From 7c2f0888f849ceb8013ea5751a7bf6c6825bedc3 Mon Sep 17 00:00:00 2001 From: Chaskiel Grundman Date: Sun, 10 Feb 2013 13:27:03 -0500 Subject: [PATCH] Integrate keytab-based decryption into afsconf_ServerAuth Now all servers can have it, though they must call rxkad_BindKeytabDecrypt themselves. Change-Id: I95fecb3f88c19b3d5193ea8200fa20c86ec08ad7 --- src/auth/Makefile.in | 3 +++ src/auth/authcon.c | 21 +++++++++++++++++++++ src/bozo/Makefile.in | 6 +++--- src/bucoord/Makefile.in | 2 +- src/budb/Makefile.in | 2 +- src/butc/Makefile.in | 6 +++--- src/cf/kerberos.m4 | 2 ++ src/config/Makefile.config.in | 1 + src/fsprobe/Makefile.in | 2 +- src/kauth/Makefile.in | 24 ++++++++++++------------ src/libafsauthent/Makefile.in | 7 +++++-- src/ptserver/Makefile.in | 18 +++++++++--------- src/scout/Makefile.in | 2 +- src/shlibafsauthent/Makefile.in | 7 +++++-- src/tbutc/Makefile.in | 2 +- src/tsm41/Makefile.in | 4 ++-- src/tviced/Makefile.in | 2 +- src/tvolser/Makefile.in | 2 +- src/update/Makefile.in | 4 ++-- src/uss/Makefile.in | 2 +- src/util/dirpath.c | 3 +++ src/util/dirpath.hin | 3 +++ src/venus/Makefile.in | 13 ++++++------- src/viced/Makefile.in | 8 ++++---- src/vlserver/Makefile.in | 10 +++++----- src/volser/Makefile.in | 4 ++-- 26 files changed, 99 insertions(+), 61 deletions(-) diff --git a/src/auth/Makefile.in b/src/auth/Makefile.in index 34deb3789..552f69b1e 100644 --- a/src/auth/Makefile.in +++ b/src/auth/Makefile.in @@ -36,7 +36,10 @@ depinstall: \ 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 @KRB5CFLAGS@ + 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 76fff02b1..85b59ec34 100644 --- a/src/auth/authcon.c +++ b/src/auth/authcon.c @@ -45,6 +45,9 @@ #include #include #include +#ifdef USE_RXKAD_KEYTAB +#include +#endif #include #include "cellconfig.h" #include "keys.h" @@ -71,12 +74,30 @@ afsconf_ServerAuth(register struct afsconf_dir *adir, { register 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 = 2; /* kerberos security index */ +#ifdef USE_RXKAD_KEYTAB + if (keytab_enable) + rxkad_BindKeytabDecrypt(tclass); +#endif UNLOCK_GLOBAL_MUTEX; return 0; } else { diff --git a/src/bozo/Makefile.in b/src/bozo/Makefile.in index 6ceac74ec..592f54b63 100644 --- a/src/bozo/Makefile.in +++ b/src/bozo/Makefile.in @@ -78,12 +78,12 @@ bosoprocs.o: bosoprocs.c ${INCLS} bos.o: bos.c ${INCLS} AFS_component_version_number.o 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 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} @@ -95,7 +95,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 c40c2d07c..b724dcb72 100644 --- a/src/bucoord/Makefile.in +++ b/src/bucoord/Makefile.in @@ -52,7 +52,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} bucoord_errs.c bc.h: bucoord_errs.et bc.p.h $(RM) -f bc.h bucoord_errs.c diff --git a/src/budb/Makefile.in b/src/budb/Makefile.in index 4d3cbcf64..bd091639c 100644 --- a/src/budb/Makefile.in +++ b/src/budb/Makefile.in @@ -71,7 +71,7 @@ struct_ops.o: budb_errs.h server.o: server.c budb_errs.h ${INCLS} AFS_component_version_number.c budb_server: $(SERVER_OBJS) ${LIBS} - ${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 51c7922ac..632399585 100644 --- a/src/butc/Makefile.in +++ b/src/butc/Makefile.in @@ -52,15 +52,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/cf/kerberos.m4 b/src/cf/kerberos.m4 index 6decb385b..b19f7f180 100644 --- a/src/cf/kerberos.m4 +++ b/src/cf/kerberos.m4 @@ -56,6 +56,8 @@ if test X$conf_krb5 = XYES; then AC_MSG_RESULT([Configuring support for Kerberos 5 utilities]) BUILD_KRB5=yes MAKE_KRB5= + AC_DEFINE([USE_RXKAD_KEYTAB], 1, + [Define to 1 if krb5 libraries are available and rxkad can use keytabs]) save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $KRB5CFLAGS" save_LIBS="$LIBS" diff --git a/src/config/Makefile.config.in b/src/config/Makefile.config.in index 6e723856a..99a7588f9 100644 --- a/src/config/Makefile.config.in +++ b/src/config/Makefile.config.in @@ -43,6 +43,7 @@ DEST = @DEST@ FSINCLUDES = @FSINCLUDES@ KERN_DBG = @KERN_DBG@ KERN_OPTMZ = @KERN_OPTMZ@ +KRB5_LIBS = @KRB5LIBS@ LD = @LD@ LEX = @LEX@ LIB_AFSDB = @LIB_AFSDB@ diff --git a/src/fsprobe/Makefile.in b/src/fsprobe/Makefile.in index c3ab825a4..d4ffced0e 100644 --- a/src/fsprobe/Makefile.in +++ b/src/fsprobe/Makefile.in @@ -41,7 +41,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 773251fdd..2c20dc800 100644 --- a/src/kauth/Makefile.in +++ b/src/kauth/Makefile.in @@ -67,7 +67,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 @@ -147,19 +147,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 @@ -167,22 +167,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 @@ -191,7 +191,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 @@ -201,12 +201,12 @@ krb_udp: krb_udp.o libkauth.a $(KLIBS) ${CC} ${LDFLAGS} -o krb_udp krb_udp.o libkauth.a $(KLIBS) 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) + ${CC} ${LDFLAGS} -o rebuild rebuild.o kautils.o $(LIBS) ${KRB5_LIBS} # # Install targets diff --git a/src/libafsauthent/Makefile.in b/src/libafsauthent/Makefile.in index f8eb58bfa..9b6d03419 100644 --- a/src/libafsauthent/Makefile.in +++ b/src/libafsauthent/Makefile.in @@ -63,7 +63,7 @@ UTILOBJS = \ fileutil.o RXKADOBJS = \ - rxkad_errs.o + rxkad_errs.o @MAKE_KRB5@ ticket5_keytab.o SYSOBJS = \ rmtsysc.o \ @@ -120,7 +120,7 @@ writeconfig.o: ${AUTH}/writeconfig.c ${CCRULE} authcon.o: ${AUTH}/authcon.c - ${CCRULE} + ${CCRULE} @KRB5CFLAGS@ ktc_errors.o: ${AUTH}/ktc_errors.c ${CCRULE} @@ -197,6 +197,9 @@ pthread_glock.o: ${UTIL}/pthread_glock.c rxkad_errs.o: ${RXKAD}/rxkad_errs.c ${CCRULE} +ticket5_keytab.o: ${RXKAD}/ticket5_keytab.c + ${CCRULE} @KRB5CFLAGS@ + ptclient.o: ${PTSERVER}/ptclient.c ${CCRULE} diff --git a/src/ptserver/Makefile.in b/src/ptserver/Makefile.in index dee0528c2..934e51da4 100644 --- a/src/ptserver/Makefile.in +++ b/src/ptserver/Makefile.in @@ -57,7 +57,7 @@ depinstall: \ # 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 @@ -103,10 +103,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 @@ -122,32 +122,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 5007c85ee..82eba40a9 100644 --- a/src/scout/Makefile.in +++ b/src/scout/Makefile.in @@ -49,7 +49,7 @@ all: scout scout.o: scout.c ${INCLS} AFS_component_version_number.c scout: scout.o $(LIBS) - ${CC} ${LDFLAGS} -o scout scout.o $(LIBS) ${TXLIBS} ${TOP_LIBDIR}/libtermlib.a ${XLIBS} + ${CC} ${LDFLAGS} -o scout scout.o $(LIBS) ${TXLIBS} ${TOP_LIBDIR}/libtermlib.a ${XLIBS} ${KRB5_LIBS} # # Installation targets diff --git a/src/shlibafsauthent/Makefile.in b/src/shlibafsauthent/Makefile.in index b66674a66..f0aea6188 100644 --- a/src/shlibafsauthent/Makefile.in +++ b/src/shlibafsauthent/Makefile.in @@ -68,7 +68,7 @@ UTILOBJS = \ fileutil.o RXKADOBJS = \ - rxkad_errs.o + rxkad_errs.o @MAKE_KRB5@ ticket5_keytab.o SYSOBJS = \ rmtsysc.o \ @@ -150,7 +150,7 @@ writeconfig.o: ${AUTH}/writeconfig.c ${CCRULE} authcon.o: ${AUTH}/authcon.c - ${CCRULE} + ${CCRULE} @KRB5CFLAGS@ ktc_errors.o: ${AUTH}/ktc_errors.c ${CCRULE} @@ -227,6 +227,9 @@ pthread_glock.o: ${UTIL}/pthread_glock.c rxkad_errs.o: ${RXKAD}/rxkad_errs.c ${CCRULE} +ticket5_keytab.o: ${RXKAD}/ticket5_keytab.c + ${CCRULE} @KRB5CFLAGS@ + ptclient.o: ${PTSERVER}/ptclient.c ${CCRULE} diff --git a/src/tbutc/Makefile.in b/src/tbutc/Makefile.in index 4d798e823..76040cc20 100644 --- a/src/tbutc/Makefile.in +++ b/src/tbutc/Makefile.in @@ -66,7 +66,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/tsm41/Makefile.in b/src/tsm41/Makefile.in index b462a751b..b2855d801 100644 --- a/src/tsm41/Makefile.in +++ b/src/tsm41/Makefile.in @@ -72,13 +72,13 @@ clean: $(RM) -f *.o $(AUTHLIBS) $(AUTHFILES) so_locations afs_dynamic_auth: ${AUTH_OBJS} ${AFSLIBS} ${AUTHFILES} - $(LD) -o $@ ${AUTH_OBJS} $(AFSLIBS) ${AUTHFILES} ${XLIBS} ${LDFLAGS} + $(LD) -o $@ ${AUTH_OBJS} $(AFSLIBS) ${AUTHFILES} @KRB5LIBS@ ${XLIBS} ${LDFLAGS} aklog_dynamic_auth: ${AUTH_KRB5_OBJS} ${AFSLIBS} ${AUTHFILES} $(LD) -o $@ ${AUTH_KRB5_OBJS} $(AFSLIBS) ${AUTHFILES} @KRB5LIBS@ ${XLIBS} ${AKLDFLAGS} afs_dynamic_kerbauth: ${AUTH_KRB_OBJS} ${KAFSLIBS} ${AUTHFILES} - $(LD) -o $@ ${AUTH_KRB_OBJS} $(KAFSLIBS) ${AUTHFILES} ${XLIBS} ${LDFLAGS} + $(LD) -o $@ ${AUTH_KRB_OBJS} $(KAFSLIBS) ${AUTHFILES} @KRB5LIBS@ ${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 b0bbf3a33..86a518631 100644 --- a/src/tviced/Makefile.in +++ b/src/tviced/Makefile.in @@ -185,7 +185,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} ${DEST}/root.server/usr/afs/bin/fileserver: fileserver ${INSTALL} -ns $? $@ diff --git a/src/tvolser/Makefile.in b/src/tvolser/Makefile.in index 153446df9..8b62df4cd 100644 --- a/src/tvolser/Makefile.in +++ b/src/tvolser/Makefile.in @@ -189,7 +189,7 @@ afsint.xdr.o: ${FSINT}/afsint.xdr.c ${COMPILE} volserver: ${objects} ${LIBS} - ${CC} ${LDFLAGS} -o volserver ${objects} ${LIBS} ${MT_LIBS} ${XLIBS} + ${CC} ${LDFLAGS} -o volserver ${objects} ${LIBS} ${MT_LIBS} ${XLIBS} ${KRB5_LIBS} ${DEST}/root.server/usr/afs/bin/volserver: volserver ${INSTALL} -ns $? $@ diff --git a/src/update/Makefile.in b/src/update/Makefile.in index 5842c1d3a..55a5d3997 100644 --- a/src/update/Makefile.in +++ b/src/update/Makefile.in @@ -23,10 +23,10 @@ all: upserver upclient # 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 ab2c10e6f..622998482 100644 --- a/src/uss/Makefile.in +++ b/src/uss/Makefile.in @@ -46,7 +46,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 a40041f9c..b8d5523f1 100644 --- a/src/util/dirpath.c +++ b/src/util/dirpath.c @@ -366,6 +366,9 @@ initDirPathArray(void) pathp = dirPathArray[AFSDIR_SERVER_KRB_EXCL_FILEPATH_ID]; AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_SERVER_ETC_DIR, AFSDIR_KRB_EXCL_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 23590ad4a..5e4673571 100644 --- a/src/util/dirpath.hin +++ b/src/util/dirpath.hin @@ -145,6 +145,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" @@ -264,6 +265,7 @@ typedef enum afsdir_id { AFSDIR_SERVER_BIN_FILE_DIRPATH_ID, AFSDIR_CLIENT_CELLALIAS_FILEPATH_ID, AFSDIR_SERVER_KRB_EXCL_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 @@ -332,6 +334,7 @@ const char *getDirPath(afsdir_id_t string_id); #define AFSDIR_SERVER_THRESHOLD_CONSTANTS_FILEPATH getDirPath(AFSDIR_SERVER_THRESHOLD_CONSTANTS_FILEPATH_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_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 8b5412e5e..53e85f293 100644 --- a/src/venus/Makefile.in +++ b/src/venus/Makefile.in @@ -47,7 +47,7 @@ all: fs up fstrace cmdebug livesys kdump-build # 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 @@ -76,15 +76,15 @@ 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} 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} @@ -92,7 +92,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 \ @@ -121,8 +121,7 @@ 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} # diff --git a/src/viced/Makefile.in b/src/viced/Makefile.in index 1b7d23f59..8a54a2686 100644 --- a/src/viced/Makefile.in +++ b/src/viced/Makefile.in @@ -72,23 +72,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} -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} ${DEST}/root.server/usr/afs/bin/fileserver: fileserver @case ${SYS_NAME} in \ diff --git a/src/vlserver/Makefile.in b/src/vlserver/Makefile.in index d4d45a869..33bd64b4a 100644 --- a/src/vlserver/Makefile.in +++ b/src/vlserver/Makefile.in @@ -46,23 +46,23 @@ depinstall: \ ${TOP_INCDIR}/afs/cnvldb.h 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} @@ -99,7 +99,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 dd4e7aefa..7d552e727 100644 --- a/src/volser/Makefile.in +++ b/src/volser/Makefile.in @@ -65,11 +65,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} -- 2.39.5