aklog-obsd-20051221

make aklog build on OpenBSD

diff --git a/README b/README
index 2491c1e9f45aa05bd47d332c26295ae3e2e04d94..ad359bfd182e0d04b5ba8b415b450817b3420803 100644 (file)
--- 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 (file)
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 9fdca98ff16e4826c684916f6191e29d5d2b4296..b50cf4d8abc1e411e5ccb6f2877842280a25a0ad 100644 (file)
--- 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 f15bb162cee83a584ad9f87b7069f0fcae8eb0de..bc7737ee948e0703ee2972358c45666a3d9f52b8 100644 (file)
--- 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 36642229be7271e4acac07867848b802ea73f639..818ddbf48822373a6d3d25a3365f10c0d5adfd2b 100644 (file)
--- 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 ac8c955c3ba33b91aeef09ecddd86093ada3f15c..4ff56e90f2b4584c3c3302ee40e5340c11b0c7f2 100644 (file)
--- 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"