auth-ktc-no-kernel-has-ktc-h-20010711

retire MAYBE_NO_KTC since no kernels have afs integrated that way these days

diff --git a/src/auth/Makefile b/src/auth/Makefile
index 7621e8c..480ef3e 100644 (file)
--- a/src/auth/Makefile
+++ b/src/auth/Makefile
@@ -38,6 +38,7 @@ all: libauth.a libauth.krb.a setkey
 cellconfig.o: cellconfig.c ${INCLS}
 #comktc.o: comktc.c ${INCLS} ${SRCDIR}include/afs/vice.h
 #comvice.o: comvice.c ${INCLS}
+ktc.o: ktc.c ${INCLS} ${SRCDIR}include/afs/vice.h
 writeconfig.o: writeconfig.c ${INCLS}
 authcon.o: authcon.c ${INCLS}
 userok.o: userok.c ${INCLS}
@@ -47,12 +48,7 @@ setkey.o: setkey.c ${INCLS} AFS_component_version_number.o
 #comauth.o: comauth.c ${INCLS} ${SRCDIR}include/afs/vice.h
 
 ktc.krb.o: ktc.c ${INCLS} ${SRCDIR}include/afs/vice.h
-       ${CC} ${CFLAGS} -DMAYBE_NO_KTC -DAFS_KERBEROS_ENV -c ktc.c -o ktc.krb.o
-
-ktc.o: ktc.c ${INCLS} ${SRCDIR}include/afs/vice.h
-       ${CC} ${CFLAGS} -DMAYBE_NO_KTC -c ktc.c
-# : ${SRCDIR}include/afs/ktc.h
-#      ${CC} ${CFLAGS} -c ktc.c
+       ${CC} ${CFLAGS} -DAFS_KERBEROS_ENV -c ktc.c -o ktc.krb.o
 
 libauth.a: $(OBJS) AFS_component_version_number.o
        -rm -f libauth.a

diff --git a/src/auth/ktc.c b/src/auth/ktc.c
index 53343e9..cbcd1d0 100644 (file)
--- a/src/auth/ktc.c
+++ b/src/auth/ktc.c
@@ -136,9 +136,6 @@ char *ktc_tkt_string();
 
 #ifdef KERNEL_KTC_COMPAT
 
-/* In case there is no include file. */
-#ifdef MAYBE_NO_KTC
-
 #ifndef KTC_SYSCALL
 #define KTC_SYSCALL    32
 #endif
@@ -156,10 +153,6 @@ char *ktc_tkt_string();
 
 #define KTC_INTERFACE_VERSION 3
 
-#else
-#include <afs/ktc.h>
-#endif
-
 /* We have to determine if the kernel supports the ktc system call.  To do so
  * we attempt to execute its noop function.  If this is successful we use the
  * kernel calls in the future otherwise we let the old code run. */