summaryrefslogtreecommitdiffstats
path: root/release/sysinstall
diff options
context:
space:
mode:
authorjkh <jkh@FreeBSD.org>2000-10-26 13:19:02 +0000
committerjkh <jkh@FreeBSD.org>2000-10-26 13:19:02 +0000
commite4d093e47ac5daf7c3347cc8f63f47c33a48d335 (patch)
tree32177119d54967797339b6997567383314a763c4 /release/sysinstall
parent9018a02c925a31789dec50f88f775ddb5649876f (diff)
downloadFreeBSD-src-e4d093e47ac5daf7c3347cc8f63f47c33a48d335.zip
FreeBSD-src-e4d093e47ac5daf7c3347cc8f63f47c33a48d335.tar.gz
More explicitly set crypto bits.
Partially submitted by: Jeff Kletsky <jeff@spotlife.com>
Diffstat (limited to 'release/sysinstall')
-rw-r--r--release/sysinstall/dist.c5
-rw-r--r--release/sysinstall/dist.h22
2 files changed, 18 insertions, 9 deletions
diff --git a/release/sysinstall/dist.c b/release/sysinstall/dist.c
index e70f446..179f4a3 100644
--- a/release/sysinstall/dist.c
+++ b/release/sysinstall/dist.c
@@ -290,8 +290,7 @@ distSetDeveloper(dialogMenuItem *self)
distReset(NULL);
Dists = _DIST_DEVELOPER;
SrcDists = DIST_SRC_ALL;
- CRYPTODists |= (DIST_CRYPTO_SCRYPTO | DIST_CRYPTO_SSECURE |
- DIST_CRYPTO_SKERBEROS4 | DIST_CRYPTO_SKERBEROS5);
+ CRYPTODists = DIST_CRYPTO_ALL;
i = distMaybeSetPorts(self);
distVerifyFlags();
return i;
@@ -316,6 +315,7 @@ distSetKernDeveloper(dialogMenuItem *self)
distReset(NULL);
Dists = _DIST_DEVELOPER;
SrcDists = DIST_SRC_SYS;
+ CRYPTODists |= DIST_CRYPTO_BIN;
i = distMaybeSetPorts(self);
distVerifyFlags();
return i;
@@ -339,6 +339,7 @@ distSetUser(dialogMenuItem *self)
distReset(NULL);
Dists = _DIST_USER;
+ CRYPTODists |= DIST_CRYPTO_BIN;
i = distMaybeSetPorts(self);
distVerifyFlags();
return i;
diff --git a/release/sysinstall/dist.h b/release/sysinstall/dist.h
index edf00c9..e939ea5 100644
--- a/release/sysinstall/dist.h
+++ b/release/sysinstall/dist.h
@@ -26,13 +26,6 @@
#define DIST_LOCAL 0x20000
#define DIST_ALL 0x3FFFF
-/* Canned distribution sets */
-#define _DIST_USER \
- ( DIST_BIN | DIST_DOC | DIST_MANPAGES | DIST_DICT | DIST_CRYPTO )
-
-#define _DIST_DEVELOPER \
- ( _DIST_USER | DIST_PROFLIBS | DIST_INFO | DIST_SRC )
-
/* Subtypes for CRYPTO distribution */
#define DIST_CRYPTO_CRYPTO 0x0001
#define DIST_CRYPTO_SCRYPTO 0x0002
@@ -124,4 +117,19 @@
#define DIST_XF86_FONTS_ALL 0x003F
#define DIST_XF86_ALL 0x1FFFF
+/* Canned distribution sets */
+#define _DIST_USER \
+ ( DIST_BIN | DIST_DOC | DIST_MANPAGES | DIST_DICT | DIST_CRYPTO )
+
+#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 */
+
+
+
+
+
OpenPOWER on IntegriCloud