diff options
author | jkh <jkh@FreeBSD.org> | 2000-09-24 06:44:00 +0000 |
---|---|---|
committer | jkh <jkh@FreeBSD.org> | 2000-09-24 06:44:00 +0000 |
commit | 197520a6f5bddf655427d52dae00f6086b44cb5a (patch) | |
tree | e0d32687a69811ff6555457c8d7cdf8d62261a95 /release | |
parent | 894e597ec76c598cf5c62a1fe6e4d6fcf83e9357 (diff) | |
download | FreeBSD-src-197520a6f5bddf655427d52dae00f6086b44cb5a.zip FreeBSD-src-197520a6f5bddf655427d52dae00f6086b44cb5a.tar.gz |
One small tweak on the security profile code; don't be verbose if
setting up default values for an express/custom install. It would
be confusing to see the informational popup completely out of context.
Diffstat (limited to 'release')
-rw-r--r-- | release/sysinstall/config.c | 51 | ||||
-rw-r--r-- | release/sysinstall/install.c | 4 |
2 files changed, 29 insertions, 26 deletions
diff --git a/release/sysinstall/config.c b/release/sysinstall/config.c index cf37e94..ab56c81 100644 --- a/release/sysinstall/config.c +++ b/release/sysinstall/config.c @@ -492,14 +492,15 @@ configSecurityFascist(dialogMenuItem *self) variable_set2("kern_securelevel", "2", 1); /* More fascist stuff should go here */ - msgConfirm("High security settings have been selected.\n\n" - "This means that most \"popular\" network services and\n" - "mechanisms like inetd(8) have been DISABLED by default.\n\n" - "PLEASE NOTE that this still does not save you from having\n" - "to properly secure your system in other ways or exercise\n" - "due diligence in your administration, this simply picks\n" - "a more secure set of out-of-box defaults to start with.\n\n" - "To change any of these settings later, edit /etc/rc.conf"); + if (self) + msgConfirm("High security settings have been selected.\n\n" + "This means that most \"popular\" network services and\n" + "mechanisms like inetd(8) have been DISABLED by default.\n\n" + "PLEASE NOTE that this still does not save you from having\n" + "to properly secure your system in other ways or exercise\n" + "due diligence in your administration, this simply picks\n" + "a more secure set of out-of-box defaults to start with.\n\n" + "To change any of these settings later, edit /etc/rc.conf"); restorescr(w); return DITEM_SUCCESS; @@ -519,14 +520,15 @@ configSecurityModerate(dialogMenuItem *self) variable_set2("sendmail_enable", "YES", 1); variable_set2("sshd_enable", "YES", 1); - msgConfirm("Moderate security settings have been selected.\n\n" - "This means that most \"popular\" network services and\n" - "mechanisms like inetd(8) have been enabled by default\n" - "for a comfortable user experience but with possible\n" - "trade-offs in system security. If this bothers you and\n" - "you know exactly what you are doing, select the high\n" - "high security profile instead.\n\n" - "To change any of these settings later, edit /etc/rc.conf"); + if (self) + msgConfirm("Moderate security settings have been selected.\n\n" + "This means that most \"popular\" network services and\n" + "mechanisms like inetd(8) have been enabled by default\n" + "for a comfortable user experience but with possible\n" + "trade-offs in system security. If this bothers you and\n" + "you know exactly what you are doing, select the high\n" + "high security profile instead.\n\n" + "To change any of these settings later, edit /etc/rc.conf"); restorescr(w); return DITEM_SUCCESS; @@ -542,14 +544,15 @@ configSecurityLiberal(dialogMenuItem *self) variable_set2("sendmail_enable", "YES", 1); variable_set2("sshd_enable", "YES", 1); - msgConfirm("Liberal security settings have been selected.\n\n" - "This means that most \"popular\" network services and\n" - "mechanisms like inetd(8) have been enabled by default\n" - "for the most comfortable user experience but with possible\n" - "trade-offs in system security. If this bothers you, select\n" - "the medium security profile or, if you know exactly what you\n" - "are doing, the high security profile instead.\n\n" - "To change any of these settings later, edit /etc/rc.conf"); + if (self) + msgConfirm("Liberal security settings have been selected.\n\n" + "This means that most \"popular\" network services and\n" + "mechanisms like inetd(8) have been enabled by default\n" + "for the most comfortable user experience but with possible\n" + "trade-offs in system security. If this bothers you, select\n" + "the medium security profile or, if you know exactly what you\n" + "are doing, the high security profile instead.\n\n" + "To change any of these settings later, edit /etc/rc.conf"); restorescr(w); return DITEM_SUCCESS; diff --git a/release/sysinstall/install.c b/release/sysinstall/install.c index cc53f3e..14232c7 100644 --- a/release/sysinstall/install.c +++ b/release/sysinstall/install.c @@ -473,7 +473,7 @@ installExpress(dialogMenuItem *self) if (DITEM_STATUS((i = installCommit(self))) == DITEM_SUCCESS) { i |= DITEM_LEAVE_MENU; /* Set default security level */ - configSecurityModerate(self); + configSecurityModerate(NULL); /* Give user the option of one last configuration spree */ installConfigure(); @@ -645,7 +645,7 @@ installCustomCommit(dialogMenuItem *self) i = installCommit(self); if (DITEM_STATUS(i) == DITEM_SUCCESS) { /* Set default security level */ - configSecurityModerate(self); + configSecurityModerate(NULL); /* Give user the option of one last configuration spree */ installConfigure(); |