svn commit: r224065 - stable/8/usr.sbin/pw

Xin LI delphij at FreeBSD.org
Fri Jul 15 18:10:59 UTC 2011


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 */


More information about the svn-src-stable-8 mailing list