Changes from dtanner for password processing for w2k KDC, and some code

[moira.git] / dbck / members.pc

diff --git a/dbck/members.pc b/dbck/members.pc
index 924e4d0d18deaff60836bd5bee7245a1f3b8ae69..1655f3c6e0bb139866fba91f8bd10aecb82ff821 100644 (file)
--- a/dbck/members.pc
+++ b/dbck/members.pc
@@ -45,6 +45,7 @@ struct hash *lists, *members;
 void fix_member(), display_member();
 int debug = 0, records = 0;
 
+char *db = "moira/moira";
 
 main(argc, argv)
 int argc;
@@ -58,7 +59,7 @@ char **argv;
 #endif DEBUG
 
 /*  ingres sms */
-    EXEC SQL CONNECT moira;
+    EXEC SQL CONNECT :db;
 /*  begin transaction */
 /*  range of m is imembers */
     /* No equivalent */
@@ -332,8 +333,10 @@ fix_members()
  *             and m.member_type = mtype */
        EXEC SQL DELETE FROM imembers WHERE list_id = :list_id AND
            member_id = :member_id AND member_type = :mtype;
-       EXEC SQL INQUIRE_SQL(:rowcount = rowcount); 
-       printf("  %d rows deleted\n", rowcount);
+       rowcount = sqlca.sqlerrd[2];
+       if (rowcount > 0)
+         printf("%d entr%s deleted\n", rowcount, 
+                rowcount == 1 ? "y" : "ies");
 #endif FIXERRORS
     }
     if (errmis > 0)
@@ -344,7 +347,7 @@ fix_members()
 insert_list(m)
 struct member *m;
 {
-    register struct member_list *l, *l1;
+    struct member_list *l, *l1;
 
     l = (struct member_list *) hash_lookup(lists, m->list_id);
     if (l == NULL) {
@@ -385,7 +388,7 @@ struct member *m;
 insert_member(m)
 struct member *m;
 {
-    register struct member_list *l, *l1;
+    struct member_list *l, *l1;
 
     l = (struct member_list *) hash_lookup(members, m->member_id);
     if (l == NULL) {
@@ -428,7 +431,7 @@ struct member *find_member(listid, memberid)
 int listid;
 int memberid;
 {
-    register struct member_list *l;
+    struct member_list *l;
 
     for (l = (struct member_list *) hash_lookup(lists, listid); l; l = l->next)
       if (l->member->member_id == memberid)
@@ -448,7 +451,7 @@ int *errmis;
     char *mtype;
     EXEC SQL END DECLARE SECTION; 
     char buf[2];
-    register struct member *m;
+    struct member *m;
 
     for (; l; l = l->next) {
        m = l->member;
@@ -484,8 +487,10 @@ int *errmis;
            EXEC SQL INSERT INTO imembers (list_id, member_id, 
                member_type, ref_count, direct)
              VALUES (:list_id, :member_id, :mtype, :ref_count, :dflag);
-           EXEC SQL INQUIRE_SQL(:rowcount = rowcount); 
-           printf("  %d rows added\n", rowcount);
+           rowcount = sqlca.sqlerrd[2];
+           if (rowcount > 0)
+             printf("%d entr%s added\n", rowcount, 
+                    rowcount == 1 ? "y" : "ies");
 #endif FIXERRORS
            continue;
        }
@@ -514,8 +519,10 @@ int *errmis;
            SET ref_count=ref_count+:ref_count, direct = :dflag 
            WHERE list_id = :list_id AND member_id = :member_id AND
                member_tpe = :mtype;
-       EXEC SQL INQUIRE_SQL(:rowcount = rowcount); 
-       printf("  %d rows fixed\n", rowcount);
+       rowcount = sqlca.sqlerrd[2];
+       if (rowcount > 0)
+         printf("%d entr%s updated\n", rowcount, 
+                rowcount == 1 ? "y" : "ies");
 #endif FIXERRORS
     }
 }
@@ -523,7 +530,7 @@ int *errmis;
 
 struct member *allocmember()
 {
-    register struct member *m;
+    struct member *m;
 
     m = (struct member *) malloc(sizeof(struct member));
     if (m == NULL) {
@@ -538,7 +545,7 @@ struct member *allocmember()
 
 int isinchain(m, l)
 struct member *m;
-register struct member_list *l;
+struct member_list *l;
 {
     for (; l; l = l->next)
       if (l->member == m)
@@ -548,9 +555,9 @@ register struct member_list *l;
 
 
 int chainlen(l)
-register struct member_list *l;
+struct member_list *l;
 {
-    register int i;
+    int i;
     for (i = 0; l; l = l->next, i++);
     return(i);
 }