From aea9e64147bd4883764f2d85b98c37a79c5e135a Mon Sep 17 00:00:00 2001 From: Simon Wilkinson Date: Tue, 8 Jan 2013 14:38:34 +0000 Subject: [PATCH] pam: Build using libtool Build the pam_afs and pam_afs.krb modules using libtool, so they fit in with the rest of the new build infrastructure. This requires some additonal symbol exports from auth and kauth, which are included Change-Id: I97a130ba69216cd63ba388f2aaabe830a0c4543f Reviewed-on: http://gerrit.openafs.org/8900 Tested-by: BuildBot Reviewed-by: Chas Williams - CONTRACTOR Reviewed-by: Derrick Brashear --- src/auth/liboafs_auth.la.sym | 4 ++ src/kauth/liboafs_kauth.la.sym | 8 +++ src/pam/Makefile.in | 95 +++++++++++++++------------------- src/rxkad/liboafs_rxkad.la.sym | 2 + 4 files changed, 56 insertions(+), 53 deletions(-) diff --git a/src/auth/liboafs_auth.la.sym b/src/auth/liboafs_auth.la.sym index 7d1c53a7b..00f0d7f20 100644 --- a/src/auth/liboafs_auth.la.sym +++ b/src/auth/liboafs_auth.la.sym @@ -30,6 +30,8 @@ afsconf_typedKey_put afsconf_typedKey_values initialize_ACFG_error_table initialize_KTC_error_table +ktc_curpag +ktc_ForgetAllTokens ktc_GetToken ktc_GetTokenEx ktc_OldPioctl @@ -44,3 +46,5 @@ token_importRxkadViceId token_replaceToken token_setPag token_setRxkadViceId +token_extractRxkad +xdr_ktc_setTokenData diff --git a/src/kauth/liboafs_kauth.la.sym b/src/kauth/liboafs_kauth.la.sym index 173a9dcef..8c71c8f64 100644 --- a/src/kauth/liboafs_kauth.la.sym +++ b/src/kauth/liboafs_kauth.la.sym @@ -1 +1,9 @@ initialize_KA_error_table +ka_VerifyUserPassword +ka_UserAuthenticateGeneral +ka_Init +ka_LocalCell +ka_StringToKey +ka_GetAdminToken +ka_AuthServerConn +ka_ChangePassword diff --git a/src/pam/Makefile.in b/src/pam/Makefile.in index 6dce91bdf..f84a7c263 100644 --- a/src/pam/Makefile.in +++ b/src/pam/Makefile.in @@ -7,68 +7,56 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config -include @TOP_OBJDIR@/src/config/Makefile.shared - - OPTMZ = ${PAM_OPTMZ} - DBG = ${PAM_DBG} - LIBS = ${TOP_LIBDIR}/libafsauthent_pic.a ${TOP_LIBDIR}/libafsrpc_pic.a \ - ${TOP_LIBDIR}/libafsutil_pic.a ${TOP_LIBDIR}/libopr_pic.a \ - ${PAM_LIBS} @LIB_AFSDB@ ${MT_LIBS} - KLIBS = ktc_krb.o ${TOP_LIBDIR}/libafsauthent_pic.a \ - ${TOP_LIBDIR}/libafsrpc_pic.a \ - ${TOP_LIBDIR}/libafsutil_pic.a \ - ${TOP_LIBDIR}/libopr_pic.a \ - ${PAM_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 +include @TOP_OBJDIR@/src/config/Makefile.pthread +include @TOP_OBJDIR@/src/config/Makefile.libtool +LT_objs = afs_account.lo afs_session.lo afs_password.lo \ + afs_pam_msg.lo afs_message.lo AFS_component_version_number.lo +LT_deps = $(top_builddir)/src/kauth/liboafs_kauth.la \ + $(top_builddir)/src/auth/liboafs_auth.la MODULE_CFLAGS=${PAM_CFLAGS} -all: test_pam pam_afs.so.1 pam_afs.krb.so.1 +all: test_pam pam_afs.la pam_afs.krb.la -CFLAGS_afs_setcred_krb.o = -DAFS_KERBEROS_ENV -CFLAGS_afs_auth_krb.o = -DAFS_KERBEROS_ENV -CFLAGS_afs_util_krb.o = -DAFS_KERBEROS_ENV -CFLAGS_ktc_krb.o = -DAFS_KERBEROS_ENV -I../auth +CFLAGS_afs_setcred_krb.lo = -DAFS_KERBEROS_ENV +CFLAGS_afs_auth_krb.lo = -DAFS_KERBEROS_ENV +CFLAGS_afs_util_krb.lo = -DAFS_KERBEROS_ENV +CFLAGS_ktc_krb.lo = -DAFS_KERBEROS_ENV -I../auth -afs_setcred.o: afs_setcred.c afs_pam_msg.h afs_message.h afs_util.h +afs_setcred.lo: afs_setcred.c afs_pam_msg.h afs_message.h afs_util.h +afs_setcred_krb.lo: afs_setcred.c afs_pam_msg.h afs_message.h afs_util.h + $(LT_CCRULE) afs_setcred.c -afs_setcred_krb.o: afs_setcred.c afs_pam_msg.h afs_message.h afs_util.h - $(AFS_CCRULE) $(srcdir)/afs_setcred.c +afs_auth.lo: afs_auth.c afs_pam_msg.h afs_message.h afs_util.h +afs_auth_krb.lo: afs_auth.c afs_pam_msg.h afs_message.h afs_util.h + $(LT_CCRULE) afs_auth.c -afs_auth.o: afs_auth.c afs_pam_msg.h afs_message.h afs_util.h +afs_util.lo: afs_util.c afs_pam_msg.h afs_message.h afs_util.h +afs_util_krb.lo: afs_util.c afs_pam_msg.h afs_message.h afs_util.h + $(LT_CCRULE) afs_util.c -afs_auth_krb.o: afs_auth.c afs_pam_msg.h afs_message.h afs_util.h - $(AFS_CCRULE) $(srcdir)/afs_auth.c - -afs_util.o: afs_util.c afs_pam_msg.h afs_message.h afs_util.h - -afs_util_krb.o: afs_util.c afs_pam_msg.h afs_message.h afs_util.h - $(AFS_CCRULE) $(srcdir)/afs_util.c - -ktc_krb.o: ${srcdir}/../auth/ktc.c ${TOP_INCDIR}/afs/cellconfig.h \ +ktc_krb.lo: ${srcdir}/../auth/ktc.c ${TOP_INCDIR}/afs/cellconfig.h \ ${TOP_INCDIR}/afs/auth.h ${srcdir}/../auth/keys.h \ ${TOP_INCDIR}/afs/vice.h - $(AFS_CCRULE) $(srcdir)/../auth/ktc.c + $(LT_CCRULE) $(srcdir)/../auth/ktc.c -pam_afs.so.1: $(SHOBJS) afs_setcred.o afs_auth.o afs_util.o \ - ${TOP_LIBDIR}/libafsauthent_pic.a \ - ${TOP_LIBDIR}/libafsrpc_pic.a \ +pam_afs.la: $(LT_objs) $(LT_deps) \ + afs_setcred.lo afs_auth.lo afs_util.lo \ pam_afs.map - ../config/shlib-build -d $(srcdir) -f pam_afs.so.1 -l pam_afs -- \ - afs_setcred.o afs_auth.o afs_util.o ${SHOBJS} \ - ${LIBS} $(LDFLAGS_hcrypto) $(LDFLAGS_roken) \ + $(LIBTOOL) --quiet --mode=link --tag=CC $(MT_CC) $(XLDFLAGS) -rpath $(libdir) \ + -module -no-undefined -o pam_afs.la \ + afs_setcred.lo afs_auth.lo afs_util.lo $(LT_objs) $(LT_deps) \ + $(PAM_LIBS) $(LDFLAGS_hcrypto) $(LDFLAGS_roken) \ $(LIB_hcrypto) $(LIB_roken) -pam_afs.krb.so.1: $(SHOBJS) afs_setcred_krb.o afs_auth_krb.o afs_util_krb.o \ - ktc_krb.o ${TOP_LIBDIR}/libafsauthent_pic.a \ - ${TOP_LIBDIR}/libafsrpc_pic.a \ - pam_afs.map - ../config/shlib-build -d $(srcdir) -f pam_afs.krb.so.1 -l pam_afs -- \ - afs_setcred_krb.o afs_auth_krb.o afs_util_krb.o \ - ${SHOBJS} ${KLIBS} $(LDFLAGS_hcrypto) $(LDFLAGS_roken) \ +pam_afs.krb.la: $(LT_objs) $(LT_deps) \ + afs_setcred_krb.lo afs_auth_krb.lo afs_util_krb.lo \ + ktc_krb.lo pam_afs.map + $(LIBTOOL) --quiet --mode=link --tag=CC $(MT_CC) $(XLDFLAGS) -rpath $(libdir) \ + -module -no-undefined -o pam_afs.krb.la \ + afs_setcred_krb.lo afs_auth_krb.lo afs_util_krb.lo ktc_krb.lo \ + $(LT_objs) $(LT_deps) $(PAM_LIBS) $(LDFLAGS_hcrypto) $(LDFLAGS_roken) \ $(LIB_hcrypto) $(LIB_roken) test_pam: test_pam.o @@ -86,15 +74,15 @@ test_pam: test_pam.o echo No link line for system $(SYS_NAME). ;; \ esac -install: pam_afs.so.1 pam_afs.krb.so.1 +install: pam_afs.la pam_afs.krb.la ${INSTALL} -d ${DESTDIR}${libdir} - ${INSTALL_DATA} pam_afs.so.1 ${DESTDIR}${libdir}/pam_afs.so.1 - ${INSTALL_DATA} pam_afs.krb.so.1 ${DESTDIR}${libdir}/pam_afs.krb.so.1 + $(INSTALL_DATA) .libs/pam_afs.so ${DESTDIR}${libdir} + $(INSTALL_DATA) .libs/pam_afs.krb.so ${DESTDIR}${libdir} -dest: pam_afs.so.1 pam_afs.krb.so.1 +dest: pam_afs.la pam_afs.krb.la ${INSTALL} -d ${DEST}/lib - ${INSTALL_DATA} pam_afs.so.1 ${DEST}/lib/pam_afs.so.1 - ${INSTALL_DATA} pam_afs.krb.so.1 ${DEST}/lib/pam_afs.krb.so.1 + $(INSTALL_DATA) .libs/pam_afs.so ${DEST}/lib + $(INSTALL_DATA) .libs/pam_afs.krb.so ${DEST}/lib afs_pam_msg.o: afs_pam_msg.c afs_pam_msg.h afs_message.h afs_message.o: afs_message.c afs_message.h @@ -103,6 +91,7 @@ afs_message.o: afs_message.c afs_message.h # Misc. targets # clean: + $(LT_CLEAN) $(RM) -f *.a *.o *.so.1 test_pam core *~ \ AFS_component_version_number.c pam_afs.exp diff --git a/src/rxkad/liboafs_rxkad.la.sym b/src/rxkad/liboafs_rxkad.la.sym index 840018174..e926ed3fe 100644 --- a/src/rxkad/liboafs_rxkad.la.sym +++ b/src/rxkad/liboafs_rxkad.la.sym @@ -1,6 +1,8 @@ +life_to_time rxkad_NewClientSecurityObject rxkad_NewServerSecurityObject rxkad_GetServerInfo +time_to_life tkt_MakeTicket tkt_CheckTimes initialize_RXK_error_table -- 2.39.5