Changeset 2105 for trunk/server/common/oursrc/accountadm

Timestamp:

Dec 31, 2011, 10:26:23 PM (13 years ago)

Author:

andersk

Message:

Fix admof to compile with OpenAFS 1.6

Location:

trunk/server/common/oursrc/accountadm

Files:

• Makefile.in (modified) (2 diffs)
• admof.c (modified) (2 diffs)

trunk/server/common/oursrc/accountadm/Makefile.in

@@ -10 +10 @@
 all-local: admof signup-scripts-frontend
 
-admof: admof.c
-        $(CC) $(CPPFLAGS) $(CFLAGS) $< -L/usr/lib/afs -L/usr/lib64/afs -lprot -lauth -lrxkad -lubik -laudit -lsys -lrx -llwp -lsys -lafsutil -lcom_err -lresolv -lkrb5 -ldes -o $@
+admof: LDLIBS = -lafsauthent_pic -lafsrpc_pic -lresolv -lkrb5 -lpthread
+admof: admof.o
 
 install:
@@ -26 +26 @@
 
 clean:
-        rm -f admof signup-scripts-frontend
+        rm -f admof admof.o signup-scripts-frontend
 
 distclean: clean

trunk/server/common/oursrc/accountadm/admof.c

@@ -21 +21 @@
 #include <unistd.h>
 #include <netinet/in.h>
+#include <afs/stds.h>
 #include <afs/vice.h>
 #include <afs/venus.h>
@@ -90 +91 @@
     }
 
-    /* Note: this first free probably should be xdr_free in OpenAFS 1.5.
-     * See commits b40b606 and f02f2e8 */
-    free(tids.idlist_val);
+    xdr_free((xdrproc_t) xdr_idlist, &tids);
     tids.idlist_val = NULL;
     free(tnames.namelist_val);