svn commit: r223115 - head/usr.sbin/pw

[ Available lists | Index of svn-src-head | Month of Jun 2011 | Week of 15 Jun 2011 | Raw email | View thread | Wrap long lines | Reply | Tag ]
From
Xin LI <delphij@FreeBSD.org>
Date
15 Jun 2011 19:09:58
Subject
svn commit: r223115 - head/usr.sbin/pw
Message-ID
201106151909.p5FJ9wR8094514@svn.freebsd.org


[ Hide this part ]
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 */


Elapsed time: 0.105 seconds