diff options
Diffstat (limited to 'usr.sbin')
-rw-r--r-- | usr.sbin/sade/menus.c | 2 | ||||
-rw-r--r-- | usr.sbin/sade/sade.8 | 6 | ||||
-rw-r--r-- | usr.sbin/sysinstall/dist.c | 8 | ||||
-rw-r--r-- | usr.sbin/sysinstall/dist.h | 10 | ||||
-rw-r--r-- | usr.sbin/sysinstall/menus.c | 2 | ||||
-rw-r--r-- | usr.sbin/sysinstall/sysinstall.8 | 6 |
6 files changed, 8 insertions, 26 deletions
diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c index 0d7b4cf..16ac0bd 100644 --- a/usr.sbin/sade/menus.c +++ b/usr.sbin/sade/menus.c @@ -967,8 +967,6 @@ DMenu MenuSubDistributions = { #endif { " crypto", "Basic encryption services", dmenuFlagCheck, dmenuSetFlag, NULL, &CRYPTODists, '[', 'X', ']', DIST_CRYPTO_CRYPTO, }, - { " krb5", "Kerberos5 authentication services", - dmenuFlagCheck, dmenuSetFlag, NULL, &CRYPTODists, '[', 'X', ']', DIST_CRYPTO_KERBEROS5 }, { " dict", "Spelling checker dictionary files", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_DICT }, { " doc", "Miscellaneous FreeBSD online docs", diff --git a/usr.sbin/sade/sade.8 b/usr.sbin/sade/sade.8 index 48eac85..929a121 100644 --- a/usr.sbin/sade/sade.8 +++ b/usr.sbin/sade/sade.8 @@ -392,7 +392,7 @@ Resets all selected distributions to the empty set (no distributions selected). .Sy Variables : None .It distSetCustom -Allows the selection of a custom distribution set (e.g. not just on of the +Allows the selection of a custom distribution set (e.g. not just one of the existing "canned" sets) with no user interaction. .Pp .Sy Variables : @@ -449,8 +449,6 @@ Compatibility with systems only) .It Li ports The ports collection. -.It Li krb5 -Kerberos5 binaries. .It Li ssecure /usr/src/secure .It Li sbase @@ -465,6 +463,8 @@ Kerberos5 binaries. /usr/src/games .It Li sinclude /usr/src/include +.It Li skrb5 +/usr/src/kerberos5 .It Li slib /usr/src/lib .It Li slibexec diff --git a/usr.sbin/sysinstall/dist.c b/usr.sbin/sysinstall/dist.c index 6a4066b..dbc138e 100644 --- a/usr.sbin/sysinstall/dist.c +++ b/usr.sbin/sysinstall/dist.c @@ -110,7 +110,6 @@ static Distribution DistTable[] = { /* The CRYPTO distribution */ static Distribution CRYPTODistTable[] = { DTE_TARBALL("crypto", &CRYPTODists, CRYPTO_CRYPTO, "/"), - DTE_TARBALL("krb5", &CRYPTODists, CRYPTO_KERBEROS5, "/"), DTE_TARBALL("ssecure", &CRYPTODists, CRYPTO_SSECURE, "/usr/src"), DTE_TARBALL("scrypto", &CRYPTODists, CRYPTO_SCRYPTO, "/usr/src"), DTE_TARBALL("skrb5", &CRYPTODists, CRYPTO_SKERBEROS5, "/usr/src"), @@ -263,11 +262,8 @@ distVerifyFlags(void) { if (SrcDists) Dists |= DIST_SRC; - if (CRYPTODists) { - if (CRYPTODists & DIST_CRYPTO_KERBEROS5) - CRYPTODists |= DIST_CRYPTO_CRYPTO; + if (CRYPTODists) Dists |= DIST_CRYPTO; - } else if ((Dists & DIST_CRYPTO) && !CRYPTODists) CRYPTODists |= DIST_CRYPTO_ALL; #ifndef X_AS_PKG @@ -378,7 +374,7 @@ distSetKernDeveloper(dialogMenuItem *self) distReset(NULL); Dists = _DIST_DEVELOPER; SrcDists = DIST_SRC_SYS; - CRYPTODists |= DIST_CRYPTO_BIN; + CRYPTODists |= DIST_CRYPTO_CRYPTO; i = distMaybeSetPorts(self); distVerifyFlags(); return i; diff --git a/usr.sbin/sysinstall/dist.h b/usr.sbin/sysinstall/dist.h index b6fc015..c71ee53 100644 --- a/usr.sbin/sysinstall/dist.h +++ b/usr.sbin/sysinstall/dist.h @@ -34,14 +34,7 @@ #define DIST_CRYPTO_CRYPTO 0x0001 #define DIST_CRYPTO_SCRYPTO 0x0002 #define DIST_CRYPTO_SSECURE 0x0004 -#if __FreeBSD__ <= 3 -#define DIST_CRYPTO_KERBEROS 0x0008 -#else -#define DIST_CRYPTO_KERBEROS4 0x0008 -#define DIST_CRYPTO_KERBEROS5 0x0010 -#define DIST_CRYPTO_SKERBEROS4 0x0020 #define DIST_CRYPTO_SKERBEROS5 0x0040 -#endif #define DIST_CRYPTO_ALL 0x007F /* Subtypes for SRC distribution */ @@ -153,9 +146,6 @@ #define _DIST_DEVELOPER \ ( _DIST_USER | DIST_PROFLIBS | DIST_INFO | DIST_SRC ) -#define DIST_CRYPTO_BIN \ - ( DIST_CRYPTO_CRYPTO | DIST_CRYPTO_KERBEROS4 | DIST_CRYPTO_KERBEROS5 ) - #endif /* _DIST_H_INCLUDE */ diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c index 0d7b4cf..16ac0bd 100644 --- a/usr.sbin/sysinstall/menus.c +++ b/usr.sbin/sysinstall/menus.c @@ -967,8 +967,6 @@ DMenu MenuSubDistributions = { #endif { " crypto", "Basic encryption services", dmenuFlagCheck, dmenuSetFlag, NULL, &CRYPTODists, '[', 'X', ']', DIST_CRYPTO_CRYPTO, }, - { " krb5", "Kerberos5 authentication services", - dmenuFlagCheck, dmenuSetFlag, NULL, &CRYPTODists, '[', 'X', ']', DIST_CRYPTO_KERBEROS5 }, { " dict", "Spelling checker dictionary files", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_DICT }, { " doc", "Miscellaneous FreeBSD online docs", diff --git a/usr.sbin/sysinstall/sysinstall.8 b/usr.sbin/sysinstall/sysinstall.8 index 48eac85..929a121 100644 --- a/usr.sbin/sysinstall/sysinstall.8 +++ b/usr.sbin/sysinstall/sysinstall.8 @@ -392,7 +392,7 @@ Resets all selected distributions to the empty set (no distributions selected). .Sy Variables : None .It distSetCustom -Allows the selection of a custom distribution set (e.g. not just on of the +Allows the selection of a custom distribution set (e.g. not just one of the existing "canned" sets) with no user interaction. .Pp .Sy Variables : @@ -449,8 +449,6 @@ Compatibility with systems only) .It Li ports The ports collection. -.It Li krb5 -Kerberos5 binaries. .It Li ssecure /usr/src/secure .It Li sbase @@ -465,6 +463,8 @@ Kerberos5 binaries. /usr/src/games .It Li sinclude /usr/src/include +.It Li skrb5 +/usr/src/kerberos5 .It Li slib /usr/src/lib .It Li slibexec |