diff options
| author | Ruslan Ermilov <ru@FreeBSD.org> | 2003-05-22 18:41:16 +0000 |
|---|---|---|
| committer | Ruslan Ermilov <ru@FreeBSD.org> | 2003-05-22 18:41:16 +0000 |
| commit | ca7367cce49327f63afba9d4d8ecb0c7da6d3833 (patch) | |
| tree | da711fb481a7f5ba62b623177d933eebda0f9b10 /usr.sbin/sysinstall/dist.c | |
| parent | a32bb1b53a1341fd3d4dc5e9c097269ba45a0efe (diff) | |
| download | src-ca7367cce49327f63afba9d4d8ecb0c7da6d3833.tar.gz src-ca7367cce49327f63afba9d4d8ecb0c7da6d3833.zip | |
The "krb5" distribution was merged with "crypto", record the death.
Reviewed by: jhb
Approved by: re (jhb)
Notes
Notes:
svn path=/head/; revision=115236
Diffstat (limited to 'usr.sbin/sysinstall/dist.c')
| -rw-r--r-- | usr.sbin/sysinstall/dist.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/usr.sbin/sysinstall/dist.c b/usr.sbin/sysinstall/dist.c index 6a4066b682b9..dbc138e3c27a 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; |