aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXin LI <delphij@FreeBSD.org>2012-03-08 18:01:07 +0000
committerXin LI <delphij@FreeBSD.org>2012-03-08 18:01:07 +0000
commit68ecc48e4309cdc51d72393bc1b2bf76c05b19c9 (patch)
treee497bc37c4ef4d700ed714726fb8317a1748537c
parent3fa952eeeaebb47166e27135d24419fa0f77dc7e (diff)
downloadsrc-68ecc48e4309cdc51d72393bc1b2bf76c05b19c9.tar.gz
src-68ecc48e4309cdc51d72393bc1b2bf76c05b19c9.zip
MFS r232550:
Backout r223115 and restore the historic behavior (create the default base directory in pw.conf). Approved by: re (kib)
Notes
Notes: svn path=/releng/8.3/; revision=232696
-rw-r--r--usr.sbin/pw/pw_user.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/usr.sbin/pw/pw_user.c b/usr.sbin/pw/pw_user.c
index b993e760c84b..e8f8adf335b4 100644
--- a/usr.sbin/pw/pw_user.c
+++ b/usr.sbin/pw/pw_user.c
@@ -170,7 +170,7 @@ pw_user(struct userconf * cnf, int mode, struct cargs * args)
* 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 */