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 <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>

diff --git a/src/auth/Makefile.in b/src/auth/Makefile.in
index 246c160..d3b9360 100644 (file)
--- 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 ad6d6fa..8bd1193 100644 (file)
--- 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.