svn commit: r242096 - in head/usr.sbin/bsdconfig: . security

[Devin Teske]

Author: dteske
Date: Thu Oct 25 21:04:11 2012
New Revision: 242096
URL: http://svn.freebsd.org/changeset/base/242096

Log:
  When Xdialog(1) is passed a NULL argument to its `--help' option, Xdialog(1)
  acts like dialog(1) in that it returns exit status 2 when the help button is
  chosen.
  
  Approved by:	adri (co-mentor) (implicit)

Modified:
  head/usr.sbin/bsdconfig/bsdconfig
  head/usr.sbin/bsdconfig/security/kern_securelevel

Modified: head/usr.sbin/bsdconfig/bsdconfig
==============================================================================
--- head/usr.sbin/bsdconfig/bsdconfig	Thu Oct 25 20:45:57 2012	(r242095)
+++ head/usr.sbin/bsdconfig/bsdconfig	Thu Oct 25 21:04:11 2012	(r242096)
@@ -189,7 +189,7 @@ dialog_menu_main()
 		--ok-label \"\$msg_ok\"                 \
 		--cancel-label \"\$msg_exit_bsdconfig\" \
 		--help-button                           \
-		${USE_XDIALOG:+--help \"\$( f_include_help BSDCONFIG )\"} \
+		${USE_XDIALOG:+--help \"\"}             \
 		--menu \"\$prompt\" $size $menu_list    \
 		2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
 	)

Modified: head/usr.sbin/bsdconfig/security/kern_securelevel
==============================================================================
--- head/usr.sbin/bsdconfig/security/kern_securelevel	Thu Oct 25 20:45:57 2012	(r242095)
+++ head/usr.sbin/bsdconfig/security/kern_securelevel	Thu Oct 25 21:04:11 2012	(r242096)
@@ -76,7 +76,7 @@ dialog_menu_main()
 		--ok-label \"\$msg_ok\"            \
 		--cancel-label \"\$msg_cancel\"    \
 		--help-button                      \
-		${USE_XDIALOG:+--help \"\$( f_include_help SECURELEVEL )\"} \
+		${USE_XDIALOG:+--help \"\"}        \
 		--menu \"\$prompt\" $size          \
 		$menu_list                         \
 		2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD