From f874f6691b3237158a223b891650d800ee8abdd3 Mon Sep 17 00:00:00 2001
From: Jim Rees <rees@umich.edu>
Date: Wed, 21 Dec 2005 18:41:47 +0000
Subject: [PATCH 1/1] aklog-obsd-20051221

make aklog build on OpenBSD
---
 README                 | 7 +++++--
 src/aklog/.cvsignore   | 3 +++
 src/aklog/Makefile.in  | 3 +--
 src/aklog/aklog_main.c | 2 ++
 src/aklog/asetkey.c    | 4 ++++
 src/cf/osconf.m4       | 2 +-
 6 files changed, 16 insertions(+), 5 deletions(-)
 create mode 100644 src/aklog/.cvsignore

diff --git a/README b/README
index 2491c1e..ad359bf 100644
--- a/README
+++ b/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
diff --git a/src/aklog/.cvsignore b/src/aklog/.cvsignore
new file mode 100644
index 0000000..a62597e
--- /dev/null
+++ b/src/aklog/.cvsignore
@@ -0,0 +1,3 @@
+Makefile
+aklog
+asetkey
diff --git a/src/aklog/Makefile.in b/src/aklog/Makefile.in
index 9fdca98..b50cf4d 100644
--- a/src/aklog/Makefile.in
+++ b/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} $? $@
diff --git a/src/aklog/aklog_main.c b/src/aklog/aklog_main.c
index f15bb16..bc7737e 100644
--- a/src/aklog/aklog_main.c
+++ b/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
diff --git a/src/aklog/asetkey.c b/src/aklog/asetkey.c
index 3664222..818ddbf 100644
--- a/src/aklog/asetkey.c
+++ b/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);
 }
diff --git a/src/cf/osconf.m4 b/src/cf/osconf.m4
index ac8c955..4ff56e9 100644
--- a/src/cf/osconf.m4
+++ b/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"
-- 
1.9.4