From owner-svn-src-head@FreeBSD.ORG  Sun Jun  2 23:15:13 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 68BF3708;
 Sun,  2 Jun 2013 23:15:13 +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 5AB981CA1;
 Sun,  2 Jun 2013 23:15:13 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r52NFC37093009;
 Sun, 2 Jun 2013 23:15:12 GMT (envelope-from dteske@svn.freebsd.org)
Received: (from dteske@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r52NFCGk093008;
 Sun, 2 Jun 2013 23:15:12 GMT (envelope-from dteske@svn.freebsd.org)
Message-Id: <201306022315.r52NFCGk093008@svn.freebsd.org>
From: Devin Teske <dteske@FreeBSD.org>
Date: Sun, 2 Jun 2013 23:15:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251274 - head/usr.sbin/bsdconfig/share
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: Sun, 02 Jun 2013 23:15:13 -0000

Author: dteske
Date: Sun Jun  2 23:15:12 2013
New Revision: 251274
URL: http://svnweb.freebsd.org/changeset/base/251274

Log:
  Fix a bug in which the user's choice to Cancel was not properly recognized.

Modified:
  head/usr.sbin/bsdconfig/share/mustberoot.subr

Modified: head/usr.sbin/bsdconfig/share/mustberoot.subr
==============================================================================
--- head/usr.sbin/bsdconfig/share/mustberoot.subr	Sun Jun  2 23:12:32 2013	(r251273)
+++ head/usr.sbin/bsdconfig/share/mustberoot.subr	Sun Jun  2 23:15:12 2013	(r251274)
@@ -176,8 +176,12 @@ f_become_root_via_sudo()
 				retval=$?
 
 				# Catch X11-related errors
-				[ $retval -eq 255 ] &&
+				if [ $retval -eq 255 ]; then
 					f_die $retval "$password"
+				elif [ $retval -ne 0 ]; then
+					# User cancelled
+					exit $retval
+				fi
 			else
 				password=$( $DIALOG \
 					--title "$DIALOG_TITLE"         \