From 1e79e4d785b93a0b08d03f2bf6575c35be7db8cc Mon Sep 17 00:00:00 2001 From: Sam Hartman Date: Thu, 5 Jul 2001 05:25:23 +0000 Subject: [PATCH] * Back out patch to ptserver that breaks it * Don't build libafs in default makefile --- Makefile.in | 2 +- debian/patch.001_ptserver_lossage | 23 +++++++++++++++ src/config/Makefile.ppc_linux22 | 46 ------------------------------ src/config/Makefile.ppc_linux22.in | 1 - src/ptserver/ptserver.c | 2 ++ 5 files changed, 26 insertions(+), 48 deletions(-) create mode 100644 debian/patch.001_ptserver_lossage delete mode 100644 src/config/Makefile.ppc_linux22 diff --git a/Makefile.in b/Makefile.in index 148d59aea..4d151bd03 100644 --- a/Makefile.in +++ b/Makefile.in @@ -375,7 +375,7 @@ libadmin: libafsauthent bozo echo Not building MT libadmin for ${SYS_NAME} ;; \ esac -finale: project cmd comerr afsd allrcmds butc tbutc libafs libuafs audit kauth log package \ +finale: project cmd comerr afsd allrcmds butc tbutc libuafs audit kauth log package \ ptserver scout bu_utils ubik uss bozo vfsck volser \ venus update xstat afsmonitor dauth tests libafsrpc \ libafsauthent libadmin diff --git a/debian/patch.001_ptserver_lossage b/debian/patch.001_ptserver_lossage new file mode 100644 index 000000000..6dab8a243 --- /dev/null +++ b/debian/patch.001_ptserver_lossage @@ -0,0 +1,23 @@ +Index: src/ptserver//ptserver.c +=================================================================== +RCS file: /afs/sipb.mit.edu/project/openafs/debian/cvs/openafs/src/ptserver/ptserver.c,v +retrieving revision 1.1.1.5 +diff -u -r1.1.1.5 ptserver.c +--- src/ptserver//ptserver.c 5 Jul 2001 01:03:41 -0000 1.1.1.5 ++++ src/ptserver//ptserver.c 5 Jul 2001 02:58:45 -0000 +@@ -43,6 +43,7 @@ + extern afs_int32 ubik_lastYesTime; + extern afs_int32 ubik_nBuffers; + ++extern int afsconf_ClientAuth(); + extern int afsconf_ServerAuth(); + extern int afsconf_CheckAuth(); + +@@ -255,6 +256,7 @@ + sc[0] = rxnull_NewServerSecurityObject(); + sc[1] = 0; + if (kerberosKeys) { ++ extern int afsconf_GetKey(); + sc[2] = rxkad_NewServerSecurityObject + (0, prdir, afsconf_GetKey, (char *)0); + } diff --git a/src/config/Makefile.ppc_linux22 b/src/config/Makefile.ppc_linux22 deleted file mode 100644 index d230b83bf..000000000 --- a/src/config/Makefile.ppc_linux22 +++ /dev/null @@ -1,46 +0,0 @@ -# AFS_OSTYPE used to indicate suffixes and os specific subdirectories. -AFS_OSTYPE = LINUX - -# Base directory for linux kernel source. Actually a prefix which is complete -# when LINUX_VERS is appended to it. -LINUX_SRCDIR = $(KSRC) -# Default list of Linux kernels to build. Build will run only if all -# can be built. To build a different set, specify LINUX_VERS to make. -LINUX_VERS = $(KVERS) - -# -# compilation and link editor flags -DBG=-g -OPTMZ=-O2 -PAM_CFLAGS = -O2 -Dlinux -DLINUX_PAM -fPIC -# Put -O2 here to _ensure_ all Makefiles pick it up. -XCFLAGS= -O2 -MT_CFLAGS=-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS} -XLDFLAGS= -SHARE_LDFLAGS = -shared -Xlinker -x -SHLIB_SUFFIX=so -SHLIB_CFLAGS= -# -# libraries -MTLIBS=-lpthread -TXLIBS= /usr/lib/libncurses.so -XLIBS= -# -# programs -AR=ar -AS=as -CP=cp -INSTALL=${DESTDIR}bin/install -LD=ld -MT_CC=cc -MV=mv -RANLIB=ranlib -RM=rm -WASHTOOL=${SRCDIR}bin/washtool -# -# Other OS specific requirements -# -YACC = bison -y -LEX = flex -l -# Used in des library. -CRYPT_OBJ = crypt.o diff --git a/src/config/Makefile.ppc_linux22.in b/src/config/Makefile.ppc_linux22.in index e67acec07..12d6df18a 100644 --- a/src/config/Makefile.ppc_linux22.in +++ b/src/config/Makefile.ppc_linux22.in @@ -30,7 +30,6 @@ XLIBS=@LIB_AFSDB@ AR=ar AS=as CP=cp -INSTALL=install LD=ld MT_CC=cc MV=mv diff --git a/src/ptserver/ptserver.c b/src/ptserver/ptserver.c index 15fc53112..df5dcedd8 100644 --- a/src/ptserver/ptserver.c +++ b/src/ptserver/ptserver.c @@ -43,6 +43,7 @@ struct afsconf_dir *prdir; extern afs_int32 ubik_lastYesTime; extern afs_int32 ubik_nBuffers; +extern int afsconf_ClientAuth(); extern int afsconf_ServerAuth(); extern int afsconf_CheckAuth(); @@ -255,6 +256,7 @@ void main (argc, argv) sc[0] = rxnull_NewServerSecurityObject(); sc[1] = 0; if (kerberosKeys) { + extern int afsconf_GetKey(); sc[2] = rxkad_NewServerSecurityObject (0, prdir, afsconf_GetKey, (char *)0); } -- 2.39.5