From 6ab0529a70f76758fa4442913128aa40b0bec84b Mon Sep 17 00:00:00 2001 From: Simon Wilkinson Date: Sat, 30 Oct 2010 14:53:39 +0100 Subject: [PATCH] auth: Use Kernel XDR for kernel tokens For consistency, we should use a version of token.xdr.c built with the -k flag when we build it into our kernel modules. Change-Id: I08e7a1966664141af6c4ed160d3fb860eb5821bd Reviewed-on: http://gerrit.openafs.org/3202 Tested-by: BuildBot Reviewed-by: Derrick Brashear --- src/auth/Makefile.in | 4 ++++ src/libafs/Makefile.common.in | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/auth/Makefile.in b/src/auth/Makefile.in index 246c1601c..d3b936036 100644 --- a/src/auth/Makefile.in +++ b/src/auth/Makefile.in @@ -36,6 +36,7 @@ depinstall: ${TOP_INCDIR}/afs/keys.h \ ${TOP_INCDIR}/afs/ktc.h \ ${TOP_INCDIR}/afs/token.h \ token.h \ + Ktoken.xdr.c \ token.xdr.c ${TOP_INCDIR}/afs/token.h: token.h @@ -100,6 +101,9 @@ ktc_errors.c auth.h: ktc_errors.et auth.p.h $(RM) -f auth.h ktc_errors.c ${COMPILE_ET} -p ${srcdir} ktc_errors -h auth +Ktoken.xdr.c: token.xg + $(RXGEN) -A -x -k -c -o $@ $(srcdir)/token.xg + token.xdr.c: token.xg $(RXGEN) -A -x -c -o $@ ${srcdir}/token.xg diff --git a/src/libafs/Makefile.common.in b/src/libafs/Makefile.common.in index ad6d6fa2f..8bd1193ee 100644 --- a/src/libafs/Makefile.common.in +++ b/src/libafs/Makefile.common.in @@ -169,7 +169,7 @@ AFSAOBJS = \ rxkad_common.o \ xdr_afsuuid.o \ xdr.o \ - token.xdr.o \ + Ktoken.xdr.o \ afs_uuid.o $(AFS_OS_OBJS) # These next two allow nfs and nonfs builds to occur in the same directory. @@ -238,7 +238,7 @@ AFSPAGOBJS = \ AFS_component_version_number.o\ xdr_afsuuid.o \ xdr.o \ - token.xdr.o \ + Ktoken.xdr.o \ afs_uuid.o $(AFS_OS_PAGOBJS) @@ -348,7 +348,7 @@ xdr_mem.o: $(TOP_SRCDIR)/rx/xdr_mem.c $(CRULE_OPT) xdr_len.o: $(TOP_SRCDIR)/rx/xdr_len.c $(CRULE_OPT) -token.xdr.o: $(TOP_OBJDIR)/src/auth/token.xdr.c +Ktoken.xdr.o: $(TOP_OBJDIR)/src/auth/Ktoken.xdr.c $(CRULE_OPT) # these files are not to be optimized - subject to change. -- 2.39.5