Use moira_schema.h

[moira.git] / incremental / afs.c

diff --git a/incremental/afs.c b/incremental/afs.c
index 140357220f6aa4b2a5dc2b27b200fc1b56bc6e47..16dc0c0b4bb649f8ed7191a88ddafa7cac47287e 100644 (file)
--- a/incremental/afs.c
+++ b/incremental/afs.c
@@ -7,6 +7,10 @@
  * <mit-copyright.h>.
  */
 
+#include <moira.h>
+#include <moira_site.h>
+#include <moira_schema.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/resource.h>
@@ -18,8 +22,6 @@
 
 #include <com_err.h>
 #include <krb.h>
-#include <moira.h>
-#include <moira_site.h>
 
 #include <afs/param.h>
 #include <afs/cellconfig.h>
@@ -64,9 +66,9 @@ extern long pr_SIdToName();
 static char tbl_buf[1024];
 static struct member {
   int op;
-  char list[33];
-  char type[9];
-  char member[129];
+  char list[LIST_NAME_SIZE];
+  char type[IMEMBERS_MEMBER_TYPE_SIZE];
+  char member[MAX_FIELD_WIDTH];
   struct member *next;
 } *member_head = NULL;
 
@@ -197,7 +199,7 @@ void do_user(char **before, int beforec, char **after, int afterc)
         from Moira but not AFS */
       if (code == PRIDEXIST)
        {
-         char ename[255];
+         char ename[PR_MAXNAMELEN];
 
          if (pr_try(pr_SIdToName, auid, ename) == 0 &&
              !strcmp(after[U_NAME], ename))
@@ -321,7 +323,7 @@ void do_list(char **before, int beforec, char **after, int afterc)
       code = pr_try(pr_CreateGroup, g1, g2, &id);
       if (code == PRIDEXIST)
        {
-         char ename[255];
+         char ename[PR_MAXNAMELEN];
 
          if (pr_try(pr_SIdToName, -agid, ename) == 0 && !strcmp(g1, ename))
            return;