Module Name: src
Committed By: martin
Date: Thu Jun 14 19:54:41 UTC 2018
Modified Files:
src/usr.sbin/user [netbsd-8]: user.c
Log Message:
Pull up following revision(s) (requested by zafer in ticket #877):
usr.sbin/user/user.c: revision 1.132
Set default homeperm values before writing usermgmt.conf file and
honor values in it instead of ignoring it.
Fixes PR bin/40324 by Guy Yur
To generate a diff of this commit:
cvs rdiff -u -r1.131 -r1.131.22.1 src/usr.sbin/user/user.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/user/user.c
diff -u src/usr.sbin/user/user.c:1.131 src/usr.sbin/user/user.c:1.131.22.1
--- src/usr.sbin/user/user.c:1.131 Wed Nov 28 11:31:27 2012
+++ src/usr.sbin/user/user.c Thu Jun 14 19:54:40 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: user.c,v 1.131 2012/11/28 11:31:27 blymn Exp $ */
+/* $NetBSD: user.c,v 1.131.22.1 2018/06/14 19:54:40 martin Exp $ */
/*
* Copyright (c) 1999 Alistair G. Crooks. All rights reserved.
@@ -33,7 +33,7 @@
#ifndef lint
__COPYRIGHT("@(#) Copyright (c) 1999\
The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: user.c,v 1.131 2012/11/28 11:31:27 blymn Exp $");
+__RCSID("$NetBSD: user.c,v 1.131.22.1 2018/06/14 19:54:40 martin Exp $");
#endif
#include <sys/types.h>
@@ -819,6 +819,7 @@ read_defaults(def_t *dp)
NEWARRAY(range_t, up->u_rv, up->u_rsize, exit(1));
up->u_inactive = DEF_INACTIVE;
up->u_expire = DEF_EXPIRE;
+ up->u_homeperm = DEF_HOMEPERM;
gp->g_rsize = 16;
gp->g_defrc = 0;
NEWARRAY(range_t, gp->g_rv, gp->g_rsize, exit(1));
@@ -903,7 +904,6 @@ read_defaults(def_t *dp)
up->u_rc += 1;
}
up->u_defrc = up->u_rc;
- up->u_homeperm = DEF_HOMEPERM;
}
/* return the next valid unused uid */
