From owner-svn-src-head@FreeBSD.ORG  Sat Jun  8 18:13:42 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 B90B7505;
 Sat,  8 Jun 2013 18:13:42 +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 AAD3D1E73;
 Sat,  8 Jun 2013 18:13:42 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r58IDgdv056473;
 Sat, 8 Jun 2013 18:13:42 GMT (envelope-from dteske@svn.freebsd.org)
Received: (from dteske@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r58IDg8o056471;
 Sat, 8 Jun 2013 18:13:42 GMT (envelope-from dteske@svn.freebsd.org)
Message-Id: <201306081813.r58IDg8o056471@svn.freebsd.org>
From: Devin Teske <dteske@FreeBSD.org>
Date: Sat, 8 Jun 2013 18:13:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251545 - head/usr.sbin/bsdconfig/usermgmt/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: Sat, 08 Jun 2013 18:13:42 -0000

Author: dteske
Date: Sat Jun  8 18:13:42 2013
New Revision: 251545
URL: http://svnweb.freebsd.org/changeset/base/251545

Log:
  Fix a regression introduced by r251544; if user chooses "NO" when being
  asked if they would like to disable password authentication for the account,
  loop back to prompt them for the password again.

Modified:
  head/usr.sbin/bsdconfig/usermgmt/share/group_input.subr
  head/usr.sbin/bsdconfig/usermgmt/share/user_input.subr

Modified: head/usr.sbin/bsdconfig/usermgmt/share/group_input.subr
==============================================================================
--- head/usr.sbin/bsdconfig/usermgmt/share/group_input.subr	Sat Jun  8 18:08:17 2013	(r251544)
+++ head/usr.sbin/bsdconfig/usermgmt/share/group_input.subr	Sat Jun  8 18:13:42 2013	(r251545)
@@ -241,6 +241,7 @@ f_dialog_input_group_password()
 			local retval=$?
 			[ $retval -eq 255 ] && return $retval # ESC was pressed
 			[ $retval -eq $SUCCESS ] && pw_group_password_disable=1
+			continue # back to password prompt
 		else
 			pw_group_password_disable=
 		fi

Modified: head/usr.sbin/bsdconfig/usermgmt/share/user_input.subr
==============================================================================
--- head/usr.sbin/bsdconfig/usermgmt/share/user_input.subr	Sat Jun  8 18:08:17 2013	(r251544)
+++ head/usr.sbin/bsdconfig/usermgmt/share/user_input.subr	Sat Jun  8 18:13:42 2013	(r251545)
@@ -338,6 +338,7 @@ f_dialog_input_password()
 			local retval=$?
 			[ $retval -eq 255 ] && return $retval # ESC was pressed
 			[ $retval -eq $SUCCESS ] && pw_password_disable=1
+			continue # back to password prompt
 		else
 			pw_password_disable=
 		fi