diff --git a/Makefile.in b/Makefile.in index 2b22b2b0e6..6ccbb03dd9 100644 --- a/Makefile.in +++ b/Makefile.in @@ -369,7 +369,7 @@ vfsck: vol ${COMPILE_PART1} vfsck ${COMPILE_PART2} ;; \ esac -pam: auth shlibafsauthent +pam: auth libafsauthent +set -x; \ if test "@HAVE_PAM@" = "yes"; then \ ${COMPILE_PART1} pam ${COMPILE_PART2} ; \ @@ -582,7 +582,7 @@ libafsrpc: comerr fsint hcrypto lwp rx rxkad rxstat sys util echo Not building MT libafsrpc for ${SYS_NAME} ;; \ esac -libafsauthent: ubik auth kauth libafsrpc volser vlserver +libafsauthent: audit auth kauth ubik util sys ptserver volser vlserver libafsrpc +case ${SYS_NAME} in \ alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[nof]bsd*) \ ${COMPILE_PART1} libafsauthent ${COMPILE_PART2} ;; \ @@ -594,14 +594,6 @@ libafsauthent: ubik auth kauth libafsrpc volser vlserver echo Not building MT libafsauthent for ${SYS_NAME} ;; \ esac -shlibafsauthent: bozo ubik auth kauth - +case ${SYS_NAME} in \ - alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*_darwin_1*|*nbsd*|*obsd*|*fbsd*) \ - ${COMPILE_PART1} shlibafsauthent ${COMPILE_PART2} ;; \ - *) \ - echo Not building shared libafsauthent for ${SYS_NAME} ;; \ - esac - kopenafs: config sys +${COMPILE_PART1} kopenafs ${COMPILE_PART2} @@ -650,7 +642,7 @@ finale: project cmd comerr afsd butc tbutc tbudb @ENABLE_KERNEL_MODULE@ libuafs ptserver tptserver scout bu_utils ubik uss bozo @VFSCK@ volser tvolser tsalvaged \ dviced dvolser libafscp\ venus update xstat afsmonitor rxdebug libafsrpc rfc3961 hcrypto \ - libafsauthent shlibafsauthent libadmin man-pages \ + libafsauthent libadmin man-pages \ tools platform kopenafs authtools $(DIR_roken) +${COMPILE_PART1} finale ${COMPILE_PART2} @@ -658,7 +650,7 @@ finale_nolibafs: project cmd comerr afsd butc tbutc tbudb libuafs audit kauth lo ptserver tptserver scout bu_utils ubik tubik uss bozo @VFSCK@ volser tvolser tsalvaged \ dviced dvolser libafscp\ venus update xstat afsmonitor rxdebug libafsrpc rfc3961 hcrypto \ - libafsauthent shlibafsauthent libadmin man-pages \ + libafsauthent libadmin man-pages \ tools platform kopenafs authtools $(DIR_roken) +${COMPILE_PART1} finale ${COMPILE_PART2} @@ -756,7 +748,6 @@ clean2: -${COMPILE_PART1} rxdebug ${COMPILE_CLEAN} -${COMPILE_PART1} libafsrpc ${COMPILE_CLEAN} -${COMPILE_PART1} libafsauthent ${COMPILE_CLEAN} - -${COMPILE_PART1} shlibafsauthent ${COMPILE_CLEAN} -${COMPILE_PART1} kopenafs ${COMPILE_CLEAN} -${COMPILE_PART1} tools ${COMPILE_CLEAN} -${COMPILE_PART1} platform ${COMPILE_CLEAN} @@ -902,7 +893,6 @@ distclean: clean src/rxstat/Makefile \ src/scout/Makefile \ src/sgistuff/Makefile \ - src/shlibafsauthent/Makefile \ src/sys/Makefile \ src/tbutc/Makefile \ src/tests/Makefile \ diff --git a/configure.ac b/configure.ac index a4f7ae3d72..03143eee62 100644 --- a/configure.ac +++ b/configure.ac @@ -230,7 +230,6 @@ src/rxosd/Makefile \ src/rxstat/Makefile \ src/scout/Makefile \ src/sgistuff/Makefile \ -src/shlibafsauthent/Makefile \ src/sys/Makefile \ src/tbutc/Makefile \ src/tests/Makefile \ diff --git a/src/audit/Makefile.in b/src/audit/Makefile.in index 5f5ee29c73..037b3d9be3 100644 --- a/src/audit/Makefile.in +++ b/src/audit/Makefile.in @@ -17,12 +17,11 @@ include @TOP_OBJDIR@/src/config/Makefile.config include @TOP_OBJDIR@/src/config/Makefile.libtool include @TOP_OBJDIR@/src/config/Makefile.lwp -LT_objs=audit.lo audit-file.lo audit-sysvmq.lo \ - AFS_component_version_number.lo +LT_objs=audit.lo audit-file.lo audit-sysvmq.lo LT_deps = $(top_builddir)/src/rxkad/liboafs_rxkad.la \ $(top_builddir)/src/util/liboafs_util.la -all: liboafs_audit.la ${TOP_LIBDIR}/libaudit.a ${TOP_INCDIR}/afs/audit.h +all: liboafs_audit.la libauthent_audit.la ${TOP_LIBDIR}/libaudit.a ${TOP_INCDIR}/afs/audit.h ${TOP_LIBDIR}/libaudit.a: libaudit.a ${INSTALL_DATA} $? $@ @@ -36,6 +35,9 @@ libaudit.a: $(LT_objs) liboafs_audit.la: liboafs_audit.la.sym $(LT_objs) $(LT_deps) $(LT_LDLIB_shlib) $(LT_objs) $(LT_deps) $(LT_libs) +libauthent_audit.la: $(LT_objs) + $(LT_LDLIB_pic) $(LT_objs) + audit.lo: audit.c audit.h audit-api.h audit-file.lo: audit-file.c audit.h audit-api.h audit-sysvmq.lo: audit-sysvmq.c audit.h audit-api.h diff --git a/src/auth/Makefile.in b/src/auth/Makefile.in index 80a472fd51..784664ba38 100644 --- a/src/auth/Makefile.in +++ b/src/auth/Makefile.in @@ -12,8 +12,7 @@ include @TOP_OBJDIR@/src/config/Makefile.lwp BASE_objs= cellconfig.lo keys.lo userok.lo writeconfig.lo authcon.lo \ acfg_errors.lo ktc_errors.lo netrestrict.lo token.xdr.lo token.lo \ - realms.lo \ - AFS_component_version_number.lo + realms.lo LT_objs= ktc.lo $(BASE_objs) KRB_objs = ktc.krb.lo $(BASE_objs) @@ -37,7 +36,8 @@ LIBS=libauth.a \ INCLS=cellconfig.h auth.h keys.h internal.h token.h -all: liboafs_auth.la ${TOP_LIBDIR}/libauth.a ${TOP_LIBDIR}/libauth.krb.a \ +all: liboafs_auth.la libauthent_auth.la \ + ${TOP_LIBDIR}/libauth.a ${TOP_LIBDIR}/libauth.krb.a \ depinstall depinstall: ${TOP_INCDIR}/afs/keys.h \ @@ -100,6 +100,9 @@ libauth.krb.a: $(KRB_objs) liboafs_auth.la: liboafs_auth.la.sym $(LT_objs) $(LT_deps) $(LT_LDLIB_shlib) $(LT_objs) $(LT_deps) $(LT_libs) +libauthent_auth.la: $(LT_objs) + $(LT_LDLIB_pic) $(LT_objs) + copyauth: copyauth.o ${LIBS} $(AFS_LDRULE) copyauth.o ${LIBS} ${XLIBS} diff --git a/src/kauth/Makefile.in b/src/kauth/Makefile.in index 3042af21a2..37ce7edb48 100644 --- a/src/kauth/Makefile.in +++ b/src/kauth/Makefile.in @@ -65,7 +65,7 @@ KLIBS=${TOP_LIBDIR}/libubik.a \ ${TOP_LIBDIR}/libopr.a \ ${TOP_LIBDIR}/libafshcrypto_lwp.a -all: liboafs_kauth.la \ +all: liboafs_kauth.la libauthent_kauth.la \ kaserver kas kpwvalid klog klog.krb knfs kpasswd rebuild kdb ka-forwarder \ ${TOP_LIBDIR}/libkauth.a \ ${TOP_LIBDIR}/libkauth.krb.a \ @@ -100,6 +100,10 @@ ${TOP_INCDIR}/afs/kaport.h: kaport.h liboafs_kauth.la: liboafs_kauth.la.sym $(LT_objs) $(LT_deps) $(LT_LDLIB_shlib) $(LT_objs) $(LT_deps) $(LT_libs) + +libauthent_kauth.la: $(LT_objs) + $(LT_LDLIB_pic) $(LT_objs) + test tests: all cd test; $(MAKE) diff --git a/src/libafsauthent/Makefile.in b/src/libafsauthent/Makefile.in index 92d325de6a..e1f748d45f 100644 --- a/src/libafsauthent/Makefile.in +++ b/src/libafsauthent/Makefile.in @@ -9,300 +9,52 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.libtool include @TOP_OBJDIR@/src/config/Makefile.pthread +LT_objs = \ + $(top_builddir)/src/audit/libauthent_audit.la \ + $(top_builddir)/src/auth/libauthent_auth.la \ + $(top_builddir)/src/kauth/libauthent_kauth.la \ + $(top_builddir)/src/ubik/libauthent_ubik.la \ + $(top_builddir)/src/sys/libauthent_sys.la \ + $(top_builddir)/src/ptserver/libauthent_ptserver.la \ + $(top_builddir)/src/volser/libauthent_volser.la \ + $(top_builddir)/src/vlserver/libauthent_vlserver.la -AUDIT= $(srcdir)/../audit -AUTH = $(srcdir)/../auth -KAUTH =$(srcdir)/../kauth -UBIK = $(srcdir)/../ubik -UTIL = $(srcdir)/../util -RXKAD = $(srcdir)/../rxkad -PTSERVER = $(srcdir)/../ptserver -VOLSER = $(srcdir)/../volser -VLSERVER = $(srcdir)/../vlserver -SYS = $(srcdir)/../sys +LT_deps = \ + $(top_builddir)/src/util/liboafs_util.la \ + $(top_builddir)/src/libafsrpc/libafsrpc.la -AUDITOBJS = audit.o audit-file.o audit-sysvmq.o +LT_libs = $(LIB_hcrypto) $(LIB_roken) $(LIB_crypt) $(LIB_AFSDB) $(MT_LIBS) -AUTHOBJS = \ - cellconfig.o \ - ktc.o \ - keys.o \ - userok.o \ - writeconfig.o \ - authcon.o \ - ktc_errors.o \ - acfg_errors.o \ - token.o \ - token.xdr.o \ - realms.o \ - netrestrict.o +all: libafsauthent.la libafsauthent_pic.la \ + $(TOP_LIBDIR)/libafsauthent.a \ + $(TOP_LIBDIR)/libafsauthent_pic.a -KAUTHOBJS = \ - kauth.xdr.o \ - kauth.cs.o \ - kaaux.o \ - client.o \ - authclient.o \ - katoken.o \ - kautils.o \ - kalocalcell.o \ - kaerrors.o \ - user.o +libafsauthent.la: libafsauthent.la.sym $(LT_objs) $(LT_deps) + $(LT_LDLIB_shlib) $(LT_objs) $(LT_deps) $(LT_libs) -UBIKOBJS = \ - uinit.o \ - ubikclient.o \ - uerrors.o \ - ubik_int.cs.o \ - ubik_int.xdr.o +libafsauthent_pic.la: $(LT_objs) + $(LT_LDLIB_pic) $(LT_objs) -UTILOBJS = \ - pthread_glock.o \ - dirpath.o \ - serverLog.o \ - fileutil.o - -RXKADOBJS = \ - rxkad_errs.o - -SYSOBJS = \ - rmtsysc.o \ - rmtsys.xdr.o \ - rmtsys.cs.o \ - afssyscalls.o \ - rmtsysnet.o \ - glue.o \ - setpag.o \ - pioctl.o - -PTSERVEROBJS = \ - ptclient.o \ - ptint.cs.o \ - ptint.xdr.o \ - ptuser.o \ - display.o \ - pterror.o - -VOLSEROBJS = \ - vsprocs.o \ - vsutils.o \ - lockprocs.o \ - volint.xdr.o \ - volint.cs.o \ - volerr.o - -VLDBOBJS = \ - vldbint.xdr.o \ - vldbint.cs.o \ - vl_errors.o - -LIBOBJS = \ - ${AUDITOBJS} \ - ${AUTHOBJS} \ - ${KAUTHOBJS} \ - ${UBIKOBJS} \ - ${UTILOBJS} \ - ${RXKADOBJS} \ - ${PTSERVEROBJS} \ - ${SYSOBJS} \ - ${VOLSEROBJS} \ - ${VLDBOBJS} - -all: ${TOP_LIBDIR}/libafsauthent.a +libafsauthent.a: $(LT_objs) + $(LT_LDLIB_static) $(LT_objs) ${TOP_LIBDIR}/libafsauthent.a: libafsauthent.a ${INSTALL_DATA} $? $@ -libafsauthent.a: ${LIBOBJS} - $(RM) -f $@ - $(AR) crv $@ ${LIBOBJS} - $(RANLIB) $@ - -audit.o: ${AUDIT}/audit.c - ${AFS_CCRULE} ${AUDIT}/audit.c - -audit-file.o: ${AUDIT}/audit-file.c - ${AFS_CCRULE} ${AUDIT}/audit-file.c - -audit-sysvmq.o: ${AUDIT}/audit-sysvmq.c - ${AFS_CCRULE} ${AUDIT}/audit-sysvmq.c - -cellconfig.o: ${AUTH}/cellconfig.c - ${AFS_CCRULE} -I../auth ${AUTH}/cellconfig.c - -keys.o: ${AUTH}/keys.c - ${AFS_CCRULE} -I../auth ${AUTH}/keys.c - -ktc.o: ${AUTH}/ktc.c - ${AFS_CCRULE} -I../auth ${AUTH}/ktc.c - -token.o: ${AUTH}/token.c - ${AFS_CCRULE} -I../auth ${AUTH}/token.c - -token.xdr.o: ../auth/token.xdr.c - ${AFS_CCRULE} -I../auth ../auth/token.xdr.c - -userok.o: ${AUTH}/userok.c - ${AFS_CCRULE} -I../auth ${AUTH}/userok.c - -writeconfig.o: ${AUTH}/writeconfig.c - ${AFS_CCRULE} -I../auth ${AUTH}/writeconfig.c - -authcon.o: ${AUTH}/authcon.c - ${AFS_CCRULE} -I../auth ${AUTH}/authcon.c - -ktc_errors.o: ../auth/ktc_errors.c - ${AFS_CCRULE} ../auth/ktc_errors.c - -acfg_errors.o: ../auth/acfg_errors.c - ${AFS_CCRULE} ../auth/acfg_errors.c - -kauth.xdr.o: ../kauth/kauth.xdr.c - ${AFS_CCRULE} ../kauth/kauth.xdr.c - -kauth.cs.o: ../kauth/kauth.cs.c - ${AFS_CCRULE} ../kauth/kauth.cs.c - -kaaux.o: ${KAUTH}/kaaux.c - ${AFS_CCRULE} -I../kauth ${KAUTH}/kaaux.c - -client.o: ${KAUTH}/client.c - ${AFS_CCRULE} -I../kauth ${KAUTH}/client.c - -authclient.o: ${KAUTH}/authclient.c - ${AFS_CCRULE} -I../kauth ${KAUTH}/authclient.c - -katoken.o: ${KAUTH}/katoken.c - ${AFS_CCRULE} -I../kauth ${KAUTH}/katoken.c - -kautils.o: ${KAUTH}/kautils.c - ${AFS_CCRULE} -I../kauth ${KAUTH}/kautils.c - -kalocalcell.o: ${KAUTH}/kalocalcell.c - ${AFS_CCRULE} -I ../kauth ${KAUTH}/kalocalcell.c - -kaerrors.o: ../kauth/kaerrors.c - ${AFS_CCRULE} ../kauth/kaerrors.c - -user.o: ${KAUTH}/user.c - ${AFS_CCRULE} -I ../kauth ${KAUTH}/user.c - -read_passwd.o: ${KAUTH}/read_passwd.c - ${AFS_CCRULE} ${KAUTH}/read_passwd.c - -ubikclient.o: ${UBIK}/ubikclient.c - ${AFS_CCRULE} ${UBIK}/ubikclient.c - -uinit.o: ${UBIK}/uinit.c - ${AFS_CCRULE} ${UBIK}/uinit.c - -uerrors.o: ../ubik/uerrors.c - ${AFS_CCRULE} ../ubik/uerrors.c - -ubik_int.cs.o: ../ubik/ubik_int.cs.c - ${AFS_CCRULE} ../ubik/ubik_int.cs.c - -ubik_int.xdr.o: ../ubik/ubik_int.xdr.c - ${AFS_CCRULE} ../ubik/ubik_int.xdr.c - -dirpath.o: ${UTIL}/dirpath.c - ${AFS_CCRULE} ${UTIL}/dirpath.c - -serverLog.o: ${UTIL}/serverLog.c - ${AFS_CCRULE} ${UTIL}/serverLog.c - -fileutil.o: ${UTIL}/fileutil.c - ${AFS_CCRULE} ${UTIL}/fileutil.c - -pthread_glock.o: ${UTIL}/pthread_glock.c - ${AFS_CCRULE} ${UTIL}/pthread_glock.c - -rxkad_errs.o: ../rxkad/rxkad_errs.c - ${AFS_CCRULE} ../rxkad/rxkad_errs.c - -ptclient.o: ${PTSERVER}/ptclient.c - ${AFS_CCRULE} -I../ptserver ${PTSERVER}/ptclient.c - -realms.o: ${AUTH}/realms.c - ${AFS_CCRULE} -I../auth ${AUTH}/realms.c - -netrestrict.o: ${AUTH}/netrestrict.c - ${AFS_CCRULE} -I../auth ${AUTH}/netrestrict.c - -ptuser.o: ${PTSERVER}/ptuser.c - ${AFS_CCRULE} -I../ptserver ${PTSERVER}/ptuser.c - -display.o: ${PTSERVER}/display.c - ${AFS_CCRULE} -I../ptserver ${PTSERVER}/display.c - -ptint.cs.o: ../ptserver/ptint.cs.c - ${AFS_CCRULE} ../ptserver/ptint.cs.c - -ptint.xdr.o: ../ptserver/ptint.xdr.c - ${AFS_CCRULE} ../ptserver/ptint.xdr.c - -pterror.o: ../ptserver/pterror.c - ${AFS_CCRULE} ../ptserver/pterror.c - -rmtsysc.o: ${SYS}/rmtsysc.c - ${AFS_CCRULE} -I../sys ${SYS}/rmtsysc.c - -rmtsys.xdr.o: ../sys/rmtsys.xdr.c - ${AFS_CCRULE} ../sys/rmtsys.xdr.c - -rmtsys.cs.o: ../sys/rmtsys.cs.c - ${AFS_CCRULE} ../sys/rmtsys.cs.c - -afssyscalls.o: ${SYS}/afssyscalls.c - ${AFS_CCRULE} ${SYS}/afssyscalls.c - -rmtsysnet.o: ${SYS}/rmtsysnet.c - ${AFS_CCRULE} -I../sys ${SYS}/rmtsysnet.c - -glue.o: ${SYS}/glue.c - ${AFS_CCRULE} ${SYS}/glue.c - -setpag.o: ${SYS}/setpag.c - ${AFS_CCRULE} ${SYS}/setpag.c - -pioctl.o: ${SYS}/pioctl.c - ${AFS_CCRULE} ${SYS}/pioctl.c - -vsprocs.o: $(VOLSER)/vsprocs.c - $(AFS_CCRULE) -I../volser $(VOLSER)/vsprocs.c - -vsutils.o: $(VOLSER)/vsutils.c - $(AFS_CCRULE) -I../volser $(VOLSER)/vsutils.c - -lockprocs.o: $(VOLSER)/lockprocs.c - $(AFS_CCRULE) -I../volser $(VOLSER)/lockprocs.c - -volint.xdr.o: ../volser/volint.xdr.c - $(AFS_CCRULE) ../volser/volint.xdr.c - -volint.cs.o: ../volser/volint.cs.c - $(AFS_CCRULE) ../volser/volint.cs.c - -volerr.o: ../volser/volerr.c - $(AFS_CCRULE) ../volser/volerr.c - -vldbint.xdr.o: ../vlserver/vldbint.xdr.c - $(AFS_CCRULE) ../vlserver/vldbint.xdr.c - -vldbint.cs.o: ../vlserver/vldbint.cs.c - $(AFS_CCRULE) ../vlserver/vldbint.cs.c - -vl_errors.o: ../vlserver/vl_errors.c - $(AFS_CCRULE) ../vlserver/vl_errors.c +${TOP_LIBDIR}/libafsauthent_pic.a: libafsauthent_pic.la + ${INSTALL_DATA} .libs/libafsauthent_pic.a $@ clean: - $(RM) -f *.o *.a libafsauthent* + $(LT_CLEAN) + $(RM) -f *.o libafsauthent.a -install: libafsauthent.a +install: libafsauthent.la libafsauthent_pic.la ${INSTALL} -d ${DESTDIR}${libdir} - ${INSTALL_DATA} libafsauthent.a ${DESTDIR}${libdir}/libafsauthent.a + ${LT_INSTALL_DATA} libafsauthent.la ${DESTDIR}${libdir}/libafsauthent.la + ${INSTALL_DATA} libafsauthent_pic.a ${DESTDIR}${libdir}/libafsauthent_pic.a dest: libafsauthent.a ${INSTALL} -d ${DEST}/lib diff --git a/src/libafsauthent/libafsauthent.la.sym b/src/libafsauthent/libafsauthent.la.sym new file mode 100644 index 0000000000..369805bf58 --- /dev/null +++ b/src/libafsauthent/libafsauthent.la.sym @@ -0,0 +1,75 @@ +afsconf_AddKey +afsconf_AddUser +afsconf_CellApply +afsconf_CheckAuth +afsconf_ClientAuth +afsconf_ClientAuthSecure +afsconf_Close +afsconf_DeleteKey +afsconf_DeleteUser +afsconf_GetCellInfo +afsconf_GetKey +afsconf_GetKeys +afsconf_GetLatestKey +afsconf_GetLocalCell +afsconf_GetNoAuthFlag +afsconf_GetNthUser +afsconf_Open +afsconf_ServerAuth +afsconf_SetCellInfo +afsconf_SetNoAuthFlag +afsconf_SuperUser +afsconf_SetSecurityFlags +ka_AuthServerConn +ka_Authenticate +ka_CellConfig +ka_CellToRealm +ka_ChangePassword +ka_ExpandCell +ka_ExplicitCell +ka_GetAdminToken +ka_GetAuthToken +ka_GetSecurity +ka_GetServerToken +ka_GetServers +ka_GetToken +ka_Init +ka_LocalCell +ka_ParseLoginName +ka_ReadPassword +ka_SingleServerConn +ka_StringToKey +ka_KeyCheckSum +ka_UserAuthenticateGeneral +ka_VerifyUserToken +ktc_ForgetAllTokens +ktc_ForgetToken +ktc_GetToken +ktc_ListTokens +ktc_OldPioctl +ktc_SetToken +ktc_curpag +ubik_Call +ubik_Call_New +ubik_CallIter +ubik_ClientDestroy +ubik_ClientInit +ubik_ParseClientList +pioctl +getDirPath +ka_AuthSpecificServersConn +pthread_recursive_mutex_lock +pthread_recursive_mutex_unlock +grmutex +initAFSDirPath +pr_GetCPS +pr_Initialize +pr_GetHostCPS +pr_NameToId +pr_IdToName +pr_ListMembers +pr_End +pr_SNameToId +afs_get_pag_from_groups +setpag +LogThreadNum diff --git a/src/libafsrpc/libafsrpc.la.sym b/src/libafsrpc/libafsrpc.la.sym index 97dbde53d9..740de13179 100644 --- a/src/libafsrpc/libafsrpc.la.sym +++ b/src/libafsrpc/libafsrpc.la.sym @@ -43,6 +43,7 @@ rxkad_global_stats_lock rxkad_stats_key afs_com_err afs_error_message +afs_error_table_name rx_socket rxevent_debugFile rx_debugFile @@ -172,3 +173,5 @@ rx_SetSecurityHeaderSize rx_SetSecurityMaxTrailerSize rx_HostOf rx_PortOf +initialize_RXK_error_table +rx_getAllAddrMaskMtu diff --git a/src/ptserver/Makefile.in b/src/ptserver/Makefile.in index da132c8fd4..7f8b811ed2 100644 --- a/src/ptserver/Makefile.in +++ b/src/ptserver/Makefile.in @@ -51,8 +51,8 @@ LT_deps = $(top_builddir)/src/opr/liboafs_opr.la \ $(top_builddir)/src/auth/liboafs_auth.la LT_libs = -all: ptserver pts pt_util db_verify liboafs_prot.la ${TOP_LIBDIR}/libprot.a \ - depinstall readgroup readpwd testpt ptclient +all: ptserver pts pt_util db_verify liboafs_prot.la libauthent_ptserver.la \ + ${TOP_LIBDIR}/libprot.a depinstall readgroup readpwd testpt ptclient generated: \ pterror.h pterror.c \ @@ -169,6 +169,9 @@ ptuser.lo: $(LINCLS) liboafs_prot.la: liboafs_prot.la.sym $(LT_objs) $(LT_deps) $(LT_LDLIB_shlib) $(LT_objs) $(LT_deps) $(LT_libs) +libauthent_ptserver.la: $(LT_objs) + $(LT_LDLIB_pic) $(LT_objs) + libprot.a: $(LT_objs) $(LT_LDLIB_lwp) $(LT_objs) diff --git a/src/shlibafsauthent/.gitignore b/src/shlibafsauthent/.gitignore deleted file mode 100644 index ae1588cb42..0000000000 --- a/src/shlibafsauthent/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -# After changing this file, please run -# git ls-files -i --exclude-standard -# to check that you haven't inadvertently ignored any tracked files. - -/libafsauthent.exp - diff --git a/src/shlibafsauthent/Makefile.in b/src/shlibafsauthent/Makefile.in deleted file mode 100644 index 1c75c850b4..0000000000 --- a/src/shlibafsauthent/Makefile.in +++ /dev/null @@ -1,378 +0,0 @@ -# API version. When something changes, increment as appropriate. -# Ignore at your own risk. -LIBAFSAUTHENTMAJOR=1 -LIBAFSAUTHENTMINOR=1 - -# Copyright 2000, International Business Machines Corporation and others. -# All Rights Reserved. -# -# This software has been released under the terms of the IBM Public -# License. For details, see the LICENSE file in the top-level source -# directory or online at http://www.openafs.org/dl/license10.html - -# This is a pthread safe library containing ubikclient, auth, kauth. - -srcdir=@srcdir@ -include @TOP_OBJDIR@/src/config/Makefile.config -include @TOP_OBJDIR@/src/config/Makefile.shared - - -MODULE_CFLAGS=-I../auth -I../kauth -I../ptserver -I../sys - -AUDIT= $(srcdir)/../audit -AUTH = $(srcdir)/../auth -KAUTH = $(srcdir)/../kauth -UBIK = $(srcdir)/../ubik -UTIL = $(srcdir)/../util -RXKAD = $(srcdir)/../rxkad -PTSERVER = $(srcdir)/../ptserver -VOLSER = $(srcdir)/../volser -VLSERVER = $(srcdir)/../vlserver -SYS = $(srcdir)/../sys - -AUDITOBJS = audit.o audit-file.o audit-sysvmq.o - -AUTHOBJS = \ - cellconfig.o \ - ktc.o \ - keys.o \ - userok.o \ - writeconfig.o \ - authcon.o \ - ktc_errors.o \ - acfg_errors.o \ - token.xdr.o \ - token.o \ - realms.o - -KAUTHOBJS = \ - kauth.xdr.o \ - kauth.cs.o \ - kaaux.o \ - client.o \ - authclient.o \ - katoken.o \ - kautils.o \ - kalocalcell.o \ - kaerrors.o \ - user.o - -UBIKOBJS = \ - uinit.o \ - ubikclient.o \ - uerrors.o \ - ubik_int.cs.o \ - ubik_int.xdr.o - -UTILOBJS = \ - pthread_glock.o \ - dirpath.o \ - serverLog.o \ - fileutil.o \ - hostparse.o \ - uuid.o \ - ktime.o \ - volparse.o - -RXKADOBJS = \ - rxkad_errs.o - -SYSOBJS = \ - rmtsysc.o \ - rmtsys.xdr.o \ - rmtsys.cs.o \ - afssyscalls.o \ - rmtsysnet.o \ - glue.o \ - setpag.o \ - pioctl.o - -PTSERVEROBJS = \ - ptclient.o \ - ptint.cs.o \ - ptint.xdr.o \ - ptuser.o \ - display.o \ - pterror.o - -VOLSEROBJS = \ - vsutils.o \ - vsprocs.o \ - lockprocs.o \ - volint.xdr.o \ - volint.cs.o \ - volerr.o - -VLDBOBJS = \ - vldbint.xdr.o \ - vldbint.cs.o \ - vl_errors.o - -COMERROBJS = \ - et_name.o - -BOSOBJS = \ - bosint.xdr.o \ - bosint.cs.o \ - boserr.o - -USDOBJS = \ - usd_file.o - -LIBOBJS = \ - ${AUDITOBJS} \ - ${AUTHOBJS} \ - ${KAUTHOBJS} \ - ${UBIKOBJS} \ - ${UTILOBJS} \ - ${RXKADOBJS} \ - ${PTSERVEROBJS} \ - ${SYSOBJS} \ - ${VOLSEROBJS} \ - ${VLDBOBJS} \ - ${COMERROBJS} \ - $(BOSOBJS) \ - $(USDOBJS) - -LIBAFSAUTHENT = libafsauthent.${SHLIB_SUFFIX}.${LIBAFSAUTHENTMAJOR}.${LIBAFSAUTHENTMINOR} - -all: ${TOP_LIBDIR}/${LIBAFSAUTHENT} ${TOP_LIBDIR}/libafsauthent_pic.a - -${TOP_LIBDIR}/${LIBAFSAUTHENT}: ${LIBAFSAUTHENT} - ../config/shlib-install -d ${TOP_LIBDIR} \ - -l libafsauthent \ - -M ${LIBAFSAUTHENTMAJOR} -m ${LIBAFSAUTHENTMINOR} - -${TOP_LIBDIR}/libafsauthent_pic.a: libafsauthent_pic.a - ${INSTALL_DATA} libafsauthent_pic.a $@ - -install: ${LIBAFSAUTHENT} libafsauthent_pic.a - ../config/shlib-install -d ${DESTDIR}${libdir} \ - -l libafsauthent \ - -M ${LIBAFSAUTHENTMAJOR} -m ${LIBAFSAUTHENTMINOR} - ${INSTALL_DATA} libafsauthent_pic.a \ - ${DESTDIR}${libdir}/libafsauthent_pic.a - -dest: ${LIBAFSAUTHENT} libafsauthent_pic.a - ../config/shlib-install -d ${DEST}/lib \ - -l libafsauthent \ - -M ${LIBAFSAUTHENTMAJOR} -m ${LIBAFSAUTHENTMINOR} - ${INSTALL_DATA} libafsauthent_pic.a \ - ${DEST}/lib/libafsauthent_pic.a - -${LIBAFSAUTHENT}: ${LIBOBJS} libafsauthent.map - ../config/shlib-build -d $(srcdir) -l libafsauthent \ - -M ${LIBAFSAUTHENTMAJOR} -m ${LIBAFSAUTHENTMINOR} -- \ - -L${TOP_LIBDIR} $(LDFLAGS_roken) $(LDFLAGS_hcrypto) \ - $(LIBOBJS) \ - -lafsrpc $(LIB_hcrypto) $(LIB_roken) $(LIB_crypt) $(LIB_AFSDB) \ - ${MT_LIBS} - -libafsauthent_pic.a: ${LIBOBJS} - $(RM) -f $@ - $(AR) crv $@ ${LIBOBJS} - $(RANLIB) $@ - -audit.o: ${AUDIT}/audit.c - ${AFS_CCRULE} ${AUDIT}/audit.c - -audit-file.o: ${AUDIT}/audit-file.c - ${AFS_CCRULE} ${AUDIT}/audit-file.c - -audit-sysvmq.o: ${AUDIT}/audit-sysvmq.c - ${AFS_CCRULE} ${AUDIT}/audit-sysvmq.c - -cellconfig.o: ${AUTH}/cellconfig.c - ${AFS_CCRULE} -I../auth ${AUTH}/cellconfig.c - -ktc.o: ${AUTH}/ktc.c - ${AFS_CCRULE} -I../auth ${AUTH}/ktc.c - -keys.o: ${AUTH}/keys.c - ${AFS_CCRULE} -I../auth ${AUTH}/keys.c - -realms.o: ${AUTH}/realms.c - ${AFS_CCRULE} -I../auth ${AUTH}/realms.c - -token.o: ${AUTH}/token.c - ${AFS_CCRULE} -I../auth ${AUTH}/token.c - -token.xdr.o: ../auth/token.xdr.c - ${AFS_CCRULE} -I../auth ../auth/token.xdr.c - -userok.o: ${AUTH}/userok.c - ${AFS_CCRULE} -I../auth ${AUTH}/userok.c - -writeconfig.o: ${AUTH}/writeconfig.c - ${AFS_CCRULE} -I../auth ${AUTH}/writeconfig.c - -authcon.o: ${AUTH}/authcon.c - ${AFS_CCRULE} -I../auth ${AUTH}/authcon.c - -ktc_errors.o: ../auth/ktc_errors.c - ${AFS_CCRULE} ../auth/ktc_errors.c - -acfg_errors.o: ../auth/acfg_errors.c - ${AFS_CCRULE} ../auth/acfg_errors.c - -kauth.xdr.o: ../kauth/kauth.xdr.c - ${AFS_CCRULE} ../kauth/kauth.xdr.c - -kauth.cs.o: ../kauth/kauth.cs.c - ${AFS_CCRULE} ../kauth/kauth.cs.c - -kaaux.o: ${KAUTH}/kaaux.c - ${AFS_CCRULE} -I../kauth ${KAUTH}/kaaux.c - -client.o: ${KAUTH}/client.c - ${AFS_CCRULE} -I../kauth ${KAUTH}/client.c - -authclient.o: ${KAUTH}/authclient.c - ${AFS_CCRULE} -I../kauth ${KAUTH}/authclient.c - -katoken.o: ${KAUTH}/katoken.c - ${AFS_CCRULE} -I../kauth ${KAUTH}/katoken.c - -kautils.o: ${KAUTH}/kautils.c - ${AFS_CCRULE} -I../kauth ${KAUTH}/kautils.c - -kalocalcell.o: ${KAUTH}/kalocalcell.c - ${AFS_CCRULE} -I ../kauth ${KAUTH}/kalocalcell.c - -kaerrors.o: ../kauth/kaerrors.c - ${AFS_CCRULE} ../kauth/kaerrors.c - -user.o: ${KAUTH}/user.c - ${AFS_CCRULE} -I ../kauth ${KAUTH}/user.c - -read_passwd.o: ${KAUTH}/read_passwd.c - ${AFS_CCRULE} ${KAUTH}/read_passwd.c - -ubikclient.o: ${UBIK}/ubikclient.c - ${AFS_CCRULE} ${UBIK}/ubikclient.c - -uinit.o: ${UBIK}/uinit.c - ${AFS_CCRULE} ${UBIK}/uinit.c - -uerrors.o: ../ubik/uerrors.c - ${AFS_CCRULE} ../ubik/uerrors.c - -ubik_int.cs.o: ../ubik/ubik_int.cs.c - ${AFS_CCRULE} ../ubik/ubik_int.cs.c - -ubik_int.xdr.o: ../ubik/ubik_int.xdr.c - ${AFS_CCRULE} ../ubik/ubik_int.xdr.c - -dirpath.o: ${UTIL}/dirpath.c - ${AFS_CCRULE} ${UTIL}/dirpath.c - -serverLog.o: ${UTIL}/serverLog.c - ${AFS_CCRULE} ${UTIL}/serverLog.c - -fileutil.o: ${UTIL}/fileutil.c - ${AFS_CCRULE} ${UTIL}/fileutil.c - -hostparse.o: ${UTIL}/hostparse.c - ${AFS_CCRULE} ${UTIL}/hostparse.c - -volparse.o: ${UTIL}/volparse.c - ${AFS_CCRULE} ${UTIL}/volparse.c - -uuid.o: ${UTIL}/uuid.c - ${AFS_CCRULE} ${UTIL}/uuid.c - -ktime.o: ${UTIL}/ktime.c - ${AFS_CCRULE} ${UTIL}/ktime.c - -pthread_glock.o: ${UTIL}/pthread_glock.c - ${AFS_CCRULE} ${UTIL}/pthread_glock.c - -rxkad_errs.o: ../rxkad/rxkad_errs.c - ${AFS_CCRULE} ../rxkad/rxkad_errs.c - -ptclient.o: ${PTSERVER}/ptclient.c - ${AFS_CCRULE} -I../ptserver ${PTSERVER}/ptclient.c - -ptuser.o: ${PTSERVER}/ptuser.c - ${AFS_CCRULE} -I../ptserver ${PTSERVER}/ptuser.c - -display.o: ${PTSERVER}/display.c - ${AFS_CCRULE} -I../ptserver ${PTSERVER}/display.c - -ptint.cs.o: ../ptserver/ptint.cs.c - ${AFS_CCRULE} ../ptserver/ptint.cs.c - -ptint.xdr.o: ../ptserver/ptint.xdr.c - ${AFS_CCRULE} ../ptserver/ptint.xdr.c - -pterror.o: ../ptserver/pterror.c - ${AFS_CCRULE} ../ptserver/pterror.c - -rmtsysc.o: ${SYS}/rmtsysc.c - ${AFS_CCRULE} -I../sys ${SYS}/rmtsysc.c - -rmtsys.xdr.o: ../sys/rmtsys.xdr.c - ${AFS_CCRULE} ../sys/rmtsys.xdr.c - -rmtsys.cs.o: ../sys/rmtsys.cs.c - ${AFS_CCRULE} ../sys/rmtsys.cs.c - -afssyscalls.o: ${SYS}/afssyscalls.c - ${AFS_CCRULE} ${SYS}/afssyscalls.c - -rmtsysnet.o: ${SYS}/rmtsysnet.c - ${AFS_CCRULE} -I../sys ${SYS}/rmtsysnet.c - -glue.o: ${SYS}/glue.c - ${AFS_CCRULE} ${SYS}/glue.c - -setpag.o: ${SYS}/setpag.c - ${AFS_CCRULE} ${SYS}/setpag.c - -pioctl.o: ${SYS}/pioctl.c - ${AFS_CCRULE} ${SYS}/pioctl.c - -vsprocs.o: $(VOLSER)/vsprocs.c - $(AFS_CCRULE) -I../volser $(VOLSER)/vsprocs.c - -vsutils.o: $(VOLSER)/vsutils.c - $(AFS_CCRULE) -I../volser $(VOLSER)/vsutils.c - -lockprocs.o: $(VOLSER)/lockprocs.c - $(AFS_CCRULE) -I../volser $(VOLSER)/lockprocs.c - -volint.xdr.o: ../volser/volint.xdr.c - $(AFS_CCRULE) ../volser/volint.xdr.c - -volint.cs.o: ../volser/volint.cs.c - $(AFS_CCRULE) ../volser/volint.cs.c - -volerr.o: ../volser/volerr.c - $(AFS_CCRULE) ../volser/volerr.c - -vldbint.xdr.o: ../vlserver/vldbint.xdr.c - $(AFS_CCRULE) ../vlserver/vldbint.xdr.c - -vldbint.cs.o: ../vlserver/vldbint.cs.c - $(AFS_CCRULE) ../vlserver/vldbint.cs.c -vl_errors.o: ../vlserver/vl_errors.c - $(AFS_CCRULE) ../vlserver/vl_errors.c - -et_name.o: ${srcdir}/../comerr/et_name.c - ${AFS_CCRULE} ${srcdir}/../comerr/et_name.c - -bosint.xdr.o: ../bozo/bosint.xdr.c - $(AFS_CCRULE) ../bozo/bosint.xdr.c - -bosint.cs.o: ../bozo/bosint.cs.c - $(AFS_CCRULE) ../bozo/bosint.cs.c - -boserr.o: ../bozo/boserr.c - $(AFS_CCRULE) ../bozo/boserr.c - -usd_file.o: ${srcdir}/../usd/usd_file.c - $(AFS_CCRULE) ${srcdir}/../usd/usd_file.c -clean: - $(RM) -f *.o *.a libafsauthent.a* libafsauthent.sl* libafsauthent.so* \ - libafsauthent_pic.a libafsauthent.dylib.* \ - libafsauthent.exp diff --git a/src/shlibafsauthent/NTMakefile b/src/shlibafsauthent/NTMakefile deleted file mode 100644 index 238eabf2f5..0000000000 --- a/src/shlibafsauthent/NTMakefile +++ /dev/null @@ -1,228 +0,0 @@ -# Copyright 2000, International Business Machines Corporation and others. -# All Rights Reserved. -# -# This software has been released under the terms of the IBM Public -# License. For details, see the LICENSE file in the top-level source -# directory or online at http://www.openafs.org/dl/license10.html - -# This is a pthread safe library containing ubikclient, auth, kauth. - -AFSDEV_AUXCDEFINES = -DAFS_PTHREAD_ENV - -RELDIR=shlibafsauthent -!include ..\config\NTMakefile.$(SYS_NAME) -!include ..\config\NTMakefile.version - -AUDIT = ..\audit -AUTH = ..\auth -KAUTH = ..\kauth -UBIK = ..\ubik -UTIL = ..\util -RXKAD = ..\rxkad -PTSERVER = ..\ptserver -SYS = ..\sys -WINNTAFSD = ..\WINNT\afsd - -LIBFILE = $(DESTDIR)\lib\afsauthent.dll - -AUDITOBJS = $(OUT)\audit.obj - -AUTHOBJS = \ - $(OUT)\cellconfig.obj \ - $(OUT)\userok.obj \ - $(OUT)\writeconfig.obj \ - $(OUT)\authcon.obj \ - $(OUT)\ktc_errors.obj \ - $(OUT)\ktc_nt.obj \ - $(OUT)\acfg_errors.obj - -KAUTHOBJS = \ - $(OUT)\kauth.xdr.obj \ - $(OUT)\kauth.cs.obj \ - $(OUT)\kaaux.obj \ - $(OUT)\client.obj \ - $(OUT)\authclient.obj \ - $(OUT)\token.obj \ - $(OUT)\kautils.obj \ - $(OUT)\kalocalcell.obj \ - $(OUT)\kaerrors.obj \ - $(OUT)\user_nt.obj - -UBIKOBJS = \ - $(OUT)\ubikclient.obj \ - $(OUT)\uerrors.obj \ - $(OUT)\ubik_int.cs.obj \ - $(OUT)\ubik_int.xdr.obj - -UTILOBJS = \ - $(OUT)\pthread_glock.obj \ - $(OUT)\fileutil.obj \ - $(OUT)\dirpath.obj \ - $(OUT)\readdir_nt.obj - -RXKADOBJS = \ - $(OUT)\rxkad_errs.obj - -PTSERVEROBJS = \ - $(OUT)\ptclient.obj \ - $(OUT)\ptint.cs.obj \ - $(OUT)\ptint.xdr.obj \ - $(OUT)\ptuser.obj \ - $(OUT)\display.obj \ - $(OUT)\pterror.obj - -SYSOBJS = \ - $(OUT)\pioctl_nt.obj - -WINNTAFSDOBJS =\ - $(OUT)\cm_config.obj \ - $(OUT)\afsrpc_c.obj - -DLLOBJS =\ - $(AUTHOBJS) \ - $(KAUTHOBJS) \ - $(UBIKOBJS) \ - $(UTILOBJS) \ - $(RXKADOBJS) \ - $(PTSERVEROBJS) \ - $(SYSOBJS) \ - $(WINNTAFSDOBJS) \ - $(AUDITOBJS) \ - $(DESTDIR)\lib\cm_dns.obj \ - afsauthent.res - -audit.obj: $(AUDIT)\audit.c - $(C2OBJ) $(AUDIT)\audit.c - -cellconfig.obj: $(AUTH)\cellconfig.c - $(C2OBJ) $(AUTH)\cellconfig.c - -userok.obj: $(AUTH)\userok.c - $(C2OBJ) $(AUTH)\userok.c - -writeconfig.obj: $(AUTH)\writeconfig.c - $(C2OBJ) $(AUTH)\writeconfig.c - -authcon.obj: $(AUTH)\authcon.c - $(C2OBJ) $(AUTH)\authcon.c - -ktc_errors.obj: $(AUTH)\ktc_errors.c - $(C2OBJ) $(AUTH)\ktc_errors.c - -acfg_errors.obj: $(AUTH)\acfg_errors.c - $(C2OBJ) $(AUTH)\acfg_errors.c - -kauth.xdr.obj: $(KAUTH)\kauth.xdr.c - $(C2OBJ) $(KAUTH)\kauth.xdr.c - -kauth.cs.obj: $(KAUTH)\kauth.cs.c - $(C2OBJ) $(KAUTH)\kauth.cs.c - -kaaux.obj: $(KAUTH)\kaaux.c - $(C2OBJ) $(KAUTH)\kaaux.c - -client.obj: $(KAUTH)\client.c - $(C2OBJ) $(KAUTH)\client.c - -authclient.obj: $(KAUTH)\authclient.c - $(C2OBJ) $(KAUTH)\authclient.c - -token.obj: $(KAUTH)\token.c - $(C2OBJ) $(KAUTH)\token.c - -kautils.obj: $(KAUTH)\kautils.c - $(C2OBJ) $(KAUTH)\kautils.c - -kalocalcell.obj: $(KAUTH)\kalocalcell.c - $(C2OBJ) $(KAUTH)\kalocalcell.c - -kaerrors.obj: $(KAUTH)\kaerrors.c - $(C2OBJ) $(KAUTH)\kaerrors.c - -ktc_nt.obj: $(AUTH)\ktc_nt.c - $(C2OBJ) $(AUTH)\ktc_nt.c - -user_nt.obj: $(KAUTH)\user_nt.c - $(C2OBJ) $(KAUTH)\user_nt.c - -ubikclient.obj: $(UBIK)\ubikclient.c - $(C2OBJ) $(UBIK)\ubikclient.c - -uerrors.obj: $(UBIK)\uerrors.c - $(C2OBJ) $(UBIK)\uerrors.c - -ubik_int.cs.obj: $(UBIK)\ubik_int.cs.c - $(C2OBJ) $(UBIK)\ubik_int.cs.c - -ubik_int.xdr.obj: $(UBIK)\ubik_int.xdr.c - $(C2OBJ) $(UBIK)\ubik_int.xdr.c - -dirpath.obj: $(UTIL)\dirpath.c - $(C2OBJ) $(UTIL)\dirpath.c - -fileutil.obj: $(UTIL)\fileutil.c - $(C2OBJ) $(UTIL)\fileutil.c - -readdir_nt.obj: $(UTIL)\readdir_nt.c - $(C2OBJ) $(UTIL)\readdir_nt.c - -pthread_glock.obj: $(UTIL)\pthread_glock.c - $(C2OBJ) $(UTIL)\pthread_glock.c - -rxkad_errs.obj: $(RXKAD)\rxkad_errs.c - $(C2OBJ) $(RXKAD)\rxkad_errs.c - -ptclient.obj: $(PTSERVER)\ptclient.c - $(C2OBJ) $(PTSERVER)\ptclient.c - -ptuser.obj: $(PTSERVER)\ptuser.c - $(C2OBJ) $(PTSERVER)\ptuser.c - -display.obj: $(PTSERVER)\display.c - $(C2OBJ) $(PTSERVER)\display.c - -ptint.cs.obj: $(PTSERVER)\ptint.cs.c - $(C2OBJ) $(PTSERVER)\ptint.cs.c - -ptint.xdr.obj: $(PTSERVER)\ptint.xdr.c - $(C2OBJ) $(PTSERVER)\ptint.xdr.c - -pterror.obj: $(PTSERVER)\pterror.c - $(C2OBJ) $(PTSERVER)\pterror.c - -pioctl_nt.obj: $(SYS)\pioctl_nt.c - $(C2OBJ) $(SYS)\pioctl_nt.c - -afsrpc_c.obj: $(WINNTAFSD)\afsrpc_c.c - $(C2OBJ) $(WINNTAFSD)\afsrpc_c.c - -cm_config.obj: $(WINNTAFSD)\cm_config.c - $(C2OBJ) $(WINNTAFSD)\cm_config.c - -DLLLIBS =\ -!IF (("$(SYS_NAME)"=="i386_win95" ) || ("$(SYS_NAME)"=="I386_WIN95" )) - $(DESTDIR)\lib\win95\afspthread.lib \ -!ELSE - $(DESTDIR)\lib\afspthread.lib \ -!ENDIF - $(DESTDIR)\lib\afsrpc.lib \ - $(DESTDIR)\lib\afsdes.lib \ - $(DESTDIR)\lib\afs\afsutil.lib \ - $(DESTDIR)\lib\afs\afsreg.lib \ - $(DESTDIR)\lib\afs\afseventlog.lib - -$(LIBFILE): $(DLLOBJS) $(DLLLIBS) - $(DLLCONLINK) /DEF:afsauthent.def rpcrt4.lib - $(_VC_MANIFEST_EMBED_DLL) - $(DLLPREP) - $(CODESIGN_USERLAND) - $(SYMSTORE_IMPORT) - -# Definitions for generating versioninfo resources -afsauthent.res: afsauthent.rc AFS_component_version_number.h - $(RC) $*.rc - -install: $(LIBFILE) - -clean :: - $(DEL) $(LIBFILE) diff --git a/src/shlibafsauthent/README b/src/shlibafsauthent/README deleted file mode 100644 index d7b2b98bdd..0000000000 --- a/src/shlibafsauthent/README +++ /dev/null @@ -1,24 +0,0 @@ -Copyright 2000, International Business Machines Corporation and others. -All Rights Reserved. - -This software has been released under the terms of the IBM Public -License. For details, see the LICENSE file in the top-level source -directory or online at http://www.openafs.org/dl/license10.html - -This library is to be used by multithreaded programs that need to access -the kauth and auth library interfaces. The primary method used to obtain -thread safety in these libraries is to lock/unlock a recursive global -mutex at the entry point of every public function in the library. - -However, not all public functions are made thread safe since not all -functions are needed by the NT admin work. In particular, there are -many public functions that make up decendants of the functions -we wish to use that weren't modified, since these functions will be -protected by the locking at a higher level function. - -To prevent people from using non-thread safe functions, platform -specific methods are used to limit the functions exported by the -library (using def files under NT and mapfiles under Solaris). For -most non-exported functions, it should be trivial to make the -transformation to thread safe by simply locking/ unlocking the -global mutex at the beginning/end of the function. diff --git a/src/shlibafsauthent/afsauthent.def b/src/shlibafsauthent/afsauthent.def deleted file mode 100644 index dc96468650..0000000000 --- a/src/shlibafsauthent/afsauthent.def +++ /dev/null @@ -1,92 +0,0 @@ -EXPORTS - afsconf_AddKey @1 - afsconf_AddUser @2 - afsconf_CellApply @3 - afsconf_CheckAuth @4 - afsconf_ClientAuth @5 - afsconf_ClientAuthSecure @6 - afsconf_Close @7 - afsconf_DeleteKey @8 - afsconf_DeleteUser @9 - afsconf_GetCellInfo @10 - afsconf_GetKey @11 - afsconf_GetKeys @12 - afsconf_GetLatestKey @13 - afsconf_GetLocalCell @14 - afsconf_GetNoAuthFlag @15 - afsconf_GetNthUser @16 - afsconf_IntGetKeys @17 - afsconf_Open @18 - afsconf_ServerAuth @19 - afsconf_SetCellInfo @20 - afsconf_SetNoAuthFlag @21 - afsconf_SuperUser @22 - ka_AuthServerConn @23 - ka_Authenticate @24 - ka_CellConfig @25 - ka_CellToRealm @26 - ka_ChangePassword @27 - ka_ExpandCell @28 - ka_ExplicitCell @29 - ka_GetAdminToken @30 - ka_GetAuthToken @31 - ka_GetSecurity @32 - ka_GetServerToken @33 - ka_GetServers @34 - ka_GetToken @35 - ka_Init @36 - ka_LocalCell @37 - ka_ParseLoginName @38 - ka_ReadPassword @39 - ka_SingleServerConn @40 - ka_StringToKey @41 - ka_UserAuthenticateGeneral @42 - ka_VerifyUserToken @43 - ubik_Call @44 - ubik_Call_New @45 - ubik_CallIter @46 - ubik_ClientDestroy @47 - ubik_ClientInit @48 - ubik_ParseClientList @49 - getDirPath @50 - ka_AuthSpecificServersConn @51 - pthread_recursive_mutex_lock @52 - pthread_recursive_mutex_unlock @53 - grmutex @54 DATA - initAFSDirPath @55 - renamefile @56 - opendir @57 - readdir @58 - closedir @59 - nterr_nt2unix @60 - ka_KeyCheckSum @61 - pr_GetCPS @62 - pr_Initialize @63 - pr_GetHostCPS @64 - afs_krb_get_lrealm @65 - pr_NameToId @66 - pr_IdToName @67 - afs_gettimeofday @68 - int_to_base32 @69 - base32_to_int @70 - ktc_ForgetAllTokens @71 - ktc_ForgetToken @72 - ktc_GetToken @73 - ktc_ListTokens @74 - ktc_SetToken @75 - ktc_OldPioctl @76 - pioctl @77 - rx_Init @78 - ka_UserAuthenticateGeneral2 @79 - - - - - DISK_function_names @83 DATA - VOTE_function_names @84 DATA - rx_Finalize @85 - pr_End @86 - pioctl_utf8 @87 - - afsconf_SetLocalRealm @88 - afsconf_IsLocalRealmMatch @89 diff --git a/src/shlibafsauthent/afsauthent.rc b/src/shlibafsauthent/afsauthent.rc deleted file mode 100644 index 28a82f33fd..0000000000 --- a/src/shlibafsauthent/afsauthent.rc +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright 2000, International Business Machines Corporation and others. - * All Rights Reserved. - * - * This software has been released under the terms of the IBM Public - * License. For details, see the LICENSE file in the top-level source - * directory or online at http://www.openafs.org/dl/license10.html - */ - -/* Define VERSIONINFO resource */ - -#define AFS_VERINFO_FILE_DESCRIPTION "AFS Authentication Utilities DLL" -#define AFS_VERINFO_DLL -#define AFS_VERINFO_NAME "afsauthent" -#define AFS_VERINFO_FILENAME "afsauthent.dll" - -#include "AFS_component_version_number.h" -#include "..\config\NTVersioninfo.rc" diff --git a/src/shlibafsauthent/libafsauthent.map b/src/shlibafsauthent/libafsauthent.map deleted file mode 100644 index 3698b635a7..0000000000 --- a/src/shlibafsauthent/libafsauthent.map +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 2000, International Business Machines Corporation and others. -# All Rights Reserved. -# -# This software has been released under the terms of the IBM Public -# License. For details, see the LICENSE file in the top-level source -# directory or online at http://www.openafs.org/dl/license10.html - -{ - global: - afsconf_AddKey; - afsconf_AddUser; - afsconf_CellApply; - afsconf_CheckAuth; - afsconf_ClientAuth; - afsconf_ClientAuthSecure; - afsconf_Close; - afsconf_DeleteKey; - afsconf_DeleteUser; - afsconf_GetCellInfo; - afsconf_GetKey; - afsconf_GetKeys; - afsconf_GetLatestKey; - afsconf_GetLocalCell; - afsconf_GetNoAuthFlag; - afsconf_GetNthUser; - afsconf_Open; - afsconf_ServerAuth; - afsconf_SetCellInfo; - afsconf_SetNoAuthFlag; - afsconf_SuperUser; - afsconf_SetSecurityFlags; - ka_AuthServerConn; - ka_Authenticate; - ka_CellConfig; - ka_CellToRealm; - ka_ChangePassword; - ka_ExpandCell; - ka_ExplicitCell; - ka_GetAdminToken; - ka_GetAuthToken; - ka_GetSecurity; - ka_GetServerToken; - ka_GetServers; - ka_GetToken; - ka_Init; - ka_LocalCell; - ka_ParseLoginName; - ka_ReadPassword; - ka_SingleServerConn; - ka_StringToKey; - ka_KeyCheckSum; - ka_UserAuthenticateGeneral; - ka_VerifyUserToken; - ktc_ForgetAllTokens; - ktc_ForgetToken; - ktc_GetToken; - ktc_ListTokens; - ktc_OldPioctl; - ktc_SetToken; - ktc_curpag; - ubik_Call; - ubik_Call_New; - ubik_CallIter; - ubik_ClientDestroy; - ubik_ClientInit; - ubik_ParseClientList; - pioctl; - getDirPath; - ka_AuthSpecificServersConn; - pthread_recursive_mutex_lock; - pthread_recursive_mutex_unlock; - grmutex; - initAFSDirPath; - pr_GetCPS; - pr_Initialize; - pr_GetHostCPS; - pr_NameToId; - pr_IdToName; - pr_ListMembers; - pr_End; - pr_SNameToId; - afs_get_pag_from_groups; - setpag; - LogThreadNum; - - local: - *; -}; diff --git a/src/sys/Makefile.in b/src/sys/Makefile.in index 267a0e7e1e..a3e3e8d035 100644 --- a/src/sys/Makefile.in +++ b/src/sys/Makefile.in @@ -30,6 +30,7 @@ LT_deps = $(top_builddir)/src/rx/liboafs_rx.la all: \ liboafs_sys.la \ libafsrpc_sys.la \ + libauthent_sys.la \ rmtsysd \ ${TOP_INCDIR}/afs/afssyscalls.h \ ${TOP_INCDIR}/afs/afs.exp \ @@ -115,6 +116,9 @@ liboafs_sys.la: liboafs_sys.la.sym $(LT_objs) $(LT_deps) afsl.exp libafsrpc_sys.la: syscall.lo $(LT_LDLIB_pic) syscall.lo +libauthent_sys.la: $(LT_objs) + $(LT_LDLIB_pic) $(LT_objs) + tests: fixit iinc idec icreate iopen istat rmtsysd syscall.lo: syscall.s diff --git a/src/tbudb/Makefile.in b/src/tbudb/Makefile.in index 24f78615af..31bcf65875 100644 --- a/src/tbudb/Makefile.in +++ b/src/tbudb/Makefile.in @@ -34,7 +34,6 @@ INCLS=\ LIBS= \ ${TOP_LIBDIR}/libbubasics.a \ $(top_builddir)/src/ubik/liboafs_ubik.la \ - ${TOP_LIBDIR}/libafsauthent.a \ $(top_builddir)/src/sys/liboafs_sys.la \ $(top_builddir)/src/rxkad/liboafs_rxkad.la \ $(top_builddir)/src/lwp/liboafs_lwpcompat.la \ diff --git a/src/tptserver/Makefile.in b/src/tptserver/Makefile.in index 4ed8ba8313..32c4fad994 100644 --- a/src/tptserver/Makefile.in +++ b/src/tptserver/Makefile.in @@ -25,7 +25,6 @@ INCLS=${TOP_INCDIR}/ubik.h \ LIBS_common= \ $(top_builddir)/src/ubik/liboafs_ubik.la \ - ${TOP_LIBDIR}/libafsauthent.a \ $(top_builddir)/src/sys/liboafs_sys.la \ $(top_builddir)/src/rx/liboafs_rx.la \ $(top_builddir)/src/rxstat/liboafs_rxstat.la \ diff --git a/src/tvolser/Makefile.in b/src/tvolser/Makefile.in index ac212685a1..77c1800ee9 100644 --- a/src/tvolser/Makefile.in +++ b/src/tvolser/Makefile.in @@ -36,7 +36,6 @@ vosobjects= ${VLSERVEROBJS} ${DIROBJS} ${VOLOBJS} LIBS_common = \ $(top_builddir)/src/sys/liboafs_sys.la \ $(top_builddir)/src/cmd/liboafs_cmd.la \ - ${TOP_LIBDIR}/libafsauthent.a \ $(top_builddir)/src/util/liboafs_util.la \ $(top_builddir)/src/usd/liboafs_usd.la \ $(top_builddir)/src/rx/liboafs_rx.la \ diff --git a/src/ubik/Makefile.in b/src/ubik/Makefile.in index 3cdf4565b6..76b6a4b274 100644 --- a/src/ubik/Makefile.in +++ b/src/ubik/Makefile.in @@ -10,10 +10,12 @@ include @TOP_OBJDIR@/src/config/Makefile.config include @TOP_OBJDIR@/src/config/Makefile.libtool include @TOP_OBJDIR@/src/config/Makefile.lwp -LT_objs = disk.lo remote.lo beacon.lo recovery.lo ubik.lo vote.lo lock.lo \ - phys.lo ubik_int.cs.lo ubik_int.ss.lo ubik_int.xdr.lo ubikcmd.lo \ - ubikclient.lo uerrors.lo uinit.lo \ - AFS_component_version_number.lo +LT_authent_objs = uinit.lo ubikclient.lo uerrors.lo ubik_int.cs.lo \ + ubik_int.xdr.lo + +LT_objs = $(LT_authent_objs) \ + disk.lo remote.lo beacon.lo recovery.lo ubik.lo vote.lo lock.lo \ + phys.lo ubik_int.ss.lo ubikcmd.lo LT_deps = $(top_builddir)/src/auth/liboafs_auth.la \ $(top_builddir)/src/opr/liboafs_opr.la \ @@ -33,7 +35,7 @@ LIBS=${TOP_LIBDIR}/librx.a ${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/libauth.a \ ${XLIBS} all: depinstall ${TOP_LIBDIR}/libubik.a udebug utst_server utst_client \ - liboafs_ubik.la + liboafs_ubik.la libauthent_ubik.la generated: \ utst_int.cs.c utst_int.ss.c utst_int.xdr.c utst_int.h \ @@ -135,6 +137,9 @@ utst_int.xdr.o: utst_int.xdr.c ${INCLS} utst_int.h liboafs_ubik.la: liboafs_ubik.la.sym $(LT_objs) $(LT_deps) $(LT_LDLIB_shlib) $(LT_objs) $(LT_deps) $(LT_libs) +libauthent_ubik.la: $(LT_authent_objs) + $(LT_LDLIB_pic) $(LT_authent_objs) + # # Installation targets # diff --git a/src/vlserver/Makefile.in b/src/vlserver/Makefile.in index cfc212e1e0..54980dcc34 100644 --- a/src/vlserver/Makefile.in +++ b/src/vlserver/Makefile.in @@ -37,8 +37,7 @@ LIBS=\ $(TOP_LIBDIR)/libopr.a \ ${TOP_LIBDIR}/libafshcrypto_lwp.a -LT_objs = vldbint.xdr.lo vldbint.cs.lo vl_errors.lo \ - AFS_component_version_number.lo +LT_objs = vldbint.xdr.lo vldbint.cs.lo vl_errors.lo LT_deps = $(top_builddir)/src/opr/liboafs_opr.la \ $(top_builddir)/src/rx/liboafs_rx.la \ @@ -47,7 +46,8 @@ LT_deps = $(top_builddir)/src/opr/liboafs_opr.la \ all: \ vlserver vlclient cnvldb vlserver cnvldb vldb_check \ Kvldbint.cs.c Kvldbint.xdr.c vldbint.h \ - liboafs_vldb.la ${TOP_LIBDIR}/libvldb.a depinstall + liboafs_vldb.la libauthent_vlserver.la \ + ${TOP_LIBDIR}/libvldb.a depinstall generated: \ vl_errors.c vlserver.h \ @@ -132,6 +132,9 @@ libvldb.a: $(LT_objs) liboafs_vldb.la: liboafs_vldb.la.sym $(LT_objs) $(LT_deps) $(LT_LDLIB_shlib) $(LT_objs) $(LT_deps) $(LT_libs) +libauthent_vlserver.la: $(LT_objs) + $(LT_LDLIB_pic) $(LT_objs) + vlclient: vlclient.o libvldb.a $(LIBS) $(AFS_LDRULE) vlclient.o libvldb.a \ $(LIBS) ${TOP_LIBDIR}/libcmd.a $(LIB_roken) ${XLIBS} diff --git a/src/volser/Makefile.in b/src/volser/Makefile.in index 93120e991d..1c4334b52f 100644 --- a/src/volser/Makefile.in +++ b/src/volser/Makefile.in @@ -63,7 +63,7 @@ SOBJS=volmain.o volprocs.o physio.o common.o voltrans.o \ dumpstuff.o volint.ss.o vol_split.o LT_objs = vsprocs.lo vsutils.lo lockprocs.lo volint.xdr.lo volerr.lo \ - volint.cs.lo AFS_component_version_number.lo + volint.cs.lo LT_deps = $(top_builddir)/src/opr/liboafs_opr.la \ $(top_builddir)/src/comerr/liboafs_comerr.la \ $(top_builddir)/src/rx/liboafs_rx.la \ @@ -72,6 +72,7 @@ LT_deps = $(top_builddir)/src/opr/liboafs_opr.la \ all: volserver vos restorevol voldump \ liboafs_volser.la \ + libauthent_volser.la \ ${TOP_INCDIR}/afs/volser.h \ ${TOP_INCDIR}/afs/vsutils_prototypes.h \ ${TOP_INCDIR}/afs/volser_prototypes.h \ @@ -119,6 +120,9 @@ libvolser.a: $(LT_objs) liboafs_volser.la: liboafs_volser.la.sym $(LT_objs) $(LT_deps) $(LT_LDLIB_shlib) $(LT_objs) $(LT_deps) $(LT_libs) +libauthent_volser.la: $(LT_objs) + $(LT_LDLIB_pic) $(LT_objs) + volser.h: volerr.c volerr.c: volerr.et volser.p.h