From owner-svn-src-stable-8@FreeBSD.ORG  Fri Jul 15 18:10:59 2011
Return-Path: <owner-svn-src-stable-8@FreeBSD.ORG>
Delivered-To: svn-src-stable-8@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B8F4F106566B;
	Fri, 15 Jul 2011 18:10:59 +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 A85168FC0A;
	Fri, 15 Jul 2011 18:10:59 +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 p6FIAxwU090270;
	Fri, 15 Jul 2011 18:10:59 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p6FIAxmZ090268;
	Fri, 15 Jul 2011 18:10:59 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201107151810.p6FIAxmZ090268@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Fri, 15 Jul 2011 18:10:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r224065 - stable/8/usr.sbin/pw
X-BeenThere: svn-src-stable-8@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 8-stable src tree
	<svn-src-stable-8.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-8>
List-Post: <mailto:svn-src-stable-8@freebsd.org>
List-Help: <mailto:svn-src-stable-8-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 15 Jul 2011 18:10:59 -0000

Author: delphij
Date: Fri Jul 15 18:10:59 2011
New Revision: 224065
URL: http://svn.freebsd.org/changeset/base/224065

Log:
  MFC r223115:
  
  Don't attempt to create the base directory when -d is specified.

Modified:
  stable/8/usr.sbin/pw/pw_user.c
Directory Properties:
  stable/8/usr.sbin/pw/   (props changed)

Modified: stable/8/usr.sbin/pw/pw_user.c
==============================================================================
--- stable/8/usr.sbin/pw/pw_user.c	Fri Jul 15 17:36:11 2011	(r224064)
+++ stable/8/usr.sbin/pw/pw_user.c	Fri Jul 15 18:10:59 2011	(r224065)
@@ -170,7 +170,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) {
+	if ((arg != NULL || getarg(args, 'm') != NULL) && (getarg(args, 'd') == NULL)) {
 		int	l = strlen(cnf->home);
 
 		if (l > 1 && cnf->home[l-1] == '/')	/* Shave off any trailing path delimiter */