STABLE14-test-heimdal-20060217

Add a configure test for heimdal and use it to build asetkey or not.
Thanks to Derek Atkins for his helpful suggestions.

diff --git a/Makefile.in b/Makefile.in
index 3dc490266c6abab58d0fcb19a3614add193d7e30..209d9b272bad620de87b874c3681a631dcac7de0 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -213,6 +213,24 @@ sgiefs:
 vol: cmd comerr dir afs sgiefs
        ${COMPILE_PART1} vol ${COMPILE_PART2}
 
+tsalvaged: vol libafsrpc libafsauthent cmd util
+       set -x; \
+       if test "@DEMAND_ATTACH@" = "yes" ; then \
+               case ${SYS_NAME} in \
+               alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*fbsd*|*nbsd2*) \
+                       ${COMPILE_PART1} tsalvaged ${COMPILE_PART2} ;; \
+               *_darwin_[1-6][0-9]) \
+                       echo Not building MT tsalvaged for ${SYS_NAME} ;; \
+               *_darwin_*) \
+                       ${COMPILE_PART1} tsalvaged  ${COMPILE_PART2} ;; \
+               *) \
+                       echo Not building MT tsalvaged for ${SYS_NAME} ;; \
+               esac \
+       else \
+               echo skipping tsalvaged ; \
+       fi
+
+
 vlserver: cmd comerr vol audit vlserver_depinstall
        ${COMPILE_PART1} vlserver ${COMPILE_PART2}
 
@@ -236,7 +254,7 @@ volser: cmd comerr tviced usd kauth audit
 
 tvolser: project tviced usd libafsrpc libafsauthent volser
        case ${SYS_NAME} in                                             \
-       alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[fo]bsd*|*nbsd[234]*)   \
+       alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*obsd*)   \
                ${COMPILE_PART1} tvolser  ${COMPILE_PART2} ;;           \
        *_darwin_[1-6][0-9])                                            \
                echo Not building MT volser for ${SYS_NAME} ;;          \
@@ -512,6 +530,8 @@ libafsauthent: ubik auth kauth libafsrpc
 # pthread based user space RX library
 shlibafsrpc: rx rxkad des
        case ${SYS_NAME} in \
+       amd64_linux24) \
+               echo Skipping shlibafsrpc for amd64_linux24 ;; \
        alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*) \
        ${COMPILE_PART1} shlibafsrpc ${COMPILE_PART2} ;; \
        *) \
@@ -520,6 +540,8 @@ shlibafsrpc: rx rxkad des
 
 shlibafsauthent: ubik auth kauth shlibafsrpc
        case ${SYS_NAME} in \
+       amd64_linux24) \
+               echo Skipping shlibafsauthent for amd64_linux24 ;; \
        alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*) \
        ${COMPILE_PART1} shlibafsauthent ${COMPILE_PART2} ;; \
        *) \
@@ -565,13 +587,13 @@ jafs: libjafs
 jafsadm: libjafsadm
 
 finale: project cmd comerr afsd butc tbutc @ENABLE_KERNEL_MODULE@ libuafs audit kauth log package \
-       ptserver scout bu_utils ubik uss bozo vfsck volser tvolser \
+       ptserver scout bu_utils ubik uss bozo vfsck volser tvolser tsalvaged \
        venus update xstat afsmonitor dauth rxdebug libafsrpc \
        libafsauthent shlibafsrpc shlibafsauthent libadmin login man-pages
        ${COMPILE_PART1} finale ${COMPILE_PART2}
 
 finale_nolibafs: project cmd comerr afsd butc tbutc libuafs audit kauth log package \
-       ptserver scout bu_utils ubik uss bozo vfsck volser tvolser \
+       ptserver scout bu_utils ubik uss bozo vfsck volser tvolser tsalvaged \
        venus update xstat afsmonitor dauth rxdebug libafsrpc \
        libafsauthent shlibafsrpc shlibafsauthent libadmin login man-pages
        ${COMPILE_PART1} finale ${COMPILE_PART2}
@@ -629,6 +651,7 @@ clean2:
        -${COMPILE_PART1} tviced ${COMPILE_CLEAN}
        -${COMPILE_PART1} volser ${COMPILE_CLEAN}
        -${COMPILE_PART1} tvolser ${COMPILE_CLEAN}
+       -${COMPILE_PART1} tsalvaged ${COMPILE_CLEAN}
        -${COMPILE_PART1} venus ${COMPILE_CLEAN}
        -${COMPILE_PART1} venus/test ${COMPILE_CLEAN}
        -${COMPILE_PART1} afsd ${COMPILE_CLEAN}
@@ -787,6 +810,7 @@ distclean: clean
        src/tests/Makefile \
        src/tests/run-tests \
        src/tests/OpenAFS/Dirpath.pm \
+       src/tsalvaged/Makefile \
        src/tsm41/Makefile \
        src/tviced/Makefile \
        src/tvolser/Makefile \

diff --git a/src/aklog/Makefile.in b/src/aklog/Makefile.in
index e80a872482a5e8d6c627de9864e3606c9d557d02..54a9b938fe750ee438a218e7240af74a26f6f6de 100644 (file)
--- a/src/aklog/Makefile.in
+++ b/src/aklog/Makefile.in
@@ -5,8 +5,8 @@
 srcdir=@srcdir@
 include @TOP_OBJDIR@/src/config/Makefile.config
 
-OPTMZ += @KRB5CFLAGS@ -DALLOW_REGISTER
-LIBS += @KRB5LIBS@
+OPTMZ = @KRB5CFLAGS@ -DALLOW_REGISTER
+AKLIBS = ${LIBS} @KRB5LIBS@
 AFSLIBS = ${TOP_LIBDIR}/libprot.a ${TOP_LIBDIR}/libubik.a \
          ${TOP_LIBDIR}/libauth.a ${TOP_LIBDIR}/librxkad.a \
          ${TOP_LIBDIR}/librx.a ${TOP_LIBDIR}/liblwp.a \
@@ -16,38 +16,35 @@ AFSLIBS = ${TOP_LIBDIR}/libprot.a ${TOP_LIBDIR}/libubik.a \
 SRCS=  aklog.c aklog_main.c  krb_util.c linked_list.c
 OBJS=   aklog.o aklog_main.o krb_util.o linked_list.o
 
-all: aklog asetkey
+all: aklog @ASETKEY@
 
 aklog: ${OBJS} ${AFSLIBS}
-       ${CC} -o $@ ${CFLAGS} ${OBJS} ${LIBS} ${AFSLIBS} ${XLIBS}
+       ${CC} -o $@ ${CFLAGS} ${OBJS} ${AKLIBS} ${AFSLIBS} ${XLIBS}
 
 asetkey: asetkey.o ${AFSLIBS}
        ${CC} -o $@ ${CFLAGS} asetkey.o ${AKLIBS} ${AFSLIBS} ${XLIBS}
- 
 
 #
 # Installation targets
 #
 install: \
-       ${DESTDIR}${bindir}/aklog
-       ${DESTDIR}${afssrvbindir}/asetkey
+       ${DESTDIR}${bindir}/aklog ${DESTDIR}${afssrvbindir}/asetkey
 
 ${DESTDIR}${bindir}/aklog: aklog
        ${INSTALL} $? $@
 
-${DESTDIR}${afssrvbindir}/asetkey: asetkey
-       ${INSTALL} $? $@
- 
+${DESTDIR}${afssrvbindir}/asetkey: @ASETKEY@
+       if test "x@ASETKEY@" != "x"; then ${INSTALL} $? $@; fi
+
 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} $? $@
 
-${DEST}/root.server/usr/afs/bin/asetkey: asetkey
-       ${INSTALL} $? $@
- 
+${DEST}/root.server/usr/afs/bin/asetkey: @ASETKEY@
+       if test "x@ASETKEY@" != "x"; then ${INSTALL} $? $@; fi
+
 #
 # Misc. targets
 #

diff --git a/src/aklog/aklog.h b/src/aklog/aklog.h
index 2984441f4a5eab53053c1aa686ecc8836828cb74..47acfc768669b62b62aa22fc39205be68381cf69 100644 (file)
--- a/src/aklog/aklog.h
+++ b/src/aklog/aklog.h
@@ -54,7 +54,7 @@ void aklog ARGS((int, char *[]));
 struct ktext {
     unsigned int length;
     unsigned char dat[MAX_KTXT_LEN];
-    u_int32_t mbz;
+    afs_uint32 mbz;
 };
 
 struct credentials {

diff --git a/src/aklog/aklog_main.c b/src/aklog/aklog_main.c
index f15bb162cee83a584ad9f87b7069f0fcae8eb0de..c5add3317285a48df7d7d8a8ec79c9d0ad617007 100644 (file)
--- a/src/aklog/aklog_main.c
+++ b/src/aklog/aklog_main.c
@@ -10,6 +10,7 @@ static char *rcsid =
        "$Id$";
 #endif /* lint || SABER */
 
+#include <afsconfig.h>
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
@@ -70,7 +71,9 @@ u_long ntohl(u_long x)
 
 #else /* !WINDOWS */
 #include <afs/stds.h>
+#ifndef HAVE_KERBEROSV_HEIM_ERR_H
 #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 dad9de91645e03b83bb758bb2dfd83ab2d5d88c9..3898608adfca732e6ce86b01d5d68cbf8e05b1fa 100644 (file)
--- a/src/aklog/asetkey.c
+++ b/src/aklog/asetkey.c
@@ -6,6 +6,7 @@
  * Updated for Kerberos 5
  */
 
+#include <afsconfig.h>
 #include <stdio.h>
 #include <sys/types.h>
 #include <netinet/in.h>

diff --git a/src/cf/kerberos.m4 b/src/cf/kerberos.m4
index 939d7f3bdc8a5e9d65e1fa11a086fbe61e854293..8ec840d2492eb8c3af423a4b9933b7ad59db3f49 100644 (file)
--- a/src/cf/kerberos.m4
+++ b/src/cf/kerberos.m4
@@ -60,6 +60,7 @@ if test X$conf_krb5 = XYES; then
        LIBS="$LIBS $KRB5LIBS"
        AC_CHECK_FUNCS([add_to_error_table add_error_table krb5_princ_size krb5_principal_get_comp_string krb5_524_convert_creds krb524_convert_creds_kdc])
        AC_CHECK_HEADERS([kerberosIV/krb.h])
+       AC_CHECK_HEADERS([kerberosV/heim_err.h])
 
 AC_MSG_CHECKING(for krb5_creds.keyblock existence)
 AC_CACHE_VAL(ac_cv_krb5_creds_keyblock_exists,
@@ -94,7 +95,16 @@ dnl  AC_CHECK_MEMBERS([krb5_creds.keyblock, krb5_creds.session],,, [#include <krb
        CPPFLAGS="$save_CPPFLAGS"
        LIBS="$save_LIBS"
 fi
+
+if test "$ac_cv_header_kerberosV_heim_err_h" = "yes"; then
+    ASETKEY=
+else
+    ASETKEY=asetkey
+fi
+
 AC_SUBST(BUILD_KRB5)
 AC_SUBST(KRB5CFLAGS)
 AC_SUBST(KRB5LIBS)
+AC_SUBST(ASETKEY)
+
 ])dnl