STABLE12-pam-update-for-correct-krb-aware-module-20011102

this still missed being pulled up

(cherry picked from commit 68196d85dbd09220f91421101f651d8e8d7322c3)

diff --git a/src/pam/Makefile.in b/src/pam/Makefile.in
index f840d9d4d42d67f8e7f8be0eefc8884e915d9a8e..521a8ca9f349b30f3f487ea4398d38a3a72a5aae 100644 (file)
--- a/src/pam/Makefile.in
+++ b/src/pam/Makefile.in
@@ -40,8 +40,8 @@ LDFLAGS = ${SHARE_LDFLAGS}
          ${AFSLIBS} ${PAMLIBS} @LIB_AFSDB@
   KLIBS = ${TOP_LIBDIR}/libkauth.krb.a ${LIBSA} ${TOP_LIBDIR}/libauth.krb.a \
          ${AFSLIBS} ${PAMLIBS} @LIB_AFSDB@
- SHOBJS = afs_auth.o afs_account.o afs_session.o afs_password.o \
-         afs_pam_msg.o afs_message.o afs_util.o AFS_component_version_number.o
+ 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
 INCLUDES=-I${TOP_SRCDIR}/config -I${TOP_INCDIR} \
        -I/usr/include -I/usr/include/sys
@@ -55,36 +55,48 @@ afs_setcred.o: afs_setcred.c afs_pam_msg.h afs_message.h afs_util.h
 afs_setcred_krb.o: afs_setcred.c afs_pam_msg.h afs_message.h afs_util.h
        ${CC} ${CFLAGS} -DAFS_KERBEROS_ENV -c afs_setcred.c -o afs_setcred_krb.o
 
-pam_afs.so.1: $(SHOBJS) afs_setcred.o
+afs_auth.o: afs_auth.c afs_pam_msg.h afs_message.h afs_util.h
+       ${CC} ${CFLAGS}  -c afs_auth.c -o afs_auth.o
+
+afs_auth_krb.o: afs_auth.c afs_pam_msg.h afs_message.h afs_util.h
+       ${CC} ${CFLAGS} -DAFS_KERBEROS_ENV  -c afs_auth.c -o afs_auth_krb.o
+
+afs_util.o: afs_util.c afs_util.h
+       ${CC} ${CFLAGS} -c afs_util.c -o afs_util.o
+
+afs_util_krb.o: afs_util.c afs_util.h
+       ${CC} ${CFLAGS} -DAFS_KERBEROS_ENV -c afs_util.c -o afs_util_krb.o
+
+pam_afs.so.1: $(SHOBJS) afs_setcred.o afs_auth.o afs_util.o
        set -x; \
        case "$(SYS_NAME)" in \
        hp_ux*) \
-               $(LD) $(LDFLAGS) -c mapfile.hp -o $@ afs_setcred.o \
+               $(LD) $(LDFLAGS) -c mapfile.hp -o $@ afs_setcred.o afs_auth.o afs_util.o\
                        $(SHOBJS) $(LIBS) ;; \
        sun*_5*) \
-               $(LD) $(LDFLAGS) -M mapfile -o $@ afs_setcred.o \
+               $(LD) $(LDFLAGS) -M mapfile -o $@ afs_setcred.o afs_auth.o afs_util.o\
                        $(SHOBJS) $(LIBS) ;; \
        *linux*) \
-               $(CC) $(LDFLAGS) -o $@ afs_setcred.o $(SHOBJS) $(LIBS) ;;\
+               $(CC) $(LDFLAGS) -o $@ afs_setcred.o afs_auth.o afs_util.o $(SHOBJS) $(LIBS) ;;\
        *fbsd*) \
-               $(CC) $(LDFLAGS) -o $@ afs_setcred.o $(SHOBJS) $(LIBS) ;;\
+               $(CC) $(LDFLAGS) -o $@ afs_setcred.o afs_auth.o afs_util.o $(SHOBJS) $(LIBS) ;;\
        * ) \
                echo No link line for system $(SYS_NAME). ;; \
        esac
 
-pam_afs.krb.so.1: $(SHOBJS) afs_setcred_krb.o
+pam_afs.krb.so.1: $(SHOBJS) afs_setcred_krb.o afs_auth_krb.o afs_util_krb.o
        set -x; \
        case "$(SYS_NAME)" in \
        hp_ux*) \
                $(LD) $(LDFLAGS) -c mapfile.hp -o $@ \
-                       afs_setcred_krb.o $(SHOBJS) $(LDFLAGS) $(KLIBS) ;; \
+                       afs_setcred_krb.o afs_auth_krb.o afs_util_krb.o $(SHOBJS) $(LDFLAGS) $(KLIBS) ;; \
        sun*_5*) \
                $(LD) $(LDFLAGS) -M mapfile -o $@ \
-                       afs_setcred_krb.o $(SHOBJS) $(LDFLAGS) $(KLIBS) ;; \
+                       afs_setcred_krb.o afs_auth_krb.o afs_util_krb.o $(SHOBJS) $(LDFLAGS) $(KLIBS) ;; \
        *linux*) \
-               $(CC) $(LDFLAGS) -o $@ afs_setcred_krb.o $(SHOBJS) $(KLIBS) ;;\
+               $(CC) $(LDFLAGS) -o $@ afs_setcred_krb.o afs_auth_krb.o afs_util_krb.o $(SHOBJS) $(KLIBS) ;;\
        *fbsd*) \
-               $(CC) $(LDFLAGS) -o $@ afs_setcred_krb.o $(SHOBJS) $(KLIBS) ;;\
+               $(CC) $(LDFLAGS) -o $@ afs_setcred_krb.o afs_auth_krb.o afs_util_krb.o $(SHOBJS) $(KLIBS) ;;\
        * ) \
                echo No link line for system $(SYS_NAME). ;; \
        esac