From owner-svn-src-head@FreeBSD.ORG  Thu Oct 25 21:04:12 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 3D2782C3;
 Thu, 25 Oct 2012 21:04:12 +0000 (UTC)
 (envelope-from dteske@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id 22ECE8FC19;
 Thu, 25 Oct 2012 21:04:12 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9PL4BFh045470;
 Thu, 25 Oct 2012 21:04:11 GMT (envelope-from dteske@svn.freebsd.org)
Received: (from dteske@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9PL4BvW045467;
 Thu, 25 Oct 2012 21:04:11 GMT (envelope-from dteske@svn.freebsd.org)
Message-Id: <201210252104.q9PL4BvW045467@svn.freebsd.org>
From: Devin Teske <dteske@FreeBSD.org>
Date: Thu, 25 Oct 2012 21:04:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r242096 - in head/usr.sbin/bsdconfig: . security
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 25 Oct 2012 21:04:12 -0000

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