summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordelphij <delphij@FreeBSD.org>2011-07-31 03:00:00 +0000
committerdelphij <delphij@FreeBSD.org>2011-07-31 03:00:00 +0000
commit48395f1e9158c619dfe304bd64c27055851055a6 (patch)
tree945324f929389d64398af07532973f715e574790
parent8a12085f21271e4c457bdf711f58f96a07c5355a (diff)
downloadFreeBSD-src-48395f1e9158c619dfe304bd64c27055851055a6.zip
FreeBSD-src-48395f1e9158c619dfe304bd64c27055851055a6.tar.gz
Backout r223115 which potentially caused a POLA violation, by restoring
historic behavior (create the default base directory in pw.conf) before I came up with a better fix for this. Requested by: nwhitehorn Approved by: re (kib)
-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 b93ca66..db33746 100644
--- a/usr.sbin/pw/pw_user.c
+++ b/usr.sbin/pw/pw_user.c
@@ -163,7 +163,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 */
OpenPOWER on IntegriCloud