diff options
author | markm <markm@FreeBSD.org> | 1999-09-19 22:30:39 +0000 |
---|---|---|
committer | markm <markm@FreeBSD.org> | 1999-09-19 22:30:39 +0000 |
commit | 9c29053eed8bc22473173d8a35050f54b409418b (patch) | |
tree | 989ea5a17e2805c7110720baaa54e4a2204c0bd7 | |
parent | d8bdd858554e1d430abb5b02e3986d2b87049060 (diff) | |
download | FreeBSD-src-9c29053eed8bc22473173d8a35050f54b409418b.zip FreeBSD-src-9c29053eed8bc22473173d8a35050f54b409418b.tar.gz |
Prepare for K5.
-rw-r--r-- | release/Makefile | 4 | ||||
-rw-r--r-- | release/sysinstall/dist.c | 4 | ||||
-rw-r--r-- | release/sysinstall/dist.h | 2 | ||||
-rw-r--r-- | release/sysinstall/menus.c | 6 | ||||
-rw-r--r-- | release/sysinstall/sysinstall.8 | 4 | ||||
-rw-r--r-- | usr.sbin/sade/menus.c | 6 | ||||
-rw-r--r-- | usr.sbin/sade/sade.8 | 4 | ||||
-rw-r--r-- | usr.sbin/sysinstall/dist.c | 4 | ||||
-rw-r--r-- | usr.sbin/sysinstall/dist.h | 2 | ||||
-rw-r--r-- | usr.sbin/sysinstall/menus.c | 6 | ||||
-rw-r--r-- | usr.sbin/sysinstall/sysinstall.8 | 4 |
11 files changed, 23 insertions, 23 deletions
diff --git a/release/Makefile b/release/Makefile index a042061..ca5e854 100644 --- 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 diff --git a/release/sysinstall/dist.c b/release/sysinstall/dist.c index efda93f..3596835 100644 --- 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; } diff --git a/release/sysinstall/dist.h b/release/sysinstall/dist.h index 74f248f..2fae0fb 100644 --- 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 */ diff --git a/release/sysinstall/menus.c b/release/sysinstall/menus.c index d637378..cf409ff 100644 --- 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 }, diff --git a/release/sysinstall/sysinstall.8 b/release/sysinstall/sysinstall.8 index 98bc9df..3e6a179 100644 --- 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 diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c index d637378..cf409ff 100644 --- 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 }, diff --git a/usr.sbin/sade/sade.8 b/usr.sbin/sade/sade.8 index 98bc9df..3e6a179 100644 --- 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 diff --git a/usr.sbin/sysinstall/dist.c b/usr.sbin/sysinstall/dist.c index efda93f..3596835 100644 --- 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; } diff --git a/usr.sbin/sysinstall/dist.h b/usr.sbin/sysinstall/dist.h index 74f248f..2fae0fb 100644 --- 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 */ diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c index d637378..cf409ff 100644 --- 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 }, diff --git a/usr.sbin/sysinstall/sysinstall.8 b/usr.sbin/sysinstall/sysinstall.8 index 98bc9df..3e6a179 100644 --- 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 |