From: Simon Wilkinson Date: Sun, 20 May 2012 16:43:10 +0000 (+0100) Subject: log: Relocate pagsh X-Git-Tag: openafs-stable-1_8_0pre1~2061 X-Git-Url: http://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=e9e9719bba91ebc6a1362c6613552a70353aec29 log: Relocate pagsh Move the pagsh utility out of sys, and into log. This moves it closer to other token and PAG related utilities, and resolves a circular dependency between sys and auth. Change-Id: Ibbbfc0e3bebc9ecb70f05b137e10e65ff9e4aff6 Reviewed-on: http://gerrit.openafs.org/8028 Tested-by: BuildBot Reviewed-by: Jeffrey Altman --- diff --git a/src/log/.gitignore b/src/log/.gitignore index cf84a74..c5f418f 100644 --- a/src/log/.gitignore +++ b/src/log/.gitignore @@ -2,6 +2,8 @@ # git ls-files -i --exclude-standard # to check that you haven't inadvertently ignored any tracked files. +/pagsh +/pagsh.krb /kseal /tokens /tokens.krb diff --git a/src/log/Makefile.in b/src/log/Makefile.in index c70f7cc..49a48c3 100644 --- a/src/log/Makefile.in +++ b/src/log/Makefile.in @@ -35,7 +35,7 @@ KLIBRARIES=${TOP_LIBDIR}/libauth.krb.a \ # # Main targets # -all: unlog tokens tokens.krb +all: unlog tokens tokens.krb pagsh pagsh.krb # # Build targets @@ -43,6 +43,16 @@ all: unlog tokens tokens.krb kseal: kseal.o ${LIBRARIES} $(AFS_LDRULE) kseal.o ${LIBRARIES} $(LIB_roken) ${XLIBS} +pagsh: pagsh.o ${LIBRARIES} + $(AFS_LDRULE) pagsh.o ${LIBRARIES} $(LIB_roken) ${XLIBS} + +CFLAGS_pagsh.krb.o = -DAFS_KERBEROS_ENV +pagsh.krb.o: pagsh.c + $(AFS_CCRULE) $(srcdir)/pagsh.c + +pagsh.krb: pagsh.krb.o ${KLIBRARIES} + $(AFS_LDRULE) pagsh.krb.o ${KLIBRARIES} $(LIB_roken) ${XLIBS} + unlog: unlog.o ${LIBRARIES} $(AFS_LDRULE) unlog.o ${LIBRARIES} $(LIB_roken) ${XLIBS} @@ -59,7 +69,7 @@ tokens.o: tokens.c ${TOP_INCDIR}/rx/xdr.h AFS_component_version_number.c # # Install targets # -install: unlog tokens tokens.krb +install: unlog tokens tokens.krb pagsh pagsh.krb ${INSTALL} -d ${DESTDIR}${bindir} ${INSTALL} -d ${DESTDIR}${afssrvbindir} ${INSTALL} -d ${DESTDIR}${sbindir} @@ -68,8 +78,11 @@ install: unlog tokens tokens.krb ${INSTALL_PROGRAM} tokens.krb ${DESTDIR}${bindir}/tokens.krb ${INSTALL_PROGRAM} tokens ${DESTDIR}${afssrvbindir}/tokens ${INSTALL_PROGRAM} tokens.krb ${DESTDIR}${afssrvbindir}/tokens.krb + ${INSTALL_PROGRAM} pagsh ${DESTDIR}${bindir}/pagsh + ${INSTALL_PROGRAM} pagsh.krb ${DESTDIR}${bindir}/pagsh.krb -dest: unlog tokens tokens.krb + +dest: unlog tokens tokens.krb pagsh pagsh.krb ${INSTALL} -d ${DEST}/bin ${INSTALL} -d ${DEST}/root.server/usr/afs/bin ${INSTALL} -d ${DEST}/etc @@ -78,12 +91,14 @@ dest: unlog tokens tokens.krb ${INSTALL_PROGRAM} tokens.krb ${DEST}/bin/tokens.krb ${INSTALL_PROGRAM} tokens ${DEST}/root.server/usr/afs/bin/tokens ${INSTALL_PROGRAM} tokens.krb ${DEST}/root.server/usr/afs/bin/tokens.krb - + ${INSTALL_PROGRAM} pagsh ${DEST}/bin/pagsh + ${INSTALL_PROGRAM} pagsh.krb ${DEST}/bin/pagsh.krb # # Misc. targets # clean: - $(RM) -f *.o unlog tokens kseal core AFS_component_version_number.c tokens.krb + $(RM) -f *.o unlog tokens kseal pagsh pagsh.krb \ + core AFS_component_version_number.c tokens.krb test: cd test; $(MAKE) diff --git a/src/sys/pagsh.c b/src/log/pagsh.c similarity index 98% rename from src/sys/pagsh.c rename to src/log/pagsh.c index 2083bc4..7bbdcfb 100644 --- a/src/sys/pagsh.c +++ b/src/log/pagsh.c @@ -24,8 +24,7 @@ #include #include #include - -#include "sys_prototypes.h" +#include #include "AFS_component_version_number.c" diff --git a/src/sys/.gitignore b/src/sys/.gitignore index 89e6019..aa60e2d 100644 --- a/src/sys/.gitignore +++ b/src/sys/.gitignore @@ -2,8 +2,6 @@ # git ls-files -i --exclude-standard # to check that you haven't inadvertently ignored any tracked files. -/pagsh -/pagsh.krb /picobj /rmtsys.h /rmtsysd diff --git a/src/sys/Makefile.in b/src/sys/Makefile.in index 8161579..073ea8f 100644 --- a/src/sys/Makefile.in +++ b/src/sys/Makefile.in @@ -29,8 +29,6 @@ RMTOBJS=rmtsysnet.o rmtsysc.o rmtsys.cs.o rmtsys.xdr.o rmtsys.ss.o rmtsyss.o all: \ rmtsysd \ - pagsh \ - pagsh.krb \ ${TOP_INCDIR}/afs/afssyscalls.h \ ${TOP_INCDIR}/afs/afs.exp \ ${TOP_INCDIR}/afs/xfsattrs.h \ @@ -105,7 +103,7 @@ libsys.a: ${OBJECTS} ${RMTOBJS} syscall.o afsl.exp AFS_component_version_number. esac $(RANLIB) $@ -tests: pagsh pagsh.krb fixit iinc idec icreate iopen istat rmtsysd +tests: fixit iinc idec icreate iopen istat rmtsysd syscall.o: syscall.s @set -e; set -x; case "$(SYS_NAME)" in \ @@ -154,16 +152,7 @@ Krmtsys.h: rmtsys.xg rmtsysd: rmtsysd.o libsys.a $(AFS_LDRULE) rmtsysd.o ${LIBS} $(LIB_roken) -pagsh: pagsh.o libsys.a AFS_component_version_number.o - $(AFS_LDRULE) pagsh.o ${LIBS} $(LIB_roken) -CFLAGS_pagsh.krb.o = -DAFS_KERBEROS_ENV -pagsh.krb.o: pagsh.c - $(AFS_CCRULE) $(srcdir)/pagsh.c - -pagsh.krb: libsys.a pagsh.krb.o ${TOP_LIBDIR}/libauth.krb.a ${TOP_LIBDIR}/librxkad.a - $(AFS_LDRULE) pagsh.krb.o ${TOP_LIBDIR}/libauth.krb.a \ - ${TOP_LIBDIR}/librxkad.a ${LIBS} $(LIB_roken) # # Test programs. @@ -223,30 +212,26 @@ afsl.exp: ${srcdir}/afsl4.exp ${srcdir}/afsl5.exp # # Installation targets # -install: libsys.a rmtsysd afssyscalls.h pagsh pagsh.krb afs.exp xfsattrs.h +install: libsys.a rmtsysd afssyscalls.h afs.exp xfsattrs.h ${INSTALL} -d ${DESTDIR}${libdir}/afs ${INSTALL} -d ${DESTDIR}${sbindir} ${INSTALL} -d ${DESTDIR}${includedir}/afs ${INSTALL_DATA} libsys.a ${DESTDIR}${libdir}/afs/libsys.a ${INSTALL_PROGRAM} rmtsysd ${DESTDIR}${sbindir}/rmtsysd ${INSTALL_DATA} ${srcdir}/afssyscalls.h ${DESTDIR}${includedir}/afs/afssyscalls.h - ${INSTALL_PROGRAM} pagsh ${DESTDIR}${bindir}/pagsh - ${INSTALL_PROGRAM} pagsh.krb ${DESTDIR}${bindir}/pagsh.krb ${INSTALL_DATA} ${srcdir}/xfsattrs.h ${DESTDIR}${includedir}/afs/xfsattrs.h @set -x; case ${SYS_NAME} in \ rs_aix*) \ ${INSTALL_DATA} afs.exp ${DESTDIR}${includedir}/afs/afs.exp;; \ esac -dest: libsys.a rmtsysd afssyscalls.h pagsh pagsh.krb afs.exp xfsattrs.h +dest: libsys.a rmtsysd afssyscalls.h afs.exp xfsattrs.h ${INSTALL} -d ${DEST}/lib/afs ${INSTALL} -d ${DEST}/etc ${INSTALL} -d ${DEST}/bin ${INSTALL} -d ${DEST}/include/afs ${INSTALL_DATA} libsys.a ${DEST}/lib/afs/libsys.a ${INSTALL_PROGRAM} rmtsysd ${DEST}/etc/rmtsysd - ${INSTALL_PROGRAM} pagsh ${DEST}/bin/pagsh - ${INSTALL_PROGRAM} pagsh.krb ${DEST}/bin/pagsh.krb ${INSTALL_DATA} ${srcdir}/afssyscalls.h ${DEST}/include/afs/afssyscalls.h ${INSTALL_DATA} ${srcdir}/xfsattrs.h ${DEST}/include/afs/xfsattrs.h @set -x; case ${SYS_NAME} in \ @@ -262,6 +247,6 @@ include ../config/Makefile.version clean: $(RM) -f *.o libsys.a xfsinode iinc idec icreate iopen istat core \ rmtsysc rmtsyss *.o rmtsys.ss.c rmtsys.cs.c rmtsys.xdr.c rmtsys.h \ - rmtsysd AFS_component_version_number.c pagsh pagsh.krb \ + rmtsysd AFS_component_version_number.c \ afs.exp afsl.exp libafssetpag.* Krmtsys.cs.c Krmtsys.h Krmtsys.xdr.c $(RM) -rf picobj