From 409c2e2e053c01f2931bd7929c68211607b3b49f Mon Sep 17 00:00:00 2001 From: Robert Watson Date: Fri, 21 Dec 2001 18:08:54 +0000 Subject: [PATCH] o Don't make 'Moderate Security Settings' the DEFAULT, as otherwise selecting 'Cancel' to avoid making changes doesn't work. Really, we should deprecate security profiles and move to a more fine-grained model. --- usr.sbin/sade/menus.c | 4 ++-- usr.sbin/sysinstall/menus.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c index 41fdc9a2873d..88f065c11b20 100644 --- a/usr.sbin/sade/menus.c +++ b/usr.sbin/sade/menus.c @@ -2087,8 +2087,8 @@ DMenu MenuSecurityProfile = { "security-related knobs in /etc/rc.conf.", "Select a canned security profile - F1 for help", "security", /* help file */ - { { "X Exit", "Exit this menu (returning to previous)", NULL, configSecurityModerate }, - { "Medium", "Moderate security settings [DEFAULT].", NULL, configSecurityModerate }, + { { "X Exit", "Exit this menu (returning to previous)", NULL, dmenuExit }, + { "Medium", "Moderate security settings.", NULL, configSecurityModerate }, { "Extreme", "Very restrictive security settings.", NULL, configSecurityExtreme }, { NULL } }, }; diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c index 41fdc9a2873d..88f065c11b20 100644 --- a/usr.sbin/sysinstall/menus.c +++ b/usr.sbin/sysinstall/menus.c @@ -2087,8 +2087,8 @@ DMenu MenuSecurityProfile = { "security-related knobs in /etc/rc.conf.", "Select a canned security profile - F1 for help", "security", /* help file */ - { { "X Exit", "Exit this menu (returning to previous)", NULL, configSecurityModerate }, - { "Medium", "Moderate security settings [DEFAULT].", NULL, configSecurityModerate }, + { { "X Exit", "Exit this menu (returning to previous)", NULL, dmenuExit }, + { "Medium", "Moderate security settings.", NULL, configSecurityModerate }, { "Extreme", "Very restrictive security settings.", NULL, configSecurityExtreme }, { NULL } }, };