From 476011cb39ba1e1872269f98fcbd7412956b919d Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Tue, 27 Mar 2007 01:54:30 +0000 Subject: [PATCH] * Remove the rx_Init calls in the PAM module. The internal counters that had to be initialized that way have been removed. * Now that we're running regen.sh as part of the build process, only patch the Autoconf source files and not the generated output to make the diff easier to audit. --- configure | 60 ++++++++++++++++++++++---------------- configure-libafs | 60 ++++++++++++++++++++++---------------- debian/changelog | 5 ++++ src/afs/LINUX/osi_groups.c | 3 -- src/afs/LINUX/osi_vfsops.c | 3 -- src/afs/afs_osi_pag.c | 17 +---------- src/pam/Makefile.in | 1 - src/pam/afs_auth.c | 8 ----- src/pam/afs_setcred.c | 7 +---- src/ubik/Makefile.in | 1 + 10 files changed, 78 insertions(+), 87 deletions(-) diff --git a/configure b/configure index e693b4d1c..45e9323ad 100755 --- a/configure +++ b/configure @@ -15800,8 +15800,9 @@ fi XCFLAGS='${DBG} ${OPTMZ}' SHLIB_SUFFIX="so" -CCOBJ=$CC -MT_CC=$CC +CC="cc" +CCOBJ="cc" +MT_CC="cc" XLIBS="${LIB_AFSDB}" KERN_DBG=-g @@ -16433,7 +16434,6 @@ case $AFS_SYSNAME in MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' MT_LIBS="-lpthread" PAM_CFLAGS="-g -O2 -Dlinux -DLINUX_PAM -fPIC" - SHLIB_CFLAGS="-fPIC" SHLIB_LDFLAGS="-shared -Xlinker -x" TXLIBS="-lncurses" XCFLAGS="-g -O2 -D_LARGEFILE64_SOURCE -G0" @@ -16461,7 +16461,6 @@ case $AFS_SYSNAME in MT_LIBS="-lpthread" PAM_CFLAGS="-g -O2 -Dlinux -DLINUX_PAM -fPIC" SHLIB_LDFLAGS="-shared -Xlinker -x" - SHLIB_CFLAGS="-fPIC" TXLIBS="/usr/lib64/libncurses.so" XCFLAGS="-g -O2 -D_LARGEFILE64_SOURCE" SHLIB_LINKER="${MT_CC} -shared" @@ -16482,14 +16481,14 @@ case $AFS_SYSNAME in ;; i386_umlinux22) - CCOBJ="${CC} -pipe" - MT_CC="${CC} -pipe" + CC="gcc -pipe" + CCOBJ="gcc -pipe" + MT_CC="gcc -pipe" KERN_OPTMZ=-O2 LEX="flex -l" MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' MT_LIBS="-lpthread" PAM_CFLAGS="-O2 -Dlinux -DLINUX_PAM -fPIC" - SHLIB_CFLAGS="-fPIC" SHLIB_LDFLAGS="-shared -Xlinker -x" TXLIBS="-lncurses" XCFLAGS="-O2 -D_LARGEFILE64_SOURCE" @@ -16498,8 +16497,9 @@ case $AFS_SYSNAME in ;; i386_linux*) - CCOBJ="${CC} -pipe" - MT_CC="${CC} -pipe" + CC="gcc -pipe" + CCOBJ="gcc -pipe" + MT_CC="gcc -pipe" KERN_OPTMZ=-O2 LEX="flex -l" MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' @@ -16510,7 +16510,6 @@ case $AFS_SYSNAME in LWP_OPTMZ=-O2 OPTMZ=-O2 PAM_CFLAGS="-g -O2 -Dlinux -DLINUX_PAM -fPIC" - SHLIB_CFLAGS="-fPIC" SHLIB_LDFLAGS="-shared -Xlinker -x" TXLIBS="-lncurses" XCFLAGS="-g -O2 -D_LARGEFILE64_SOURCE" @@ -16518,8 +16517,9 @@ case $AFS_SYSNAME in ;; i386_umlinux24) - CCOBJ="${CC} -pipe" - MT_CC="${CC} -pipe" + CC="gcc -pipe" + CCOBJ="gcc -pipe" + MT_CC="gcc -pipe" KERN_OPTMZ=-O2 LEX="flex -l" MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' @@ -16530,7 +16530,6 @@ case $AFS_SYSNAME in LWP_OPTMZ=-O2 OPTMZ=-O2 PAM_CFLAGS="-g -O2 -Dlinux -DLINUX_PAM -fPIC" - SHLIB_CFLAGS="-fPIC" SHLIB_LDFLAGS="-shared -Xlinker -x" TXLIBS="-lncurses" XCFLAGS="-g -O2 -D_LARGEFILE64_SOURCE" @@ -16538,8 +16537,9 @@ case $AFS_SYSNAME in ;; i386_umlinux26) - CCOBJ="${CC} -pipe" - MT_CC="${CC} -pipe" + CC="gcc -pipe" + CCOBJ="gcc -pipe" + MT_CC="gcc -pipe" KERN_OPTMZ=-O2 LEX="flex -l" MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' @@ -16550,7 +16550,6 @@ case $AFS_SYSNAME in LWP_OPTMZ=-O2 OPTMZ=-O2 PAM_CFLAGS="-g -O2 -Dlinux -DLINUX_PAM -fPIC" - SHLIB_CFLAGS="-fPIC" SHLIB_LDFLAGS="-shared -Xlinker -x" TXLIBS="-lncurses" XCFLAGS="-g -O2 -D_LARGEFILE64_SOURCE" @@ -16576,7 +16575,6 @@ case $AFS_SYSNAME in MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' MT_LIBS="-lpthread" PAM_CFLAGS="-O2 -Dlinux -DLINUX_PAM -fPIC" - SHLIB_CFLAGS="-fPIC" SHLIB_LDFLAGS="-shared -Xlinker -x" TXLIBS="-lncurses" XCFLAGS="-O2 -D_LARGEFILE64_SOURCE" @@ -16747,7 +16745,8 @@ case $AFS_SYSNAME in ;; s390_linux22) - CCOBJ="$CC" + CC="gcc" + CCOBJ="gcc" LD="ld" KERN_OPTMZ=-O2 LEX="flex -l" @@ -16755,7 +16754,6 @@ case $AFS_SYSNAME in MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' MT_LIBS="-lpthread" PAM_CFLAGS="-O -Dlinux -DLINUX_PAM -fPIC" - SHLIB_CFLAGS="-fPIC" SHLIB_LDFLAGS="-shared -Xlinker -x" TXLIBS="-lncurses" XCFLAGS="-O -g -D_LARGEFILE64_SOURCE" @@ -16764,7 +16762,8 @@ case $AFS_SYSNAME in ;; s390_linux24|s390_linux26) - CCOBJ="$CC" + CC="gcc" + CCOBJ="gcc" LD="ld" KERN_OPTMZ=-O2 LEX="flex -l" @@ -16772,7 +16771,6 @@ case $AFS_SYSNAME in MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' MT_LIBS="-lpthread" PAM_CFLAGS="-O -Dlinux -DLINUX_PAM -fPIC" - SHLIB_CFLAGS="-fPIC" SHLIB_LDFLAGS="-shared -Xlinker -x" TXLIBS="-lncurses" XCFLAGS="-O -g -D_LARGEFILE64_SOURCE" @@ -16781,7 +16779,8 @@ case $AFS_SYSNAME in ;; s390x_linux24|s390x_linux26) - CCOBJ="$CC" + CC="gcc" + CCOBJ="gcc -fPIC" LD="ld" KERN_OPTMZ=-O2 LEX="flex -l" @@ -16789,7 +16788,6 @@ case $AFS_SYSNAME in MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' MT_LIBS="-lpthread" PAM_CFLAGS="-O -Dlinux -DLINUX_PAM -fPIC" - SHLIB_CFLAGS="-fPIC" SHLIB_LDFLAGS="-shared -Xlinker -x -Xlinker -Bsymbolic" TXLIBS="-lncurses" XCFLAGS="-O -g -D_LARGEFILE64_SOURCE -D__s390x__" @@ -16859,13 +16857,12 @@ case $AFS_SYSNAME in SHLIB_LINKER="${CC} -shared" ;; - sparc*_linux*) + sparc64_linux*) KERN_OPTMZ=-O2 LEX="flex -l" MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' MT_LIBS="-lpthread" PAM_CFLAGS="-O2 -Dlinux -DLINUX_PAM -fPIC" - SHLIB_CFLAGS="-fPIC" SHLIB_LDFLAGS="-shared -Xlinker -x" TXLIBS="-lncurses" XCFLAGS="-O2 -D_LARGEFILE64_SOURCE" @@ -16875,6 +16872,19 @@ case $AFS_SYSNAME in SHLIB_LINKER="${MT_CC} -shared" ;; + sparc_linux22) + KERN_OPTMZ=-O2 + LEX="flex -l" + MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' + MT_LIBS="-lpthread" + PAM_CFLAGS="-O2 -Dlinux -DLINUX_PAM -fPIC" + SHLIB_LDFLAGS="-shared -Xlinker -x" + TXLIBS="-lncurses" + XCFLAGS="-O2 -D_LARGEFILE64_SOURCE" + YACC="bison -y" + SHLIB_LINKER="${MT_CC} -shared" + ;; + sun4_413) CCXPG2="/usr/xpg2bin/cc" CC="gcc" diff --git a/configure-libafs b/configure-libafs index 6c6ecea96..5a310e3e2 100755 --- a/configure-libafs +++ b/configure-libafs @@ -15800,8 +15800,9 @@ fi XCFLAGS='${DBG} ${OPTMZ}' SHLIB_SUFFIX="so" -CCOBJ=$CC -MT_CC=$CC +CC="cc" +CCOBJ="cc" +MT_CC="cc" XLIBS="${LIB_AFSDB}" KERN_DBG=-g @@ -16433,7 +16434,6 @@ case $AFS_SYSNAME in MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' MT_LIBS="-lpthread" PAM_CFLAGS="-g -O2 -Dlinux -DLINUX_PAM -fPIC" - SHLIB_CFLAGS="-fPIC" SHLIB_LDFLAGS="-shared -Xlinker -x" TXLIBS="-lncurses" XCFLAGS="-g -O2 -D_LARGEFILE64_SOURCE -G0" @@ -16461,7 +16461,6 @@ case $AFS_SYSNAME in MT_LIBS="-lpthread" PAM_CFLAGS="-g -O2 -Dlinux -DLINUX_PAM -fPIC" SHLIB_LDFLAGS="-shared -Xlinker -x" - SHLIB_CFLAGS="-fPIC" TXLIBS="/usr/lib64/libncurses.so" XCFLAGS="-g -O2 -D_LARGEFILE64_SOURCE" SHLIB_LINKER="${MT_CC} -shared" @@ -16482,14 +16481,14 @@ case $AFS_SYSNAME in ;; i386_umlinux22) - CCOBJ="${CC} -pipe" - MT_CC="${CC} -pipe" + CC="gcc -pipe" + CCOBJ="gcc -pipe" + MT_CC="gcc -pipe" KERN_OPTMZ=-O2 LEX="flex -l" MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' MT_LIBS="-lpthread" PAM_CFLAGS="-O2 -Dlinux -DLINUX_PAM -fPIC" - SHLIB_CFLAGS="-fPIC" SHLIB_LDFLAGS="-shared -Xlinker -x" TXLIBS="-lncurses" XCFLAGS="-O2 -D_LARGEFILE64_SOURCE" @@ -16498,8 +16497,9 @@ case $AFS_SYSNAME in ;; i386_linux*) - CCOBJ="${CC} -pipe" - MT_CC="${CC} -pipe" + CC="gcc -pipe" + CCOBJ="gcc -pipe" + MT_CC="gcc -pipe" KERN_OPTMZ=-O2 LEX="flex -l" MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' @@ -16510,7 +16510,6 @@ case $AFS_SYSNAME in LWP_OPTMZ=-O2 OPTMZ=-O2 PAM_CFLAGS="-g -O2 -Dlinux -DLINUX_PAM -fPIC" - SHLIB_CFLAGS="-fPIC" SHLIB_LDFLAGS="-shared -Xlinker -x" TXLIBS="-lncurses" XCFLAGS="-g -O2 -D_LARGEFILE64_SOURCE" @@ -16518,8 +16517,9 @@ case $AFS_SYSNAME in ;; i386_umlinux24) - CCOBJ="${CC} -pipe" - MT_CC="${CC} -pipe" + CC="gcc -pipe" + CCOBJ="gcc -pipe" + MT_CC="gcc -pipe" KERN_OPTMZ=-O2 LEX="flex -l" MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' @@ -16530,7 +16530,6 @@ case $AFS_SYSNAME in LWP_OPTMZ=-O2 OPTMZ=-O2 PAM_CFLAGS="-g -O2 -Dlinux -DLINUX_PAM -fPIC" - SHLIB_CFLAGS="-fPIC" SHLIB_LDFLAGS="-shared -Xlinker -x" TXLIBS="-lncurses" XCFLAGS="-g -O2 -D_LARGEFILE64_SOURCE" @@ -16538,8 +16537,9 @@ case $AFS_SYSNAME in ;; i386_umlinux26) - CCOBJ="${CC} -pipe" - MT_CC="${CC} -pipe" + CC="gcc -pipe" + CCOBJ="gcc -pipe" + MT_CC="gcc -pipe" KERN_OPTMZ=-O2 LEX="flex -l" MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' @@ -16550,7 +16550,6 @@ case $AFS_SYSNAME in LWP_OPTMZ=-O2 OPTMZ=-O2 PAM_CFLAGS="-g -O2 -Dlinux -DLINUX_PAM -fPIC" - SHLIB_CFLAGS="-fPIC" SHLIB_LDFLAGS="-shared -Xlinker -x" TXLIBS="-lncurses" XCFLAGS="-g -O2 -D_LARGEFILE64_SOURCE" @@ -16576,7 +16575,6 @@ case $AFS_SYSNAME in MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' MT_LIBS="-lpthread" PAM_CFLAGS="-O2 -Dlinux -DLINUX_PAM -fPIC" - SHLIB_CFLAGS="-fPIC" SHLIB_LDFLAGS="-shared -Xlinker -x" TXLIBS="-lncurses" XCFLAGS="-O2 -D_LARGEFILE64_SOURCE" @@ -16747,7 +16745,8 @@ case $AFS_SYSNAME in ;; s390_linux22) - CCOBJ="$CC" + CC="gcc" + CCOBJ="gcc" LD="ld" KERN_OPTMZ=-O2 LEX="flex -l" @@ -16755,7 +16754,6 @@ case $AFS_SYSNAME in MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' MT_LIBS="-lpthread" PAM_CFLAGS="-O -Dlinux -DLINUX_PAM -fPIC" - SHLIB_CFLAGS="-fPIC" SHLIB_LDFLAGS="-shared -Xlinker -x" TXLIBS="-lncurses" XCFLAGS="-O -g -D_LARGEFILE64_SOURCE" @@ -16764,7 +16762,8 @@ case $AFS_SYSNAME in ;; s390_linux24|s390_linux26) - CCOBJ="$CC" + CC="gcc" + CCOBJ="gcc" LD="ld" KERN_OPTMZ=-O2 LEX="flex -l" @@ -16772,7 +16771,6 @@ case $AFS_SYSNAME in MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' MT_LIBS="-lpthread" PAM_CFLAGS="-O -Dlinux -DLINUX_PAM -fPIC" - SHLIB_CFLAGS="-fPIC" SHLIB_LDFLAGS="-shared -Xlinker -x" TXLIBS="-lncurses" XCFLAGS="-O -g -D_LARGEFILE64_SOURCE" @@ -16781,7 +16779,8 @@ case $AFS_SYSNAME in ;; s390x_linux24|s390x_linux26) - CCOBJ="$CC" + CC="gcc" + CCOBJ="gcc -fPIC" LD="ld" KERN_OPTMZ=-O2 LEX="flex -l" @@ -16789,7 +16788,6 @@ case $AFS_SYSNAME in MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' MT_LIBS="-lpthread" PAM_CFLAGS="-O -Dlinux -DLINUX_PAM -fPIC" - SHLIB_CFLAGS="-fPIC" SHLIB_LDFLAGS="-shared -Xlinker -x -Xlinker -Bsymbolic" TXLIBS="-lncurses" XCFLAGS="-O -g -D_LARGEFILE64_SOURCE -D__s390x__" @@ -16859,13 +16857,12 @@ case $AFS_SYSNAME in SHLIB_LINKER="${CC} -shared" ;; - sparc*_linux*) + sparc64_linux*) KERN_OPTMZ=-O2 LEX="flex -l" MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' MT_LIBS="-lpthread" PAM_CFLAGS="-O2 -Dlinux -DLINUX_PAM -fPIC" - SHLIB_CFLAGS="-fPIC" SHLIB_LDFLAGS="-shared -Xlinker -x" TXLIBS="-lncurses" XCFLAGS="-O2 -D_LARGEFILE64_SOURCE" @@ -16875,6 +16872,19 @@ case $AFS_SYSNAME in SHLIB_LINKER="${MT_CC} -shared" ;; + sparc_linux22) + KERN_OPTMZ=-O2 + LEX="flex -l" + MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' + MT_LIBS="-lpthread" + PAM_CFLAGS="-O2 -Dlinux -DLINUX_PAM -fPIC" + SHLIB_LDFLAGS="-shared -Xlinker -x" + TXLIBS="-lncurses" + XCFLAGS="-O2 -D_LARGEFILE64_SOURCE" + YACC="bison -y" + SHLIB_LINKER="${MT_CC} -shared" + ;; + sun4_413) CCXPG2="/usr/xpg2bin/cc" CC="gcc" diff --git a/debian/changelog b/debian/changelog index 07918a4c5..79de23d41 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,11 @@ openafs (1.4.4-1) experimental; urgency=low capability in MIT Kerberos 1.6 and later. (Closes: #410314) * Apply patch from Thomas Sesselmann to support setting options to pass to bosserver in /etc/default/openafs-fileserver. (Closes: #409357) + * Remove the rx_Init calls in the PAM module. The internal counters + that had to be initialized that way have been removed. + * Now that we're running regen.sh as part of the build process, only + patch the Autoconf source files and not the generated output to make + the diff easier to audit. -- diff --git a/src/afs/LINUX/osi_groups.c b/src/afs/LINUX/osi_groups.c index 80c974207..c94977e74 100644 --- a/src/afs/LINUX/osi_groups.c +++ b/src/afs/LINUX/osi_groups.c @@ -561,9 +561,6 @@ static int afs_pag_instantiate(struct key *key, const void *data, size_t datalen goto error; /* ensure key being set matches current pag */ -#ifdef AFS_LINUX26_ONEGROUP_ENV - pag = afs_get_pag_from_groups(current->group_info); -#else #ifdef AFS_LINUX26_ONEGROUP_ENV pag = afs_get_pag_from_groups(current->group_info); #else diff --git a/src/afs/LINUX/osi_vfsops.c b/src/afs/LINUX/osi_vfsops.c index 3b3a9edb9..b9ad8d2f6 100644 --- a/src/afs/LINUX/osi_vfsops.c +++ b/src/afs/LINUX/osi_vfsops.c @@ -418,9 +418,6 @@ afs_statfs(struct super_block *sbp, struct statfs *__statp, int size) /* hardcode in case that which is giveth is taken away */ statp->f_type = 0x5346414F; -#if defined(STATFS_TAKES_DENTRY) - statp->f_bsize = dentry->d_sb->s_blocksize; -#else #if defined(STATFS_TAKES_DENTRY) statp->f_bsize = dentry->d_sb->s_blocksize; #else diff --git a/src/afs/afs_osi_pag.c b/src/afs/afs_osi_pag.c index 09b1c540b..9a11286f8 100644 --- a/src/afs/afs_osi_pag.c +++ b/src/afs/afs_osi_pag.c @@ -51,8 +51,6 @@ afs_uint32 pagCounter = 0; #endif /* Local variables */ - /* Local variables */ - /* * Pags are implemented as follows: the set of groups whose long * representation is '41XXXXXX' hex are used to represent the pags. @@ -393,6 +391,7 @@ afs_getpag_val() #endif #endif /* UKERNEL && AFS_WEB_ENHANCEMENTS */ + /* Note - needs to be available on AIX, others can be static - rework this */ #if defined(AFS_OSF_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) int @@ -447,20 +446,6 @@ afs_InitReq(register struct vrequest *av, struct AFS_UCRED *acred) return 0; } -#ifdef AFS_LINUX26_ONEGROUP_ENV -afs_uint32 -afs_get_pag_from_groups(struct group_info *group_info) -{ - afs_uint32 g0 = 0; - afs_uint32 i; - AFS_STATCNT(afs_get_pag_from_groups); - for (i = 0; (i < group_info->ngroups && - (g0 = GROUP_AT(group_info, i)) != (gid_t) NOGROUP); i++) { - if (((g0 >> 24) & 0xff) == 'A') - return g0; - } - return NOPAG; -} #ifdef AFS_LINUX26_ONEGROUP_ENV afs_uint32 diff --git a/src/pam/Makefile.in b/src/pam/Makefile.in index dcd11a674..c198ab013 100644 --- a/src/pam/Makefile.in +++ b/src/pam/Makefile.in @@ -54,7 +54,6 @@ afs_auth_krb.o: afs_auth.c afs_pam_msg.h afs_message.h afs_util.h afs_util.o: afs_util.c afs_pam_msg.h afs_message.h afs_util.h ${CC} ${CFLAGS} -c ${srcdir}/afs_util.c -o afs_util.o - afs_util_krb.o: afs_util.c afs_pam_msg.h afs_message.h afs_util.h ${CC} ${CFLAGS} -DAFS_KERBEROS_ENV -c ${srcdir}/afs_util.c -o afs_util_krb.o diff --git a/src/pam/afs_auth.c b/src/pam/afs_auth.c index b32c6ff18..78ed0ca0f 100644 --- a/src/pam/afs_auth.c +++ b/src/pam/afs_auth.c @@ -314,10 +314,6 @@ pam_sm_authenticate(pam_handle_t * pamh, int flags, int argc, if (cpid <= 0) { /* The child process */ if (logmask && LOG_MASK(LOG_DEBUG)) syslog(LOG_DEBUG, "in child"); - if ((code = rx_Init(0)) != 0) { - pam_afs_syslog(LOG_ERR, PAMAFS_KAERROR, code); - exit(0); - } if (refresh_token || set_token) code = ka_UserAuthenticateGeneral(KA_USERAUTH_VERSION, user, /* kerberos name */ NULL, /* instance */ @@ -367,10 +363,6 @@ pam_sm_authenticate(pam_handle_t * pamh, int flags, int argc, pam_afs_syslog(LOG_ERR, PAMAFS_PAMERROR, errno); } } else { /* dont_fork, used by httpd */ - if ((code = rx_Init(0)) != 0) { - pam_afs_syslog(LOG_ERR, PAMAFS_KAERROR, code); - RET(PAM_AUTH_ERR); - } if (logmask && LOG_MASK(LOG_DEBUG)) syslog(LOG_DEBUG, "dont_fork"); if (refresh_token || set_token) diff --git a/src/pam/afs_setcred.c b/src/pam/afs_setcred.c index 368ed2c2a..d6830fc05 100644 --- a/src/pam/afs_setcred.c +++ b/src/pam/afs_setcred.c @@ -52,7 +52,7 @@ pam_sm_setcred(pam_handle_t * pamh, int flags, int argc, const char **argv) int refresh_token = 0; int set_expires = 0; /* the default is to not to set the env variable */ int use_klog = 0; - int i, code; + int i; struct pam_conv *pam_convp = NULL; char my_password_buf[256]; char *cell_ptr = NULL; @@ -281,11 +281,6 @@ pam_sm_setcred(pam_handle_t * pamh, int flags, int argc, const char **argv) #endif } - if ((code = rx_Init(0)) != 0) { - pam_afs_syslog(LOG_ERR, PAMAFS_KAERROR, code); - RET(PAM_AUTH_ERR); - } - if (flags & PAM_REFRESH_CRED) { if (use_klog) { auth_ok = !do_klog(user, password, "00:00:01", cell_ptr); diff --git a/src/ubik/Makefile.in b/src/ubik/Makefile.in index fd3103f4f..018173863 100644 --- a/src/ubik/Makefile.in +++ b/src/ubik/Makefile.in @@ -149,6 +149,7 @@ clean: include ../config/Makefile.version + ${DESTDIR}${libdir}/libubik.a: libubik.a ${INSTALL} $? $@ -- 2.39.5