From owner-svn-src-head@FreeBSD.ORG  Sun Jul 31 03:00:00 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 721D4106564A;
	Sun, 31 Jul 2011 03:00:00 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5E01B8FC12;
	Sun, 31 Jul 2011 03:00:00 +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 p6V300LD026212;
	Sun, 31 Jul 2011 03:00:00 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p6V3003d026210;
	Sun, 31 Jul 2011 03:00:00 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201107310300.p6V3003d026210@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Sun, 31 Jul 2011 03:00:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r224535 - head/usr.sbin/pw
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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, 31 Jul 2011 03:00:00 -0000

Author: delphij
Date: Sun Jul 31 03:00:00 2011
New Revision: 224535
URL: http://svn.freebsd.org/changeset/base/224535

Log:
  Backout r223115 which potentially caused a POLA violation, by restoring
  historic behavior (create the default base directory in pw.conf) before
  I came up with a better fix for this.
  
  Requested by:	nwhitehorn
  Approved by:	re (kib)

Modified:
  head/usr.sbin/pw/pw_user.c

Modified: head/usr.sbin/pw/pw_user.c
==============================================================================
--- head/usr.sbin/pw/pw_user.c	Sat Jul 30 23:42:15 2011	(r224534)
+++ head/usr.sbin/pw/pw_user.c	Sun Jul 31 03:00:00 2011	(r224535)
@@ -163,7 +163,7 @@ pw_user(struct userconf * cnf, int mode,
 	 * If we'll need to use it or we're updating it,
 	 * then create the base home directory if necessary
 	 */
-	if ((arg != NULL || getarg(args, 'm') != NULL) && (getarg(args, 'd') == NULL)) {
+	if (arg != NULL || getarg(args, 'm') != NULL) {
 		int	l = strlen(cnf->home);
 
 		if (l > 1 && cnf->home[l-1] == '/')	/* Shave off any trailing path delimiter */