[259] in Kerberos-V5-bugs
[Tony Lill: SVR4 port of Kerberos 5]
tytso@ATHENA.MIT.EDU (tytso@ATHENA.MIT.EDU)
Mon Nov 30 23:08:29 1992
To: athena.mit.edu!tytso@eddie.mit.edu
Subject: [Tony Lill: SVR4 port of Kerberos 5]
Date: Mon, 30 Nov 92 11:59:55 -0500
From: Tony Lill <harvard!scubed!riipsdev.waterloo.ncr.com!ajlill@eddie.mit.edu>
Ok, here's the patches. Where should I send any future patches? The
address krb5_bugs@athena.mit.edu doesn't seem to exist.
------- Forwarded Message
Following is a set of patch files and some new imake config files
whick should get this thing running on SVR4. I've got the Beta 2
release running on my NCR 3000. This is an i386 machine running SVR4.
I'm using ISODE 8.0, and it seems to work ok. I havn't done extensive
testing, but the KDC and the admin server appear to work, and I've got
some client code sending priviledged messages about.
The following shar file contains patches to imake, com_err, ss, and the
krb5 source tree, plus the files config/ncr.cf and
config/sv4Lib.rules. The patches to the tools are against those found
on ftp.uu.net on the 14th of October. The file is a tad over 65k, so I
hope it arrives ok.
The port went quite smoothly, once I got imake under control. The only
real change was in os/localaddr.c, and replacing <sys/file.h> with
<fcntl.h> in a few places.
#! /bin/sh
# This is a shell archive. Remove anything before this line, then unpack
# it by saving it into a file and typing "sh file". To overwrite existing
# files, type "sh file -c". You can also feed this as standard input via
# unshar, or by typing "sh <file", e.g.. If this archive is complete, you
# will see the following message at the end:
# "End of shell archive."
# Contents: com_err_patches config imake_patches krb5_patches ss_patch
# config/ncr.cf config/sv4Lib.rules
# Wrapped by ajlill@riipsdev on Thu Nov 12 17:39:55 1992
PATH=/bin:/usr/bin:/usr/ucb ; export PATH
if test -f com_err_patches -a "${1}" != "-c" ; then
echo shar: Will not over-write existing file \"com_err_patches\"
else
echo shar: Extracting \"com_err_patches\" \(3393 characters\)
sed "s/^X//" >com_err_patches <<'END_OF_com_err_patches'
Xdiff -c tools/bin/com_err/com_err.c:1.1.1.1 tools/bin/com_err/com_err.c:1.2
X*** tools/bin/com_err/com_err.c:1.1.1.1 Thu Nov 12 16:43:41 1992
X--- tools/bin/com_err/com_err.c Thu Nov 12 16:43:41 1992
X***************
X*** 7,26 ****
X #include <stdio.h>
X #include "mit-sipb-copyright.h"
X
X! /*
X! * Our environment only provides for ANSI's <stdarg.h> when using GNU
X! * C. Grump grump...
X! */
X! #if ! __GNUC__
X! #define VARARGS 1
X! #endif
X!
X /* We don't have the v*printf routines... */
X #define vfprintf(stream,fmt,args) _doprnt(fmt,args,stream)
X
X- #if __STDC__ && !VARARGS
X- # include <stdarg.h>
X- #else /* varargs: not STDC or no <stdarg> */
X /* Non-ANSI, always take <varargs.h> path. */
X # undef VARARGS
X # define VARARGS 1
X--- 7,18 ----
X #include <stdio.h>
X #include "mit-sipb-copyright.h"
X
X! #ifdef __STDC__
X! # include <stdarg.h>
X! #else /* varargs: not STDC or no <stdarg> */
X /* We don't have the v*printf routines... */
X #define vfprintf(stream,fmt,args) _doprnt(fmt,args,stream)
X
X /* Non-ANSI, always take <varargs.h> path. */
X # undef VARARGS
X # define VARARGS 1
X***************
X*** 41,52 ****
X #undef com_err
X
X /* BSD. sigh. */
X #undef vfprintf
X #define vfprintf(stream,fmt,args) _doprnt(fmt,args,stream)
X
X #if ! lint
X static const char rcsid[] =
X! "$Header: /home2/ajlill/src/stage2/tools/bin/imake/com_err.c,v 1.1.1.1 1992/10/14 14:51:06 ajlill Exp $";
X #endif /* ! lint */
X
X static void
X--- 33,46 ----
X #undef com_err
X
X /* BSD. sigh. */
X+ #ifndef __STDC__
X #undef vfprintf
X #define vfprintf(stream,fmt,args) _doprnt(fmt,args,stream)
X+ #endif
X
X #if ! lint
X static const char rcsid[] =
X! "$Header: /home2/ajlill/src/stage2/tools/bin/imake/com_err.c,v 1.2 1992/10/30 01:17:11 ajlill Exp $";
X #endif /* ! lint */
X
X static void
Xdiff -c tools/bin/com_err/com_err.h:1.1.1.1 tools/bin/com_err/com_err.h:1.2
X*** tools/bin/com_err/com_err.h:1.1.1.1 Thu Nov 12 16:43:42 1992
X--- tools/bin/com_err/com_err.h Thu Nov 12 16:43:42 1992
X***************
X*** 11,17 ****
X #ifndef __COM_ERR_H
X
X #ifdef __STDC__
X! #ifndef __HIGHC__ /* gives us STDC but not stdarg */
X #include <stdarg.h>
X #else
X #include <varargs.h>
X--- 11,17 ----
X #ifndef __COM_ERR_H
X
X #ifdef __STDC__
X! #if !defined(__HIGHC__) || defined(SVR4) /* gives us STDC but not stdarg */
X #include <stdarg.h>
X #else
X #include <varargs.h>
Xdiff -c tools/bin/com_err/compile_et.c:1.1.1.1 tools/bin/com_err/compile_et.c:1.2
X*** tools/bin/com_err/compile_et.c:1.1.1.1 Thu Nov 12 16:43:42 1992
X--- tools/bin/com_err/compile_et.c Thu Nov 12 16:43:43 1992
X***************
X*** 8,14 ****
X--- 8,18 ----
X */
X
X #include <stdio.h>
X+ #ifdef SVR4
X+ #include <fcntl.h>
X+ #else
X #include <sys/file.h>
X+ #endif
X #include <string.h>
X #include <sys/param.h>
X #include "mit-sipb-copyright.h"
X***************
X*** 23,29 ****
X "Copyright 1987,1988 by MIT Student Information Processing Board";
X
X static const char rcsid_compile_et_c[] =
X! "$Header: /home2/ajlill/src/stage2/tools/bin/imake/compile_et.c,v 1.1.1.1 1992/10/14 14:51:15 ajlill Exp $";
X #endif
X
X extern char *gensym();
X--- 27,33 ----
X "Copyright 1987,1988 by MIT Student Information Processing Board";
X
X static const char rcsid_compile_et_c[] =
X! "$Header: /home2/ajlill/src/stage2/tools/bin/imake/compile_et.c,v 1.2 1992/10/30 01:17:05 ajlill Exp $";
X #endif
X
X extern char *gensym();
END_OF_com_err_patches
if test 3393 -ne `wc -c <com_err_patches`; then
echo shar: \"com_err_patches\" unpacked with wrong size!
fi
# end of overwriting check
fi
if test ! -d config ; then
echo shar: Creating directory \"config\"
mkdir config
fi
if test -f imake_patches -a "${1}" != "-c" ; then
echo shar: Will not over-write existing file \"imake_patches\"
else
echo shar: Extracting \"imake_patches\" \(829 characters\)
sed "s/^X//" >imake_patches <<'END_OF_imake_patches'
Xdiff -c tools/bin/imake/imakemdep.h:1.1.1.1 tools/bin/imake/imakemdep.h:1.2
X*** tools/bin/imake/imakemdep.h:1.1.1.1 Thu Nov 12 16:42:37 1992
X--- tools/bin/imake/imakemdep.h Thu Nov 12 16:42:37 1992
X***************
X*** 29,34 ****
X--- 29,38 ----
X #define imake_ccflags "-DSYSV -DUSG"
X #endif
X
X+ #ifdef ncr3000
X+ #define imake_ccflags "-DSYSV -DUSG -DSVR4"
X+ #endif
X+
X #ifdef CRAY
X #define imake_ccflags "-DSYSV -DUSG"
X #endif
X***************
X*** 124,129 ****
X--- 128,136 ----
X #ifdef macII
X "-DmacII", /* Apple A/UX */
X #endif
X+ #ifdef ncr3000
X+ "-Dncr3000", /* NCR products */
X+ #endif
X #ifdef att
X "-Datt", /* AT&T products */
X #endif
X***************
X*** 195,200 ****
X--- 202,210 ----
X #endif
X #ifdef CRAY
X {"CRAY", "1"},
X+ #endif
X+ #ifdef ncr3000
X+ {"ncr3000", "1"},
X #endif
X #ifdef att
X {"att", "1"},
END_OF_imake_patches
if test 829 -ne `wc -c <imake_patches`; then
echo shar: \"imake_patches\" unpacked with wrong size!
fi
# end of overwriting check
fi
if test -f krb5_patches -a "${1}" != "-c" ; then
echo shar: Will not over-write existing file \"krb5_patches\"
else
echo shar: Extracting \"krb5_patches\" \(47733 characters\)
sed "s/^X//" >krb5_patches <<'END_OF_krb5_patches'
Xdiff -c ap/security/kerberos/src/admin/aname/kdb5_anadd.c:1.1.1.2 ap/security/kerberos/src/admin/aname/kdb5_anadd.c:1.2
X*** ap/security/kerberos/src/admin/aname/kdb5_anadd.c:1.1.1.2 Thu Nov 12 17:21:01 1992
X--- ap/security/kerberos/src/admin/aname/kdb5_anadd.c Thu Nov 12 17:21:01 1992
X***************
X*** 27,39 ****
X
X #if !defined(lint) && !defined(SABER)
X static char rcsid_anadd_c[] =
X! "$Id: kdb5_anadd.c,v 1.1.1.2 1992/11/09 17:06:49 ajlill Exp $";
X #endif /* !lint & !SABER */
X
X #include <krb5/krb5.h>
X #include <krb5/ext-proto.h>
X #include <krb5/dbm.h>
X #include <sys/file.h>
X #include <com_err.h>
X #include <stdio.h>
X #include <errno.h>
X--- 27,43 ----
X
X #if !defined(lint) && !defined(SABER)
X static char rcsid_anadd_c[] =
X! "$Id: kdb5_anadd.c,v 1.2 1992/11/03 00:31:05 ajlill Exp $";
X #endif /* !lint & !SABER */
X
X #include <krb5/krb5.h>
X #include <krb5/ext-proto.h>
X #include <krb5/dbm.h>
X+ #ifdef SVR4
X+ #include <fcntl.h>
X+ #else
X #include <sys/file.h>
X+ #endif
X #include <com_err.h>
X #include <stdio.h>
X #include <errno.h>
Xdiff -c ap/security/kerberos/src/config/Imake.rules:1.1.1.2 ap/security/kerberos/src/config/Imake.rules:1.4
X*** ap/security/kerberos/src/config/Imake.rules:1.1.1.2 Thu Nov 12 17:21:58 1992
X--- ap/security/kerberos/src/config/Imake.rules Thu Nov 12 17:21:58 1992
X***************
X*** 1,6 ****
X /**/# $Source: /home2/ajlill/src/stage2/ap/security/kerberos/src/Imake.rules,v $
X /**/# $Author: ajlill $
X! /**/# $Id: Imake.rules,v 1.1.1.2 1992/11/09 17:11:10 ajlill Exp $
X /**/#
X
X /**/###########################################################################
X--- 1,6 ----
X /**/# $Source: /home2/ajlill/src/stage2/ap/security/kerberos/src/Imake.rules,v $
X /**/# $Author: ajlill $
X! /**/# $Id: Imake.rules,v 1.4 1992/11/12 22:20:02 ajlill Exp $
X /**/#
X
X /**/###########################################################################
X***************
X*** 349,355 ****
X $(INSTALL) -c $(INSTLIBFLAGS) llib-l/**/libname.ln dest
X #endif /* InstallLintLibrary */
X
X-
X /*
X * InstallManPageLong - generate rules to install the indicated manual page,
X * giving it an alternate name. This is used for installing man pages whose
X--- 349,354 ----
X***************
X*** 358,369 ****
X * short file names).
X */
X #ifndef InstallManPageLong
X #define InstallManPageLong(file,destdir,dest) @@\
X install.man:: file.man @@\
X $(INSTALL) -c $(INSTMANFLAGS) file.man destdir/dest.ManSuffix
X #endif /* InstallManPageLong */
X
X-
X /*
X * InstallManPage - generate rules to install the indicated manual page.
X */
X--- 357,379 ----
X * short file names).
X */
X #ifndef InstallManPageLong
X+ #if SystemV4
X+ /*
X+ * man pages are kept pre-formatted and packed in directories that look like
X+ * /usr/catman/KERBEROS/g[1-8]/file.z
X+ */
X+ #define InstallManPageLong(file,destdir,dest) @@\
X+ install.man:: file.man @@\
X+ $(RM) destdir/dest.z @@\
X+ tbl file.man | nroff -man > destdir/dest @@\
X+ pack -f destdir/dest
X+ #else
X #define InstallManPageLong(file,destdir,dest) @@\
X install.man:: file.man @@\
X $(INSTALL) -c $(INSTMANFLAGS) file.man destdir/dest.ManSuffix
X+ #endif /* !SystemV4 */
X #endif /* InstallManPageLong */
X
X /*
X * InstallManPage - generate rules to install the indicated manual page.
X */
X***************
X*** 694,700 ****
X @@\
X .c.o: @@\
X $(RM) $@ shared/$@ @@\
X! $(CC) -pic -c $(SHAREDCODEDEF) $(SHLIBDEF) $(CFLAGS) $(SRCDIR)$*.c @@\
X $(MV) $*.o shared/$*.o @@\
X $(CC) -c $(SHLIBDEF) $(CFLAGS) $(SRCDIR)$*.c @@\
X @@\
X--- 704,710 ----
X @@\
X .c.o: @@\
X $(RM) $@ shared/$@ @@\
X! $(CC) $(PICFLAGS) -c $(SHAREDCODEDEF) $(SHLIBDEF) $(CFLAGS) $(SRCDIR)$*.c @@\
X $(MV) $*.o shared/$*.o @@\
X $(CC) -c $(SHLIBDEF) $(CFLAGS) $(SRCDIR)$*.c @@\
X @@\
X***************
X*** 716,722 ****
X @@\
X .c.o: @@\
X $(RM) $@ shared/$@ debugger/$@ @@\
X! $(CC) -pic -c $(SHAREDCODEDEF) $(SHLIBDEF) $(CFLAGS) $(SRCDIR)$*.c @@\
X $(MV) $*.o shared/$*.o @@\
X $(CC) -g -c $(SHLIBDEF) $(CFLAGS) $(SRCDIR)$*.c @@\
X $(MV) $*.o debugger/$*.o @@\
X--- 726,732 ----
X @@\
X .c.o: @@\
X $(RM) $@ shared/$@ debugger/$@ @@\
X! $(CC) $(PICFLAGS) -c $(SHAREDCODEDEF) $(SHLIBDEF) $(CFLAGS) $(SRCDIR)$*.c @@\
X $(MV) $*.o shared/$*.o @@\
X $(CC) -g -c $(SHLIBDEF) $(CFLAGS) $(SRCDIR)$*.c @@\
X $(MV) $*.o debugger/$*.o @@\
X***************
X*** 742,748 ****
X @@\
X objs: depends @@\
X $(RM) $@ shared/$@ debugger/$@ @@\
X! $(CC) -pic -c $(SHAREDCODEDEF) $(SHLIBDEF) $(CFLAGS) options $*.c @@\
X $(MV) $*.o shared/$*.o @@\
X $(CC) -g -c $(SHLIBDEF) $(CFLAGS) options $*.c @@\
X $(MV) $*.o debugger/$*.o @@\
X--- 752,758 ----
X @@\
X objs: depends @@\
X $(RM) $@ shared/$@ debugger/$@ @@\
X! $(CC) $(PICFLAGS) -c $(SHAREDCODEDEF) $(SHLIBDEF) $(CFLAGS) options $*.c @@\
X $(MV) $*.o shared/$*.o @@\
X $(CC) -g -c $(SHLIBDEF) $(CFLAGS) options $*.c @@\
X $(MV) $*.o debugger/$*.o @@\
X***************
X*** 760,766 ****
X @@\
X objs: depends @@\
X $(RM) $@ shared/$@ @@\
X! $(CC) -pic -c $(SHAREDCODEDEF) $(SHLIBDEF) $(CFLAGS) options $*.c @@\
X $(MV) $*.o shared/$*.o @@\
X $(CC) -c $(SHLIBDEF) $(CFLAGS) options $*.c
X #endif /* SpecialDebuggedAndProfiledObjectRule */
X--- 770,776 ----
X @@\
X objs: depends @@\
X $(RM) $@ shared/$@ @@\
X! $(CC) $(PICFLAGS) -c $(SHAREDCODEDEF) $(SHLIBDEF) $(CFLAGS) options $*.c @@\
X $(MV) $*.o shared/$*.o @@\
X $(CC) -c $(SHLIBDEF) $(CFLAGS) options $*.c
X #endif /* SpecialDebuggedAndProfiledObjectRule */
X***************
X*** 858,864 ****
X @@\
X lib/**/libname.so.rev: solist @@\
X $(RM) $@~ @@\
X! (cd shared; $(LD) -o ../$@~ -assert pure-text solist) @@\
X $(RM) $@ @@\
X $(MV) $@~ $@ @@\
X @@\
X--- 868,874 ----
X @@\
X lib/**/libname.so.rev: solist @@\
X $(RM) $@~ @@\
X! (cd shared; $(LD) -o ../$@~ $(SHLIBLDFLAGS) solist) @@\
X $(RM) $@ @@\
X $(MV) $@~ $@ @@\
X @@\
Xdiff -c ap/security/kerberos/src/config/Imake.tmpl:1.1.1.2 ap/security/kerberos/src/config/Imake.tmpl:1.4
X*** ap/security/kerberos/src/config/Imake.tmpl:1.1.1.2 Thu Nov 12 17:21:58 1992
X--- ap/security/kerberos/src/config/Imake.tmpl Thu Nov 12 17:21:59 1992
X***************
X*** 4,10 ****
X
X /**/# $Source: /home2/ajlill/src/stage2/ap/security/kerberos/src/Imake.tmpl,v $
X /**/# $Author: ajlill $
X! /**/# $Id: Imake.tmpl,v 1.1.1.2 1992/11/09 17:11:13 ajlill Exp $
X /**/#
X
X /**/###########################################################################
X--- 4,10 ----
X
X /**/# $Source: /home2/ajlill/src/stage2/ap/security/kerberos/src/Imake.tmpl,v $
X /**/# $Author: ajlill $
X! /**/# $Id: Imake.tmpl,v 1.4 1992/11/12 22:19:59 ajlill Exp $
X /**/#
X
X /**/###########################################################################
X***************
X*** 96,101 ****
X--- 96,116 ----
X #define HPArchitecture
X #endif /* hpux */
X
X+ #ifdef ncr3000
X+ #define MacroIncludeFile <ncr.cf>
X+ #define MacroFile ncr.cf
X+ #undef ncr3000
X+ #define NCRArchitecture
X+ #endif /* att */
X+
X+ #ifdef windows
X+ #define MacroIncludeFile <windows.cf>
X+ #define MacroFile windows.cf
X+ #undef windows
X+ #define IBMArchitecture
X+ #define PS2Architecture
X+ #endif /* att */
X+
X #ifdef att
X #define MacroIncludeFile <att.cf>
X #define MacroFile att.cf
X***************
X*** 340,345 ****
X--- 355,368 ----
X #endif
X #endif
X
X+ #ifndef SharedLibraryLoadFlags
X+ #define SharedLibraryLoadFlags -assert pure-text
X+ #endif
X+
X+ #ifndef PositionIndependentCFlags
X+ #define PositionIndependentCFlags -pic
X+ #endif
X+
X #ifndef StripInstalledPrograms
X #define StripInstalledPrograms NO /* leave symbol table just in case */
X #endif
X***************
X*** 498,504 ****
X #ifndef MvCmd
X #define MvCmd mv
X #endif
X! #if !defined(RanlibCmd) && !SystemV
X #define RanlibCmd ranlib
X #endif
X #ifndef RanlibInstFlags
X--- 521,527 ----
X #ifndef MvCmd
X #define MvCmd mv
X #endif
X! #if !defined(RanlibCmd) && !SystemV && !SystemV4
X #define RanlibCmd ranlib
X #endif
X #ifndef RanlibInstFlags
X***************
X*** 629,635 ****
X--- 652,661 ----
X #if HasSharedLibraries
X SHAREDCODEDEF = SharedCodeDef
X SHLIBDEF = SharedLibraryDef
X+ SHLIBLDFLAGS = SharedLibraryLoadFlags
X+ PICFLAGS = PositionIndependentCFlags
X #endif
X+
X #if !HasVoidSignalReturn
X SIGNAL_DEFINES = -DSIGNALRETURNSINT
X #endif
Xdiff -c ap/security/kerberos/src/config/Project.tmpl:1.1.1.2 ap/security/kerberos/src/config/Project.tmpl:1.4
X*** ap/security/kerberos/src/config/Project.tmpl:1.1.1.2 Thu Nov 12 17:21:59 1992
X--- ap/security/kerberos/src/config/Project.tmpl Thu Nov 12 17:21:59 1992
X***************
X*** 2,8 ****
X /**/#
X /**/# $Source: /home2/ajlill/src/stage2/ap/security/kerberos/src/Project.tmpl,v $
X /**/# $Author: ajlill $
X! /**/# $Id: Project.tmpl,v 1.1.1.2 1992/11/09 17:11:22 ajlill Exp $
X
X #define ProjectKRB 5
X
X--- 2,8 ----
X /**/#
X /**/# $Source: /home2/ajlill/src/stage2/ap/security/kerberos/src/Project.tmpl,v $
X /**/# $Author: ajlill $
X! /**/# $Id: Project.tmpl,v 1.4 1992/11/12 22:19:56 ajlill Exp $
X
X #define ProjectKRB 5
X
X***************
X*** 73,79 ****
X #define DesDefines YouMustFigureOutYourDesDefines
X #endif
X #ifndef Krb5Root
X! #define Krb5Root /krb5
X #endif
X
X #ifndef PepsyTarget
X--- 73,79 ----
X #define DesDefines YouMustFigureOutYourDesDefines
X #endif
X #ifndef Krb5Root
X! #define Krb5Root /usr/local/kerberos.V5
X #endif
X
X #ifndef PepsyTarget
X***************
X*** 80,86 ****
X #define PepsyTarget(basename) @@\
X .SUFFIXES: .py @@\
X basename/**/_defs.h basename/**/_pre_defs.h basename-types.h basename/**/_tables.c: basename-asn.py @@\
X! @echo '***Ignore the warning message "Warning: Can'\''t find UNIV.ph failed"' @@\
X $(PEPSY) $(PSYFLAGS) $(SRCDIR)basename-asn.py
X #endif /* PepsyTarget */
X
X--- 80,86 ----
X #define PepsyTarget(basename) @@\
X .SUFFIXES: .py @@\
X basename/**/_defs.h basename/**/_pre_defs.h basename-types.h basename/**/_tables.c: basename-asn.py @@\
X! @echo '***Ignore the warning message "Warning\: Can'\''t find UNIV.ph failed"' @@\
X $(PEPSY) $(PSYFLAGS) $(SRCDIR)basename-asn.py
X #endif /* PepsyTarget */
X
X***************
X*** 235,243 ****
X--- 235,255 ----
X * giving it an alternate suffix.
X */
X #ifndef Krb5InstallManPage
X+ #if SystemV4
X+ /*
X+ * man pages are kept pre-formatted and packed in directories that look like
X+ * /usr/catman/KERBEROS/g[1-8]/file.z
X+ */
X+ #define Krb5InstallManPage(file,destdir,suffix) @@\
X+ install.man:: file.M @@\
X+ $(RM) destdir/file.z @@\
X+ tbl file.M | nroff -man > destdir/file @@\
X+ pack -f destdir/file
X+ #else
X #define Krb5InstallManPage(file,destdir,suffix) @@\
X install.man:: file.M @@\
X $(INSTALL) -c $(INSTMANFLAGS) file.M destdir/file.suffix
X+ #endif /* ! SystemV4 */
X #endif /* Krb5InstallManPage */
X
X /*
X***************
X*** 260,265 ****
X--- 272,282 ----
X Krb5SimpleProgramTarget(program,$(ADMIN_BINDIR),$(ADMIN_MANDIR),$(ADMIN_MANSUFFIX))
X #endif /* Krb5AdminProgramTarget */
X
X+ #ifndef Krb5ServerProgramTarget
X+ #define Krb5ServerProgramTarget(program) @@\
X+ Krb5SimpleProgramTarget(program,$(SERVER_BINDIR),$(SERVER_MANDIR),$(SERVER_MANSUFFIX))
X+ #endif /* Krb5ServerProgramTarget */
X+
X #ifndef Krb5ClientProgramTarget
X #define Krb5ClientProgramTarget(program) @@\
X Krb5SimpleProgramTarget(program,$(CLIENT_BINDIR),$(CLIENT_MANDIR),$(CLIENT_MANSUFFIX))
X***************
X*** 423,428 ****
X--- 440,450 ----
X #else
X P_STDARG=-UUseStdarg
X #endif
X+ #if HasStrdup
X+ P_STRDUP=-DHasStrdupTrue
X+ #else
X+ P_STRDUP=-UHasStrdupTrue
X+ #endif
X #if HasAnsiStdio
X P_ANSI_STDIO=-DHasAnsiStdio
X #else
X***************
X*** 475,481 ****
X #endif
X KRB5ROOT = Krb5Root
X
X! PROCESS_DEFINES = $(P_TERMIOS) $(P_FLOCKS) $(P_TYPES) $(P_SIGTYPE) $(P_STRINGH) $(P_BITSIZE) $(P_DBM) $(P_INET) $(P_STDLIB
H) $(P_TIME_DEFS) $(P_PROTOS) $(P_NPROTO) $(P_STDARG) $(P_ANSI_STDIO) $(P_VOID) $(P_CONST) $(P_VOLATILE) $(P_UNISTD) $(P_NESTPR
OTO) -DUnifdefRan
X PROCESS_REPLACE = -e "s+@KRB5ROOT+$(KRB5ROOT)+"
X DESDEFINES = DesDefines
X #if HasSharedLibraries
X--- 497,503 ----
X #endif
X KRB5ROOT = Krb5Root
X
X! PROCESS_DEFINES = $(P_TERMIOS) $(P_FLOCKS) $(P_TYPES) $(P_SIGTYPE) $(P_STRINGH) $(P_BITSIZE) $(P_DBM) $(P_INET) $(P_STDLIB
H) $(P_TIME_DEFS) $(P_PROTOS) $(P_NPROTO) $(P_STDARG) $(P_STRDUP) $(P_ANSI_STDIO) $(P_VOID) $(P_CONST) $(P_VOLATILE) $(P_UNISTD
) $(P_NESTPROTO) -DUnifdefRan
X PROCESS_REPLACE = -e "s+@KRB5ROOT+$(KRB5ROOT)+"
X DESDEFINES = DesDefines
X #if HasSharedLibraries
X***************
X*** 521,525 ****
X--- 543,549 ----
X CLIENT_BINDIR = ClientBindir
X CLIENT_MANSUFFIX = ClientManSuffix
X CLIENT_MANDIR = ClientMandir
X+ FILE_MANSUFFIX = FileManSuffix
X+ FILE_MANDIR = FileMandir
X KRB5_LIBDIR = Krb5Libdir
X KRB5_INCDIR = Krb5Incdir
Xdiff -c ap/security/kerberos/src/config/site.def:1.1.1.2 ap/security/kerberos/src/config/site.def:1.4
X*** ap/security/kerberos/src/config/site.def:1.1.1.2 Thu Nov 12 17:22:00 1992
X--- ap/security/kerberos/src/config/site.def Thu Nov 12 17:22:00 1992
X***************
X*** 1,6 ****
X /**/# $Source: /home2/ajlill/src/stage2/ap/security/kerberos/src/site.def,v $
X /**/# $Author: ajlill $
X! /**/# $Id: site.def,v 1.1.1.2 1992/11/09 17:11:47 ajlill Exp $
X /**/#
X
X /**/# site: $XConsortium: site.def,v 1.21 89/12/06 11:46:50 jim Exp $
X--- 1,6 ----
X /**/# $Source: /home2/ajlill/src/stage2/ap/security/kerberos/src/site.def,v $
X /**/# $Author: ajlill $
X! /**/# $Id: site.def,v 1.4 1992/11/12 22:19:49 ajlill Exp $
X /**/#
X
X /**/# site: $XConsortium: site.def,v 1.21 89/12/06 11:46:50 jim Exp $
X***************
X*** 29,35 ****
X #define InstKmemFlag -g kmem -m 2755
X #define StripInstalledPrograms YES
X #define InstUidFlags -o root -m 4755
X!
X /*
X * SET THESE PARAMETERS FIRST !!!
X */
X--- 29,35 ----
X #define InstKmemFlag -g kmem -m 2755
X #define StripInstalledPrograms YES
X #define InstUidFlags -o root -m 4755
X! #define UseInstalled
X /*
X * SET THESE PARAMETERS FIRST !!!
X */
X***************
X*** 51,57 ****
X #endif
X /* AdminMandir: manual page directory for administrative man pages */
X #ifndef AdminMandir
X! #define AdminMandir $(KRB5ROOT)/man/man8
X #endif
X
X /* ServerManSuffix: man page suffix for server programs */
X--- 51,57 ----
X #endif
X /* AdminMandir: manual page directory for administrative man pages */
X #ifndef AdminMandir
X! #define AdminMandir /usr/catman/KERBEROS/g8
X #endif
X
X /* ServerManSuffix: man page suffix for server programs */
X***************
X*** 60,66 ****
X #endif
X /* ServerMandir: manual page directory for server man pages */
X #ifndef ServerMandir
X! #define ServerMandir $(KRB5ROOT)/man/man8
X #endif
X
X /* ClientManSuffix: man page suffix for client programs */
X--- 60,66 ----
X #endif
X /* ServerMandir: manual page directory for server man pages */
X #ifndef ServerMandir
X! #define ServerMandir /usr/catman/KERBEROS/g8
X #endif
X
X /* ClientManSuffix: man page suffix for client programs */
X***************
X*** 69,76 ****
X #endif
X /* ClientMandir: manual page directory for client man pages */
X #ifndef ClientMandir
X! #define ClientMandir $(KRB5ROOT)/man/man1
X #endif
X
X /*
X * 3. Binary program install areas.
X--- 69,85 ----
X #endif
X /* ClientMandir: manual page directory for client man pages */
X #ifndef ClientMandir
X! #define ClientMandir /usr/catman/KERBEROS/g1
X! #endif
X!
X! /* FileManSuffix: man page suffix for files */
X! #ifndef FileManSuffix
X! #define FileManSuffix 5
X #endif
X+ /* FileMandir: manual page directory for file man pages */
X+ #ifndef FileMandir
X+ #define FileMandir $(KRB5ROOT)/catman/KERBEROS/g5
X+ #endif
X
X /*
X * 3. Binary program install areas.
X***************
X*** 124,144 ****
X #if defined(AIXArchitecture) && OSMajorVersion == 1
X #define ExtraLoadFlags -T0x400000
X #else
X! #if !defined(UltrixArchitecture) && !defined(AIXArchitecture) && !defined(SunArchitecture)
X #define ExtraLoadFlags -Z
X #endif
X #endif
X
X /* With gcc, use -g -O. Otherwise use the default (-O). */
X #if !defined(DefaultCDebugFlags) && HasGcc
X #define DefaultCDebugFlags OptimizedCDebugFlags DebuggableCDebugFlags
X #endif
X
X! #if HasNdbm
X! #define DbmLib
X! #else
X! #define DbmLib -ldbm
X! #endif
X
X /* If you have the Hesiod software and libraries installed, and want to
X use it in some application programs, then turn these on. If they're
X--- 133,152 ----
X #if defined(AIXArchitecture) && OSMajorVersion == 1
X #define ExtraLoadFlags -T0x400000
X #else
X! #if !defined(UltrixArchitecture) && !defined(AIXArchitecture) && !defined(SunArchitecture) && !SystemV4
X #define ExtraLoadFlags -Z
X #endif
X #endif
X
X+ #define DefaultCDebugFlags -g
X /* With gcc, use -g -O. Otherwise use the default (-O). */
X #if !defined(DefaultCDebugFlags) && HasGcc
X #define DefaultCDebugFlags OptimizedCDebugFlags DebuggableCDebugFlags
X #endif
X
X! #define HasNdbm YES
X! #define DbmLib -lgdbm
X!
X
X /* If you have the Hesiod software and libraries installed, and want to
X use it in some application programs, then turn these on. If they're
X***************
X*** 163,181 ****
X library. This might want to be -lisode if you have it installed.
X IsodeDir is put into the 'make' variable ISODE. */
X
X! #define IsodeLib -L/mit/isode/isode-7.0/@sys/lib -lisode
X! #define IsodeDir /mit/isode/isode-7.0
X
X /* Re-define PepsyCmd if pepsy isn't in your search path. */
X
X! #define PepsyCmd $(ISODE)/@sys/bin/pepsy
X #endif
X
X #define UseImakeInstalled /* -- turn on if you have imake installed */
X #define UseMakedependInstalled /* -- turn on if you have makedepend installed */
X! #define Krb4ApplCompat /* turn this on if you want selected applications to
X work with both v4 & v5 code */
X! #define Krb4KDCCompat /* turn this on if you want the KDC to provide v4
X tickets from a v5 database */
X /* #define Krb4Includes <empty> -- If you don't want to use our copy of the
X Kerberos V4 include files, set this to
X--- 171,190 ----
X library. This might want to be -lisode if you have it installed.
X IsodeDir is put into the 'make' variable ISODE. */
X
X! #define IsodeLib -lisode
X! #define IsodeDir /mit/isode/isode-6.8
X
X /* Re-define PepsyCmd if pepsy isn't in your search path. */
X
X! #define PepsyCmd pepsy
X #endif
X+ #define PepsyFlags -f -h0 -a -s -C
X
X #define UseImakeInstalled /* -- turn on if you have imake installed */
X #define UseMakedependInstalled /* -- turn on if you have makedepend installed */
X! /* #define Krb4ApplCompat /* turn this on if you want selected applications to
X work with both v4 & v5 code */
X! /* #define Krb4KDCCompat /* turn this on if you want the KDC to provide v4
X tickets from a v5 database */
X /* #define Krb4Includes <empty> -- If you don't want to use our copy of the
X Kerberos V4 include files, set this to
X***************
X*** 189,210 ****
X /* the following might want to be put into a specific architecture
X definition file */
X
X! /* #define HasVfprintf -- turn on if you have vfprintf/vsprintf in libc
X (might want to be in the architecture-specific
X configuration file) */
X /* #define HasVsyslog -- turn on if you have vsyslog in libc
X (might want to be in the architecture-specific
X configuration file) */
X! /* #define HasStrdup -- turn on if you have strdup() in libc
X (might want to be in the architecture-specific
X configuration file) */
X
X /* alternate library search paths, if needed for some system libraries */
X! #define LdLibLocations -L/usr/athena/lib
X
X /* additional include paths, if needed, such as those needed
X to get special include files, like <ss/ss.h> or <com_err.h> */
X! #define StandardIncludes -I/usr/athena/include
X
X #if defined(AIXArchitecture) && OSMajorVersion == 3
X #define StandardDefines -D_ALL_SOURCE
X--- 198,219 ----
X /* the following might want to be put into a specific architecture
X definition file */
X
X! #define HasVfprintf YES /* -- turn on if you have vfprintf/vsprintf in libc
X (might want to be in the architecture-specific
X configuration file) */
X /* #define HasVsyslog -- turn on if you have vsyslog in libc
X (might want to be in the architecture-specific
X configuration file) */
X! #define HasStrdup YES /* -- turn on if you have strdup() in libc
X (might want to be in the architecture-specific
X configuration file) */
X
X /* alternate library search paths, if needed for some system libraries */
X! #define LdLibLocations -L/usr/local/lib
X
X /* additional include paths, if needed, such as those needed
X to get special include files, like <ss/ss.h> or <com_err.h> */
X! #define StandardIncludes -I/usr/local/include
X
X #if defined(AIXArchitecture) && OSMajorVersion == 3
X #define StandardDefines -D_ALL_SOURCE
X***************
X*** 224,230 ****
X #define Krb5Root /mit/krb5/decmips
X #endif
X
X! #define AthenaEnv YES /* Define this if you are in the
X athena environment.
X No one else should define this. */
X
X--- 233,239 ----
X #define Krb5Root /mit/krb5/decmips
X #endif
X
X! /* #define AthenaEnv YES /* Define this if you are in the
X athena environment.
X No one else should define this. */
X
X***************
X*** 241,248 ****
X--- 250,260 ----
X #else
X #define STDCTopIncludes -I$(TOP)/include/stdc-incl
X #endif
X+
X #endif /* HasGCC */
X #endif
X+
X+ #define DependCmd /usr/local/bin/xmakedepend
X
X #ifdef UltrixArchitecture
X #define MakeCmd gmake
Xdiff -c ap/security/kerberos/src/include/krb5/stock/config.h:1.1.1.2 ap/security/kerberos/src/include/krb5/stock/config.h:1.2
X*** ap/security/kerberos/src/include/krb5/stock/config.h:1.1.1.2 Thu Nov 12 17:22:05 1992
X--- ap/security/kerberos/src/include/krb5/stock/config.h Thu Nov 12 17:22:05 1992
X***************
X*** 4,10 ****
X /*
X * $Source: /home2/ajlill/src/stage2/ap/security/kerberos/src/config.h,v $
X * $Author: ajlill $
X! * $Id: config.h,v 1.1.1.2 1992/11/09 17:14:27 ajlill Exp $
X *
X * Copyright 1990,1991 by the Massachusetts Institute of Technology.
X * All Rights Reserved.
X--- 4,10 ----
X /*
X * $Source: /home2/ajlill/src/stage2/ap/security/kerberos/src/config.h,v $
X * $Author: ajlill $
X! * $Id: config.h,v 1.2 1992/11/12 22:19:31 ajlill Exp $
X *
X * Copyright 1990,1991 by the Massachusetts Institute of Technology.
X * All Rights Reserved.
X***************
X*** 82,87 ****
X--- 82,91 ----
X #define STDARG_PROTOTYPES
X #endif
X
X+ #ifdef HasStrdupTrue
X+ #define HAS_STRDUP
X+ #endif
X+
X #ifdef NoNestedPrototypes
X #define NO_NESTED_PROTOTYPES
X #endif
X***************
X*** 126,131 ****
X--- 130,144 ----
X error: only one of BitsizeNN, please.
X #endif
X #define BITS64
X+ #endif
X+
X+ #ifdef MS_DOS /* Put this here to shrink the cc command
X+ line */
X+ #define USG /* MS_DOS and SVR4 are both so close to
X+ POSIX, that this almost always
X+ saves time */
X+ #define SYSV
X+ #define SVR4
X #endif
X
X #ifdef SYSV
Xcvs patch: Examining ap/security/kerberos/src/include/krb5/error_tables
Xdiff -c ap/security/kerberos/src/include/krb5/error_def.h:1.1.1.2 ap/security/kerberos/src/include/krb5/error_def.h:1.2
X*** ap/security/kerberos/src/include/krb5/error_def.h:1.1.1.2 Thu Nov 12 17:22:06 1992
X--- ap/security/kerberos/src/include/krb5/error_def.h Thu Nov 12 17:22:06 1992
X***************
X*** 1,7 ****
X /*
X * $Source: /home2/ajlill/src/stage2/ap/security/kerberos/src/error_def.h,v $
X * $Author: ajlill $
X! * $Id: error_def.h,v 1.1.1.2 1992/11/09 17:13:41 ajlill Exp $
X *
X * Copyright 1990 by the Massachusetts Institute of Technology.
X * All Rights Reserved.
X--- 1,7 ----
X /*
X * $Source: /home2/ajlill/src/stage2/ap/security/kerberos/src/error_def.h,v $
X * $Author: ajlill $
X! * $Id: error_def.h,v 1.2 1992/11/12 22:19:28 ajlill Exp $
X *
X * Copyright 1990 by the Massachusetts Institute of Technology.
X * All Rights Reserved.
X***************
X*** 30,38 ****
X--- 30,47 ----
X #ifndef KRB5_ERROR_DEF__
X #define KRB5_ERROR_DEF__
X
X+ #ifdef MS_DOS
X #include <krb5/krb5_err.h>
X #include <krb5/kdb5_err.h>
X+ #include <krb5/isod_err.h>
X+ #if (_MSC_VER < 700 ) /* Included in stdlib.h */
X+ #include <errno.h>
X+ #endif
X+ #else
X+ #include <krb5/krb5_err.h>
X+ #include <krb5/kdb5_err.h>
X #include <krb5/isode_err.h>
X #include <errno.h>
X+ #endif
X
X #endif /* KRB5_ERROR_DEF__ */
Xdiff -c ap/security/kerberos/src/include/krb5/ext-proto.h:1.1.1.2 ap/security/kerberos/src/include/krb5/ext-proto.h:1.2
X*** ap/security/kerberos/src/include/krb5/ext-proto.h:1.1.1.2 Thu Nov 12 17:22:06 1992
X--- ap/security/kerberos/src/include/krb5/ext-proto.h Thu Nov 12 17:22:06 1992
X***************
X*** 1,7 ****
X /*
X * $Source: /home2/ajlill/src/stage2/ap/security/kerberos/src/ext-proto.h,v $
X * $Author: ajlill $
X! * $Id: ext-proto.h,v 1.1.1.2 1992/11/09 17:13:45 ajlill Exp $
X *
X * Copyright 1990 by the Massachusetts Institute of Technology.
X * All Rights Reserved.
X--- 1,7 ----
X /*
X * $Source: /home2/ajlill/src/stage2/ap/security/kerberos/src/ext-proto.h,v $
X * $Author: ajlill $
X! * $Id: ext-proto.h,v 1.2 1992/11/12 22:19:24 ajlill Exp $
X *
X * Copyright 1990 by the Massachusetts Institute of Technology.
X * All Rights Reserved.
X***************
X*** 51,57 ****
X--- 51,59 ----
X #include <strings.h>
X #endif
X
X+ #ifndef HAS_STRDUP
X extern char *strdup PROTOTYPE((const char *));
X+ #endif
X
X #ifdef HAS_UNISTD_H
X #include <unistd.h>
Xdiff -c ap/security/kerberos/src/include/krb5/krb5.h:1.1.1.2 ap/security/kerberos/src/include/krb5/krb5.h:1.2
X*** ap/security/kerberos/src/include/krb5/krb5.h:1.1.1.2 Thu Nov 12 17:22:07 1992
X--- ap/security/kerberos/src/include/krb5/krb5.h Thu Nov 12 17:22:07 1992
X***************
X*** 1,7 ****
X /*
X * $Source: /home2/ajlill/src/stage2/ap/security/kerberos/src/krb5.h,v $
X * $Author: ajlill $
X! * $Id: krb5.h,v 1.1.1.2 1992/11/09 17:14:01 ajlill Exp $
X *
X * Copyright 1989,1990 by the Massachusetts Institute of Technology.
X * All Rights Reserved.
X--- 1,7 ----
X /*
X * $Source: /home2/ajlill/src/stage2/ap/security/kerberos/src/krb5.h,v $
X * $Author: ajlill $
X! * $Id: krb5.h,v 1.2 1992/11/12 22:19:21 ajlill Exp $
X *
X * Copyright 1989,1990 by the Massachusetts Institute of Technology.
X * All Rights Reserved.
X***************
X*** 36,41 ****
X--- 36,51 ----
X
X #include <krb5/config.h>
X
X+ #ifdef MS_DOS
X+ #include <krb5/basedefs.h>
X+ #include <krb5/hostaddr.h>
X+ #include <krb5/encrypt.h>
X+ #include <krb5/fldbits.h>
X+ #include <krb5/errors.h>
X+ #include <krb5/proto.h>
X+ #include <krb5/macros.h>
X+ #include <krb5/errordef.h>
X+ #else
X #include <krb5/base-defs.h>
X #include <krb5/hostaddr.h>
X #include <krb5/encryption.h>
X***************
X*** 44,49 ****
X--- 54,60 ----
X #include <krb5/proto.h>
X #include <krb5/macros.h>
X #include <krb5/error_def.h>
X+ #endif
X
X /* Time set */
X typedef struct _krb5_ticket_times {
X***************
X*** 245,251 ****
X--- 256,266 ----
X #include <krb5/ccache.h>
X #include <krb5/rcache.h>
X #include <krb5/keytab.h>
X+ #ifdef MS_DOS
X+ #include <krb5/fncproto.h>
X+ #else
X #include <krb5/func-proto.h>
X+ #endif
X #include <krb5/free.h>
X
X /* This is from Sandia */
Xdiff -c ap/security/kerberos/src/include/krb5/los-proto.h:1.1.1.2 ap/security/kerberos/src/include/krb5/los-proto.h:1.2
X*** ap/security/kerberos/src/include/krb5/los-proto.h:1.1.1.2 Thu Nov 12 17:22:07 1992
X--- ap/security/kerberos/src/include/krb5/los-proto.h Thu Nov 12 17:22:07 1992
X***************
X*** 1,7 ****
X /*
X * $Source: /home2/ajlill/src/stage2/ap/security/kerberos/src/los-proto.h,v $
X * $Author: ajlill $
X! * $Id: los-proto.h,v 1.1.1.2 1992/11/09 17:14:06 ajlill Exp $
X *
X * Copyright 1990,1991 by the Massachusetts Institute of Technology.
X * All Rights Reserved.
X--- 1,7 ----
X /*
X * $Source: /home2/ajlill/src/stage2/ap/security/kerberos/src/los-proto.h,v $
X * $Author: ajlill $
X! * $Id: los-proto.h,v 1.2 1992/11/12 22:19:19 ajlill Exp $
X *
X * Copyright 1990,1991 by the Massachusetts Institute of Technology.
X * All Rights Reserved.
X***************
X*** 44,49 ****
X--- 44,53 ----
X krb5_error_code krb5_unlock_file
X PROTOTYPE((FILE *,
X char * ));
X+ krb5_error_code krb5_lock_fno
X+ PROTOTYPE((int,
X+ char *,
X+ int ));
X krb5_error_code krb5_timeofday
X PROTOTYPE((krb5_int32 * ));
X krb5_error_code krb5_us_timeofday
Xdiff -c ap/security/kerberos/src/include/krb5/sysincl.h:1.1.1.2 ap/security/kerberos/src/include/krb5/sysincl.h:1.4
X*** ap/security/kerberos/src/include/krb5/sysincl.h:1.1.1.2 Thu Nov 12 17:22:08 1992
X--- ap/security/kerberos/src/include/krb5/sysincl.h Thu Nov 12 17:22:08 1992
X***************
X*** 1,7 ****
X /*
X * $Source: /home2/ajlill/src/stage2/ap/security/kerberos/src/sysincl.h,v $
X * $Author: ajlill $
X! * $Id: sysincl.h,v 1.1.1.2 1992/11/09 17:14:31 ajlill Exp $
X *
X * Copyright 1990 by the Massachusetts Institute of Technology.
X * All Rights Reserved.
X--- 1,7 ----
X /*
X * $Source: /home2/ajlill/src/stage2/ap/security/kerberos/src/sysincl.h,v $
X * $Author: ajlill $
X! * $Id: sysincl.h,v 1.4 1992/11/12 22:19:13 ajlill Exp $
X *
X * Copyright 1990 by the Massachusetts Institute of Technology.
X * All Rights Reserved.
X***************
X*** 43,61 ****
X #include <sys/time.h> /* struct timeval, utimes() */
X #endif
X #include <sys/stat.h> /* struct stat, stat() */
X #include <sys/param.h> /* MAXPATHLEN */
X
X #include <sys/file.h> /* prototypes for file-related
X syscalls; flags for open &
X friends */
X #ifndef L_SET
X #define L_SET 0 /* absolute offset */
X #define L_INCR 1 /* relative to current offset */
X #define L_XTND 2 /* relative to end of file */
X #endif /* L_SET */
X-
X- #if defined(SYSV) || defined(_AIX)
X- #include <fcntl.h>
X- #endif
X
X #endif /* KRB5_SYSINCL__ */
X--- 43,77 ----
X #include <sys/time.h> /* struct timeval, utimes() */
X #endif
X #include <sys/stat.h> /* struct stat, stat() */
X+ #ifndef MS_DOS
X #include <sys/param.h> /* MAXPATHLEN */
X+ #else
X+ #define MAXPATHLEN 1024
X+ #endif
X
X+ #ifndef SVR4
X #include <sys/file.h> /* prototypes for file-related
X syscalls; flags for open &
X friends */
X+ #endif
X+ #if defined(SYSV) || defined(_AIX)
X+ #ifdef SVR4
X+ #include <fcntl.h>
X+ #ifndef MS_DOS
X+ #include <unistd.h>
X+ #endif
X+ #define L_SET SEEK_SET
X+ #define L_INCR SEEK_CUR
X+ #define L_XTND SEEK_END
X+ #else
X+ #include <sys/fcntl.h>
X+ #endif
X+ #endif
X+
X #ifndef L_SET
X #define L_SET 0 /* absolute offset */
X #define L_INCR 1 /* relative to current offset */
X #define L_XTND 2 /* relative to end of file */
X #endif /* L_SET */
X
X #endif /* KRB5_SYSINCL__ */
Xcvs patch: Examining ap/security/kerberos/src/include/sys
Xcvs patch: Examining ap/security/kerberos/src/kdc
Xdiff -c ap/security/kerberos/src/kdc/network.c:1.1.1.2 ap/security/kerberos/src/kdc/network.c:1.4
X*** ap/security/kerberos/src/kdc/network.c:1.1.1.2 Thu Nov 12 17:22:11 1992
X--- ap/security/kerberos/src/kdc/network.c Thu Nov 12 17:22:11 1992
X***************
X*** 26,32 ****
X
X #if !defined(lint) && !defined(SABER)
X static char rcsid_network_c[] =
X! "$Id: network.c,v 1.1.1.2 1992/11/09 17:17:00 ajlill Exp $";
X #endif /* !lint & !SABER */
X
X #include <krb5/copyright.h>
X--- 26,32 ----
X
X #if !defined(lint) && !defined(SABER)
X static char rcsid_network_c[] =
X! "$Id: network.c,v 1.4 1992/11/12 22:18:50 ajlill Exp $";
X #endif /* !lint & !SABER */
X
X #include <krb5/copyright.h>
X***************
X*** 79,84 ****
X--- 79,88 ----
X return retval;
X }
X memset((char *)&sin, 0, sizeof(sin));
X+ #ifdef SVR4
X+ sin.sin_family = AF_INET;
X+ sin.sin_addr.s_addr = INADDR_ANY;
X+ #endif
X sin.sin_port = sp->s_port;
X if (bind(udp_port_fd, (struct sockaddr *)&sin, sizeof(sin)) == -1) {
X retval = errno;
X***************
X*** 108,113 ****
X--- 112,121 ----
X return retval;
X }
X memset((char *)&sin, 0, sizeof(sin));
X+ #ifdef SVR4
X+ sin.sin_family = AF_INET;
X+ sin.sin_addr.s_addr = INADDR_ANY;
X+ #endif
X sin.sin_port = sp->s_port;
X if (bind(sec_udp_port_fd, (struct sockaddr *)&sin, sizeof(sin)) == -1) {
X retval = errno;
Xdiff -c ap/security/kerberos/src/lib/ccache/file/fcc.h:1.1.1.2 ap/security/kerberos/src/lib/ccache/file/fcc.h:1.2
X*** ap/security/kerberos/src/lib/ccache/file/fcc.h:1.1.1.2 Thu Nov 12 17:22:17 1992
X--- ap/security/kerberos/src/lib/ccache/file/fcc.h Thu Nov 12 17:22:18 1992
X***************
X*** 1,7 ****
X /*
X * $Source: /home2/ajlill/src/stage2/ap/security/kerberos/src/fcc.h,v $
X * $Author: ajlill $
X! * $Id: fcc.h,v 1.1.1.2 1992/11/09 17:19:38 ajlill Exp $
X *
X * Copyright 1990,1991 by the Massachusetts Institute of Technology.
X * All Rights Reserved.
X--- 1,7 ----
X /*
X * $Source: /home2/ajlill/src/stage2/ap/security/kerberos/src/fcc.h,v $
X * $Author: ajlill $
X! * $Id: fcc.h,v 1.2 1992/11/12 22:18:41 ajlill Exp $
X *
X * Copyright 1990,1991 by the Massachusetts Institute of Technology.
X * All Rights Reserved.
X***************
X*** 65,71 ****
X--- 65,77 ----
X #endif
X
X /* macros to make checking flags easier */
X+ #ifdef MSWINDOWS_H /* you can use files in Window, as
X+ long as you don't keep them open
X+ between calls */
X+ #define OPENCLOSE(id) 1
X+ #else
X #define OPENCLOSE(id) (((krb5_fcc_data *)id->data)->flags & KRB5_TC_OPENCLOSE)
X+ #endif
X
X typedef struct _krb5_fcc_data {
X char *filename;
Xdiff -c ap/security/kerberos/src/lib/krb425/kuserok.c:1.1.1.2 ap/security/kerberos/src/lib/krb425/kuserok.c:1.2
X*** ap/security/kerberos/src/lib/krb425/kuserok.c:1.1.1.2 Thu Nov 12 17:22:38 1992
X--- ap/security/kerberos/src/lib/krb425/kuserok.c Thu Nov 12 17:22:38 1992
X***************
X*** 32,38 ****
X--- 32,43 ----
X #include <sys/param.h>
X #include <sys/socket.h>
X #include <sys/stat.h>
X+ #ifdef SVR4
X+ #include <fcntl.h>
X+ #include <unistd.h>
X+ #else
X #include <sys/file.h>
X+ #endif
X
X #define OK 0
X #ifdef NOTOK
Xdiff -c ap/security/kerberos/src/lib/os/localaddr.c:1.1.1.2 ap/security/kerberos/src/lib/os/localaddr.c:1.4
X*** ap/security/kerberos/src/lib/os/localaddr.c:1.1.1.2 Thu Nov 12 17:22:42 1992
X--- ap/security/kerberos/src/lib/os/localaddr.c Thu Nov 12 17:22:42 1992
X***************
X*** 29,35 ****
X
X #if !defined(lint) && !defined(SABER)
X static char rcsid_getaddr_c[] =
X! "$Id: localaddr.c,v 1.1.1.2 1992/11/09 17:31:22 ajlill Exp $";
X #endif /* !lint & !SABER */
X
X #include <krb5/krb5.h>
X--- 29,35 ----
X
X #if !defined(lint) && !defined(SABER)
X static char rcsid_getaddr_c[] =
X! "$Id: localaddr.c,v 1.4 1992/11/12 22:18:09 ajlill Exp $";
X #endif /* !lint & !SABER */
X
X #include <krb5/krb5.h>
X***************
X*** 78,83 ****
X--- 78,100 ----
X * Add more address families here.
X */
X
X+ /* The Wollongong TCP implementation for NCR System 3000 version of
X+ Berkeley sockets doesn't have a proper implementation of the
X+ SIOCGIFCONF ioctls. The code ifdef'd WINTCP works around this. The
X+ problem is probably endemic to all streams based network implementations.
X+ This fix was provided by Marc Staveley */
X+ #ifndef SIOCGIFCONF /* win-tcp (NCR System 3000) */
X+ # include <netinet/ip.h> /* for IPIOC_GET */
X+ # include <stropts.h> /* Stream ioctl calls */
X+ # include <fcntl.h>
X+ # define SIOCGIFCONF IPIOC_GETIFCONF
X+ # define SIOCGIFFLAGS IPIOC_GETIFFLAGS
X+ # define SIOCGIFDSTADDR IPIOC_GETIFDSTADDR
X+ # define SIOCGIFBRDADDR IPIOC_GETIFBRDADDR
X+ # define SIOCGIFADDR IPIOC_GETIFADDR
X+ # define WINTCP
X+ #endif
X+
X extern int errno;
X
X /*
X***************
X*** 95,127 ****
X krb5_address ***addr;
X {
X struct ifreq *ifr;
X! struct ifconf ifc;
X int s, code, n, i;
X! char buf[1024];
X krb5_address *addr_temp [ 1024/sizeof(struct ifreq) ];
X int n_found;
X int mem_err = 0;
X
X! ifc.ifc_len = sizeof(buf);
X! ifc.ifc_buf = buf;
X
X s = socket (USE_AF, USE_TYPE, USE_PROTO);
X if (s < 0)
X return errno;
X
X! code = ioctl (s, SIOCGIFCONF, (char *)&ifc);
X if (code < 0) {
X int retval = errno;
X close(s);
X return retval;
X }
X! n = ifc.ifc_len / sizeof (struct ifreq);
X
X! for (n_found=0, i=0; i<n && ! mem_err; i++) {
X krb5_address *address;
X- ifr = &ifc.ifc_req[i];
X
X! if (ioctl (s, SIOCGIFFLAGS, (char *)ifr) < 0)
X continue;
X
X #ifdef IFF_LOOPBACK
X--- 112,163 ----
X krb5_address ***addr;
X {
X struct ifreq *ifr;
X! struct ifconf *ifc;
X int s, code, n, i;
X! char ifc_buffer[1024];
X! #ifndef WINTCP
X! char ifr_buffer[1024];
X! #endif
X krb5_address *addr_temp [ 1024/sizeof(struct ifreq) ];
X int n_found;
X int mem_err = 0;
X
X! ifc = (struct ifconf *) ifc_buffer;
X! #ifdef WINTCP
X! ifc->ifc_req = (struct ifreq *) &ifc->ifc_req;
X! ifc->ifc_len = sizeof(ifc_buffer) - sizeof( struct ifconf );
X! #else
X! ifc->ifc_len = sizeof(ifr_buffer);
X! ifc->ifc_buf = (struct ifreq *) ifr_buffer;
X! #endif
X
X+ #ifdef WINTCP
X+ s = open ("/dev/ip", O_RDWR);
X+ #else
X s = socket (USE_AF, USE_TYPE, USE_PROTO);
X+ #endif
X if (s < 0)
X return errno;
X
X! code = ioc (s, SIOCGIFCONF, ifc_buffer, sizeof(ifc_buffer) );
X if (code < 0) {
X int retval = errno;
X close(s);
X return retval;
X }
X! n = ifc->ifc_len / sizeof (struct ifreq);
X
X! #ifdef WINTCP
X! for (n_found=0, i=0, ifr = (struct ifreq *)&ifc->ifc_req;
X! i<n && ! mem_err; i++, ++ifr)
X! #else
X! for (n_found=0, i=0, ifr = (struct ifreq *)ifc->ifc_req;
X! i<n && ! mem_err; i++, ++ifr)
X! #endif
X! {
X krb5_address *address;
X
X! if (ioc (s, SIOCGIFFLAGS, (char *)ifr, sizeof(struct ifreq)) < 0)
X continue;
X
X #ifdef IFF_LOOPBACK
X***************
X*** 133,139 ****
X /* interface is down; skip */
X continue;
X
X! if (ioctl (s, SIOCGIFADDR, (char *)ifr) < 0)
X /* can't get address */
X continue;
X
X--- 169,175 ----
X /* interface is down; skip */
X continue;
X
X! if (ioc (s, SIOCGIFADDR, (char *)ifr, sizeof(struct ifreq)) < 0)
X /* can't get address */
X continue;
X
X***************
X*** 222,224 ****
X--- 258,282 ----
X (*addr)[n_found] = 0;
X return 0;
X }
X+
X+ static int
X+ ioc( int fd, int cmd, char *buf, int len ) {
X+ #ifdef WINTCP
X+ struct strioctl ioc;
X+ /* bundle up the ioctl in an internal message, and pass it
X+ down the stream until (hopefully) some module recognizes it
X+ and responds */
X+ if( isastream(fd) ) {
X+ ioc.ic_cmd = cmd;
X+ ioc.ic_dp = buf;
X+ ioc.ic_len = len;
X+ ioc.ic_timout = 0;
X+
X+ return( ioctl(fd, I_STR, &ioc) );
X+ }
X+
X+ else
X+ #endif
X+ return( ioctl(fd, cmd, buf) );
X+ }
X+
Xdiff -c ap/security/kerberos/src/lib/os/lock_file.c:1.1.1.2 ap/security/kerberos/src/lib/os/lock_file.c:1.2
X*** ap/security/kerberos/src/lib/os/lock_file.c:1.1.1.2 Thu Nov 12 17:22:42 1992
X--- ap/security/kerberos/src/lib/os/lock_file.c Thu Nov 12 17:22:42 1992
X***************
X*** 27,33 ****
X
X #if !defined(lint) && !defined(SABER)
X static char rcsid_lock_file_c [] =
X! "$Id: lock_file.c,v 1.1.1.2 1992/11/09 17:31:25 ajlill Exp $";
X #endif /* !lint & !SABER */
X
X #include <krb5/krb5.h>
X--- 27,33 ----
X
X #if !defined(lint) && !defined(SABER)
X static char rcsid_lock_file_c [] =
X! "$Id: lock_file.c,v 1.2 1992/11/12 22:18:05 ajlill Exp $";
X #endif /* !lint & !SABER */
X
X #include <krb5/krb5.h>
X***************
X*** 63,68 ****
X--- 63,77 ----
X char *pathname;
X int mode;
X {
X+ return(krb5_lock_fno(fileno(filep), pathname, mode));
X+ }
X+
X+ krb5_error_code
X+ krb5_lock_fno(fd, pathname, mode)
X+ int fd;
X+ char *pathname;
X+ int mode;
X+ {
X #ifdef POSIX_FILE_LOCKS
X int lock_cmd = F_SETLKW;
X struct flock lock_arg;
X***************
X*** 99,105 ****
X lock_arg.l_whence = 0;
X lock_arg.l_start = 0;
X lock_arg.l_len = 0;
X! if (fcntl(fileno(filep), lock_cmd, &lock_arg) == -1) {
X if (errno == EACCES || errno == EAGAIN) /* see POSIX/IEEE 1003.1-1988,
X 6.5.2.4 */
X return(EAGAIN);
X--- 108,114 ----
X lock_arg.l_whence = 0;
X lock_arg.l_start = 0;
X lock_arg.l_len = 0;
X! if (fcntl(fd, lock_cmd, &lock_arg) == -1) {
X if (errno == EACCES || errno == EAGAIN) /* see POSIX/IEEE 1003.1-1988,
X 6.5.2.4 */
X return(EAGAIN);
X***************
X*** 106,112 ****
X return(errno);
X }
X #else
X! if (flock(fileno(filep), lock_flag) == -1)
X return(errno);
X #endif
X return 0;
X--- 115,121 ----
X return(errno);
X }
X #else
X! if (flock(fd, lock_flag) == -1)
X return(errno);
X #endif
X return 0;
Xdiff -c ap/security/kerberos/src/lib/os/krbfileio.c:1.1.1.1 ap/security/kerberos/src/lib/os/krbfileio.c:1.2
X*** ap/security/kerberos/src/lib/os/krbfileio.c:1.1.1.1 Thu Nov 12 17:22:44 1992
X--- ap/security/kerberos/src/lib/os/krbfileio.c Thu Nov 12 17:22:44 1992
X***************
X*** 39,45 ****
X--- 39,49 ----
X #include <krb5/libos.h>
X #include <krb5/los-proto.h>
X
X+ #ifdef SYSV
X+ #include <fcntl.h>
X+ #else
X #include <sys/file.h>
X+ #endif
X
X #include <sys/types.h>
X #include <krb5/ext-proto.h>
Xcvs patch: Examining ap/security/kerberos/src/lib/rcache
Xdiff -c ap/security/kerberos/src/lib/syslog.c:1.1.1.2 ap/security/kerberos/src/lib/syslog.c:1.3
X*** ap/security/kerberos/src/lib/syslog.c:1.1.1.2 Thu Nov 12 17:22:48 1992
X--- ap/security/kerberos/src/lib/syslog.c Thu Nov 12 17:22:48 1992
X***************
X*** 164,170 ****
X--- 164,179 ----
X int fd;
X
X (void)signal(SIGALRM, SIG_DFL);
X+ #ifdef SVR4
X+ {
X+ sigset_t blocked;
X+ sigfillset(&blocked);
X+ sigdelset(&blocked,SIGALRM);
X+ sigprocmask(SIG_BLOCK,&blocked,NULL);
X+ }
X+ #else
X sigsetmask((long)~sigmask(SIGALRM));
X+ #endif
X (void)alarm((u_int)5);
X if ((fd = open(CONSOLE, O_WRONLY, 0)) < 0)
X return;
Xcvs patch: Examining ap/security/kerberos/src/lib/crc32
Xcvs patch: Examining ap/security/kerberos/src/lib/md4
Xcvs patch: Examining ap/security/kerberos/src/lib/md5
Xcvs patch: Examining ap/security/kerberos/src/lib/errortbl
Xcvs patch: Examining ap/security/kerberos/src/prototype
Xcvs patch: Examining ap/security/kerberos/src/slave
Xdiff -c ap/security/kerberos/src/slave/kprop.c:1.1.1.2 ap/security/kerberos/src/slave/kprop.c:1.4
X*** ap/security/kerberos/src/slave/kprop.c:1.1.1.2 Thu Nov 12 17:22:51 1992
X--- ap/security/kerberos/src/slave/kprop.c Thu Nov 12 17:22:52 1992
X***************
X*** 26,32 ****
X
X #if !defined(lint) && !defined(SABER)
X static char rcsid_kprop_c[] =
X! "$Id: kprop.c,v 1.1.1.2 1992/11/09 17:32:47 ajlill Exp $";
X #endif /* !lint && !SABER */
X
X #include <krb5/krb5.h>
X--- 26,32 ----
X
X #if !defined(lint) && !defined(SABER)
X static char rcsid_kprop_c[] =
X! "$Id: kprop.c,v 1.4 1992/11/12 22:17:53 ajlill Exp $";
X #endif /* !lint && !SABER */
X
X #include <krb5/krb5.h>
X***************
X*** 36,47 ****
X--- 36,53 ----
X #include <krb5/kdb_dbm.h>
X #include <krb5/ext-proto.h>
X #include <krb5/los-proto.h>
X+ #include <krb5/libos.h>
X #include <com_err.h>
X #include <errno.h>
X
X #include <stdio.h>
X #include <ctype.h>
X+ #ifdef SVR4
X+ #include <fcntl.h>
X+ #include <unistd.h>
X+ #else
X #include <sys/file.h>
X+ #endif
X #include <signal.h>
X #include <string.h>
X #include <sys/types.h>
X***************
X*** 410,432 ****
X char *data_ok_fn;
X static char ok[] = ".dump_ok";
X
X! if ((fd = open(data_fn, O_RDONLY)) < 0) {
X com_err(progname, errno, "while trying to open %s",
X data_fn);
X exit(1);
X }
X
X! #ifdef POSIX_FILE_LOCKS
X! if (lockf(fd, LOCK_SH | LOCK_NB, 0) < 0) {
X! if (errno == EWOULDBLOCK || errno == EAGAIN)
X! com_err(progname, 0, "database locked");
X! else
X! com_err(progname, errno, "while trying to flock %s",
X! data_fn);
X! exit(1);
X! }
X! #else
X! if (flock(fd, LOCK_SH | LOCK_NB) < 0) {
X if (errno == EWOULDBLOCK || errno == EAGAIN)
X com_err(progname, 0, "database locked");
X else
X--- 416,429 ----
X char *data_ok_fn;
X static char ok[] = ".dump_ok";
X
X! if ((fd = open(data_fn, O_RDWR)) < 0) {
X com_err(progname, errno, "while trying to open %s",
X data_fn);
X exit(1);
X }
X
X! if (krb5_lock_fno (fd, data_fn,
X! KRB5_LOCKMODE_DONTBLOCK|KRB5_LOCKMODE_SHARED) < 0 ) {
X if (errno == EWOULDBLOCK || errno == EAGAIN)
X com_err(progname, 0, "database locked");
X else
X***************
X*** 434,440 ****
X data_fn);
X exit(1);
X }
X- #endif
X if (fstat(fd, &stbuf)) {
X com_err(progname, errno, "while trying to stat %s",
X data_fn);
X--- 431,436 ----
Xdiff -c ap/security/kerberos/src/kadmin/kpasswd/Imakefile:1.1.1.1 ap/security/kerberos/src/kadmin/kpasswd/Imakefile:1.2
X*** ap/security/kerberos/src/kadmin/kpasswd/Imakefile:1.1.1.1 Thu Nov 12 17:22:57 1992
X--- ap/security/kerberos/src/kadmin/kpasswd/Imakefile Thu Nov 12 17:22:57 1992
X***************
X*** 1,6 ****
X # $Source: /home2/ajlill/src/stage2/ap/security/kerberos/src/Imakefile,v $
X # $Author: ajlill $
X! # $Header: /home2/ajlill/src/stage2/ap/security/kerberos/src/Imakefile,v 1.1.1.1 1992/11/09 17:15:27 ajlill Exp $
X #
X # Copyright 1989 by the Massachusetts Institute of Technology.
X #
X--- 1,6 ----
X # $Source: /home2/ajlill/src/stage2/ap/security/kerberos/src/Imakefile,v $
X # $Author: ajlill $
X! # $Header: /home2/ajlill/src/stage2/ap/security/kerberos/src/Imakefile,v 1.2 1992/11/12 22:19:03 ajlill Exp $
X #
X # Copyright 1989 by the Massachusetts Institute of Technology.
X #
X***************
X*** 13,18 ****
X--- 13,22 ----
X K4LIB=-l$(DES425LIB)
X #else
X K4LIB=
X+ #endif
X+
X+ #if SystemV4
X+ DEFINES = -DNO_UT_HOST
X #endif
X
X SRCS = \
Xdiff -c ap/security/kerberos/src/kadmin/kpasswd/kpasswd.c:1.1.1.1 ap/security/kerberos/src/kadmin/kpasswd/kpasswd.c:1.2
X*** ap/security/kerberos/src/kadmin/kpasswd/kpasswd.c:1.1.1.1 Thu Nov 12 17:22:58 1992
X--- ap/security/kerberos/src/kadmin/kpasswd/kpasswd.c Thu Nov 12 17:22:58 1992
X***************
X*** 18,24 ****
X
X #ifndef lint
X static char rcsid_kpasswd_c[] =
X! "$Header: /home2/ajlill/src/stage2/ap/security/kerberos/src/kpasswd.c,v 1.1.1.1 1992/11/09 17:15:33 ajlill Exp $";
X #endif /* lint */
X
X /*
X--- 18,24 ----
X
X #ifndef lint
X static char rcsid_kpasswd_c[] =
X! "$Header: /home2/ajlill/src/stage2/ap/security/kerberos/src/kpasswd.c,v 1.2 1992/11/12 22:18:59 ajlill Exp $";
X #endif /* lint */
X
X /*
X***************
X*** 150,156 ****
X arg = &arg2;
X }
X my_keyblock = (krb5_keyblock *)malloc(sizeof(**key));
X! if (!*key) {
X if (f_salt) xfree(salt.data);
X if (arg != (struct v4_pwd_keyproc_arg *) keyseed)
X memset((char *) arg->password.data, 0, arg->password.length);
X--- 150,156 ----
X arg = &arg2;
X }
X my_keyblock = (krb5_keyblock *)malloc(sizeof(**key));
X! if (!my_keyblock) {
X if (f_salt) xfree(salt.data);
X if (arg != (struct v4_pwd_keyproc_arg *) keyseed)
X memset((char *) arg->password.data, 0, arg->password.length);
X***************
X*** 161,168 ****
X (*my_keyblock).keytype = type;
X (*my_keyblock).length = 8;
X
X! if (retval = des_string_to_key(arg->password.data,
X! v4_keyptr)) {
X xfree(*key);
X if (f_salt) xfree(salt.data);
X if (arg != (struct v4_pwd_keyproc_arg *) keyseed)
X--- 161,168 ----
X (*my_keyblock).keytype = type;
X (*my_keyblock).length = 8;
X
X! if (retval = mit_des_string_to_key(arg->password.data,
X! v4_keyptr)) {
X xfree(*key);
X if (f_salt) xfree(salt.data);
X if (arg != (struct v4_pwd_keyproc_arg *) keyseed)
Xcvs patch: Examining ap/security/kerberos/src/kadmin/server
END_OF_krb5_patches
if test 47733 -ne `wc -c <krb5_patches`; then
echo shar: \"krb5_patches\" unpacked with wrong size!
fi
# end of overwriting check
fi
if test -f ss_patch -a "${1}" != "-c" ; then
echo shar: Will not over-write existing file \"ss_patch\"
else
echo shar: Extracting \"ss_patch\" \(7241 characters\)
sed "s/^X//" >ss_patch <<'END_OF_ss_patch'
Xdcvs patch -r 1.1.1 tools/bin/ss
Xcvs patch: Examining tools/bin/ss/profiled
Xdiff -c tools/bin/ss/Imakefile:1.1.1.1 tools/bin/ss/Imakefile:1.3
X*** tools/bin/ss/Imakefile:1.1.1.1 Thu Nov 12 16:45:42 1992
X--- tools/bin/ss/Imakefile Thu Nov 12 16:45:42 1992
X***************
X*** 1,10 ****
X
X! #ETDIR=../../et/src/
X
X #ifdef ultrix
X! DEFINES=-I. -DPOSIX
X #else
X! DEFINES=-I.
X #endif
X
X LINTFLAGS=-uhv
X--- 1,10 ----
X
X! ETDIR=../com_err/
X
X #ifdef ultrix
X! DEFINES=-I. -I.. -DPOSIX
X #else
X! DEFINES=-I. -I..
X #endif
X
X LINTFLAGS=-uhv
X***************
X*** 54,60 ****
X ProfiledObjectRule()
X
X SimpleLibrary(ss,$(OBJS),$(ATHLIBDIR))
X! SimpleLint(ss,$(SRCS))
X
X SimpleProgram(mk_cmds, $(MKCMDSOBJS),-ll,$(ATHBINDIR))
X
X--- 54,60 ----
X ProfiledObjectRule()
X
X SimpleLibrary(ss,$(OBJS),$(ATHLIBDIR))
X! /*SimpleLint(ss,$(SRCS))*/
X
X SimpleProgram(mk_cmds, $(MKCMDSOBJS),-ll,$(ATHBINDIR))
X
Xdiff -c tools/bin/ss/help.c:1.1.1.1 tools/bin/ss/help.c:1.2
X*** tools/bin/ss/help.c:1.1.1.1 Thu Nov 12 16:45:43 1992
X--- tools/bin/ss/help.c Thu Nov 12 16:45:43 1992
X***************
X*** 5,11 ****
X--- 5,15 ----
X */
X
X #include <sys/param.h>
X+ #ifdef SVR4
X+ #include <fcntl.h>
X+ #else
X #include <sys/file.h>
X+ #endif
X #include <sys/wait.h>
X #include "ss_internal.h"
X #include "copyright.h"
X***************
X*** 82,87 ****
X--- 86,94 ----
X
X #include <sys/types.h>
X #include <sys/dir.h>
X+ #ifdef SVR4
X+ #include <dirent.h>
X+ #endif
X
X void ss_add_info_dir(sci_idx, info_dir, code_ptr)
X int sci_idx;
Xdiff -c tools/bin/ss/listen.c:1.1.1.1 tools/bin/ss/listen.c:1.2
X*** tools/bin/ss/listen.c:1.1.1.1 Thu Nov 12 16:45:45 1992
X--- tools/bin/ss/listen.c Thu Nov 12 16:45:45 1992
X***************
X*** 1,7 ****
X /*
X * Listener loop for subsystem library libss.a.
X *
X! * $Header: /home2/ajlill/src/stage2/tools/bin/imake/listen.c,v 1.1.1.1 1992/10/14 15:02:28 ajlill Exp $
X * $Locker: $
X *
X * Copyright 1987, 1988 by MIT Student Information Processing Board
X--- 1,7 ----
X /*
X * Listener loop for subsystem library libss.a.
X *
X! * $Header: /home2/ajlill/src/stage2/tools/bin/imake/listen.c,v 1.2 1992/10/30 01:31:59 ajlill Exp $
X * $Locker: $
X *
X * Copyright 1987, 1988 by MIT Student Information Processing Board
X***************
X*** 21,27 ****
X
X #ifndef lint
X static char const rcs_id[] =
X! "$Header: /home2/ajlill/src/stage2/tools/bin/imake/listen.c,v 1.1.1.1 1992/10/14 15:02:28 ajlill Exp $";
X #endif
X
X #ifdef POSIX
X--- 21,27 ----
X
X #ifndef lint
X static char const rcs_id[] =
X! "$Header: /home2/ajlill/src/stage2/tools/bin/imake/listen.c,v 1.2 1992/10/30 01:31:59 ajlill Exp $";
X #endif
X
X #ifdef POSIX
X***************
X*** 68,87 ****
X char expanded_input[BUFSIZ];
X char buffer[BUFSIZ];
X char *end = buffer;
X- int mask;
X int code;
X jmp_buf old_jmpb;
X ss_data *old_info = current_info;
X static sigtype print_prompt();
X
X current_info = info = ss_info(sci_idx);
X sig_cont = (sigtype (*)())0;
X info->abort = 0;
X mask = sigblock(sigmask(SIGINT));
X bcopy(listen_jmpb, old_jmpb, sizeof(jmp_buf));
X sig_int = signal(SIGINT, listen_int_handler);
X setjmp(listen_jmpb);
X (void) sigsetmask(mask);
X while(!info->abort) {
X print_prompt();
X *end = '\0';
X--- 68,101 ----
X char expanded_input[BUFSIZ];
X char buffer[BUFSIZ];
X char *end = buffer;
X int code;
X jmp_buf old_jmpb;
X ss_data *old_info = current_info;
X static sigtype print_prompt();
X+ #ifdef SVR4
X+ sigset_t newmask, mask;
X+ #else
X+ int mask;
X+ #endif
X
X current_info = info = ss_info(sci_idx);
X sig_cont = (sigtype (*)())0;
X info->abort = 0;
X+ #ifdef SVR4
X+ sigemptyset(&newmask);
X+ sigaddset(&newmask,SIGINT);
X+ sigprocmask(SIG_BLOCK,&newmask, &mask);
X+ #else
X mask = sigblock(sigmask(SIGINT));
X+ #endif
X bcopy(listen_jmpb, old_jmpb, sizeof(jmp_buf));
X sig_int = signal(SIGINT, listen_int_handler);
X setjmp(listen_jmpb);
X+ #ifdef SVR4
X+ sigprocmask(SIG_SETMASK,&mask,NULL);
X+ #else
X (void) sigsetmask(mask);
X+ #endif
X while(!info->abort) {
X print_prompt();
X *end = '\0';
Xdiff -c tools/bin/ss/list_rqs.c:1.1.1.1 tools/bin/ss/list_rqs.c:1.2
X*** tools/bin/ss/list_rqs.c:1.1.1.1 Thu Nov 12 16:45:46 1992
X--- tools/bin/ss/list_rqs.c Thu Nov 12 16:45:46 1992
X***************
X*** 34,55 ****
X char buffer[BUFSIZ];
X FILE *output;
X int fd;
X- int mask;
X #ifdef POSIX
X void (*func)();
X #else
X int (*func)();
X #endif
X union wait waitb;
X
X DONT_USE(argc);
X DONT_USE(argv);
X
X mask = sigblock(sigmask(SIGINT));
X func = signal(SIGINT, SIG_IGN);
X fd = ss_pager_create();
X output = fdopen(fd, "w");
X! sigsetmask(mask);
X
X fprintf (output, "Available %s requests:\n\n",
X ss_info (sci_idx) -> subsystem_name);
X--- 34,70 ----
X char buffer[BUFSIZ];
X FILE *output;
X int fd;
X #ifdef POSIX
X void (*func)();
X #else
X int (*func)();
X #endif
X+ #ifdef SVR4
X+ sigset_t mask, newmask;
X+ int waitb;
X+ #else
X+ int mask;
X union wait waitb;
X+ #endif
X
X DONT_USE(argc);
X DONT_USE(argv);
X
X+ #ifdef SVR4
X+ sigemptyset(&newmask);
X+ sigaddset(&newmask,SIGINT);
X+ sigprocmask(SIG_BLOCK,&newmask, &mask);
X+ #else
X mask = sigblock(sigmask(SIGINT));
X+ #endif
X func = signal(SIGINT, SIG_IGN);
X fd = ss_pager_create();
X output = fdopen(fd, "w");
X! #ifdef SVR4
X! sigprocmask(SIG_SETMASK,&mask,NULL);
X! #else
X! (void) sigsetmask(mask);
X! #endif
X
X fprintf (output, "Available %s requests:\n\n",
X ss_info (sci_idx) -> subsystem_name);
Xdiff -c tools/bin/ss/pager.c:1.1.1.1 tools/bin/ss/pager.c:1.2
X*** tools/bin/ss/pager.c:1.1.1.1 Thu Nov 12 16:45:46 1992
X--- tools/bin/ss/pager.c Thu Nov 12 16:45:46 1992
X***************
X*** 10,16 ****
X--- 10,20 ----
X #include "ss_internal.h"
X #include "copyright.h"
X #include <stdio.h>
X+ #ifdef SVR4
X+ #include <fcntl.h>
X+ #else
X #include <sys/file.h>
X+ #endif
X #include <signal.h>
X
X static char MORE[] = "more";
X***************
X*** 70,78 ****
X--- 74,89 ----
X (void) close(i);
X (void) signal(SIGINT, SIG_DFL);
X {
X+ #ifdef SVR4
X+ sigset_t mask;
X+ sigemptyset(&mask);
X+ sigaddset(&mask,SIGINT);
X+ sigprocmask(SIG_UNBLOCK,&mask,NULL);
X+ #else
X register int mask = sigblock(0);
X mask &= ~sigmask(SIGINT);
X sigsetmask(mask);
X+ #endif
X }
X if (_ss_pager_name == (char *)NULL) {
X if ((_ss_pager_name = getenv("PAGER")) == (char *)NULL)
Xdiff -c tools/bin/ss/ss_internal.h:1.1.1.1 tools/bin/ss/ss_internal.h:1.2
X*** tools/bin/ss/ss_internal.h:1.1.1.1 Thu Nov 12 16:45:47 1992
X--- tools/bin/ss/ss_internal.h Thu Nov 12 16:45:47 1992
X***************
X*** 35,41 ****
X extern pointer alloca PROTOTYPE((unsigned));
X #else
X #if defined(__HIGHC__) /* Barf! */
X! pragma on(alloca);
X #define LOCAL_ALLOC(x) alloca(x)
X #define LOCAL_FREE(x)
X extern pointer alloca PROTOTYPE((unsigned));
X--- 35,41 ----
X extern pointer alloca PROTOTYPE((unsigned));
X #else
X #if defined(__HIGHC__) /* Barf! */
X! #pragma on(alloca);
X #define LOCAL_ALLOC(x) alloca(x)
X #define LOCAL_FREE(x)
X extern pointer alloca PROTOTYPE((unsigned));
END_OF_ss_patch
if test 7241 -ne `wc -c <ss_patch`; then
echo shar: \"ss_patch\" unpacked with wrong size!
fi
# end of overwriting check
fi
if test -f config/ncr.cf -a "${1}" != "-c" ; then
echo shar: Will not over-write existing file \"config/ncr.cf\"
else
echo shar: Extracting \"config/ncr.cf\" \(1756 characters\)
sed "s/^X//" >config/ncr.cf <<'END_OF_config/ncr.cf'
X/**/# platform: $XConsortium: att.cf,v 1.15 91/07/29 10:43:44 rws Exp $
X
X#define OSName AT&T Unix System V Release 4.2
X/**/# operating system: OSName
X#define OSMajorVersion 4
X#define OSMinorVersion 2
X
X#define SystemV4 YES
X
X/* Mods for Kerberos */
X#define ExecableScripts YES
X#define HasSockets YES
X#define HasVFork YES
X#define HasVsyslog YES
X#define HasPutenv YES
X#define HasStrerror YES
X#define HasVoidSignalReturn YES
X#define HasDESLibrary YES
X#define NeedFunctionPrototypes YES
X#define HasSharedLibraries NO /* We do, but additive libraries make it difficult */
X#define HasSaberC NO
X#define HasStdlibH 2 /* Always use <stdlib.h> */
X#define HasStringH YES
X#define HasUnistdH YES
X#define HasPosixTermios YES
X#define HasPosixFileLocks YES
X#define HasPosixTypes YES
X#define HasStrdup YES
X#define HasVfprintf YES
X#define HasInet YES
X#define WantPrototypes YES
X#define NeedNarrowPrototypes YES /* A function of the ANSI C compiler */
X#define UseStdarg YES
X#define UseSysTimeH YES
X#define UseTimeH YES
X
X#define StandardCppDefines -DSYSV -DSVR4 -DUSG
X#define StandardDefines -DSYSV -DSVR4 -DUSG
X#define InstallCmd /usr/ucb/install -c
X#define DesDefines -DBIG -DMSBFIRST -DMUSTALIGN
X#define Bitsize32 YES
X
X/* The default here is to use the streams interface for Xlib, but various
X * other things (X server, font server, font library, phigs, xdm chooser)
X * still depend on sockets being around, so we always link with -lsocket.
X */
X#define ExtraLibraries -lsocket -lnsl -lc -L /usr/ucblib -lucb
X#define BootstrapCFlags -Dncr3000
X#define NeedWidePrototypes NO /* experimental */
X#define LibraryRules "sv4Lib.rules" /* Additive libraries screw us up */
X#define SharedLibraryLoadFlags -G
X#define PositionIndependentCFlags -K PIC
END_OF_config/ncr.cf
if test 1756 -ne `wc -c <config/ncr.cf`; then
echo shar: \"config/ncr.cf\" unpacked with wrong size!
fi
# end of overwriting check
fi
if test -f config/sv4Lib.rules -a "${1}" != "-c" ; then
echo shar: Will not over-write existing file \"config/sv4Lib.rules\"
else
echo shar: Extracting \"config/sv4Lib.rules\" \(2398 characters\)
sed "s/^X//" >config/sv4Lib.rules <<'END_OF_config/sv4Lib.rules'
X/**/# $XConsortium: sv4Lib.rules,v 1.8 91/07/19 15:38:53 rws Exp $
X
X/*
X * SVR4 shared library rules
X */
X
X#ifndef HasSharedLibraries
X#define HasSharedLibraries YES
X#endif
X#ifndef SharedDataSeparation
X#define SharedDataSeparation NO
X#endif
X#ifndef SharedCodeDef
X#define SharedCodeDef /**/
X#endif
X#ifndef SharedLibraryDef
X#define SharedLibraryDef /**/
X#endif
X#ifndef ShLibIncludeFile
X#define ShLibIncludeFile <sv4Lib.tmpl>
X#endif
X#ifndef SharedLibraryLoadFlags
X#define SharedLibraryLoadFlags -G -z text
X#endif
X#ifndef PositionIndependentCFlags
X#define PositionIndependentCFlags -K PIC
X#endif
X
X#if HasSharedLibraries
X/*
X * InstallSharedLibrary - generate rules to install the shared library.
X */
X#ifndef InstallSharedLibrary
X#define InstallSharedLibrary(libname,rev,dest) @@\
Xinstall:: Concat(lib,libname.so.rev) @@\
X MakeDir($(DESTDIR)dest) @@\
X $(INSTALL) -c $(INSTLIBFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest @@\
X $(RM) Concat($(DESTDIR)dest/lib,libname.so) @@\
X $(LN) Concat(lib,libname.so.rev) Concat($(DESTDIR)dest/lib,libname.so)
X
X#endif /* InstallSharedLibrary */
X
X/*
X * InstallSharedLibraryData - generate rules to install the shared library data
X */
X#ifndef InstallSharedLibraryData
X#define InstallSharedLibraryData(libname,rev,dest)
X#endif /* InstallSharedLibraryData */
X
X#ifndef Concat
X#define Concat(x,y) x/**/y
X#endif
X
X/*
X * SharedLibraryTarget - generate rules to create a shared library;
X * build it into a different name so that we do not hose people by having
X * the library gone for long periods.
X */
X#ifndef SVR4SharedLibraryTarget
X#define SVR4SharedLibraryTarget(libname,rev,solist,down,up) @@\
XAllTarget(Concat(lib,libname.so.rev)) @@\
X @@\
XConcat(lib,libname.so.rev): solist @@\
X $(RM) $@~ @@\
X (cd down; $(LD) -o up/$@~ $(SHLIBLDFLAGS) -h $@ solist) @@\
X $(RM) $@ @@\
X $(MV) $@~ $@ @@\
X $(RM) Concat(lib,libname.so) @@\
X $(LN) $@ Concat(lib,libname.so) @@\
X @@\
Xclean:: @@\
X $(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so)
X
X#endif /* SharedLibraryTarget */
X
X#define SharedLibraryTarget(libname,deps) @@\
X SVR4SharedLibraryTarget(libname,0,*.o,shared,..)
X/*
X * SharedLibraryDataTarget - generate rules to create shlib data file;
X */
X#ifndef SharedLibraryDataTarget
X#define SharedLibraryDataTarget(libname,rev,salist)
X#endif /* SharedLibraryTarget */
X
X#endif /* HasSharedLibraries */
END_OF_config/sv4Lib.rules
if test 2398 -ne `wc -c <config/sv4Lib.rules`; then
echo shar: \"config/sv4Lib.rules\" unpacked with wrong size!
fi
# end of overwriting check
fi
echo shar: End of shell archive.
exit 0
- ----
Tony Lill, Tony.Lill@Waterloo.NCR.COM
President, A. J. Lill Consultants (519) 650 0660
539 Grand Valley Dr., Cambridge, Ont. (519) 653 9732
presently at E&M Waterloo, NCR Canada Ltd. (519) 884 1710 x624
voice plus 643 1624
"Welcome to All Things UNIX, where if it's not UNIX, it's CRAP!"
------- End of Forwarded Message
