d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

KerberosIV deorbit sequence: Un-teach sysinstall about KerberosIV. I'm

Browse Source 
not 100% sure that I've done this in the right way. If folks want to
revisit this, please be my guest.
This commit is contained in:
Mark Murray 2003-03-08 12:07:13 +00:00
parent 19cc9881b2
commit 4b48036b9b
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=111991
6 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
usr.sbin/sade/menus.c
View File

@ -46,7 +46,7 @@ setSrc(dialogMenuItem *self)
Dists |= DIST_SRC;
SrcDists = DIST_SRC_ALL;
CRYPTODists |= (DIST_CRYPTO_SCRYPTO | DIST_CRYPTO_SSECURE |
DIST_CRYPTO_SKERBEROS4 | DIST_CRYPTO_SKERBEROS5);
DIST_CRYPTO_SKERBEROS5);
return DITEM_SUCCESS | DITEM_REDRAW;
}
@ -56,7 +56,7 @@ clearSrc(dialogMenuItem *self)
Dists &= ~DIST_SRC;
SrcDists = 0;
CRYPTODists &= ~(DIST_CRYPTO_SCRYPTO | DIST_CRYPTO_SSECURE |
DIST_CRYPTO_SKERBEROS4 | DIST_CRYPTO_SKERBEROS5);
DIST_CRYPTO_SKERBEROS5);
return DITEM_SUCCESS | DITEM_REDRAW;
}
@ -969,8 +969,6 @@ DMenu MenuSubDistributions = {
#endif
{ " crypto", "Basic encryption services",
dmenuFlagCheck, dmenuSetFlag, NULL, &CRYPTODists, '[', 'X', ']', DIST_CRYPTO_CRYPTO, },
{ " krb4", "KerberosIV authentication services",
dmenuFlagCheck, dmenuSetFlag, NULL, &CRYPTODists, '[', 'X', ']', DIST_CRYPTO_KERBEROS4 },
{ " krb5", "Kerberos5 authentication services",
dmenuFlagCheck, dmenuSetFlag, NULL, &CRYPTODists, '[', 'X', ']', DIST_CRYPTO_KERBEROS5 },
{ " dict", "Spelling checker dictionary files",
@ -1039,8 +1037,6 @@ DMenu MenuSrcDistributions = {
dmenuFlagCheck, dmenuSetFlag, NULL, &CRYPTODists, '[', 'X', ']', DIST_CRYPTO_SCRYPTO },
{ " share", "/usr/src/share (documents and shared files)",
dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_SHARE },
{ " skrb4", "/usr/src/kerberosIV (sources for KerberosIV)",
dmenuFlagCheck, dmenuSetFlag, NULL, &CRYPTODists, '[', 'X', ']', DIST_CRYPTO_SKERBEROS4 },
{ " skrb5", "/usr/src/kerberos5 (sources for Kerberos5)",
dmenuFlagCheck, dmenuSetFlag, NULL, &CRYPTODists, '[', 'X', ']', DIST_CRYPTO_SKERBEROS5 },
{ " ssecure", "/usr/src/secure (BSD encryption sources)",

2
usr.sbin/sade/sade.8
View File

@ -449,8 +449,6 @@ Compatibility with
systems only)
.It Li ports
The ports collection.
.It Li krb4
KerberosIV binaries.
.It Li krb5
Kerberos5 binaries.
.It Li ssecure

4
usr.sbin/sysinstall/dist.c
View File

@ -110,11 +110,9 @@ static Distribution DistTable[] = {
/* The CRYPTO distribution */
static Distribution CRYPTODistTable[] = {
DTE_TARBALL("crypto", &CRYPTODists, CRYPTO_CRYPTO, "/"),
DTE_TARBALL("krb4", &CRYPTODists, CRYPTO_KERBEROS4, "/"),
DTE_TARBALL("krb5", &CRYPTODists, CRYPTO_KERBEROS5, "/"),
DTE_TARBALL("ssecure", &CRYPTODists, CRYPTO_SSECURE, "/usr/src"),
DTE_TARBALL("scrypto", &CRYPTODists, CRYPTO_SCRYPTO, "/usr/src"),
DTE_TARBALL("skrb4", &CRYPTODists, CRYPTO_SKERBEROS4, "/usr/src"),
DTE_TARBALL("skrb5", &CRYPTODists, CRYPTO_SKERBEROS5, "/usr/src"),
{ NULL },
};
@ -266,7 +264,7 @@ distVerifyFlags(void)
if (SrcDists)
Dists |= DIST_SRC;
if (CRYPTODists) {
if (CRYPTODists & (DIST_CRYPTO_KERBEROS4 | DIST_CRYPTO_KERBEROS5))
if (CRYPTODists & DIST_CRYPTO_KERBEROS5)
CRYPTODists |= DIST_CRYPTO_CRYPTO;
Dists |= DIST_CRYPTO;
}

1
usr.sbin/sysinstall/installUpgrade.c
View File

@ -84,7 +84,6 @@ static HitList etc_files [] = {
{ JUST_COPY, "hosts.equiv", TRUE, NULL },
{ JUST_COPY, "hosts.lpd", TRUE, NULL },
{ JUST_COPY, "inetd.conf", TRUE, NULL },
{ JUST_COPY, "kerberosIV", TRUE, NULL },
{ JUST_COPY, "localtime", TRUE, NULL },
{ JUST_COPY, "login.access", TRUE, NULL },
{ JUST_COPY, "login.conf", TRUE, NULL },

8
usr.sbin/sysinstall/menus.c
View File

@ -46,7 +46,7 @@ setSrc(dialogMenuItem *self)
Dists |= DIST_SRC;
SrcDists = DIST_SRC_ALL;
CRYPTODists |= (DIST_CRYPTO_SCRYPTO | DIST_CRYPTO_SSECURE |
DIST_CRYPTO_SKERBEROS4 | DIST_CRYPTO_SKERBEROS5);
DIST_CRYPTO_SKERBEROS5);
return DITEM_SUCCESS | DITEM_REDRAW;
}
@ -56,7 +56,7 @@ clearSrc(dialogMenuItem *self)
Dists &= ~DIST_SRC;
SrcDists = 0;
CRYPTODists &= ~(DIST_CRYPTO_SCRYPTO | DIST_CRYPTO_SSECURE |
DIST_CRYPTO_SKERBEROS4 | DIST_CRYPTO_SKERBEROS5);
DIST_CRYPTO_SKERBEROS5);
return DITEM_SUCCESS | DITEM_REDRAW;
}
@ -969,8 +969,6 @@ DMenu MenuSubDistributions = {
#endif
{ " crypto", "Basic encryption services",
dmenuFlagCheck, dmenuSetFlag, NULL, &CRYPTODists, '[', 'X', ']', DIST_CRYPTO_CRYPTO, },
{ " krb4", "KerberosIV authentication services",
dmenuFlagCheck, dmenuSetFlag, NULL, &CRYPTODists, '[', 'X', ']', DIST_CRYPTO_KERBEROS4 },
{ " krb5", "Kerberos5 authentication services",
dmenuFlagCheck, dmenuSetFlag, NULL, &CRYPTODists, '[', 'X', ']', DIST_CRYPTO_KERBEROS5 },
{ " dict", "Spelling checker dictionary files",
@ -1039,8 +1037,6 @@ DMenu MenuSrcDistributions = {
dmenuFlagCheck, dmenuSetFlag, NULL, &CRYPTODists, '[', 'X', ']', DIST_CRYPTO_SCRYPTO },
{ " share", "/usr/src/share (documents and shared files)",
dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_SHARE },
{ " skrb4", "/usr/src/kerberosIV (sources for KerberosIV)",
dmenuFlagCheck, dmenuSetFlag, NULL, &CRYPTODists, '[', 'X', ']', DIST_CRYPTO_SKERBEROS4 },
{ " skrb5", "/usr/src/kerberos5 (sources for Kerberos5)",
dmenuFlagCheck, dmenuSetFlag, NULL, &CRYPTODists, '[', 'X', ']', DIST_CRYPTO_SKERBEROS5 },
{ " ssecure", "/usr/src/secure (BSD encryption sources)",

2
usr.sbin/sysinstall/sysinstall.8
View File

@ -449,8 +449,6 @@ Compatibility with
systems only)
.It Li ports
The ports collection.
.It Li krb4
KerberosIV binaries.
.It Li krb5
Kerberos5 binaries.
.It Li ssecure