From owner-svn-src-all@FreeBSD.ORG Fri Jul 29 15:51:42 2011 Return-Path: Delivered-To: svn-src-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5952F106566B; Fri, 29 Jul 2011 15:51:42 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from argol.doit.wisc.edu (argol.doit.wisc.edu [144.92.197.212]) by mx1.freebsd.org (Postfix) with ESMTP id 2F4818FC08; Fri, 29 Jul 2011 15:51:42 +0000 (UTC) MIME-version: 1.0 Content-transfer-encoding: 7BIT Content-type: text/plain; CHARSET=US-ASCII; format=flowed Received: from avs-daemon.smtpauth3.wiscmail.wisc.edu by smtpauth3.wiscmail.wisc.edu (Sun Java(tm) System Messaging Server 7u2-7.05 32bit (built Jul 30 2009)) id <0LP300000QQ5KL00@smtpauth3.wiscmail.wisc.edu>; Fri, 29 Jul 2011 10:51:41 -0500 (CDT) Received: from comporellon.tachypleus.net ([unknown] [76.210.68.180]) by smtpauth3.wiscmail.wisc.edu (Sun Java(tm) System Messaging Server 7u2-7.05 32bit (built Jul 30 2009)) with ESMTPSA id <0LP300KBUQQ4D310@smtpauth3.wiscmail.wisc.edu>; Fri, 29 Jul 2011 10:51:40 -0500 (CDT) Date: Fri, 29 Jul 2011 10:51:39 -0500 From: Nathan Whitehorn To: delphij@freebsd.org Message-id: <4E32D70B.9060307@freebsd.org> X-Spam-Report: AuthenticatedSender=yes, SenderIP=76.210.68.180 X-Spam-PmxInfo: Server=avs-13, Version=5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2011.7.29.154214, SenderIP=76.210.68.180 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:5.0) Gecko/20110704 Thunderbird/5.0 X-Mailman-Approved-At: Fri, 29 Jul 2011 16:42:46 +0000 Cc: svn-src-all@FreeBSD.org, FreeBSD Release Engineering Team Subject: Re: svn commit: r223115 - head/usr.sbin/pw X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Jul 2011 15:51:42 -0000 > Author: delphij > Date: Wed Jun 15 19:09:58 2011 > New Revision: 223115 > URL:http://svn.freebsd.org/changeset/base/223115 > > Log: > Don't attempt to create the base directory when -d is specified. > > MFC after: 1 month > > Modified: > head/usr.sbin/pw/pw_user.c > > Modified: head/usr.sbin/pw/pw_user.c > ============================================================================== > --- head/usr.sbin/pw/pw_user.c Wed Jun 15 18:05:08 2011 (r223114) > +++ head/usr.sbin/pw/pw_user.c Wed Jun 15 19:09:58 2011 (r223115) > @@ -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) { > + 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 */ This has broken use of adduser(8) on new systems without /home (or /usr/home) when using default settings and so has also broken creation of home directories in the installer. Please either fix adduser(8) not to fail or revert this. -Nathan