death-to-permit-xprt-h-20010327

permit_xprt.h, we hardly knew ye

diff --git a/src/WINNT/install/InstallShield5/GenFileGroups.bat b/src/WINNT/install/InstallShield5/GenFileGroups.bat
index 600af60..ab12b9e 100644 (file)
--- a/src/WINNT/install/InstallShield5/GenFileGroups.bat
+++ b/src/WINNT/install/InstallShield5/GenFileGroups.bat
@@ -1262,7 +1262,7 @@ echo file0=%IS5_INCL%\afs\afs_args.h >> Client_Afs_Header_Files.fgl
 echo file1=%IS5_INCL%\afs\debug.h >> Client_Afs_Header_Files.fgl
 echo file2=%IS5_INCL%\afs\param.h >> Client_Afs_Header_Files.fgl
 echo file3=%IS5_INCL%\afs\afs_sysnames.h >> Client_Afs_Header_Files.fgl
-echo file4=%IS5_INCL%\afs\permit_xprt.h >> Client_Afs_Header_Files.fgl
+echo file4=%IS5_INCL%\afs\bnode.h >> Client_Afs_Header_Files.fgl
 echo file5=%IS5_INCL%\afs\stds.h >> Client_Afs_Header_Files.fgl
 echo file6=%IS5_INCL%\afs\icl.h >> Client_Afs_Header_Files.fgl
 echo file7=%IS5_INCL%\afs\procmgmt.h >> Client_Afs_Header_Files.fgl
@@ -1349,7 +1349,6 @@ echo file87=%IS5_INCL%\afs\volser.h >> Client_Afs_Header_Files.fgl
 echo file88=%IS5_INCL%\afs\volint.h >> Client_Afs_Header_Files.fgl
 echo file89=%IS5_INCL%\afs\fs_stats.h >> Client_Afs_Header_Files.fgl
 echo file90=%IS5_INCL%\afs\bosint.h >> Client_Afs_Header_Files.fgl
-echo file91=%IS5_INCL%\afs\bnode.h >> Client_Afs_Header_Files.fgl
 echo. >> Client_Afs_Header_Files.fgl
 echo [General] >> Client_Afs_Header_Files.fgl
 echo Type=FILELIST >> Client_Afs_Header_Files.fgl

diff --git a/src/afsweb/weblog.c b/src/afsweb/weblog.c
index 9fe9e80..d265490 100644 (file)
--- a/src/afsweb/weblog.c
+++ b/src/afsweb/weblog.c
@@ -274,7 +274,6 @@ static int makeNewPAG()
 
 #include "adkint.h"
 #include "assert.h"
-#include <permit_xprt.h>
 #include <des.h>
 #include <afs/afsutil.h>
 

diff --git a/src/auth/authcon.c b/src/auth/authcon.c
index ac8d81e..1a838f2 100644 (file)
--- a/src/auth/authcon.c
+++ b/src/auth/authcon.c
@@ -7,19 +7,6 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
-/*
- * Revision 2.3  90/08/31  16:11:49
- * Move permit_xprt.h.
- * 
- * Revision 2.2  90/08/20  10:05:54
- * Include permit_xprt.h.
- * Use stds.h.
- * 
- * Revision 2.1  90/08/07  18:51:45
- * Start with clean version to sync test and dev trees.
- * */
-/* See RCS log for older history. */
-
 #if defined(UKERNEL)
 #include "../afs/param.h"
 #include "../afs/sysincludes.h"
@@ -60,20 +47,6 @@ extern int afsconf_GetKey();
 extern struct rx_securityClass *rxkad_NewServerSecurityObject();
 extern struct rx_securityClass *rxkad_NewClientSecurityObject();
 
-/*
- * Note: it is necessary for the #include of permit_xprt.h occur
- * AFTER the above declaration of rxkad_NewClientSecurityObject() --
- * otherwise, depending on the version of permit_xprt.h that gets
- * included, there might be a syntax error.
- */
-
-#if defined(UKERNEL)
-#include "../afs/permit_xprt.h"
-#else /* defined(UKERNEL) */
-#include "../permit_xprt.h"
-#endif /* defined(UKERNEL) */
-
-
 /* return a null security object if nothing else can be done */
 static afs_int32 QuickAuth(astr, aindex)
 struct rx_securityClass **astr;

diff --git a/src/bozo/bos.c b/src/bozo/bos.c
index 9659b13..75ce0c3 100644 (file)
--- a/src/bozo/bos.c
+++ b/src/bozo/bos.c
@@ -53,7 +53,6 @@ static IStatServer();
 static DoStat();
 
 #include "bosint.h"
-#include "../permit_xprt.h"
 
 #define MRAFS_OFFSET  9
 #define ADDPARMOFFSET 26

diff --git a/src/config/Makefile b/src/config/Makefile
index 6ea8484..125069c 100644 (file)
--- a/src/config/Makefile
+++ b/src/config/Makefile
@@ -68,7 +68,7 @@ ${KERNELDIR}/afs/param.h ${DESTDIR}include/afs/param.h :: param.${SYS_NAME}.h
 ${KERNELDIR}/afs/afs_sysnames.h ${DESTDIR}include/afs/afs_sysnames.h :: afs_sysnames.h
        $(RM) -f $@; $(CP) $? $@
 
-DESTINCLS = ${DESTDIR}include/afs/afs_args.h ${DESTDIR}include/afs/venus.h ${DESTDIR}include/afs/debug.h ${DESTDIR}include/afs/afs_sysnames.h  ${DESTDIR}include/afs/param.h  ${DESTDIR}include/afs/stds.h  ${DESTDIR}include/afs/icl.h ../permit_xprt.h
+DESTINCLS = ${DESTDIR}include/afs/afs_args.h ${DESTDIR}include/afs/venus.h ${DESTDIR}include/afs/debug.h ${DESTDIR}include/afs/afs_sysnames.h  ${DESTDIR}include/afs/param.h  ${DESTDIR}include/afs/stds.h  ${DESTDIR}include/afs/icl.h 
 
 ${KERNELDIR}/afs/stds.h ${DESTDIR}include/afs/stds.h :: stds.h
        $(RM) -f $@; $(CP) $? $@
@@ -88,24 +88,6 @@ ${DESTDIR}include/afs/venus.h :: venus.h
 ${DESTDIR}include/afs/debug.h :: debug.h 
        $(RM) -f $@; $(CP) $? $@
 
-${KERNELDIR}/afs/permit_xprt.h ../permit_xprt.h:
-       $(RM) -f ${KERNELDIR}/afs/permit_xprt.h ../permit_xprt.h
-       if [ -f SRC/../xprt/permit_xprt.h ] ; then \
-          echo "XPRT" ; \
-          perm_src=`pwd`/../xprt ; \
-          echo "perm_src='$$perm_src'" ; \
-          set -x ; \
-          $(CP) $$perm_src/permit_export.h ${KERNELDIR}/afs/permit_xprt.h ; \
-          ln -s $$perm_src/permit_xprt.h   ../permit_xprt.h ; \
-       else \
-          echo "CONFIG" ; \
-          perm_src=`pwd` ; \
-          echo "perm_src='$$perm_src'" ; \
-          set -x ; \
-          $(CP) $$perm_src/permit_xprt.h   ${KERNELDIR}/afs/permit_xprt.h ; \
-          ln -s $$perm_src/permit_xprt.h   ../permit_xprt.h ; \
-       fi                   
-
 $(UKDIRS): 
        set $@; $(MKDIR_IF_NEEDED)
 
@@ -133,19 +115,6 @@ ${UKERNELDIR}/afs/venus.h :: venus.h
 ${UKERNELDIR}/afs/afs_args.h :: afs_args.h 
        $(RM) -f $@; $(CP) $? $@
 
-${UKERNELDIR}/afs/permit_xprt.h:
-       $(RM) -f ${UKERNELDIR}/afs/permit_xprt.h
-       if [ -f SRC/../xprt/permit_xprt.h ] ; then \
-          echo "XPRT" ; \
-          perm_src=`pwd`/../xprt ; \
-       else \
-          echo "CONFIG" ; \
-          perm_src=`pwd`/../config ; \
-       fi; \
-       echo "perm_src='$$perm_src'" ; \
-       set -x ; \
-       ln -s $$perm_src/permit_xprt.h   ${UKERNELDIR}/afs/permit_xprt.h
-
 # lkversion is the target the Linux build uses to verify the build machine
 # has headers in the right place for the requested kernel builds.
 #
@@ -161,8 +130,6 @@ lkversion:
        esac
 
 install.noversion: $(KDIRS) noversionMakef all $(DESTINCLS) venus.h
-       $(RM) -f ${DESTDIR}/include/afs/permit_xprt.h
-       $(CP) permit_xprt.h ${DESTDIR}/include/afs/
 
 system: install
 install: version install.noversion kinstall ukinstall
@@ -174,14 +141,14 @@ install: version install.noversion kinstall ukinstall
 
 kinstall: lkversion config $(KDIRS) ${KERNELDIR}/afs/param.h \
        ${KERNELDIR}/afs/stds.h \
-       ${KERNELDIR}/afs/permit_xprt.h ${KERNELDIR}/afs/afs_sysnames.h \
+       ${KERNELDIR}/afs/afs_sysnames.h \
        ${KERNELDIR}/config/Makefile.${SYS_NAME} \
        ${KERNELDIR}/afs/afs_args.h \
        ${KERNELDIR}/afs/icl.h \
        ${KERNELDIR}/afs/AFS_component_version_number.c
 
 ukinstall webinstall: $(DESTINCLS) config $(UKDIRS) ${UKERNELDIR}/afs/param.h ${UKERNELDIR}/afs/stds.h \
-       ${UKERNELDIR}/afs/permit_xprt.h ${UKERNELDIR}/afs/afs_sysnames.h \
+       ${UKERNELDIR}/afs/afs_sysnames.h \
        ${UKERNELDIR}/config/Makefile.${SYS_NAME} \
        ${UKERNELDIR}/afs/afs_args.h \
        ${UKERNELDIR}/afs/icl.h \

diff --git a/src/config/NTMakefile b/src/config/NTMakefile
index a5ef7db..917e8cb 100644 (file)
--- a/src/config/NTMakefile
+++ b/src/config/NTMakefile
@@ -26,26 +26,13 @@ INCFILES =\
        $(INCFILEDIR)\debug.h \
        $(INCFILEDIR)\param.h \
        $(INCFILEDIR)\afs_sysnames.h \
-       $(INCFILEDIR)\permit_xprt.h \
        $(INCFILEDIR)\stds.h \
-       $(INCFILEDIR)\icl.h \
-       ..\permit_xprt.h
+       $(INCFILEDIR)\icl.h 
 
 
 $(INCFILEDIR)\param.h: param.$(SYS_NAME).h
        $(COPY) $? $@
 
-!IF (EXIST($(SRCROOT)\xprt\permit_xprt.h))
-..\permit_xprt.h: $(SRCROOT)\xprt\permit_xprt.h
-       $(DEL) ..\permit_xprt.h
-       $(COPY) $(SRCROOT)\xprt\permit_xprt.h ..\permit_xprt.h
-!ELSE
-..\permit_xprt.h: .\permit_xprt.h
-       $(DEL) ..\permit_xprt.h
-       $(COPY) .\permit_xprt.h ..\permit_xprt.h
-!ENDIF
-
-
 idirs: doclink
 !      IF (!EXIST($(DESTDIR)\include))
                $(MKDIR) $(DESTDIR)\include

diff --git a/src/dauth/dlog.c b/src/dauth/dlog.c
index 02c56fc..afce5ec 100644 (file)
--- a/src/dauth/dlog.c
+++ b/src/dauth/dlog.c
@@ -89,9 +89,6 @@
 #include <des.h>
 #include <afs/afsutil.h>
 
-#include "../permit_xprt.h"
-
-
 /*
  * The password reading routine in des/readpassword.c will not work if the
  * buffer size passed in is greater than BUFSIZ, so we pretty well have to

diff --git a/src/des/Makefile b/src/des/Makefile
index 5e7dd75..a3c6b06 100644 (file)
--- a/src/des/Makefile
+++ b/src/des/Makefile
@@ -208,9 +208,6 @@ ${DES_LIB}: ${TARGOBJS} ${COMMONOBJS} AFS_component_version_number.o
        ar r ${DES_LIB} ${TARGOBJS} ${COMMONOBJS} AFS_component_version_number.o
        $(RANLIB) ${DES_LIB}
 
-# export stuff
-des.o cbc_encrypt.o pcbc_encrypt.o new_rnd_key.o cksum.o testit.o verify.o: ../permit_xprt.h
-
 #      host system stuff
 make_ip: make_ip.o misc.o
        ${CC} make_ip.o misc.o ${LDFLAGS} -o make_ip

diff --git a/src/des/cbc_encrypt.c b/src/des/cbc_encrypt.c
index 32adc83..e6bbe41 100644 (file)
--- a/src/des/cbc_encrypt.c
+++ b/src/des/cbc_encrypt.c
@@ -23,7 +23,6 @@
 #include <afs/param.h>
 
 #define XPRT_CBC_ENCRYPT
-#include "../permit_xprt.h"
 
 extern int des_debug;
 extern int des_debug_print();

diff --git a/src/des/cksum.c b/src/des/cksum.c
index 89ebd6b..fd80452 100644 (file)
--- a/src/des/cksum.c
+++ b/src/des/cksum.c
@@ -30,7 +30,6 @@
 #include "des_internal.h"
 
 #define XPRT_CKSUM
-#include "../permit_xprt.h"
 
 extern int des_debug;
 extern int des_debug_print();

diff --git a/src/des/des.c b/src/des/des.c
index ba5aa19..e8e4438 100644 (file)
--- a/src/des/des.c
+++ b/src/des/des.c
@@ -48,7 +48,6 @@
 #include "stats.h"
 
 #define XPRT_DES
-#include "../permit_xprt.h"
 
 #ifdef DEBUG
 #define DBG_PRINT(s) if (des_debug & 2) \

diff --git a/src/des/new_rnd_key.c b/src/des/new_rnd_key.c
index 56deae1..88536e2 100644 (file)
--- a/src/des/new_rnd_key.c
+++ b/src/des/new_rnd_key.c
@@ -31,7 +31,6 @@ static afs_int32 des_set_sequence_number(des_cblock new_sequence_number);
 static afs_int32 des_generate_random_block(des_cblock block);
 
 #define XPRT_NEW_RND_KEY
-#include "../permit_xprt.h"
 
 static int is_inited = 0;
 #ifdef AFS_PTHREAD_ENV

diff --git a/src/des/pcbc_encrypt.c b/src/des/pcbc_encrypt.c
index f2642c0..32cec6b 100644 (file)
--- a/src/des/pcbc_encrypt.c
+++ b/src/des/pcbc_encrypt.c
@@ -27,7 +27,6 @@
 #include "des_internal.h"
 
 #define XPRT_PCBC_ENCRYPT
-#include "../permit_xprt.h"
 
 extern int des_debug;
 extern int des_debug_print();

diff --git a/src/des/strng_to_key.c b/src/des/strng_to_key.c
index f539f7d..253cb96 100644 (file)
--- a/src/des/strng_to_key.c
+++ b/src/des/strng_to_key.c
@@ -31,8 +31,6 @@ extern int des_debug_print();
 extern void des_fixup_key_parity();
 extern afs_uint32 des_cbc_cksum();
 
-#include "../permit_xprt.h"
-
 /*
  * convert an arbitrary length string to a DES key
  */

diff --git a/src/des/test/testit.c b/src/des/test/testit.c
index e2bdbe2..b7d2610 100644 (file)
--- a/src/des/test/testit.c
+++ b/src/des/test/testit.c
@@ -30,8 +30,6 @@ extern int des_ecb_encrypt();
 extern int des_cbc_encrypt();
 extern int des_pcbc_encrypt();
 
-#include "../../permit_xprt.h"
-
 char *progname;
 int sflag;
 int vflag;

diff --git a/src/des/test/verify.c b/src/des/test/verify.c
index 4a1b8e8..dd48582 100644 (file)
--- a/src/des/test/verify.c
+++ b/src/des/test/verify.c
@@ -27,8 +27,6 @@ extern int des_key_sched();
 extern int des_ecb_encrypt();
 extern int des_cbc_encrypt();
 
-#include "../../permit_xprt.h"
-
 char *progname;
 int nflag = 2;
 int vflag;

diff --git a/src/kauth/Makefile b/src/kauth/Makefile
index 27f28d8..5f2e4a7 100644 (file)
--- a/src/kauth/Makefile
+++ b/src/kauth/Makefile
@@ -18,7 +18,6 @@ MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
 
 CFLAGS = ${OPTMZ} -I${SRCDIR}include ${XCFLAGS}
 LDFLAGS = ${OPTMZ} ${XLDFLAGS}
-PE = ../permit_xprt.h
 INCLS=${SRCDIR}include/ubik.h \
              ${SRCDIR}include/lwp.h \
              ${SRCDIR}include/lock.h  \
@@ -93,10 +92,10 @@ xkaprocs: kaprocs.c ${INCLS}
 # tightly controlled.
 #      ${CC} ${CFLAGS} -c kaprocs.c -DSPECIAL=1 -DGETPASSWORD
 
-kaprocs.o: kaprocs.c ${INCLS} ${PE} kaport.h
+kaprocs.o: kaprocs.c ${INCLS} kaport.h
        ${CC} ${CFLAGS} -c kaprocs.c -DSPECIAL=1
 
-authclient.o: authclient.c ${INCLS} ${PE}
+authclient.o: authclient.c ${INCLS}
 
 
 #authserver.o: authserver.c ${INCLS}
@@ -199,7 +198,7 @@ kdb: kdb.o ${INCLS}
 kdb.o: kdb.c AFS_component_version_number.o
 
 krb_udp.o: krb_udp.c kaserver.h kautils.h kauth.h prot.h \
-          ${SRCDIR}include/lwp.h ${PE} AFS_component_version_number.o
+          ${SRCDIR}include/lwp.h AFS_component_version_number.o
 
 krb_udp: krb_udp.o libkauth.a
        ${CC} ${LDFLAGS} -o krb_udp krb_udp.o libkauth.a ${SRCDIR}lib/liblwp.a ${deslib} ${rxkadlib} ${SRCDIR}lib/afs/libcom_err.a ${utilib} ${auditlib}

diff --git a/src/kauth/authclient.c b/src/kauth/authclient.c
index e21a01d..c48868f 100644 (file)
--- a/src/kauth/authclient.c
+++ b/src/kauth/authclient.c
@@ -43,7 +43,6 @@
 #include "../afs/kautils.h"
 #include "../afs/pthread_glock.h"
 
-#include "../afs/permit_xprt.h"
 #else /* defined(UKERNEL) */
 #include <afs/param.h>
 #include <afs/stds.h>
@@ -63,8 +62,6 @@
 #include <afs/afsutil.h>
 #include "kauth.h"
 #include "kautils.h"
-
-#include "../permit_xprt.h"
 #endif /* defined(UKERNEL) */
 
 

diff --git a/src/kauth/client.c b/src/kauth/client.c
index 4e7f3c4..db91476 100644 (file)
--- a/src/kauth/client.c
+++ b/src/kauth/client.c
@@ -7,13 +7,6 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
-/*
- * Revision 2.2  90/08/20  11:15:39
- * Include permit_xprt.h.
- * Cleanup line length.
- *  */
-/* See RCS log for older history. */
-
 #if defined(UKERNEL)
 #include "../afs/param.h"
 #include "../afs/sysincludes.h"
@@ -28,7 +21,6 @@
 #include "../afs/pthread_glock.h"
 #include "../des/des.h"
 
-#include "../afs/permit_xprt.h"
 #else /* defined(UKERNEL) */
 #include <afs/param.h>
 #include <afs/stds.h>
@@ -43,8 +35,6 @@
 #include <afs/afsutil.h>
 #include "kauth.h"
 #include "kautils.h"
-
-#include "../permit_xprt.h"
 #endif /* defined(UKERNEL) */
 
 

diff --git a/src/kauth/kaprocs.c b/src/kauth/kaprocs.c
index 562fba9..9667a6e 100644 (file)
--- a/src/kauth/kaprocs.c
+++ b/src/kauth/kaprocs.c
@@ -41,9 +41,6 @@
 #include "kaport.h"
 #include "afs/audit.h"
 
-#include "../permit_xprt.h"
-
-
 extern struct ubik_dbase *KA_dbase;
 struct kaheader cheader;
 Date           cheaderReadTime;        /* time cheader last read in */

diff --git a/src/kauth/kautils.c b/src/kauth/kautils.c
index a588382..1a2b1bc 100644 (file)
--- a/src/kauth/kautils.c
+++ b/src/kauth/kautils.c
@@ -42,9 +42,6 @@
 #include "kauth.h"
 #include "kautils.h"
 
-#include "../permit_xprt.h"
-
-
 
 /* This should match the behavior of ParseLoginName on input so that the output
  * and input are compatible.  In names "." should show as \056 and in names and

diff --git a/src/kauth/krb_udp.c b/src/kauth/krb_udp.c
index 65b144f..d5e5ad7 100644 (file)
--- a/src/kauth/krb_udp.c
+++ b/src/kauth/krb_udp.c
@@ -41,9 +41,6 @@
 #include "afs/audit.h"
 #include "kalog.h"
 
-#include "../permit_xprt.h"
-
-
 /* my kerberos error codes */
 #define KERB_ERR_BAD_MSG_TYPE  99
 #define KERB_ERR_BAD_LIFETIME  98

diff --git a/src/kauth/user_nt.c b/src/kauth/user_nt.c
index f70cbd4..4fd2ed4 100644 (file)
--- a/src/kauth/user_nt.c
+++ b/src/kauth/user_nt.c
@@ -23,7 +23,6 @@
 #include <rx/rxkad.h>
 #include <crypt.h>
 #include <des.h>
-#include "../permit_xprt.h"
 
 int krb_add_host (struct sockaddr_in *server_list_p);
 static void krb_set_port(long port);

diff --git a/src/libadmin/bos/afs_bosAdmin.c b/src/libadmin/bos/afs_bosAdmin.c
index 8c44ea7..ea6ead4 100644 (file)
--- a/src/libadmin/bos/afs_bosAdmin.c
+++ b/src/libadmin/bos/afs_bosAdmin.c
@@ -23,7 +23,6 @@
 #ifdef AFS_NT40_ENV
 #include <io.h>
 #endif
-#include "../../permit_xprt.h"
 
 
 /*

diff --git a/src/libadmin/client/afs_clientAdmin.c b/src/libadmin/client/afs_clientAdmin.c
index 56e9046..c415298 100644 (file)
--- a/src/libadmin/client/afs_clientAdmin.c
+++ b/src/libadmin/client/afs_clientAdmin.c
@@ -40,9 +40,6 @@
 #include <afs/vlserver.h>
 #include <afs/pthread_glock.h>
 
-
-#include "../../permit_xprt.h"
-
 /*
  * AFS client administration functions.
  *

diff --git a/src/ptserver/Makefile b/src/ptserver/Makefile
index 3b9b19d..3a0308f 100644 (file)
--- a/src/ptserver/Makefile
+++ b/src/ptserver/Makefile
@@ -15,7 +15,6 @@ COMPILE_ET = ${SRCDIR}bin/compile_et
 MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
 
 CFLAGS = $(DBUG) -I${SRCDIR}include ${XCFLAGS}
-PE = ../permit_xprt.h
 INCLS=${SRCDIR}include/ubik.h \
        ${SRCDIR}include/lock.h  \
        ${SRCDIR}include/lwp.h \
@@ -98,7 +97,7 @@ ptclient: ptclient.o display.o libprot.a $(LIBS)
 
 ptclient.o: ptclient.c ${INCLS} AFS_component_version_number.c
 
-ptuser.o: ptuser.c ${LINCLS} ${PE}
+ptuser.o: ptuser.c ${LINCLS}
 
 pterror.h pterror.c: pterror.et
        $(RM) -f pterror.h pterror.c; ${COMPILE_ET} pterror

diff --git a/src/ptserver/ptuser.c b/src/ptserver/ptuser.c
index d85805d..7d3382c 100644 (file)
--- a/src/ptserver/ptuser.c
+++ b/src/ptserver/ptuser.c
@@ -23,7 +23,6 @@
 #include "../afs/ptclient.h"
 #include "../afs/pterror.h"
 
-#include "../afs/permit_xprt.h"
 #else /* defined(UKERNEL) */
 #include <afs/param.h>
 #include <afs/stds.h>
@@ -43,8 +42,6 @@
 #include <afs/afsutil.h>
 #include "ptclient.h"
 #include "pterror.h"
-
-#include "../permit_xprt.h"
 #endif /* defined(UKERNEL) */
 
 

diff --git a/src/rx/test/generator.c b/src/rx/test/generator.c
index 7974cf6..7a7154f 100644 (file)
--- a/src/rx/test/generator.c
+++ b/src/rx/test/generator.c
@@ -930,7 +930,6 @@ PRIVATE void WriteCltHeader(char *serverName, int srv_no, FILE *itl_h)
            "#include <rx/rx_null.h>\n"
            "#include <rx/rxkad.h>\n"
            "#include <afs/cmd.h>\n"
-           "#include \"../../../permit_xprt.h\"\n"
            "#include \"%s%d.h\"\n"
            ,
            platform[4], serverName, srv_no);
@@ -1264,7 +1263,6 @@ PRIVATE void WriteServHeader(FILE *srv_h, char *serverName, int srv_no)
        "#include <rx/rx_null.h>\n"
        "#include <rx/rxkad.h>\n"
        "#include <afs/cmd.h>\n"
-       "#include \"../../../permit_xprt.h\"\n"
        "#include \"%s.h\"\n\n"
        "struct ktc_encryptionKey serviceKey =\n"
        "\t{0x45, 0xe3, 0x3d, 0x16, 0x29, 0x64, 0x8a, 0x8f};\n"

diff --git a/src/rxkad/Makefile b/src/rxkad/Makefile
index bb933fc..be08e3d 100644 (file)
--- a/src/rxkad/Makefile
+++ b/src/rxkad/Makefile
@@ -18,10 +18,9 @@ COMPILE_ET = ${SRCDIR}bin/compile_et
 MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
 
 CFLAGS = ${OPTMZ} -I${SRCDIR}include ${XCFLAGS}
-PE = ../permit_xprt.h
 INCLS= ${SRCDIR}include/rx/rx.h \
        ${SRCDIR}include/rx/xdr.h \
-       rxkad.h ${PE}
+       rxkad.h
 
 OBJS= rxkad_client.o rxkad_server.o rxkad_common.o ticket.o rxkad_errs.o
 
@@ -62,7 +61,7 @@ rxkad_errs.c rxkad.h: rxkad_errs.et rxkad.p.h
 
 ticket.o: ticket.c lifetimes.h ${INCLS}
 
-fcrypt.o: fcrypt.c fcrypt.h sboxes.h rxkad.h ${PE}
+fcrypt.o: fcrypt.c fcrypt.h sboxes.h rxkad.h
        ${CC} ${CFLAGS} -c fcrypt.c
 
 kinstall: ${KSRCS}

diff --git a/src/rxkad/domestic/crypt_conn.c b/src/rxkad/domestic/crypt_conn.c
index 92818b6..1bd7cb7 100644 (file)
--- a/src/rxkad/domestic/crypt_conn.c
+++ b/src/rxkad/domestic/crypt_conn.c
@@ -39,12 +39,6 @@
 
 #include "private_data.h"
 #define XPRT_RXKAD_CRYPT
-#ifdef KERNEL
-#include "../afs/permit_xprt.h"
-#else
-#include "../permit_xprt.h"
-#endif
-
 
 afs_int32 rxkad_DecryptPacket (conn, schedule, ivec, len, packet)
   IN struct rx_connection *conn;

diff --git a/src/rxkad/domestic/fcrypt.c b/src/rxkad/domestic/fcrypt.c
index 8504cdc..a07a100 100644 (file)
--- a/src/rxkad/domestic/fcrypt.c
+++ b/src/rxkad/domestic/fcrypt.c
@@ -56,11 +56,6 @@ int ROUNDS = 16;
 #endif
 
 #define XPRT_FCRYPT
-#ifdef KERNEL
-#include "../afs/permit_xprt.h"
-#else
-#include "../permit_xprt.h"
-#endif
 
 int fc_keysched (key, schedule)
   IN struct ktc_encryptionKey *key;

diff --git a/src/rxkad/rxkad_client.c b/src/rxkad/rxkad_client.c
index 10c3d40..19bae16 100644 (file)
--- a/src/rxkad/rxkad_client.c
+++ b/src/rxkad/rxkad_client.c
@@ -51,12 +51,6 @@
 
 #include "private_data.h"
 #define XPRT_RXKAD_CLIENT
-#ifdef KERNEL
-#include "../afs/permit_xprt.h"
-#else
-#include "../permit_xprt.h"
-#endif
-
 
 char *rxi_Alloc();
 

diff --git a/src/rxkad/rxkad_common.c b/src/rxkad/rxkad_common.c
index 196f42f..8e00127 100644 (file)
--- a/src/rxkad/rxkad_common.c
+++ b/src/rxkad/rxkad_common.c
@@ -49,12 +49,6 @@
 
 #include "private_data.h"
 #define XPRT_RXKAD_COMMON
-#ifdef KERNEL
-#include "../afs/permit_xprt.h"
-#else
-#include "../permit_xprt.h"
-#endif
-
 
 char *rxi_Alloc();
 

diff --git a/src/rxkad/rxkad_server.c b/src/rxkad/rxkad_server.c
index 43c232a..add3e7b 100644 (file)
--- a/src/rxkad/rxkad_server.c
+++ b/src/rxkad/rxkad_server.c
@@ -26,8 +26,6 @@
 #include <afs/afsutil.h>
 #include "private_data.h"
 #define XPRT_RXKAD_SERVER
-#include "../permit_xprt.h"
-
 
 /*
  * This can be set to allow alternate ticket decoding.

diff --git a/src/rxkad/test/stress_c.c b/src/rxkad/test/stress_c.c
index 21ae378..85bcf7a 100644 (file)
--- a/src/rxkad/test/stress_c.c
+++ b/src/rxkad/test/stress_c.c
@@ -29,13 +29,8 @@
 #define FT_ApproxTime() (int)time(0)
 #endif
 
-#ifdef rx_GetPacketCksum
-#include "../../permit_xprt.h"
-#endif
-
 extern int maxSkew;
 
-
 static char *whoami;
 
 static long GetServer(aname)

diff --git a/src/rxkad/ticket.c b/src/rxkad/ticket.c
index b9219f9..d0b14dd 100644 (file)
--- a/src/rxkad/ticket.c
+++ b/src/rxkad/ticket.c
@@ -7,18 +7,6 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
-/*
- * Revision 2.3  90/08/31  16:19:53
- * Move permit_xprt.h.
- * 
- * Revision 2.2  90/08/20  10:21:25
- * Include permit_xprt.h.
- * Cleanup; prune log, flush andrew style ticket functions.
- * 
- * Revision 2.1  90/08/07  19:33:44
- * Start with clean version to sync test and dev trees.
- * */
-
 #if defined(UKERNEL)
 #include "../afs/param.h"
 #include "../afs/sysincludes.h"
@@ -29,8 +17,6 @@
 #include "../des/des.h"
 #include "../afs/lifetimes.h"
 #include "../afs/rxkad.h"
-
-#include "../afs/permit_xprt.h"
 #else /* defined(UKERNEL) */
 #include <afs/param.h>
 #include <afs/stds.h>
@@ -45,8 +31,6 @@
 #include <des.h>
 #include "lifetimes.h"
 #include "rxkad.h"
-
-#include "../permit_xprt.h"
 #endif /* defined(UKERNEL) */