From owner-svn-src-all@FreeBSD.ORG Thu Jun 20 05:40:12 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id DADCAB9E; Thu, 20 Jun 2013 05:40:12 +0000 (UTC) (envelope-from dteske@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id B3D7A1AB3; Thu, 20 Jun 2013 05:40:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5K5eCXN029238; Thu, 20 Jun 2013 05:40:12 GMT (envelope-from dteske@svn.freebsd.org) Received: (from dteske@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5K5eCNR029235; Thu, 20 Jun 2013 05:40:12 GMT (envelope-from dteske@svn.freebsd.org) Message-Id: <201306200540.r5K5eCNR029235@svn.freebsd.org> From: Devin Teske Date: Thu, 20 Jun 2013 05:40:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r252017 - in head/usr.sbin/bsdconfig/security: . include X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Jun 2013 05:40:12 -0000 Author: dteske Date: Thu Jun 20 05:40:11 2013 New Revision: 252017 URL: http://svnweb.freebsd.org/changeset/base/252017 Log: Add debugging (for a case that shouldn't arise, but makes it more obvious if a menu addition is made in one plce but forgotten in another). Modified: head/usr.sbin/bsdconfig/security/include/messages.subr head/usr.sbin/bsdconfig/security/kern_securelevel head/usr.sbin/bsdconfig/security/security Modified: head/usr.sbin/bsdconfig/security/include/messages.subr ============================================================================== --- head/usr.sbin/bsdconfig/security/include/messages.subr Thu Jun 20 03:55:41 2013 (r252016) +++ head/usr.sbin/bsdconfig/security/include/messages.subr Thu Jun 20 05:40:11 2013 (r252017) @@ -46,3 +46,5 @@ msg_securelevel_desc="Configure securele msg_securelevels_menu_text="This menu allows you to select the securelevel your system runs with.\nWhen operating at a securelevel, certain root privileges are disabled,\nwhich may increase resistance to exploits and protect system integrity.\nIn secure mode system flags may not be overridden by the root user,\naccess to direct kernel memory is limited, and kernel modules may not\nbe changed. In highly secure mode, mounted file systems may not be\nmodified on-disk, tampering with the system clock is prohibited. In\nnetwork secure mode configuration changes to firewalling are prohibited.\n " msg_securelevels_menu_title="Securelevel Configuration Menu" msg_system_security_options_menu="System Security Options Menu" +msg_unknown_kern_securelevel_selection="Unknown kern.securelevel selection" +msg_unknown_security_menu_selection="Unknown security menu selection" Modified: head/usr.sbin/bsdconfig/security/kern_securelevel ============================================================================== --- head/usr.sbin/bsdconfig/security/kern_securelevel Thu Jun 20 03:55:41 2013 (r252016) +++ head/usr.sbin/bsdconfig/security/kern_securelevel Thu Jun 20 05:40:11 2013 (r252017) @@ -158,6 +158,8 @@ case "$mtag" in f_sysrc_set kern_securelevel_enable "YES" f_sysrc_set kern_securelevel "3" ;; +*) + f_die 1 "$msg_unknown_kern_securelevel_selection" esac exit $SUCCESS Modified: head/usr.sbin/bsdconfig/security/security ============================================================================== --- head/usr.sbin/bsdconfig/security/security Thu Jun 20 03:55:41 2013 (r252016) +++ head/usr.sbin/bsdconfig/security/security Thu Jun 20 05:40:11 2013 (r252017) @@ -165,6 +165,8 @@ while :; do f_sysrc_set nfs_reserved_port_only "NO" ;; "3 [ ] $msg_nfs_port") # Same; Toggle value f_sysrc_set nfs_reserved_port_only "YES" ;; + *) + f_die 1 "$msg_unknown_security_menu_selection" esac done