Prepare for K5.

1999-09-19 22:30:39 +00:00 · 1999-09-19 22:30:39 +00:00 · 759d820ee8
commit 759d820ee8
parent 9275f6f375
11 changed files with 23 additions and 23 deletions
--- a/release/Makefile
+++ b/release/Makefile
@ -65,7 +65,7 @@ DIST_DOCS= ABOUT.TXT ERRATA.TXT LAYOUT.TXT README.TXT HARDWARE.TXT \
 #
 COMPAT_DISTS?=	compat1x compat20 compat21 compat22 compat3x
 OTHER_DISTS?=	manpages catpages games proflibs dict info doc
-CRYPTO_DISTS?=	krb des
+CRYPTO_DISTS?=	krb4 des
 BIN_DISTS?=	bin
 DISTRIBUTIONS?=	${BIN_DISTS} ${OTHER_DISTS} ${COMPAT_DISTS} ${CRYPTO_DISTS}
 KERNELS?=	GENERIC
@ -404,7 +404,7 @@ release.6:
 	done
 	# More munition braindeadness.
 	( cd ${RD}/dists && \
-		if [ -f krb/krb.aa ] ; then mv krb/* des && rmdir krb ; fi )
+		if [ -f krb4/krb4.aa ] ; then mv krb4/* des && rmdir krb4 ; fi )
 	touch release.6


--- a/release/sysinstall/dist.c
+++ b/release/sysinstall/dist.c
@ -91,7 +91,7 @@ static Distribution DistTable[] = {
 /* The DES distribution (not for export!) */
 static Distribution DESDistTable[] = {
 { "des",        "/",                    &DESDists,	DIST_DES_DES,		NULL		},
-{ "krb",	"/",			&DESDists,	DIST_DES_KERBEROS,	NULL		},
+{ "krb4",	"/",			&DESDists,	DIST_DES_KERBEROS4,	NULL		},
 { "ssecure",	"/usr/src",		&DESDists,	DIST_DES_SSECURE,	NULL		},
 { "scrypto",	"/usr/src",		&DESDists,	DIST_DES_SCRYPTO,	NULL		},
 { "skerbero",	"/usr/src",		&DESDists,	DIST_DES_SKERBEROS,	NULL		},
@ -198,7 +198,7 @@ distVerifyFlags(void)
    if (SrcDists)
 	Dists |= DIST_SRC;
    if (DESDists) {
-	if (DESDists & DIST_DES_KERBEROS)
+	if (DESDists & DIST_DES_KERBEROS4)
 	    DESDists |= DIST_DES_DES;
 	Dists |= DIST_DES;
    }
--- a/release/sysinstall/dist.h
+++ b/release/sysinstall/dist.h
@ -37,7 +37,7 @@
 #define DIST_DES_DES		0x0001
 #define DIST_DES_SCRYPTO	0x0002
 #define DIST_DES_SSECURE	0x0004
-#define DIST_DES_KERBEROS	0x0008
+#define DIST_DES_KERBEROS4	0x0008
 #define DIST_DES_SKERBEROS	0x0010

 /* Subtypes for SRC distribution */
--- a/release/sysinstall/menus.c
+++ b/release/sysinstall/menus.c
@ -862,9 +862,9 @@ DMenu MenuDESDistributions = {
    NULL,
    { { "des",		"Basic DES encryption services",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_DES, },
-      { "krb",		"Kerberos encryption services",
-	dmenuFlagCheck,	dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_KERBEROS },
-      { "skerbero",	"Sources for Kerberos IV",
+      { "krb4",		"KerberosIV authentication services",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_KERBEROS4 },
+      { "skerbero",	"Sources for Kerberos",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_SKERBEROS },
      { "ssecure",	"Sources for DES",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_SSECURE },
--- a/release/sysinstall/sysinstall.8
+++ b/release/sysinstall/sysinstall.8
@ -412,8 +412,8 @@ Compatibility with
 systems only)
 .It Li ports
 The ports collection.
-.It Li krb
-Kerberos binaries.
+.It Li krb4
+KerberosIV binaries.
 .It Li ssecure
 /usr/src/secure
 .It Li sbase
--- a/usr.sbin/sade/menus.c
+++ b/usr.sbin/sade/menus.c
@ -862,9 +862,9 @@ DMenu MenuDESDistributions = {
    NULL,
    { { "des",		"Basic DES encryption services",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_DES, },
-      { "krb",		"Kerberos encryption services",
-	dmenuFlagCheck,	dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_KERBEROS },
-      { "skerbero",	"Sources for Kerberos IV",
+      { "krb4",		"KerberosIV authentication services",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_KERBEROS4 },
+      { "skerbero",	"Sources for Kerberos",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_SKERBEROS },
      { "ssecure",	"Sources for DES",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_SSECURE },
--- a/usr.sbin/sade/sade.8
+++ b/usr.sbin/sade/sade.8
@ -412,8 +412,8 @@ Compatibility with
 systems only)
 .It Li ports
 The ports collection.
-.It Li krb
-Kerberos binaries.
+.It Li krb4
+KerberosIV binaries.
 .It Li ssecure
 /usr/src/secure
 .It Li sbase
--- a/usr.sbin/sysinstall/dist.c
+++ b/usr.sbin/sysinstall/dist.c
@ -91,7 +91,7 @@ static Distribution DistTable[] = {
 /* The DES distribution (not for export!) */
 static Distribution DESDistTable[] = {
 { "des",        "/",                    &DESDists,	DIST_DES_DES,		NULL		},
-{ "krb",	"/",			&DESDists,	DIST_DES_KERBEROS,	NULL		},
+{ "krb4",	"/",			&DESDists,	DIST_DES_KERBEROS4,	NULL		},
 { "ssecure",	"/usr/src",		&DESDists,	DIST_DES_SSECURE,	NULL		},
 { "scrypto",	"/usr/src",		&DESDists,	DIST_DES_SCRYPTO,	NULL		},
 { "skerbero",	"/usr/src",		&DESDists,	DIST_DES_SKERBEROS,	NULL		},
@ -198,7 +198,7 @@ distVerifyFlags(void)
    if (SrcDists)
 	Dists |= DIST_SRC;
    if (DESDists) {
-	if (DESDists & DIST_DES_KERBEROS)
+	if (DESDists & DIST_DES_KERBEROS4)
 	    DESDists |= DIST_DES_DES;
 	Dists |= DIST_DES;
    }
--- a/usr.sbin/sysinstall/dist.h
+++ b/usr.sbin/sysinstall/dist.h
@ -37,7 +37,7 @@
 #define DIST_DES_DES		0x0001
 #define DIST_DES_SCRYPTO	0x0002
 #define DIST_DES_SSECURE	0x0004
-#define DIST_DES_KERBEROS	0x0008
+#define DIST_DES_KERBEROS4	0x0008
 #define DIST_DES_SKERBEROS	0x0010

 /* Subtypes for SRC distribution */
--- a/usr.sbin/sysinstall/menus.c
+++ b/usr.sbin/sysinstall/menus.c
@ -862,9 +862,9 @@ DMenu MenuDESDistributions = {
    NULL,
    { { "des",		"Basic DES encryption services",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_DES, },
-      { "krb",		"Kerberos encryption services",
-	dmenuFlagCheck,	dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_KERBEROS },
-      { "skerbero",	"Sources for Kerberos IV",
+      { "krb4",		"KerberosIV authentication services",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_KERBEROS4 },
+      { "skerbero",	"Sources for Kerberos",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_SKERBEROS },
      { "ssecure",	"Sources for DES",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_SSECURE },
--- a/usr.sbin/sysinstall/sysinstall.8
+++ b/usr.sbin/sysinstall/sysinstall.8
@ -412,8 +412,8 @@ Compatibility with
 systems only)
 .It Li ports
 The ports collection.
-.It Li krb
-Kerberos binaries.
+.It Li krb4
+KerberosIV binaries.
 .It Li ssecure
 /usr/src/secure
 .It Li sbase