[Pkg-shadow-commits] r1915 - in debian/trunk/debian: . patches
nekral-guest at alioth.debian.org
nekral-guest at alioth.debian.org
Wed Mar 19 18:43:47 UTC 2008
Author: nekral-guest
Date: 2008-03-19 18:43:46 +0000 (Wed, 19 Mar 2008)
New Revision: 1915
Removed:
debian/trunk/debian/patches/467_useradd_-r_LSB
Modified:
debian/trunk/debian/changelog
debian/trunk/debian/patches/series
Log:
Support for -r, --system was added upstream. (467_useradd_-r_LSB)
Modified: debian/trunk/debian/changelog
===================================================================
--- debian/trunk/debian/changelog 2008-03-19 18:41:31 UTC (rev 1914)
+++ debian/trunk/debian/changelog 2008-03-19 18:43:46 UTC (rev 1915)
@@ -10,6 +10,7 @@
- Remove patches applied upstream:
+ debian/patches/451_login_PATH
+ debian/patches/462_warn_to_edit_shadow
+ + debian/patches/467_useradd_-r_LSB
* debian/watch: Add a watch file for shadow.
-- Nicolas FRANCOIS (Nekral) <nicolas.francois at centraliens.net> Sun, 24 Feb 2008 18:33:31 +0100
Deleted: debian/trunk/debian/patches/467_useradd_-r_LSB
===================================================================
--- debian/trunk/debian/patches/467_useradd_-r_LSB 2008-03-19 18:41:31 UTC (rev 1914)
+++ debian/trunk/debian/patches/467_useradd_-r_LSB 2008-03-19 18:43:46 UTC (rev 1915)
@@ -1,111 +0,0 @@
-Goal: Add a "-r" option to useradd
-
-Fixes: #333706
-
-Status wrt upstream: Forwarded but not applied yet. Not sure that upstream
- is really ready to apply it. We apply it anyway because
- LSB compliance is important for Debian
-
-Index: shadow-4.1.0/src/useradd.c
-===================================================================
---- shadow-4.1.0.orig/src/useradd.c
-+++ shadow-4.1.0/src/useradd.c
-@@ -127,6 +127,7 @@
- mflg = 0, /* create user's home directory if it doesn't exist */
- nflg = 0, /* create a group having the same name as the user */
- oflg = 0, /* permit non-unique user ID to be specified with -u */
-+ rflg = 0, /* create a system account (LSB compliance) */
- sflg = 0, /* shell program for new account */
- uflg = 0; /* specify user ID for new account */
-
-@@ -637,6 +638,7 @@
- " (non-unique) UID\n"
- " -p, --password PASSWORD use encrypted password for the new user\n"
- " account\n"
-+ " -r, --system create a system account\n"
- " -s, --shell SHELL the login shell for the new user account\n"
- " -u, --uid UID force use the UID for the new user account\n"
- "\n"));
-@@ -685,11 +687,19 @@
- spent->sp_namp = (char *) user_name;
- spent->sp_pwdp = (char *) user_pass;
- spent->sp_lstchg = time ((time_t *) 0) / SCALE;
-- spent->sp_min = scale_age (getdef_num ("PASS_MIN_DAYS", -1));
-- spent->sp_max = scale_age (getdef_num ("PASS_MAX_DAYS", -1));
-- spent->sp_warn = scale_age (getdef_num ("PASS_WARN_AGE", -1));
-- spent->sp_inact = scale_age (def_inactive);
-- spent->sp_expire = scale_age (user_expire);
-+ if (!rflg) {
-+ spent->sp_min = scale_age (getdef_num ("PASS_MIN_DAYS", -1));
-+ spent->sp_max = scale_age (getdef_num ("PASS_MAX_DAYS", -1));
-+ spent->sp_warn = scale_age (getdef_num ("PASS_WARN_AGE", -1));
-+ spent->sp_inact = scale_age (def_inactive);
-+ spent->sp_expire = scale_age (user_expire);
-+ } else {
-+ spent->sp_min = scale_age(-1);
-+ spent->sp_max = scale_age(-1);
-+ spent->sp_warn = scale_age(-1);
-+ spent->sp_inact = scale_age(-1);
-+ spent->sp_expire = scale_age(-1);
-+ }
- spent->sp_flag = -1;
- }
-
-@@ -822,8 +832,13 @@
- const struct passwd *pwd;
- uid_t uid_min, uid_max;
-
-- uid_min = getdef_unum ("UID_MIN", 1000);
-- uid_max = getdef_unum ("UID_MAX", 60000);
-+ if (!rflg) {
-+ uid_min = getdef_unum ("UID_MIN", 1000);
-+ uid_max = getdef_unum ("UID_MAX", 60000);
-+ } else {
-+ uid_min = 1;
-+ uid_max = getdef_unum ("UID_MIN", 1000) - 1;
-+ }
-
- /*
- * Start with some UID value if the user didn't provide us with
-@@ -1004,12 +1019,13 @@
- {"create-home", no_argument, NULL, 'm'},
- {"non-unique", no_argument, NULL, 'o'},
- {"password", required_argument, NULL, 'p'},
-+ {"system", no_argument, NULL, 'r'},
- {"shell", required_argument, NULL, 's'},
- {"uid", required_argument, NULL, 'u'},
- {NULL, 0, NULL, '\0'}
- };
- while ((c =
-- getopt_long (argc, argv, "b:c:d:De:f:g:G:k:O:K:mMop:s:u:",
-+ getopt_long (argc, argv, "b:c:d:De:f:g:G:k:O:K:mMop:rs:u:",
- long_options, NULL)) != -1) {
- switch (c) {
- case 'b':
-@@ -1160,6 +1176,9 @@
- }
- user_pass = optarg;
- break;
-+ case 'r':
-+ rflg++;
-+ break;
- case 's':
- if (!VALID (optarg)
- || (optarg[0]
-@@ -1553,6 +1572,8 @@
- */
- static void create_home (void)
- {
-+ if (!rflg) { /* for system accounts defaults are ignored and we
-+ * do not create a home dir -- gafton */
- if (access (user_home, F_OK)) {
- /* XXX - create missing parent directories. --marekm */
- if (mkdir (user_home, 0)) {
-@@ -1576,6 +1597,7 @@
- "adding home directory", user_name, user_id, 1);
- #endif
- }
-+ }
- }
-
- /*
Modified: debian/trunk/debian/patches/series
===================================================================
--- debian/trunk/debian/patches/series 2008-03-19 18:41:31 UTC (rev 1914)
+++ debian/trunk/debian/patches/series 2008-03-19 18:43:46 UTC (rev 1915)
@@ -15,7 +15,6 @@
454_userdel_no_MAIL_FILE
501_commonio_group_shadow
463_login_delay_obeys_to_PAM
-467_useradd_-r_LSB
466_fflush-prompt
523_su_arguments_are_concatenated
523_su_arguments_are_no_more_concatenated_by_default
More information about the Pkg-shadow-commits
mailing list