Integrate keytab-based decryption into afsconf_BuildServerSecurityObjects

Now all servers can have it.

authcon.o grows a krb5 dependency and needs to get KRB5_CPPFLAGS.

Change-Id: I95fecb3f88c19b3d5193ea8200fa20c86ec08ad7

diff --git a/configure.ac b/configure.ac
index ccbb2edfa3555ee0d9b780655b9b65fcec774d70..788256f56c68ffc68510bc8a9156881dffd25bb6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -50,6 +50,8 @@ MAKE_KRB5="#"
 AS_IF([test x"$KRB5_LIBS" != x],
     [BUILD_KRB5=yes
      MAKE_KRB5=
+     AC_DEFINE([USE_RXKAD_KEYTAB], 1,
+              [Define to 1 if krb5 libraries are available and rxkad can use keytabs])
      RRA_LIB_KRB5_SWITCH
      AC_CHECK_FUNCS([add_error_table \
         add_to_error_table \

diff --git a/src/auth/Makefile.in b/src/auth/Makefile.in
index dd718b460a3d6b65a7a491e96b60814455babfb6..dc209babdcd865f72e007b8cc4e279c323d004df 100644 (file)
--- a/src/auth/Makefile.in
+++ b/src/auth/Makefile.in
@@ -57,7 +57,10 @@ ${TOP_LIBDIR}/libauth.krb.a: libauth.krb.a
 cellconfig.o: cellconfig.c ${INCLS}
 ktc.o: ktc.c ${INCLS} ${TOP_INCDIR}/afs/vice.h
 writeconfig.o: writeconfig.c ${INCLS}
+
 authcon.o: authcon.c ${INCLS}
+       ${CCOBJ} ${CFLAGS} -c ${srcdir}/authcon.c @KRB5_CPPFLAGS@
+
 userok.o: userok.c ${INCLS}
 cellconfig.o: cellconfig.c ${INCLS}
 copyauth.o: copyauth.c ${INCLS} AFS_component_version_number.o

diff --git a/src/auth/authcon.c b/src/auth/authcon.c
index 55f0d6a6fc5ce8ec5b27b5861e451638e4517b71..14c119f0f4eeeaae0373177f61f6a2a3ff14bf4c 100644 (file)
--- a/src/auth/authcon.c
+++ b/src/auth/authcon.c
@@ -26,7 +26,11 @@
 #include <des.h>
 #include <des_prototypes.h>
 #include <rx/rxkad.h>
+#ifdef USE_RXKAD_KEYTAB
+#include <afs/dirpath.h>
+#endif
 #include <rx/rx.h>
+#include <afs/afsutil.h>
 #include "cellconfig.h"
 #include "keys.h"
 #include "auth.h"
@@ -51,13 +55,30 @@ afsconf_ServerAuth(void *arock,
 {
     struct afsconf_dir *adir = (struct afsconf_dir *) arock;
     struct rx_securityClass *tclass;
-
+#ifdef USE_RXKAD_KEYTAB
+    int keytab_enable = 0;
+    char *keytab_name;
+    size_t ktlen;
+    ktlen = 5 + strlen(adir->name) + 1 + strlen(AFSDIR_RXKAD_KEYTAB_FILE) + 1;
+    keytab_name = malloc(ktlen);
+    if (keytab_name != NULL) {
+       strcompose(keytab_name, ktlen, "FILE:", adir->name, "/",
+                  AFSDIR_RXKAD_KEYTAB_FILE, (char *)NULL);
+       if (rxkad_InitKeytabDecrypt(keytab_name) == 0)
+           keytab_enable = 1;
+       free(keytab_name);
+    }
+#endif
     LOCK_GLOBAL_MUTEX;
     tclass = (struct rx_securityClass *)
        rxkad_NewServerSecurityObject(0, adir, afsconf_GetKey, NULL);
     if (tclass) {
        *astr = tclass;
        *aindex = RX_SECIDX_KAD;
+#ifdef USE_RXKAD_KEYTAB
+       if (keytab_enable)
+           rxkad_BindKeytabDecrypt(tclass);
+#endif
        UNLOCK_GLOBAL_MUTEX;
        return 0;
     } else {
@@ -231,6 +252,20 @@ afsconf_BuildServerSecurityObjects(struct afsconf_dir *dir,
                                   struct rx_securityClass ***classes,
                                   afs_int32 *numClasses)
 {
+#ifdef USE_RXKAD_KEYTAB
+    int keytab_enable = 0;
+    char *keytab_name;
+    size_t ktlen;
+    ktlen = 5 + strlen(dir->name) + 1 + strlen(AFSDIR_RXKAD_KEYTAB_FILE) + 1;
+    keytab_name = malloc(ktlen);
+    if (keytab_name != NULL) {
+       strcompose(keytab_name, ktlen, "FILE:", dir->name, "/",
+                  AFSDIR_RXKAD_KEYTAB_FILE, (char *)NULL);
+       if (rxkad_InitKeytabDecrypt(keytab_name) == 0)
+           keytab_enable = 1;
+       free(keytab_name);
+    }
+#endif
     if (flags & AFSCONF_SEC_OBJS_RXKAD_CRYPT)
        *numClasses = 4;
     else
@@ -242,9 +277,18 @@ afsconf_BuildServerSecurityObjects(struct afsconf_dir *dir,
     (*classes)[1] = NULL;
     (*classes)[2] = rxkad_NewServerSecurityObject(0, dir,
                                                  afsconf_GetKey, NULL);
-    if (flags & AFSCONF_SEC_OBJS_RXKAD_CRYPT)
+#ifdef USE_RXKAD_KEYTAB
+    if (keytab_enable)
+       rxkad_BindKeytabDecrypt((*classes)[2]);
+#endif
+    if (flags & AFSCONF_SEC_OBJS_RXKAD_CRYPT) {
        (*classes)[3] = rxkad_NewServerSecurityObject(rxkad_crypt, dir,
                                                      afsconf_GetKey, NULL);
+#ifdef USE_RXKAD_KEYTAB
+       if (keytab_enable)
+           rxkad_BindKeytabDecrypt((*classes)[3]);
+#endif
+    }
 }
 #endif
 

diff --git a/src/bozo/Makefile.in b/src/bozo/Makefile.in
index 4890fe0d99cbe24f800c956fb7250d007072c5c8..a89898f980e171e078991a9a3ea1fa0f691c830c 100644 (file)
--- a/src/bozo/Makefile.in
+++ b/src/bozo/Makefile.in
@@ -96,13 +96,13 @@ bos.o: bos.c ${INCLS} AFS_component_version_number.o
        $(CC) $(CFLAGS) -c ${srcdir}/bos.c
 
 bos: bos.o $(LIBS) libbos.a
-       ${CC} ${CFLAGS} -o bos bos.o libbos.a $(LIBS)  ${XLIBS}
+       ${CC} ${CFLAGS} -o bos bos.o libbos.a $(LIBS)  ${XLIBS} ${KRB5_LIBS}
 
 bos_util.o: bos_util.c ${INCLS} AFS_component_version_number.o ${TOP_INCDIR}/afs/bnode.h
        $(CC) $(CFLAGS) -c ${srcdir}/bos_util.c
 
 bos_util: bos_util.o $(LIBS) 
-       ${CC} ${CFLAGS} -o bos_util bos_util.o $(LIBS)  ${XLIBS}
+       ${CC} ${CFLAGS} -o bos_util bos_util.o $(LIBS)  ${XLIBS} ${KRB5_LIBS}
 
 ezbnodeops.o: ezbnodeops.c ${INCLS}
 
@@ -114,7 +114,7 @@ libbos.a: bosint.xdr.o bosint.cs.o boserr.o AFS_component_version_number.o
        $(RANLIB) $@
 
 bosserver: $(OBJS) $(LIBS)
-       ${CC} $(CFLAGS) -o bosserver $(OBJS) ${TOP_LIBDIR}/libaudit.a $(LIBS)  ${XLIBS} 
+       ${CC} $(CFLAGS) -o bosserver $(OBJS) ${TOP_LIBDIR}/libaudit.a $(LIBS)  ${XLIBS} ${KRB5_LIBS}
 
 #
 # Install targets

diff --git a/src/bucoord/Makefile.in b/src/bucoord/Makefile.in
index 465f5538b1f6e8135fccad5c10a12b2bda621c40..b41086d31363c9fe4bdf63246725e60751a7a794 100644 (file)
--- a/src/bucoord/Makefile.in
+++ b/src/bucoord/Makefile.in
@@ -67,7 +67,7 @@ main.o: AFS_component_version_number.c
 $(BACKOBJS): bc.h ${TOP_INCDIR}/afs/butc.h
 
 backup:  $(BACKOBJS) ${LIBS}
-       ${CC} ${CFLAGS} -o backup $(BACKOBJS) ${LIBS} ${XLIBS}
+       ${CC} ${CFLAGS} -o backup $(BACKOBJS) ${LIBS} ${XLIBS} ${KRB5_LIBS}
 
 bc.h: bucoord_errs.c
 

diff --git a/src/budb/Makefile.in b/src/budb/Makefile.in
index 29ce529e7d1ce673abaaea39f07cfde9b9971ae2..3c94964d804151878a427c4f3d77be91438dfc05 100644 (file)
--- a/src/budb/Makefile.in
+++ b/src/budb/Makefile.in
@@ -96,7 +96,7 @@ struct_ops.o: budb_errs.h ${TOP_INCDIR}/afs/budb_client.h
 server.o: server.c budb_errs.h ${INCLS} AFS_component_version_number.c
 
 budb_server: $(SERVER_OBJS) ${LIBS} ${TOP_INCDIR}/afs/budb_client.h
-       ${CC} ${LDFLAGS} -o budb_server $(SERVER_OBJS) ${LIBS} ${XLIBS}
+       ${CC} ${LDFLAGS} -o budb_server $(SERVER_OBJS) ${LIBS} ${XLIBS} ${KRB5_LIBS}
 
 budb.cs.c: budb.rg
        ${RXGEN} -A -u -C -o $@ ${srcdir}/budb.rg

diff --git a/src/butc/Makefile.in b/src/butc/Makefile.in
index 34ad963c0d8345af3f2c744dce1af1b1e759694d..078fd6efbb63a55b2121a41aad6a36971d79b6fc 100644 (file)
--- a/src/butc/Makefile.in
+++ b/src/butc/Makefile.in
@@ -56,15 +56,15 @@ SOBJS=dbentries.o tcprocs.o lwps.o tcmain.o list.o recoverDb.o tcudbprocs.o \
 all: butc read_tape
 
 butc_test: ${TESTOBJS} ${LIBS} ${INCLS} ${HACKS}
-       ${CC} ${CFLAGS} ${TESTOBJS} ${LIBS} ${XLIBS} -o butc_test
+       ${CC} ${CFLAGS} ${TESTOBJS} ${LIBS} ${XLIBS} ${KRB5_LIBS} -o butc_test
 
 tdump: tdump.c AFS_component_version_number.c
        ${CC} ${CFLAGS} ${srcdir}/tdump.c -o tdump
 
 butc: ${SOBJS} ${LIBS} ${INCLS} ${HACKS}
        @case ${SYS_NAME} in \
-         rs_aix*) ${CC} ${CFLAGS} ${SOBJS} ${LIBS} ${XLIBS} /usr/lib/libc_r.a -o butc;; \
-         *)        ${CC} ${CFLAGS} ${SOBJS} ${LIBS} ${XLIBS} -o butc;; \
+         rs_aix*) ${CC} ${CFLAGS} ${SOBJS} ${LIBS} ${XLIBS} ${KRB5_LIBS} /usr/lib/libc_r.a -o butc;; \
+         *)        ${CC} ${CFLAGS} ${SOBJS} ${LIBS} ${XLIBS} ${KRB5_LIBS} -o butc;; \
        esac
 
 tcmain.o: tcmain.c ${INCLS} AFS_component_version_number.c

diff --git a/src/config/Makefile.config.in b/src/config/Makefile.config.in
index 5a6ea7c6e7d9c993ad0b09439f121f0eea3e4419..cb57007932111fe47eea0c70bc1a8c91d3796fb5 100644 (file)
--- a/src/config/Makefile.config.in
+++ b/src/config/Makefile.config.in
@@ -47,6 +47,7 @@ FSINCLUDES = @FSINCLUDES@
 INCLUDE_LIBINTL = @INCLUDE_libintl@
 KERN_DBG = @KERN_DBG@
 KERN_OPTMZ = @KERN_OPTMZ@
+KRB5_LIBS = @KRB5_LIBS@
 LD = @LD@
 LEX = @LEX@
 LIB_AFSDB = @LIB_AFSDB@

diff --git a/src/dviced/Makefile.in b/src/dviced/Makefile.in
index 40d8bc0035db28a13e451dbf36dafe3c2fd5d499..5b8f5cdd3a79144db6da6b9e3c8d71c83dcc401a 100644 (file)
--- a/src/dviced/Makefile.in
+++ b/src/dviced/Makefile.in
@@ -211,7 +211,7 @@ state_analyzer.o: ${TVICED}/state_analyzer.c
        ${CCRULE}
 
 dafileserver: ${objects} ${LIBS}
-       ${CC} ${LDFLAGS} -o dafileserver ${objects} ${LIBS} ${MT_LIBS} ${XLIBS}
+       ${CC} ${LDFLAGS} -o dafileserver ${objects} ${LIBS} ${MT_LIBS} ${XLIBS} ${KRB5_LIBS}
 
 state_analyzer: ${SDBGOBJS}
        ${CC} ${LDFLAGS} -o state_analyzer ${SDBGOBJS} ${MT_LIBS} ${XLIBS}

diff --git a/src/dvolser/Makefile.in b/src/dvolser/Makefile.in
index da3925e5ec95a89982bdc2d07c5618f096689ae7..46bdd8d22c58f31ec8688d0f8f8e31dac1e00fa9 100644 (file)
--- a/src/dvolser/Makefile.in
+++ b/src/dvolser/Makefile.in
@@ -218,7 +218,7 @@ afsint.xdr.o: ${FSINT}/afsint.xdr.c
        ${COMPILE}
 
 davolserver: ${objects} ${LIBS}
-       ${CC} ${LDFLAGS} -o davolserver ${objects} ${LIBS} ${MT_LIBS} ${XLIBS}
+       ${CC} ${LDFLAGS} -o davolserver ${objects} ${LIBS} ${MT_LIBS} ${XLIBS} ${KRB5_LIBS}
 
 install: davolserver
        ${INSTALL} -d ${DESTDIR}${afssrvlibexecdir}

diff --git a/src/fsprobe/Makefile.in b/src/fsprobe/Makefile.in
index af1244baabd850ed602c7fc18a559cd6daafe97d..30fbeadcefad83e30b08e296733e6bc164850431 100644 (file)
--- a/src/fsprobe/Makefile.in
+++ b/src/fsprobe/Makefile.in
@@ -51,7 +51,7 @@ fsprobe_callback.o: fsprobe_callback.c ${INCLS}
 
 fsprobe_test: fsprobe_test.o libfsprobe.a ${LIBS}
        ${CC} ${CFLAGS} -o fsprobe_test fsprobe_test.o libfsprobe.a \
-               ${LIBS} ${XLIBS}
+               ${LIBS} ${XLIBS} ${KRB5_LIBS}
 
 #
 # Install targets

diff --git a/src/kauth/Makefile.in b/src/kauth/Makefile.in
index 9ba2cb5179f3ef475025bee5ee3e31cf8723e4b6..e2157cb25c7072c746b7839ca498f37175752609 100644 (file)
--- a/src/kauth/Makefile.in
+++ b/src/kauth/Makefile.in
@@ -89,7 +89,7 @@ test tests: all
        cd test; $(MAKE)
 
 kaserver: kautils.o kalocalcell.o kadatabase.o kaprocs.o kalog.o kauth.ss.o kauth.xdr.o kaserver.o kaaux.o krb_udp.o kaauxdb.o $(LIBS) 
-       ${CC} ${LDFLAGS} -o kaserver kaserver.o kautils.o kalocalcell.o kadatabase.o krb_udp.o kaprocs.o kalog.o kauth.ss.o kauth.xdr.o kaaux.o kaauxdb.o $(LIBS) ${XLIBS} ${TOP_LIBDIR}/libaudit.a
+       ${CC} ${LDFLAGS} -o kaserver kaserver.o kautils.o kalocalcell.o kadatabase.o krb_udp.o kaprocs.o kalog.o kauth.ss.o kauth.xdr.o kaaux.o kaauxdb.o $(LIBS) ${XLIBS} ${TOP_LIBDIR}/libaudit.a ${KRB5_LIBS}
 
 kaserver.o: kaserver.c ${INCLS} AFS_component_version_number.o
 
@@ -175,19 +175,19 @@ krb_tf.o: krb_tf.c ${INCLS}
 
 kas: kauth.h kautils.h admin_tools.o libkauth.a $(LIBS) kas.o kkids.o
        ${CC} ${LDFLAGS} -o kas kas.o admin_tools.o kkids.o libkauth.a \
-                       ${LIBS} ${XLIBS}
+                       ${LIBS} ${XLIBS} ${KRB5_LIBS}
 
 klog: AFS_component_version_number.o kauth.h kautils.h libkauth.a $(LIBS) \
        klog.o
-       ${CC} ${LDFLAGS} -o klog klog.o libkauth.a ${LIBS} ${XLIBS}
+       ${CC} ${LDFLAGS} -o klog klog.o libkauth.a ${LIBS} ${XLIBS} ${KRB5_LIBS}
 
 klog.o: klog.c kauth.h kautils.h AFS_component_version_number.o
 
 klog.krb: kauth.h kautils.h libkauth.krb.a $(KLIBS) klog.o
-       ${CC} ${LDFLAGS} -o klog.krb klog.o libkauth.krb.a ${KLIBS} ${XLIBS}
+       ${CC} ${LDFLAGS} -o klog.krb klog.o libkauth.krb.a ${KLIBS} ${XLIBS} ${KRB5_LIBS}
 
 knfs: kauth.h kautils.h libkauth.a $(LIBS) knfs.o
-       ${CC} ${LDFLAGS} -o knfs knfs.o libkauth.a ${LIBS} ${XLIBS}
+       ${CC} ${LDFLAGS} -o knfs knfs.o libkauth.a ${LIBS} ${XLIBS} ${KRB5_LIBS}
 
 knfs.o: knfs.c AFS_component_version_number.o
 
@@ -195,22 +195,22 @@ klogin.o: klogin.c ${INCLS} AFS_component_version_number.o
        ${CC} ${CFLAGS} -c ${srcdir}/klogin.c -DKAUTH
 
 klogin: libkauth.a $(LIBS) klogin.o
-       ${CC} ${LDFLAGS} -o klogin klogin.o libkauth.a ${LIBS} ${XLIBS}
+       ${CC} ${LDFLAGS} -o klogin klogin.o libkauth.a ${LIBS} ${XLIBS} ${KRB5_LIBS}
 
 klogin.krb: libkauth.a $(KLIBS) klogin.o
-       ${CC} ${LDFLAGS} -o klogin.krb klogin.o libkauth.krb.a ${KLIBS} ${XLIBS}
+       ${CC} ${LDFLAGS} -o klogin.krb klogin.o libkauth.krb.a ${KLIBS} ${XLIBS} ${KRB5_LIBS}
 
 kpasswd.o: kauth.h kautils.h ${INCLS} kpasswd.c AFS_component_version_number.o
        ${CC} ${CFLAGS} -c ${srcdir}/kpasswd.c 
 
 kpasswd: kauth.h kautils.h libkauth.a $(LIBS) kpasswd.o kkids.o
-       ${CC} ${LDFLAGS} -o kpasswd kpasswd.o kkids.o libkauth.a ${LIBS} ${XLIBS}
+       ${CC} ${LDFLAGS} -o kpasswd kpasswd.o kkids.o libkauth.a ${LIBS} ${XLIBS} ${KRB5_LIBS}
 
 kpwvalid.o: kpwvalid.c AFS_component_version_number.o
        ${CC} ${CFLAGS} -c ${srcdir}/kpwvalid.c
 
 kpwvalid: kpwvalid.o $(LIBS)
-       ${CC} ${LDFLAGS} -o kpwvalid kpwvalid.o ${LIBS} ${XLIBS}
+       ${CC} ${LDFLAGS} -o kpwvalid kpwvalid.o ${LIBS} ${XLIBS} ${KRB5_LIBS}
 
 user.krb.o: user.c ${INCLS} ${TOP_INCDIR}/afs/vice.h
        ${CCOBJ} ${CFLAGS} -DAFS_KERBEROS_ENV -c ${srcdir}/user.c -o user.krb.o
@@ -219,7 +219,7 @@ user.o: user.c ${INCLS} ${TOP_INCDIR}/afs/vice.h
        ${CCOBJ} ${CFLAGS} -c ${srcdir}/user.c
 
 kdb: kdb.o ${INCLS} ${LIBS} libkauth.a
-       ${CC} ${LDFLAGS} -o kdb kdb.o libkauth.a ${LIBS} ${XLIBS}
+       ${CC} ${LDFLAGS} -o kdb kdb.o libkauth.a ${LIBS} ${XLIBS} ${KRB5_LIBS}
 
 kdb.o: kdb.c AFS_component_version_number.o
 
@@ -232,12 +232,12 @@ krb_udp: krb_udp.o libkauth.a $(KLIBS)
 ka-forwarder.o: ka-forwarder.c
 
 ka-forwarder: ka-forwarder.o
-       ${CC} -o $@ ${CFLAGS} ka-forwarder.o ${LIBS} ${XLIBS}
+       ${CC} -o $@ ${CFLAGS} ka-forwarder.o ${LIBS} ${XLIBS} ${KRB5_LIBS}
 
 rebuild.o: rebuild.c $(INCLS) AFS_component_version_number.o
 
 rebuild: rebuild.o kautils.o $(LIBS)
-       ${CC} ${LDFLAGS} -o rebuild rebuild.o kautils.o $(LIBS) ${XLIBS}
+       ${CC} ${LDFLAGS} -o rebuild rebuild.o kautils.o $(LIBS) ${XLIBS} ${KRB5_LIBS}
 
 #
 # Install targets

diff --git a/src/libafsauthent/Makefile.in b/src/libafsauthent/Makefile.in
index 7bf1f2ecf8ea8eb2a540a5c35b082b2bd237c9d1..730a4484caf500075bb66933e59fc7885a169f05 100644 (file)
--- a/src/libafsauthent/Makefile.in
+++ b/src/libafsauthent/Makefile.in
@@ -69,7 +69,7 @@ UTILOBJS = \
        fileutil.o
 
 RXKADOBJS = \
-       rxkad_errs.o
+       rxkad_errs.o @MAKE_KRB5@ ticket5_keytab.o
 
 SYSOBJS = \
        rmtsysc.o \
@@ -131,7 +131,7 @@ writeconfig.o: ${AUTH}/writeconfig.c
        ${CCRULE} -I../auth
 
 authcon.o: ${AUTH}/authcon.c
-       ${CCRULE} -I../auth
+       ${CCRULE} -I../auth @KRB5_CPPFLAGS@
 
 ktc_errors.o: ${AUTH}/ktc_errors.c
        ${CCRULE}
@@ -214,6 +214,9 @@ pthread_glock.o: ${UTIL}/pthread_glock.c
 rxkad_errs.o: ${RXKAD}/rxkad_errs.c
        ${CCRULE}
 
+ticket5_keytab.o: ${RXKAD}/ticket5_keytab.c
+       ${CCRULE} @KRB5_CPPFLAGS@
+
 ptclient.o: ${PTSERVER}/ptclient.c
        ${CCRULE} -I../ptserver
 

diff --git a/src/pam/Makefile.in b/src/pam/Makefile.in
index b180a69f03f2dcee7094193b0c749963eff4a776..2e721e793732a00a2d01ed2340feac4413b772a0 100644 (file)
--- a/src/pam/Makefile.in
+++ b/src/pam/Makefile.in
@@ -22,9 +22,10 @@ AFSLIBS = ${TOP_LIBDIR}/librxkad.a ${TOP_LIBDIR}/libsys.a \
 
 LDFLAGS = ${SHLIB_LDFLAGS}
    LIBS = ${TOP_LIBDIR}/libafsauthent_pic.a ${TOP_LIBDIR}/libafsrpc_pic.a \
-         ${PAM_LIBS} @LIB_AFSDB@ ${MT_LIBS}
+         ${PAM_LIBS} ${KRB5_LIBS} @LIB_AFSDB@ ${MT_LIBS}
   KLIBS = ktc_krb.o ${TOP_LIBDIR}/libafsauthent_pic.a \
-         ${TOP_LIBDIR}/libafsrpc_pic.a ${PAM_LIBS} @LIB_AFSDB@ ${MT_LIBS}
+         ${TOP_LIBDIR}/libafsrpc_pic.a ${PAM_LIBS} ${KRB5_LIBS} \
+         @LIB_AFSDB@ ${MT_LIBS}
  SHOBJS = afs_account.o afs_session.o afs_password.o \
          afs_pam_msg.o afs_message.o AFS_component_version_number.o
    OBJS = $(SHOBJS) test_pam.o

diff --git a/src/ptserver/Makefile.in b/src/ptserver/Makefile.in
index d07520bd09abf9d5a538a566f6590c103814e7ab..d4663c8b2e1b71a6022fcab3751725c15d31a320 100644 (file)
--- a/src/ptserver/Makefile.in
+++ b/src/ptserver/Makefile.in
@@ -96,7 +96,7 @@ ${TOP_INCDIR}/afs/ptserver.h: ptserver.h
 # Build targets
 #
 ptserver: ptserver.o ptutils.o ptprocs.o ptint.ss.o ptint.xdr.o utils.o $(LIBS) ${TOP_LIBDIR}/libaudit.a map.o
-       $(CC) ${CFLAGS} -o ptserver ptserver.o ptutils.o ptprocs.o ptint.ss.o ptint.xdr.o utils.o map.o $(LIBS) ${XLIBS} ${TOP_LIBDIR}/libaudit.a
+       $(CC) ${CFLAGS} -o ptserver ptserver.o ptutils.o ptprocs.o ptint.ss.o ptint.xdr.o utils.o map.o $(LIBS) ${XLIBS} ${TOP_LIBDIR}/libaudit.a ${KRB5_LIBS}
 
 ptserver.o: ptserver.c ${INCLS} AFS_component_version_number.c
 
@@ -146,10 +146,10 @@ display.o: display.c ${INCLS}
 db_verify.o: db_verify.c ${INCLS} AFS_component_version_number.c
 
 db_verify: db_verify.o pterror.o display.o $(LIBS)
-       $(CC) ${CFLAGS} -o db_verify db_verify.o display.o pterror.o $(LIBS) ${XLIBS}
+       $(CC) ${CFLAGS} -o db_verify db_verify.o display.o pterror.o $(LIBS) ${XLIBS} ${KRB5_LIBS}
 
 ptclient: ptclient.o display.o libprot.a $(LIBS)
-       $(CC) ${CFLAGS} -o ptclient ptclient.o display.o libprot.a $(LIBS) ${XLIBS}
+       $(CC) ${CFLAGS} -o ptclient ptclient.o display.o libprot.a $(LIBS) ${XLIBS} ${KRB5_LIBS}
 
 ptclient.o: ptclient.c ${INCLS} AFS_component_version_number.c
 
@@ -165,32 +165,32 @@ libprot.a: ptuser.o pterror.o ptint.cs.o ptint.xdr.o AFS_component_version_numbe
        $(RANLIB) $@
 
 pts: pts.o libprot.a ${TOP_LIBDIR}/libcmd.a $(LIBS)
-       $(CC) ${CFLAGS} -o pts pts.o ${TOP_LIBDIR}/libcmd.a libprot.a ${LIBS} ${XLIBS}
+       $(CC) ${CFLAGS} -o pts pts.o ${TOP_LIBDIR}/libcmd.a libprot.a ${LIBS} ${XLIBS} ${KRB5_LIBS}
 
 pts.o: pts.c ${LINCLS} ${TOP_INCDIR}/afs/cmd.h AFS_component_version_number.c
 
 readgroup: readgroup.o libprot.a $(LIBS)
-       $(CC) ${CFLAGS} -o readgroup readgroup.o libprot.a ${LIBS} ${XLIBS}
+       $(CC) ${CFLAGS} -o readgroup readgroup.o libprot.a ${LIBS} ${XLIBS} ${KRB5_LIBS}
 
 readgroup.o: readgroup.c ${LINCLS} AFS_component_version_number.c
 
 readpwd: readpwd.o libprot.a $(LIBS)
-       $(CC) ${CFLAGS} -o readpwd readpwd.o libprot.a ${LIBS} ${XLIBS}
+       $(CC) ${CFLAGS} -o readpwd readpwd.o libprot.a ${LIBS} ${XLIBS} ${KRB5_LIBS}
 
 readpwd.o: readpwd.c ${LINCLS} AFS_component_version_number.c
 
 testpt: testpt.o libprot.a ${TOP_LIBDIR}/libcmd.a $(LIBS)
        case "$(SYS_NAME)" in \
        *_darwin_12 ) \
-               $(CC) ${CFLAGS} -o testpt testpt.o ${TOP_LIBDIR}/libcmd.a libprot.a $(LIBS) ;; \
+               $(CC) ${CFLAGS} -o testpt testpt.o ${TOP_LIBDIR}/libcmd.a libprot.a $(LIBS) ${KRB5_LIBS} ;; \
        * ) \
-               $(CC) ${CFLAGS} -o testpt testpt.o -lm ${TOP_LIBDIR}/libcmd.a libprot.a $(LIBS) ${XLIBS} ;; \
+               $(CC) ${CFLAGS} -o testpt testpt.o -lm ${TOP_LIBDIR}/libcmd.a libprot.a $(LIBS) ${XLIBS} ${KRB5_LIBS} ;; \
        esac
 
 testpt.o: testpt.c ${INCLS} ${TOP_INCDIR}/afs/cmd.h AFS_component_version_number.c
 
 pt_util: pt_util.o ptutils.o ubik.o utils.o map.o libprot.a $(LIBS)
-       $(CC) ${CFLAGS} -o pt_util pt_util.o ptutils.o ubik.o utils.o map.o libprot.a ${TOP_LIBDIR}/libcmd.a $(LIBS) ${XLIBS}
+       $(CC) ${CFLAGS} -o pt_util pt_util.o ptutils.o ubik.o utils.o map.o libprot.a ${TOP_LIBDIR}/libcmd.a $(LIBS) ${XLIBS} ${KRB5_LIBS}
 
 ubik.o: ubik.c ${INCLS}
 

diff --git a/src/scout/Makefile.in b/src/scout/Makefile.in
index 374bfb354c25aeaaebbd9e451fa5d6bf3fe02f26..7bc00bf6af496de95105d591d0ec4da4f7654cea 100644 (file)
--- a/src/scout/Makefile.in
+++ b/src/scout/Makefile.in
@@ -53,7 +53,7 @@ all: scout
 scout.o: scout.c ${INCLS} AFS_component_version_number.c
 
 scout: scout.o $(LIBS)
-       ${CC} ${LDFLAGS} -o scout scout.o $(LIBS) ${LIB_curses} ${XLIBS}
+       ${CC} ${LDFLAGS} -o scout scout.o $(LIBS) ${LIB_curses} ${XLIBS} ${KRB5_LIBS}
 
 #
 # Installation targets

diff --git a/src/shlibafsauthent/Makefile.in b/src/shlibafsauthent/Makefile.in
index dddff33a5cae642f213a26f584f2bb2b07f5ce9b..ddc0a87daf1c6a642dfbc66d1f0b7002333cd470 100644 (file)
--- a/src/shlibafsauthent/Makefile.in
+++ b/src/shlibafsauthent/Makefile.in
@@ -74,7 +74,7 @@ UTILOBJS = \
        fileutil.o
 
 RXKADOBJS = \
-       rxkad_errs.o
+       rxkad_errs.o @MAKE_KRB5@ ticket5_keytab.o
 
 SYSOBJS = \
        rmtsysc.o \
@@ -133,7 +133,7 @@ dest: ${LIBAFSAUTHENT} libafsauthent_pic.a
 ${LIBAFSAUTHENT}: ${LIBOBJS} libafsauthent.map
        ../config/shlib-build -d $(srcdir) -l libafsauthent \
                -M ${LIBAFSAUTHENTMAJOR} -m ${LIBAFSAUTHENTMINOR} -- \
-               -L${TOP_LIBDIR} -lafsrpc ${LIB_crypt} ${LIBOBJS} ${LIB_AFSDB} ${MT_LIBS}
+               -L${TOP_LIBDIR} -lafsrpc ${LIB_crypt} ${LIBOBJS} ${LIB_AFSDB} ${MT_LIBS} ${KRB5_LIBS}
 
 libafsauthent_pic.a: ${LIBOBJS}
        $(RM) -f $@
@@ -162,7 +162,7 @@ writeconfig.o: ${AUTH}/writeconfig.c
        ${CCRULE}
 
 authcon.o: ${AUTH}/authcon.c
-       ${CCRULE}
+       ${CCRULE} @KRB5_CPPFLAGS@
 
 ktc_errors.o: ${AUTH}/ktc_errors.c
        ${CCRULE}
@@ -245,6 +245,9 @@ pthread_glock.o: ${UTIL}/pthread_glock.c
 rxkad_errs.o: ${RXKAD}/rxkad_errs.c
        ${CCRULE}
 
+ticket5_keytab.o: ${RXKAD}/ticket5_keytab.c
+       ${CCRULE} @KRB5_CPPFLAGS@
+
 ptclient.o: ${PTSERVER}/ptclient.c
        ${CCRULE}
 

diff --git a/src/tbudb/Makefile.in b/src/tbudb/Makefile.in
index 039494128f7be1947c5789de51c592f210c6e76a..6ff9493d8634b0696131ab9080b421a080c0035b 100644 (file)
--- a/src/tbudb/Makefile.in
+++ b/src/tbudb/Makefile.in
@@ -155,7 +155,7 @@ server.o: ${BUDB}/server.c budb_errs.h ${INCLS}
 
 
 budb_server: $(SERVER_OBJS) ${LIBS}
-       ${CC} ${LDFLAGS} -o budb_server $(SERVER_OBJS) ${LIBS} ${MT_LIBS} ${XLIBS}
+       ${CC} ${LDFLAGS} -o budb_server $(SERVER_OBJS) ${LIBS} ${MT_LIBS} ${XLIBS} ${KRB5_LIBS}
 
 budb.cs.c: ${BUDB}/budb.rg
        ${RXGEN} -u -C -o $@ ${srcdir}/${BUDB}/budb.rg

diff --git a/src/tbutc/Makefile.in b/src/tbutc/Makefile.in
index 43f36c9a63e82f2fbfa441cf270200f835d003f1..5227227ecf66cfa561fc73f8c4a0d46e89ca4c6c 100644 (file)
--- a/src/tbutc/Makefile.in
+++ b/src/tbutc/Makefile.in
@@ -70,7 +70,7 @@ BUTCLIBS=${TOP_LIBDIR}/libbudb.a \
 all: butc
 
 butc: ${BUTCOBJS} ${BUTCLIBS}
-       ${CC} ${CFLAGS} ${BUTCOBJS} ${BUTCLIBS} ${MT_LIBS} ${XLIBS} -o butc
+       ${CC} ${CFLAGS} ${BUTCOBJS} ${BUTCLIBS} ${MT_LIBS} ${XLIBS} ${KRB5_LIBS} -o butc
 
 libbutm.a: ${BUTMOBJS} AFS_component_version_number.o
        -$(RM) -f libbutm.a

diff --git a/src/tptserver/Makefile.in b/src/tptserver/Makefile.in
index 379dc61d3e8ad42e9d21a10aa310c733473fe02d..a5d1989cfba7400f8eb0b18ae34a7b071d57fd25 100644 (file)
--- a/src/tptserver/Makefile.in
+++ b/src/tptserver/Makefile.in
@@ -155,7 +155,7 @@ display.o: ${PTSERVER}/display.c ${INCLS}
        ${CCRULE} ${srcdir}/${PTSERVER}/display.c
 
 ptserver: ptserver.o ptutils.o ptprocs.o ptint.ss.o ptint.xdr.o utils.o $(LIBS) ${TOP_LIBDIR}/libaudit.a map.o
-       ${CC} ${LDFLAGS} -o ptserver ptserver.o ptutils.o ptprocs.o ptint.ss.o ptint.xdr.o utils.o map.o $(LIBS) ${MT_LIBS} ${XLIBS} ${TOP_LIBDIR}/libaudit.a
+       ${CC} ${LDFLAGS} -o ptserver ptserver.o ptutils.o ptprocs.o ptint.ss.o ptint.xdr.o utils.o map.o $(LIBS) ${MT_LIBS} ${XLIBS} ${TOP_LIBDIR}/libaudit.a ${KRB5_LIBS}
 
 db_verify.o: ${PTSERVER}/db_verify.c ${INCLS}
        ${CCRULE} ${srcdir}/${PTSERVER}/db_verify.c
@@ -164,7 +164,7 @@ db_verify: db_verify.o pterror.o display.o $(LIBS)
        $(CC) ${LDFLAGS} -o db_verify db_verify.o display.o pterror.o $(LIBS) ${MT_LIBS} ${XLIBS}
 
 ptclient: ptclient.o display.o ptuser.o pterror.o ptint.cs.o ptint.xdr.o AFS_component_version_number.o $(LIBS)
-       $(CC) ${LDFLAGS} -o ptclient ptclient.o display.o $(PTOBJS) $(LIBS) ${MT_LIBS} ${XLIBS}
+       $(CC) ${LDFLAGS} -o ptclient ptclient.o display.o $(PTOBJS) $(LIBS) ${MT_LIBS} ${XLIBS} ${KRB5_LIBS}
 
 ptclient.o: ${PTSERVER}/ptclient.c ${INCLS}
        ${CCRULE} ${srcdir}/${PTSERVER}/ptclient.c
@@ -177,31 +177,31 @@ pterror.h pterror.c: ${PTSERVER}/pterror.et
        ${COMPILE_ET} -p ${srcdir}/${PTSERVER} pterror
 
 pts: pts.o $(PTOBJS) ${TOP_LIBDIR}/libcmd.a $(LIBS) ${INCLS}
-       $(CC) ${LDFLAGS} -o pts pts.o ${TOP_LIBDIR}/libcmd.a $(PTOBJS) ${LIBS} ${MT_LIBS} ${XLIBS}
+       $(CC) ${LDFLAGS} -o pts pts.o ${TOP_LIBDIR}/libcmd.a $(PTOBJS) ${LIBS} ${MT_LIBS} ${XLIBS} ${KRB5_LIBS}
 
 pts.o: ${PTSERVER}/pts.c
        ${CCRULE} ${srcdir}/${PTSERVER}/pts.c
 
 readgroup: readgroup.o $(PTOBJS) $(LIBS)
-       $(CC) ${CFLAGS} -o readgroup readgroup.o $(PTOBJS) ${LIBS} ${MT_LIBS} ${XLIBS}
+       $(CC) ${CFLAGS} -o readgroup readgroup.o $(PTOBJS) ${LIBS} ${MT_LIBS} ${XLIBS} ${KRB5_LIBS}
 
 readgroup.o: ${PTSERVER}/readgroup.c ${INCLS}
        ${CCRULE} ${srcdir}/${PTSERVER}/readgroup.c
 
 readpwd: readpwd.o $(PTOBJS) $(LIBS)
-       $(CC) ${CFLAGS} -o readpwd readpwd.o $(PTOBJS) ${LIBS} ${MT_LIBS} ${XLIBS}
+       $(CC) ${CFLAGS} -o readpwd readpwd.o $(PTOBJS) ${LIBS} ${MT_LIBS} ${XLIBS} ${KRB5_LIBS}
 
 readpwd.o: ${PTSERVER}/readpwd.c ${INCLS}
        ${CCRULE} ${srcdir}/${PTSERVER}/readpwd.c
 
 testpt: testpt.o $(PTOBJS) ${TOP_LIBDIR}/libcmd.a $(LIBS)
-       $(CC) ${CFLAGS} -o testpt testpt.o -lm ${TOP_LIBDIR}/libcmd.a $(PTOBJS) $(LIBS) ${MT_LIBS} ${XLIBS}
+       $(CC) ${CFLAGS} -o testpt testpt.o -lm ${TOP_LIBDIR}/libcmd.a $(PTOBJS) $(LIBS) ${MT_LIBS} ${XLIBS} ${KRB5_LIBS}
 
 testpt.o: ${PTSERVER}/testpt.c ${INCLS}
        ${CCRULE} ${srcdir}/${PTSERVER}/testpt.c
 
 pt_util: pt_util.o ptutils.o ubik.o utils.o map.o $(PTOBJS) $(LIBS)
-       $(CC) ${CFLAGS} -o pt_util pt_util.o ptutils.o ubik.o utils.o map.o $(PTOBJS) ${TOP_LIBDIR}/libcmd.a $(LIBS) ${MT_LIBS} ${XLIBS}
+       $(CC) ${CFLAGS} -o pt_util pt_util.o ptutils.o ubik.o utils.o map.o $(PTOBJS) ${TOP_LIBDIR}/libcmd.a $(LIBS) ${MT_LIBS} ${XLIBS} ${KRB5_LIBS}
 
 pt_util.o: ${PTSERVER}/pt_util.c
        ${CCRULE} ${srcdir}/${PTSERVER}/pt_util.c

diff --git a/src/tsm41/Makefile.in b/src/tsm41/Makefile.in
index 8751f8f320bf96d6b96b9241016b0617de7e95df..5bef2e252cd3ad0c177501b6e721342334ace475 100644 (file)
--- a/src/tsm41/Makefile.in
+++ b/src/tsm41/Makefile.in
@@ -79,10 +79,10 @@ aklog_dynamic_auth: ${AUTH_KRB5_OBJS} ${AFSLIBS} ${AUTHFILES}
        $(LD) -o $@ ${AUTH_KRB5_OBJS} $(AFSLIBS) ${AUTHFILES} @KRB5_LIBS@ ${XLIBS} ${AKLDFLAGS}
 
 afs_dynamic_auth: ${AUTH_OBJS} ${AFSLIBS} ${AUTHFILES}
-       $(LD) -o $@ ${AUTH_OBJS} $(AFSLIBS) ${AUTHFILES} ${XLIBS} ${LDFLAGS}
+       $(LD) -o $@ ${AUTH_OBJS} $(AFSLIBS) ${AUTHFILES} @KRB5_LIBS@ ${XLIBS} ${LDFLAGS}
 
 afs_dynamic_kerbauth: ${AUTH_KRB_OBJS} ${KAFSLIBS} ${AUTHFILES}
-       $(LD) -o $@ ${AUTH_KRB_OBJS} $(KAFSLIBS) ${AUTHFILES} ${XLIBS} ${LDFLAGS}
+       $(LD) -o $@ ${AUTH_KRB_OBJS} $(KAFSLIBS) ${AUTHFILES} @KRB5_LIBS@ ${XLIBS} ${LDFLAGS}
 
 aix_auth_common.o: ${srcdir}/aix_auth_common.c
        ${CCRULE}

diff --git a/src/tviced/Makefile.in b/src/tviced/Makefile.in
index e3459631da3dc87b4ce3595e41e15d387d002207..4a3c5eed3fb2565e751d8aa39807be799f053a52 100644 (file)
--- a/src/tviced/Makefile.in
+++ b/src/tviced/Makefile.in
@@ -205,7 +205,7 @@ afsint.xdr.o: ${FSINT}/afsint.xdr.c
        ${CCRULE}
 
 fileserver: ${objects} ${LIBS}
-       ${CC} ${LDFLAGS} -o fileserver ${objects} ${LIBS} ${MT_LIBS} ${XLIBS}
+       ${CC} ${LDFLAGS} -o fileserver ${objects} ${LIBS} ${MT_LIBS} ${XLIBS} ${KRB5_LIBS}
 
 install: fileserver
        ${INSTALL} -d ${DESTDIR}${afssrvlibexecdir}

diff --git a/src/tvlserver/Makefile.in b/src/tvlserver/Makefile.in
index 051a8a8b61f53595b3f969233088749dc027dd15..949065e459e562e76ac3686f00f0b3e058b56f95 100644 (file)
--- a/src/tvlserver/Makefile.in
+++ b/src/tvlserver/Makefile.in
@@ -109,26 +109,26 @@ get_krbrlm.o: ${UTIL}/get_krbrlm.c
 
 
 vldb_check: vldb_check.o ${LIBS} AFS_component_version_number.o
-       $(CC) ${LDFLAGS} -o vldb_check vldb_check.o AFS_component_version_number.o ${LIBS} ${MT_LIBS} ${XLIBS} 
+       $(CC) ${LDFLAGS} -o vldb_check vldb_check.o AFS_component_version_number.o ${LIBS} ${MT_LIBS} ${XLIBS} ${KRB5_LIBS}
 
 vldb_check.o: ${VLSERVER}/vldb_check.c 
        ${CCRULE} ${srcdir}/${VLSERVER}/vldb_check.c
 
 cnvldb: cnvldb.o ${LIBS} 
-       $(CC) ${LDFLAGS} -o cnvldb cnvldb.o ${LIBS} ${MT_LIBS} ${XLIBS}
+       $(CC) ${LDFLAGS} -o cnvldb cnvldb.o ${LIBS} ${MT_LIBS} ${XLIBS} ${KRB5_LIBS}
 
 cnvldb.o: ${VLSERVER}/cnvldb.c
        ${CCRULE} ${srcdir}/${VLSERVER}/cnvldb.c
 
 sascnvldb: sascnvldb.o ${LIBS} 
-       $(CC) ${LDFLAGS} -o sascnvldb sascnvldb.o ${LIBS} ${MT_LIBS} ${XLIBS}
+       $(CC) ${LDFLAGS} -o sascnvldb sascnvldb.o ${LIBS} ${MT_LIBS} ${XLIBS} ${KRB5_LIBS}
 
 sascnvldb.o: ${VLSERVER}/sascnvldb.c
        ${CCRULE} ${srcdir}/${VLSERVER}/sascnvldb.c
 
 vlserver: vlserver.o vlutils.o vlprocs.o vldbint.ss.o vldbint.xdr.o $(LIBS)
        $(CC) ${LDFLAGS} -o vlserver vlserver.o vlutils.o vlprocs.o vldbint.ss.o \
-               vldbint.xdr.o $(LIBS) ${MT_LIBS} ${XLIBS} ${TOP_LIBDIR}/libaudit.a
+               vldbint.xdr.o $(LIBS) ${MT_LIBS} ${XLIBS} ${TOP_LIBDIR}/libaudit.a ${KRB5_LIBS}
 
 vlserver.o: ${VLSERVER}/vlserver.c ${INCLS} AFS_component_version_number.o
        ${CCRULE} ${srcdir}/${VLSERVER}/vlserver.c
@@ -171,7 +171,7 @@ Kvldbint.xdr.c: ${VLSERVER}/vldbint.xg
        ${RXGEN} -A -x -k -c -o $@ ${srcdir}/${VLSERVER}/vldbint.xg
 
 vlclient: vlclient.o $(OBJS) $(LIBS) ${INCLS}
-       $(CC) ${LDFLAGS} -o vlclient vlclient.o $(OBJS) $(LIBS) ${MT_LIBS} ${XLIBS} ${TOP_LIBDIR}/libcmd.a
+       $(CC) ${LDFLAGS} -o vlclient vlclient.o $(OBJS) $(LIBS) ${MT_LIBS} ${XLIBS} ${TOP_LIBDIR}/libcmd.a ${KRB5_LIBS}
 
 vlclient.o: ${VLSERVER}/vlclient.c
        ${CCRULE} ${srcdir}/${VLSERVER}/vlclient.c

diff --git a/src/tvolser/Makefile.in b/src/tvolser/Makefile.in
index aaa870bdc83b4e16917b9a5a0c6c7d020b124295..05726b6b487bef385974c7b566742bbb6a4e8c33 100644 (file)
--- a/src/tvolser/Makefile.in
+++ b/src/tvolser/Makefile.in
@@ -231,7 +231,7 @@ vos: vos.o  ${VOSOBJS} ${VLSERVEROBJS} ${LIBS} ${TOP_LIBDIR}/libubik_pthread.a
        ${CC} ${LDFLAGS} -o vos vos.o ${VOSOBJS} ${VLSERVEROBJS} ${LIBS} ${TOP_LIBDIR}/libubik_pthread.a ${MT_LIBS} ${XLIBS}
 
 volserver: ${objects} ${LIBS}
-       ${CC} ${LDFLAGS} -o volserver ${objects} ${LIBS} ${MT_LIBS} ${XLIBS}
+       ${CC} ${LDFLAGS} -o volserver ${objects} ${LIBS} ${MT_LIBS} ${XLIBS} ${KRB5_LIBS}
 
 install: volserver
        ${INSTALL} -d ${DESTDIR}${afssrvlibexecdir}

diff --git a/src/update/Makefile.in b/src/update/Makefile.in
index 56e9fc8f9c44d26c5c35e60fa070ec58e5df98e0..d4e2a2d159ce310f42598db5671b35464cc10a77 100644 (file)
--- a/src/update/Makefile.in
+++ b/src/update/Makefile.in
@@ -30,10 +30,10 @@ generated: update.cs.c update.ss.c update.xdr.c update.h
 # Build targets
 #
 upclient: client.o update.cs.o utils.o ${LIBS} 
-       ${CC} ${CFLAGS} -o upclient client.o update.cs.o utils.o ${LIBS} ${XLIBS}
+       ${CC} ${CFLAGS} -o upclient client.o update.cs.o utils.o ${LIBS} ${XLIBS} ${KRB5_LIBS}
 
 upserver: server.o utils.o update.ss.o ${LIBS}
-       ${CC} ${CFLAGS} -o upserver server.o utils.o update.ss.o ${LIBS} ${XLIBS}
+       ${CC} ${CFLAGS} -o upserver server.o utils.o update.ss.o ${LIBS} ${XLIBS} ${KRB5_LIBS}
 
 utils.o: utils.c update.h global.h
 

diff --git a/src/uss/Makefile.in b/src/uss/Makefile.in
index e3d4dfea671ea5f6cc64565add0f393719417989..95ebfb70acc6e2456f2c36bf622637436c99ba14 100644 (file)
--- a/src/uss/Makefile.in
+++ b/src/uss/Makefile.in
@@ -47,7 +47,7 @@ OBJS =  uss_procs.o \
        y.tab.o 
 
 uss: uss.o ${OBJS} 
-       ${CC} ${CFLAGS} -o uss uss.o ${OBJS} ${LIBS}
+       ${CC} ${CFLAGS} -o uss uss.o ${OBJS} ${LIBS} ${KRB5_LIBS}
 
 uss.o:  uss.c AFS_component_version_number.c
        ${CC} -c ${CFLAGS} ${srcdir}/uss.c

diff --git a/src/util/dirpath.c b/src/util/dirpath.c
index 212b8f5cde4f6267cc85b90495c25497fbbf004c..9505459efd09efe594bb732ed1d507427103d93a 100644 (file)
--- a/src/util/dirpath.c
+++ b/src/util/dirpath.c
@@ -389,6 +389,9 @@ initDirPathArray(void)
     pathp = dirPathArray[AFSDIR_SERVER_FSSTATE_FILEPATH_ID];
     AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_LOCAL_DIR, AFSDIR_FSSTATE_FILE);
 
+    pathp = dirPathArray[AFSDIR_SERVER_RXKAD_KEYTAB_FILEPATH_ID];
+    AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_SERVER_ETC_DIR, AFSDIR_RXKAD_KEYTAB_FILE);
+
     /* client file paths */
 #ifdef AFS_NT40_ENV
     strcpy(dirPathArray[AFSDIR_CLIENT_THISCELL_FILEPATH_ID],

diff --git a/src/util/dirpath.hin b/src/util/dirpath.hin
index c649c6ad441ffc31f6a887e283755a6f5315c714..2890426328f56f257a7e9119a06f7dfec937c992 100644 (file)
--- a/src/util/dirpath.hin
+++ b/src/util/dirpath.hin
@@ -149,6 +149,7 @@ ConstructLocalLogPath(const char *cpath,
 #define AFSDIR_VOLSERLOG_FILE   "VolserLog"
 #define AFSDIR_AUDIT_FILE       "Audit"
 #define AFSDIR_KRB_EXCL_FILE    "krb.excl"
+#define AFSDIR_RXKAD_KEYTAB_FILE "rxkad.keytab"
 
 #define AFSDIR_ROOTVOL_FILE     "RootVolume"
 #define AFSDIR_HOSTDUMP_FILE    "hosts.dump"
@@ -282,6 +283,7 @@ typedef enum afsdir_id {
       AFSDIR_SERVER_SALSRV_FILEPATH_ID,
       AFSDIR_SERVER_SALSRVLOG_FILEPATH_ID,
       AFSDIR_SERVER_FSSTATE_FILEPATH_ID,
+      AFSDIR_SERVER_RXKAD_KEYTAB_FILEPATH_ID,
       AFSDIR_PATHSTRING_MAX } afsdir_id_t;
 
 /* getDirPath() returns a pointer to a string from an internal array of path strings 
@@ -355,6 +357,7 @@ const char *getDirPath(afsdir_id_t string_id);
 #define AFSDIR_SERVER_MIGRATELOG_FILEPATH getDirPath(AFSDIR_SERVER_MIGRATELOG_FILEPATH_ID)
 #define AFSDIR_SERVER_KRB_EXCL_FILEPATH getDirPath(AFSDIR_SERVER_KRB_EXCL_FILEPATH_ID)
 #define AFSDIR_SERVER_FSSTATE_FILEPATH getDirPath(AFSDIR_SERVER_FSSTATE_FILEPATH_ID)
+#define AFSDIR_SERVER_RXKAD_KEYTAB_FILEPATH getDirPath(AFSDIR_SERVER_RXKAD_KEYTAB_FILEPATH_ID)
 
 /* client file paths */
 #define AFSDIR_CLIENT_THISCELL_FILEPATH getDirPath(AFSDIR_CLIENT_THISCELL_FILEPATH_ID)

diff --git a/src/venus/Makefile.in b/src/venus/Makefile.in
index 5124bbcb0ca255e837ca529dee2e98f0137d593f..16c0a23f68ec6d2db58926c5b036ab9074f23880 100644 (file)
--- a/src/venus/Makefile.in
+++ b/src/venus/Makefile.in
@@ -68,7 +68,7 @@ all: fs up fstrace cmdebug livesys kdump-build cacheout afsio
 # Build targets
 #
 cacheout: cacheout.o
-       $(CC) ${CFLAGS} -o cacheout cacheout.o ${LIBS} ${XLIBS} ${CMLIBS}
+       $(CC) ${CFLAGS} -o cacheout cacheout.o ${LIBS} ${XLIBS} ${CMLIBS} ${KRB5_LIBS}
 
 cacheout.o: cacheout.c
 
@@ -84,7 +84,7 @@ up: up.o
 fs.o: fs.c ${INCLS} AFS_component_version_number.c
 
 fs: fs.o $(LIBS)
-       ${CC} ${CFLAGS} -o fs fs.o ${TOP_LIBDIR}/libprot.a $(LIBS) ${XLIBS}
+       ${CC} ${CFLAGS} -o fs fs.o ${TOP_LIBDIR}/libprot.a $(LIBS) ${XLIBS} ${KRB5_LIBS}
 
 afsio.o: ${srcdir}/afsio.c ${AFSIO_INCLS} AFS_component_version_number.c
        ${PTH_CCRULE} ${srcdir}/afsio.c
@@ -102,10 +102,10 @@ afsio: afsio.o vldbint.cs.o afscbint.ss.o vldbint.xdr.o ${AFSIO_LIBS}
 livesys.o: livesys.c ${INCLS} AFS_component_version_number.c
 
 livesys: livesys.c $(LIBS)
-       ${CC} ${CFLAGS} -o livesys ${srcdir}/livesys.c $(LIBS) ${XLIBS}
+       ${CC} ${CFLAGS} -o livesys ${srcdir}/livesys.c $(LIBS) ${XLIBS} ${KRB5_LIBS}
 
 twiddle: twiddle.c $(LIBS)
-       ${CC} ${CFLAGS} -o twiddle ${srcdir}/twiddle.c $(LIBS) ${XLIBS}
+       ${CC} ${CFLAGS} -o twiddle ${srcdir}/twiddle.c $(LIBS) ${XLIBS} ${KRB5_LIBS}
 
 gcpags: gcpags.c $(LIBS)
        ${CC} ${CFLAGS} -o gcpags ${srcdir}/gcpags.c $(LIBS) ${XLIBS}
@@ -113,7 +113,7 @@ gcpags: gcpags.c $(LIBS)
 whatfid.o: whatfid.c ${INCLS} AFS_component_version_number.c
 
 whatfid: whatfid.o ${LIBS}
-       ${CC} ${CFLAGS} -o whatfid whatfid.o ${LIBS} ${XLIBS}
+       ${CC} ${CFLAGS} -o whatfid whatfid.o ${LIBS} ${XLIBS} ${KRB5_LIBS}
 
 fstrace.o: fstrace.c AFS_component_version_number.c
        case ${SYS_NAME} in \
@@ -140,12 +140,12 @@ fstrace: fstrace.o
 cmdebug.o: cmdebug.c ${INCLS} AFS_component_version_number.c
 
 cmdebug: cmdebug.o ${CMLIBS}
-       $(CC) -o cmdebug cmdebug.o ${CFLAGS} ${CMLIBS} ${XLIBS}
+       $(CC) -o cmdebug cmdebug.o ${CFLAGS} ${CMLIBS} ${XLIBS} ${KRB5_LIBS}
 
 dedebug.o: dedebug.c ${INCLS} AFS_component_version_number.c
 
 dedebug: dedebug.o ${CMLIBS}
-       $(CC) -o dedebug dedebug.o ${CFLAGS} ${CMLIBS} ${XLIBS}
+       $(CC) -o dedebug dedebug.o ${CFLAGS} ${CMLIBS} ${XLIBS} ${KRB5_LIBS}
 
 
 

diff --git a/src/viced/Makefile.in b/src/viced/Makefile.in
index bfb3f4b132c425d509b1aa4530bb56f6bc554565..24e12a8777449ec517cd7a9fb69825ba72a22840 100644 (file)
--- a/src/viced/Makefile.in
+++ b/src/viced/Makefile.in
@@ -79,23 +79,23 @@ fileserver: ${objects} ${headers} ${LIBS}
        case ${SYS_NAME} in \
        rs_aix*) \
            ${CC} -K ${LDFLAGS} -o fileserver ${objects} \
-           ${TOP_LIBDIR}/libaudit.a ${LIBS} ${XLIBS} ;; \
+           ${TOP_LIBDIR}/libaudit.a ${LIBS} ${XLIBS} ${KRB5_LIBS} ;; \
        *) \
            ${CC} ${LDFLAGS} -o fileserver ${objects} \
-           ${TOP_LIBDIR}/libaudit.a ${LIBS} ${XLIBS} ;; \
+           ${TOP_LIBDIR}/libaudit.a ${LIBS} ${XLIBS} ${KRB5_LIBS} ;; \
        esac
 
 fsprobe.o: fsprobe.c AFS_component_version_number.c
        ${CC} ${CFLAGS} @CFLAGS_NOERROR@ -DINTERPRET_DUMP -c ${srcdir}/fsprobe.c
 
 fsprobe: fsprobe.o
-       ${CC} ${CFLAGS} -o fsprobe fsprobe.o ${LIBS} ${XLIBS} 
+       ${CC} ${CFLAGS} -o fsprobe fsprobe.o ${LIBS} ${XLIBS} ${KRB5_LIBS}
 
 cbd.o: callback.c AFS_component_version_number.c
        ${CC} ${CFLAGS} -DINTERPRET_DUMP -c -o cbd.o ${srcdir}/callback.c
 
 cbd: cbd.o
-       ${CC} ${CFLAGS} -DINTERPRET_DUMP -o cbd cbd.o ${LIBS} ${XLIBS} 
+       ${CC} ${CFLAGS} -DINTERPRET_DUMP -o cbd cbd.o ${LIBS} ${XLIBS} ${KRB5_LIBS}
 
 install: fileserver fs_stats.h
        ${INSTALL} -d ${DESTDIR}${afssrvlibexecdir}

diff --git a/src/vlserver/Makefile.in b/src/vlserver/Makefile.in
index 2c0279beb433ebe89a062524b9977b50ca61d601..3e7ad4bbd8b1b9ac7da6363092eb5804babf9aa5 100644 (file)
--- a/src/vlserver/Makefile.in
+++ b/src/vlserver/Makefile.in
@@ -71,23 +71,23 @@ ${TOP_INCDIR}/afs/cnvldb.h: cnvldb.h
        ${INSTALL_DATA} $? $@
 
 vldb_check: vldb_check.o ${LIBS}
-       $(CC) ${CFLAGS} -o vldb_check vldb_check.o ${LIBS} ${XLIBS} 
+       $(CC) ${CFLAGS} -o vldb_check vldb_check.o ${LIBS} ${XLIBS} ${KRB5_LIBS}
 
 vldb_check.o: vldb_check.c AFS_component_version_number.o
 
 cnvldb: cnvldb.o ${LIBS}
-       $(CC) ${CFLAGS} -o cnvldb cnvldb.o ${LIBS} ${XLIBS}
+       $(CC) ${CFLAGS} -o cnvldb cnvldb.o ${LIBS} ${XLIBS} ${KRB5_LIBS}
 
 cnvldb.o: cnvldb.c cnvldb.h AFS_component_version_number.o
 
 sascnvldb: sascnvldb.o ${LIBS}
-       $(CC) ${CFLAGS} -o sascnvldb sascnvldb.o ${LIBS} ${XLIBS}
+       $(CC) ${CFLAGS} -o sascnvldb sascnvldb.o ${LIBS} ${XLIBS} ${KRB5_LIBS}
 
 sascnvldb.o: sascnvldb.c cnvldb.h AFS_component_version_number.o
 
 vlserver: vlserver.o vlutils.o vlprocs.o vldbint.ss.o vldbint.xdr.o $(LIBS)
        $(CC) ${CFLAGS} -o vlserver vlserver.o vlutils.o vlprocs.o vldbint.ss.o \
-               vldbint.xdr.o $(LIBS) ${XLIBS} ${TOP_LIBDIR}/libaudit.a
+               vldbint.xdr.o $(LIBS) ${XLIBS} ${TOP_LIBDIR}/libaudit.a ${KRB5_LIBS}
 
 vlserver.o: vlserver.c ${INCLS} AFS_component_version_number.o
 vlutils.o: vlutils.c ${INCLS}
@@ -124,7 +124,7 @@ libvldb.a: $(OBJS) AFS_component_version_number.o
        $(RANLIB) $@
 
 vlclient: vlclient.o libvldb.a $(LIBS)
-       $(CC) ${CFLAGS} -o vlclient vlclient.o libvldb.a $(LIBS) ${XLIBS} ${TOP_LIBDIR}/libcmd.a
+       $(CC) ${CFLAGS} -o vlclient vlclient.o libvldb.a $(LIBS) ${XLIBS} ${TOP_LIBDIR}/libcmd.a ${KRB5_LIBS}
 
 vlclient.o: vlclient.c ${INCLS} AFS_component_version_number.o
 

diff --git a/src/volser/Makefile.in b/src/volser/Makefile.in
index 1cb379abfcce5ee23904f25a1fd43cf51432e221..5e5ac6d3df0231f30eaa40dbcb0f6da595086c10 100644 (file)
--- a/src/volser/Makefile.in
+++ b/src/volser/Makefile.in
@@ -90,11 +90,11 @@ restorevol: restorevol.c
                ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a ${XLIBS}
 
 vos: vos.o ${VSOBJS} libvolser.a ${LIBS}
-       ${CC} ${LDFLAGS} -o vos vos.o $(VSOBJS) libvolser.a ${LIBS} ${XLIBS}
+       ${CC} ${LDFLAGS} -o vos vos.o $(VSOBJS) libvolser.a ${LIBS} ${XLIBS} ${KRB5_LIBS}
 
 volserver: $(SOBJS) $(LIBS) ${TOP_LIBDIR}/libdir.a
        ${CC} ${DBUG} -o volserver $(SOBJS) ${TOP_LIBDIR}/libdir.a \
-               ${LDFLAGS} $(LIBS) ${XLIBS}
+               ${LDFLAGS} $(LIBS) ${XLIBS} ${KRB5_LIBS}
 
 voldump: vol-dump.o ${VOLDUMP_LIBS}
        ${CC} ${CFLAGS} -o voldump vol-dump.o ${VOLDUMP_LIBS} ${XLIBS}