aklog-obsd-20051221

make aklog build on OpenBSD

README

@@ -154,8 +154,11 @@ E  HP-UX 11.0 Notes
 
 F  OpenBSD Notes
 
-   We recommend you build with --enable-namei-fileserver and
-   --enable-largefile-fileserver options.
+   We recommend you build with the following options to configure:
+     --enable-namei-fileserver
+     --enable-largefile-fileserver
+     --enable-supergroups
+     --with-krb5
 
    You need kernel source installed to build OpenAFS.  Use the
    --with-bsd-kernel-headers= configure option if your kernel source is not

src/aklog/.cvsignore

@@ -0,0 +1,3 @@
+Makefile
+aklog
+asetkey

src/aklog/Makefile.in

@@ -37,8 +37,7 @@ ${DESTDIR}${afssrvbindir}/asetkey: asetkey
 	${INSTALL} $? $@
 
 dest: \
-	${DEST}/bin/aklog
-	${DEST}/root.server/usr/afs/bin/asetkey
+	${DEST}/bin/aklog ${DEST}/root.server/usr/afs/bin/asetkey
 
 ${DEST}/bin/aklog: aklog
 	${INSTALL} $? $@

src/aklog/aklog_main.c

@@ -70,7 +70,9 @@ u_long ntohl(u_long x)
 
 #else /* !WINDOWS */
 #include <afs/stds.h>
+#ifndef AFS_OBSD_ENV
 #include <afs/com_err.h>
+#endif
 
 #include <afs/param.h>
 #ifdef AFS_SUN5_ENV

src/aklog/asetkey.c

@@ -32,6 +32,9 @@
 int
 main(int argc, char *argv[])
 {
+#ifdef AFS_OBSD_ENV
+    fprintf(stderr, "asetkey not implemented. Use kadmin instead.\n");
+#else
     struct afsconf_dir *tdir;
     register long code;
     const char *confdir;
@@ -134,5 +137,6 @@ main(int argc, char *argv[])
 		"assistance\n", argv[0], argv[1], argv[0]);
 	exit(1);
     }
+#endif
     exit(0);
 }

src/cf/osconf.m4

@@ -374,7 +374,7 @@ case $AFS_SYSNAME in
 
 	*_obsd*)
 		KRB5CFLAGS="-I/usr/include/kerberosV"
-		KRB5LIBS="-lkrb5"
+		KRB5LIBS="-lkrb5 -lcrypto"
 		LEX="flex -l"
 		MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
 		MT_LIBS="-pthread"