[302] in Kerberos-V5-bugs
Steve Lunt: Some patches to V5 B2
tytso@ATHENA.MIT.EDU (tytso@ATHENA.MIT.EDU)
Tue Mar 9 22:48:34 1993
[2353] daemon@ATHENA.MIT.EDU (Steve Lunt) Kerberos 11/06/92 16:49 (307 lines)
Subject: Re: Some patches to V5 B2
Date: Fri, 6 Nov 92 16:02:48 EST
From: Steve Lunt <lunt@ctt.bellcore.com>
To: jik@Athena.MIT.EDU
Cc: kerberos@Athena.MIT.EDU
Here are patches I've made to the Kerberos Version 5 beta #2.
-- Steve
Steven J. Lunt Bellcore
Information Technology Security RRC 1L-213
lunt@bellcore.com 444 Hoes Lane
(908) 699-4244 Piscataway, NJ 08854
Imakefile:
added config-files to SUBDIRS to install manual pages
config-files/Imakefile:
create this file, which installs manual pages
appl/sample/sclient.c:
strange bug with "%*s" in printf
appl/sample/Imakefile:
install binaries
config/Project.tmpl:
support the install of server programs and files
config/site.def:
support the install of server programs and files
GCC should be Gcc
config/sun.cf:
Sun has setenv
GCC should be Gcc
tests/create/Imakefile:
install binary
*** Imakefile.orig Fri Nov 6 11:40:24 1992
--- Imakefile Fri Nov 6 11:40:27 1992
***************
*** 33,39 ****
make ${MFLAGS} depend
make ${MFLAGS} all
! SUBDIRS = include lib kdc admin kadmin slave clients appl tests
LNINSTALLDIRS =
MakeSubdirs($(SUBDIRS))
--- 33,39 ----
make ${MFLAGS} depend
make ${MFLAGS} all
! SUBDIRS = include lib kdc admin kadmin slave clients appl tests config-files
LNINSTALLDIRS =
MakeSubdirs($(SUBDIRS))
*** config-files/Imakefile.orig Fri Nov 6 14:00:11 1992
--- config-files/Imakefile Fri Nov 6 14:01:10 1992
***************
*** 0 ****
--- 1,6 ----
+ all::
+
+ Krb5InstallManPage(krb.conf,$(FILE_MANDIR),$(FILE_MANSUFFIX))
+ Krb5InstallManPage(krb.realms,$(FILE_MANDIR),$(FILE_MANSUFFIX))
+
+ depend::
*** appl/sample/sclient.c.orig Fri Nov 6 11:42:39 1992
--- appl/sample/sclient.c Fri Nov 6 11:42:39 1992
***************
*** 214,221 ****
com_err(argv[0], errno, "while reading data from server");
exit(1);
}
! printf("reply len %d, contents:\n%*s\n",
! recv_data.length,recv_data.length,recv_data.data);
} else {
com_err(argv[0], 0, "no error or reply from sendauth!");
exit(1);
--- 214,222 ----
com_err(argv[0], errno, "while reading data from server");
exit(1);
}
! recv_data.data[recv_data.length] = '\0';
! printf("reply len %d, contents:\n%s\n",
! recv_data.length,recv_data.data);
} else {
com_err(argv[0], 0, "no error or reply from sendauth!");
exit(1);
*** appl/sample/Imakefile.orig Fri Nov 6 11:47:13 1992
--- appl/sample/Imakefile Fri Nov 6 11:47:48 1992
***************
*** 27,34 ****
LOCAL_LIBRARIES = $(KLIB)
SRCS = sclient.c sserver.c
! SimpleTestProgramTarget(sclient)
! SimpleTestProgramTarget(sserver)
DependTarget()
LintTarget()
--- 27,34 ----
LOCAL_LIBRARIES = $(KLIB)
SRCS = sclient.c sserver.c
! Krb5ClientProgramTarget(sclient)
! Krb5ServerProgramTarget(sserver)
DependTarget()
LintTarget()
*** config/Project.tmpl.orig Wed Sep 30 18:36:16 1992
--- config/Project.tmpl Fri Nov 6 13:36:38 1992
***************
*** 73,79 ****
#define DesDefines YouMustFigureOutYourDesDefines
#endif
#ifndef Krb5Root
! #define Krb5Root /krb5
#endif
#ifndef PepsyTarget
--- 73,79 ----
#define DesDefines YouMustFigureOutYourDesDefines
#endif
#ifndef Krb5Root
! #define Krb5Root /usr/local/kerberos.V5
#endif
#ifndef PepsyTarget
***************
*** 80,86 ****
#define PepsyTarget(basename) @@\
.SUFFIXES: .py @@\
basename/**/_defs.h basename/**/_pre_defs.h basename-types.h basename/**/_tables.c: basename-asn.py @@\
! @echo '***Ignore the warning message "Warning: Can'\''t find UNIV.ph failed"' @@\
$(PEPSY) $(PSYFLAGS) $(SRCDIR)basename-asn.py
#endif /* PepsyTarget */
--- 80,86 ----
#define PepsyTarget(basename) @@\
.SUFFIXES: .py @@\
basename/**/_defs.h basename/**/_pre_defs.h basename-types.h basename/**/_tables.c: basename-asn.py @@\
! @echo '***Ignore the warning message "Warning\: Can'\''t find UNIV.ph failed"' @@\
$(PEPSY) $(PSYFLAGS) $(SRCDIR)basename-asn.py
#endif /* PepsyTarget */
***************
*** 260,265 ****
--- 260,270 ----
Krb5SimpleProgramTarget(program,$(ADMIN_BINDIR),$(ADMIN_MANDIR),$(ADMIN_MANSUFFIX))
#endif /* Krb5AdminProgramTarget */
+ #ifndef Krb5ServerProgramTarget
+ #define Krb5ServerProgramTarget(program) @@\
+ Krb5SimpleProgramTarget(program,$(SERVER_BINDIR),$(SERVER_MANDIR),$(SERVER_MANSUFFIX))
+ #endif /* Krb5ServerProgramTarget */
+
#ifndef Krb5ClientProgramTarget
#define Krb5ClientProgramTarget(program) @@\
Krb5SimpleProgramTarget(program,$(CLIENT_BINDIR),$(CLIENT_MANDIR),$(CLIENT_MANSUFFIX))
***************
*** 521,525 ****
--- 526,532 ----
CLIENT_BINDIR = ClientBindir
CLIENT_MANSUFFIX = ClientManSuffix
CLIENT_MANDIR = ClientMandir
+ FILE_MANSUFFIX = FileManSuffix
+ FILE_MANDIR = FileMandir
KRB5_LIBDIR = Krb5Libdir
KRB5_INCDIR = Krb5Incdir
*** config/site.def.orig Wed Sep 30 18:36:16 1992
--- config/site.def Fri Nov 6 13:44:28 1992
***************
*** 51,57 ****
#endif
/* AdminMandir: manual page directory for administrative man pages */
#ifndef AdminMandir
! #define AdminMandir $(KRB5ROOT)/man/man8
#endif
/* ServerManSuffix: man page suffix for server programs */
--- 51,57 ----
#endif
/* AdminMandir: manual page directory for administrative man pages */
#ifndef AdminMandir
! #define AdminMandir $(KRB5ROOT)/man/man$(ADMIN_MANSUFFIX)
#endif
/* ServerManSuffix: man page suffix for server programs */
***************
*** 60,66 ****
#endif
/* ServerMandir: manual page directory for server man pages */
#ifndef ServerMandir
! #define ServerMandir $(KRB5ROOT)/man/man8
#endif
/* ClientManSuffix: man page suffix for client programs */
--- 60,66 ----
#endif
/* ServerMandir: manual page directory for server man pages */
#ifndef ServerMandir
! #define ServerMandir $(KRB5ROOT)/man/man$(SERVER_MANSUFFIX)
#endif
/* ClientManSuffix: man page suffix for client programs */
***************
*** 69,77 ****
#endif
/* ClientMandir: manual page directory for client man pages */
#ifndef ClientMandir
! #define ClientMandir $(KRB5ROOT)/man/man1
#endif
/*
* 3. Binary program install areas.
*/
--- 69,86 ----
#endif
/* ClientMandir: manual page directory for client man pages */
#ifndef ClientMandir
! #define ClientMandir $(KRB5ROOT)/man/man$(CLIENT_MANSUFFIX)
#endif
+ /* FileManSuffix: man page suffix for files */
+ #ifndef FileManSuffix
+ #define FileManSuffix 5
+ #endif
+ /* FileMandir: manual page directory for file man pages */
+ #ifndef FileMandir
+ #define FileMandir $(KRB5ROOT)/man/man$(FILE_MANSUFFIX)
+ #endif
+
/*
* 3. Binary program install areas.
*/
***************
*** 235,247 ****
#endif
#if defined(VaxArchitecture) || defined(RtArchitecture)
! #ifdef HasGCC
#ifdef SourceTop
#define STDCTopIncludes -I$(SRCTOP)/include/stdc-incl
#else
#define STDCTopIncludes -I$(TOP)/include/stdc-incl
#endif
! #endif /* HasGCC */
#endif
#ifdef UltrixArchitecture
--- 244,256 ----
#endif
#if defined(VaxArchitecture) || defined(RtArchitecture)
! #ifdef HasGcc
#ifdef SourceTop
#define STDCTopIncludes -I$(SRCTOP)/include/stdc-incl
#else
#define STDCTopIncludes -I$(TOP)/include/stdc-incl
#endif
! #endif /* HasGcc */
#endif
#ifdef UltrixArchitecture
*** config/sun.cf.orig Wed Sep 30 18:36:16 1992
--- config/sun.cf Fri Nov 6 13:46:53 1992
***************
*** 33,40 ****
#define HasStdlibH YES
#define HasInet YES
#define HasPutenv YES
#define HasBsearch YES
! #define HasGCC NO
#define UseSysTimeH YES
#define IsPOSIX NO
#define Bitsize32 YES
--- 33,41 ----
#define HasStdlibH YES
#define HasInet YES
#define HasPutenv YES
+ #define HaveSetenv YES
#define HasBsearch YES
! #define HasGcc NO
#define UseSysTimeH YES
#define IsPOSIX NO
#define Bitsize32 YES
*** tests/create/Imakefile.orig Wed Sep 30 18:36:19 1992
--- tests/create/Imakefile Fri Nov 6 15:03:35 1992
***************
*** 25,30 ****
DEPLIBS = $(DEPKDBLIB) $(DEPKLIB)
LOCAL_LIBRARIES = $(KDBLIB) $(KLIB)
! SimpleTestProgramTarget(kdb5_mkdums)
DependTarget()
--- 25,30 ----
DEPLIBS = $(DEPKDBLIB) $(DEPKLIB)
LOCAL_LIBRARIES = $(KDBLIB) $(KLIB)
! Krb5ServerProgramTarget(kdb5_mkdums)
DependTarget()
--[2353]--
