From 94aa0f0860653ca4431ed1a6adaee10ef731be21 Mon Sep 17 00:00:00 2001 From: Simon Wilkinson Date: Thu, 16 Sep 2010 07:09:20 +0100 Subject: [PATCH] Rename kauth/token.c as kauth/katoken.c The kauth 'token.c' collides with the same file in auth when doing Windows builds. As kauth is the legacy package, rename its source file, and update the build system to take account of this. Change-Id: Ib99ef6674a4bfd6a2810b417b34bdc564b3533dc Reviewed-on: http://gerrit.openafs.org/2766 Tested-by: BuildBot Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear --- src/kauth/Makefile.in | 8 ++++---- src/kauth/NTMakefile | 4 ++-- src/kauth/{token.c => katoken.c} | 0 src/libafsauthent/Makefile.in | 4 ++-- src/libafsauthent/NTMakefile | 4 ++-- src/libuafs/Makefile.common.in | 12 ++++++------ src/shlibafsauthent/Makefile.in | 4 ++-- 7 files changed, 18 insertions(+), 18 deletions(-) rename src/kauth/{token.c => katoken.c} (100%) diff --git a/src/kauth/Makefile.in b/src/kauth/Makefile.in index 4887bb185..414b70b5f 100644 --- a/src/kauth/Makefile.in +++ b/src/kauth/Makefile.in @@ -36,7 +36,7 @@ LIBS=${TOP_LIBDIR}/libubik.a \ ${TOP_LIBDIR}/libafsutil.a \ $(DBM) -UKSRCS=authclient.c user.c kautils.h kaserver.h kaaux.c token.c \ +UKSRCS=authclient.c user.c kautils.h kaserver.h kaaux.c katoken.c \ kalocalcell.c client.c kaerrors.c KLIBS=${TOP_LIBDIR}/libubik.a \ @@ -52,8 +52,8 @@ KLIBS=${TOP_LIBDIR}/libubik.a \ ${TOP_LIBDIR}/libcom_err.a \ ${TOP_LIBDIR}/libafsutil.a -OBJS=kauth.xdr.o kauth.cs.o kaaux.o client.o authclient.o token.o kautils.o kalocalcell.o kaerrors.o user.o krb_tf.o -KOBJS=kauth.xdr.o kauth.cs.o kaaux.o client.o authclient.o token.o kautils.o kalocalcell.o kaerrors.o user.krb.o krb_tf.o +OBJS=kauth.xdr.o kauth.cs.o kaaux.o client.o authclient.o katoken.o kautils.o kalocalcell.o kaerrors.o user.o krb_tf.o +KOBJS=kauth.xdr.o kauth.cs.o kaaux.o client.o authclient.o katoken.o kautils.o kalocalcell.o kaerrors.o user.krb.o krb_tf.o all: kaserver kas kpwvalid klog klog.krb knfs kpasswd rebuild kdb ka-forwarder \ ${TOP_LIBDIR}/libkauth.a \ @@ -159,7 +159,7 @@ libkauth.krb.a: $(KOBJS) AFS_component_version_number.o read_passwd.o: read_passwd.c ${CC} ${CFLAGS} -c read_passwd.c -token.o: token.c ${INCLS} +katoken.o: katoken.c ${INCLS} client.o: client.c ${INCLS} AFS_component_version_number.o diff --git a/src/kauth/NTMakefile b/src/kauth/NTMakefile index 69ae7d337..16e8f6854 100644 --- a/src/kauth/NTMakefile +++ b/src/kauth/NTMakefile @@ -33,7 +33,7 @@ KAUTH_LIBOBJS =\ $(OUT)\kaaux.obj \ $(OUT)\client.obj \ $(OUT)\authclient.obj \ - $(OUT)\token.obj \ + $(OUT)\katoken.obj \ $(OUT)\kautils.obj \ $(OUT)\kalocalcell.obj \ $(OUT)\kaerrors.obj \ @@ -55,7 +55,7 @@ KAUTH_KRB_LIBOBJS =\ $(OUT)\kaaux.obj \ $(OUT)\client.obj \ $(OUT)\authclient.obj \ - $(OUT)\token.obj \ + $(OUT)\katoken.obj \ $(OUT)\kautils.obj \ $(OUT)\kalocalcell.obj \ $(OUT)\kaerrors.obj \ diff --git a/src/kauth/token.c b/src/kauth/katoken.c similarity index 100% rename from src/kauth/token.c rename to src/kauth/katoken.c diff --git a/src/libafsauthent/Makefile.in b/src/libafsauthent/Makefile.in index a13fdbb3b..7e1845656 100644 --- a/src/libafsauthent/Makefile.in +++ b/src/libafsauthent/Makefile.in @@ -162,8 +162,8 @@ client.o: ${KAUTH}/client.c authclient.o: ${KAUTH}/authclient.c ${CCRULE} -I../kauth -katoken.o: ${KAUTH}/token.c - ${CCRULE} -o katoken.o -I../kauth +katoken.o: ${KAUTH}/katoken.c + ${CCRULE} -I../kauth kautils.o: ${KAUTH}/kautils.c ${CCRULE} -I../kauth diff --git a/src/libafsauthent/NTMakefile b/src/libafsauthent/NTMakefile index 21094f32b..9b2df9146 100644 --- a/src/libafsauthent/NTMakefile +++ b/src/libafsauthent/NTMakefile @@ -48,11 +48,11 @@ KAUTHOBJS = \ $(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 + $(OUT)\user_nt.obj \ + $(OUT)\katoken.obj UBIKOBJS = \ $(OUT)\uinit.obj \ diff --git a/src/libuafs/Makefile.common.in b/src/libuafs/Makefile.common.in index dbfec0eff..f0b436f78 100644 --- a/src/libuafs/Makefile.common.in +++ b/src/libuafs/Makefile.common.in @@ -867,8 +867,8 @@ $(UOBJ)/user.o: $(TOP_SRCDIR)/kauth/user.c $(CRULE1) $(UOBJ)/hostparse.o: $(TOP_SRCDIR)/util/hostparse.c $(CRULE1) -$(UOBJ)/katoken.o: $(TOP_SRCDIR)/kauth/token.c - $(CRULE1) -o katoken.o +$(UOBJ)/katoken.o: $(TOP_SRCDIR)/kauth/katoken.c + $(CRULE1) $(UOBJ)/acfg_errors.o: $(TOP_OBJDIR)/src/auth/acfg_errors.c $(CRULE1) $(UOBJ)/kaaux.o: $(TOP_SRCDIR)/kauth/kaaux.c @@ -1155,8 +1155,8 @@ $(WEBOBJ)/user.o: $(TOP_SRCDIR)/kauth/user.c $(CRULE2) $(WEBOBJ)/hostparse.o: $(TOP_SRCDIR)/util/hostparse.c $(CRULE2) -$(WEBOBJ)/katoken.o: $(TOP_SRCDIR)/kauth/token.c - $(CRULE2) -o katoken.o +$(WEBOBJ)/katoken.o: $(TOP_SRCDIR)/kauth/katoken.c + $(CRULE2) $(WEBOBJ)/acfg_errors.o: $(TOP_OBJDIR)/src/auth/acfg_errors.c $(CRULE2) $(WEBOBJ)/kaaux.o: $(TOP_SRCDIR)/kauth/kaaux.c @@ -1437,8 +1437,8 @@ $(JUAFS)/user.o: $(TOP_SRCDIR)/kauth/user.c $(CRULE1) $(JUAFS)/hostparse.o: $(TOP_SRCDIR)/util/hostparse.c $(CRULE1) -$(JUAFS)/katoken.o: $(TOP_SRCDIR)/kauth/token.c - $(CRULE1) -o katoken.o +$(JUAFS)/katoken.o: $(TOP_SRCDIR)/kauth/katoken.c + $(CRULE1) $(JUAFS)/acfg_errors.o: $(TOP_OBJDIR)/src/auth/acfg_errors.c $(CRULE1) $(JUAFS)/kaaux.o: $(TOP_SRCDIR)/kauth/kaaux.c diff --git a/src/shlibafsauthent/Makefile.in b/src/shlibafsauthent/Makefile.in index af12e16c0..0ff87ce63 100644 --- a/src/shlibafsauthent/Makefile.in +++ b/src/shlibafsauthent/Makefile.in @@ -193,8 +193,8 @@ client.o: ${KAUTH}/client.c authclient.o: ${KAUTH}/authclient.c ${CCRULE} -katoken.o: ${KAUTH}/token.c - ${CCRULE} -o katoken.o +katoken.o: ${KAUTH}/katoken.c + ${CCRULE} kautils.o: ${KAUTH}/kautils.c ${CCRULE} -- 2.39.5