[Pkg-shadow-commits] r3560 - in upstream/trunk: . src
Nicolas FRANÇOIS
nekral-guest at alioth.debian.org
Sun Nov 6 18:39:59 UTC 2011
Author: nekral-guest
Date: 2011-11-06 18:39:59 +0000 (Sun, 06 Nov 2011)
New Revision: 3560
Modified:
upstream/trunk/ChangeLog
upstream/trunk/src/chage.c
upstream/trunk/src/chgpasswd.c
upstream/trunk/src/chpasswd.c
upstream/trunk/src/chsh.c
upstream/trunk/src/faillog.c
upstream/trunk/src/gpasswd.c
upstream/trunk/src/groupadd.c
upstream/trunk/src/groupdel.c
upstream/trunk/src/groupmems.c
upstream/trunk/src/groupmod.c
upstream/trunk/src/grpconv.c
upstream/trunk/src/grpunconv.c
upstream/trunk/src/lastlog.c
upstream/trunk/src/newusers.c
upstream/trunk/src/passwd.c
upstream/trunk/src/pwconv.c
upstream/trunk/src/pwunconv.c
upstream/trunk/src/su.c
upstream/trunk/src/useradd.c
upstream/trunk/src/userdel.c
upstream/trunk/src/usermod.c
upstream/trunk/src/vipw.c
Log:
* src/chage.c, src/chgpasswd.c, src/chpasswd.c, src/chsh.c,
src/faillog.c, src/gpasswd.c, src/groupadd.c, src/groupdel.c,
src/groupmems.c, src/groupmod.c, src/grpconv.c, src/grpunconv.c,
src/lastlog.c, src/newusers.c, src/passwd.c, src/pwconv.c,
src/pwunconv.c, src/su.c, src/useradd.c, src/userdel.c,
src/usermod.c, src/vipw.c: Align and sort options.
Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog 2011-11-06 18:39:53 UTC (rev 3559)
+++ upstream/trunk/ChangeLog 2011-11-06 18:39:59 UTC (rev 3560)
@@ -1,5 +1,14 @@
2011-10-31 Nicolas François <nicolas.francois at centraliens.net>
+ * src/chage.c, src/chgpasswd.c, src/chpasswd.c, src/chsh.c,
+ src/faillog.c, src/gpasswd.c, src/groupadd.c, src/groupdel.c,
+ src/groupmems.c, src/groupmod.c, src/grpconv.c, src/grpunconv.c,
+ src/lastlog.c, src/newusers.c, src/passwd.c, src/pwconv.c,
+ src/pwunconv.c, src/su.c, src/useradd.c, src/userdel.c,
+ src/usermod.c, src/vipw.c: Align and sort options.
+
+2011-10-31 Nicolas François <nicolas.francois at centraliens.net>
+
* NEWS, src/pwck.c, man/pwck.8.xm, src/grpck.c, man/grpck.8.xml:
Add --root option.
Modified: upstream/trunk/src/chage.c
===================================================================
--- upstream/trunk/src/chage.c 2011-11-06 18:39:53 UTC (rev 3559)
+++ upstream/trunk/src/chage.c 2011-11-06 18:39:59 UTC (rev 3560)
@@ -386,15 +386,15 @@
*/
int c;
static struct option long_options[] = {
- {"lastday", required_argument, NULL, 'd'},
+ {"lastday", required_argument, NULL, 'd'},
{"expiredate", required_argument, NULL, 'E'},
- {"help", no_argument, NULL, 'h'},
- {"inactive", required_argument, NULL, 'I'},
- {"list", no_argument, NULL, 'l'},
- {"mindays", required_argument, NULL, 'm'},
- {"maxdays", required_argument, NULL, 'M'},
- {"root", required_argument, NULL, 'R'},
- {"warndays", required_argument, NULL, 'W'},
+ {"help", no_argument, NULL, 'h'},
+ {"inactive", required_argument, NULL, 'I'},
+ {"list", no_argument, NULL, 'l'},
+ {"mindays", required_argument, NULL, 'm'},
+ {"maxdays", required_argument, NULL, 'M'},
+ {"root", required_argument, NULL, 'R'},
+ {"warndays", required_argument, NULL, 'W'},
{NULL, 0, NULL, '\0'}
};
Modified: upstream/trunk/src/chgpasswd.c
===================================================================
--- upstream/trunk/src/chgpasswd.c 2011-11-06 18:39:53 UTC (rev 3559)
+++ upstream/trunk/src/chgpasswd.c 2011-11-06 18:39:59 UTC (rev 3560)
@@ -156,12 +156,12 @@
int c;
static struct option long_options[] = {
{"crypt-method", required_argument, NULL, 'c'},
- {"encrypted", no_argument, NULL, 'e'},
- {"help", no_argument, NULL, 'h'},
- {"md5", no_argument, NULL, 'm'},
- {"root", required_argument, NULL, 'R'},
+ {"encrypted", no_argument, NULL, 'e'},
+ {"help", no_argument, NULL, 'h'},
+ {"md5", no_argument, NULL, 'm'},
+ {"root", required_argument, NULL, 'R'},
#ifdef USE_SHA_CRYPT
- {"sha-rounds", required_argument, NULL, 's'},
+ {"sha-rounds", required_argument, NULL, 's'},
#endif
{NULL, 0, NULL, '\0'}
};
Modified: upstream/trunk/src/chpasswd.c
===================================================================
--- upstream/trunk/src/chpasswd.c 2011-11-06 18:39:53 UTC (rev 3559)
+++ upstream/trunk/src/chpasswd.c 2011-11-06 18:39:59 UTC (rev 3560)
@@ -149,13 +149,13 @@
int c;
static struct option long_options[] = {
{"crypt-method", required_argument, NULL, 'c'},
- {"encrypted", no_argument, NULL, 'e'},
- {"md5", no_argument, NULL, 'm'},
- {"root", required_argument, NULL, 'R'},
+ {"encrypted", no_argument, NULL, 'e'},
+ {"help", no_argument, NULL, 'h'},
+ {"md5", no_argument, NULL, 'm'},
+ {"root", required_argument, NULL, 'R'},
#ifdef USE_SHA_CRYPT
- {"sha-rounds", required_argument, NULL, 's'},
+ {"sha-rounds", required_argument, NULL, 's'},
#endif /* USE_SHA_CRYPT */
- {"help", no_argument, NULL, 'h'},
{NULL, 0, NULL, '\0'}
};
@@ -167,15 +167,15 @@
#endif /* !USE_SHA_CRYPT */
long_options, NULL)) != -1) {
switch (c) {
- case 'h':
- usage (E_SUCCESS);
- /*@notreached@*/break;
case 'c':
crypt_method = optarg;
break;
case 'e':
eflg = true;
break;
+ case 'h':
+ usage (E_SUCCESS);
+ /*@notreached@*/break;
case 'm':
md5flg = true;
break;
Modified: upstream/trunk/src/chsh.c
===================================================================
--- upstream/trunk/src/chsh.c 2011-11-06 18:39:53 UTC (rev 3559)
+++ upstream/trunk/src/chsh.c 2011-11-06 18:39:59 UTC (rev 3560)
@@ -206,8 +206,8 @@
{
int c;
static struct option long_options[] = {
- {"help", no_argument, NULL, 'h'},
- {"root", required_argument, NULL, 'R'},
+ {"help", no_argument, NULL, 'h'},
+ {"root", required_argument, NULL, 'R'},
{"shell", required_argument, NULL, 's'},
{NULL, 0, NULL, '\0'}
};
Modified: upstream/trunk/src/faillog.c
===================================================================
--- upstream/trunk/src/faillog.c 2011-11-06 18:39:53 UTC (rev 3559)
+++ upstream/trunk/src/faillog.c 2011-11-06 18:39:59 UTC (rev 3560)
@@ -579,14 +579,14 @@
{
int c;
static struct option long_options[] = {
- {"all", no_argument, NULL, 'a'},
- {"help", no_argument, NULL, 'h'},
+ {"all", no_argument, NULL, 'a'},
+ {"help", no_argument, NULL, 'h'},
{"lock-secs", required_argument, NULL, 'l'},
- {"maximum", required_argument, NULL, 'm'},
- {"reset", no_argument, NULL, 'r'},
- {"root", required_argument, NULL, 'R'},
- {"time", required_argument, NULL, 't'},
- {"user", required_argument, NULL, 'u'},
+ {"maximum", required_argument, NULL, 'm'},
+ {"reset", no_argument, NULL, 'r'},
+ {"root", required_argument, NULL, 'R'},
+ {"time", required_argument, NULL, 't'},
+ {"user", required_argument, NULL, 'u'},
{NULL, 0, NULL, '\0'}
};
while ((c = getopt_long (argc, argv, "ahl:m:rR:t:u:",
Modified: upstream/trunk/src/gpasswd.c
===================================================================
--- upstream/trunk/src/gpasswd.c 2011-11-06 18:39:53 UTC (rev 3559)
+++ upstream/trunk/src/gpasswd.c 2011-11-06 18:39:59 UTC (rev 3560)
@@ -229,14 +229,14 @@
{
int c;
static struct option long_options[] = {
- {"add", required_argument, NULL, 'a'},
- {"delete", required_argument, NULL, 'd'},
- {"help", no_argument, NULL, 'h'},
- {"remove-password", no_argument, NULL, 'r'},
- {"restrict", no_argument, NULL, 'R'},
- {"administrators", required_argument, NULL, 'A'},
- {"members", required_argument, NULL, 'M'},
- {"root", required_argument, NULL, 'Q'},
+ {"add", required_argument, NULL, 'a'},
+ {"administrators", required_argument, NULL, 'A'},
+ {"delete", required_argument, NULL, 'd'},
+ {"help", no_argument, NULL, 'h'},
+ {"members", required_argument, NULL, 'M'},
+ {"root", required_argument, NULL, 'Q'},
+ {"remove-password", no_argument, NULL, 'r'},
+ {"restrict", no_argument, NULL, 'R'},
{NULL, 0, NULL, '\0'}
};
Modified: upstream/trunk/src/groupadd.c
===================================================================
--- upstream/trunk/src/groupadd.c 2011-11-06 18:39:53 UTC (rev 3559)
+++ upstream/trunk/src/groupadd.c 2011-11-06 18:39:59 UTC (rev 3560)
@@ -378,14 +378,14 @@
char *cp;
int c;
static struct option long_options[] = {
- {"force", no_argument, NULL, 'f'},
- {"gid", required_argument, NULL, 'g'},
- {"help", no_argument, NULL, 'h'},
- {"key", required_argument, NULL, 'K'},
- {"non-unique", no_argument, NULL, 'o'},
- {"password", required_argument, NULL, 'p'},
- {"system", no_argument, NULL, 'r'},
- {"root", required_argument, NULL, 'R'},
+ {"force", no_argument, NULL, 'f'},
+ {"gid", required_argument, NULL, 'g'},
+ {"help", no_argument, NULL, 'h'},
+ {"key", required_argument, NULL, 'K'},
+ {"non-unique", no_argument, NULL, 'o'},
+ {"password", required_argument, NULL, 'p'},
+ {"system", no_argument, NULL, 'r'},
+ {"root", required_argument, NULL, 'R'},
{NULL, 0, NULL, '\0'}
};
Modified: upstream/trunk/src/groupdel.c
===================================================================
--- upstream/trunk/src/groupdel.c 2011-11-06 18:39:53 UTC (rev 3559)
+++ upstream/trunk/src/groupdel.c 2011-11-06 18:39:59 UTC (rev 3560)
@@ -316,7 +316,7 @@
*/
int c;
static struct option long_options[] = {
- {"help", no_argument, NULL, 'h'},
+ {"help", no_argument, NULL, 'h'},
{"root", required_argument, NULL, 'R'},
{NULL, 0, NULL, '\0'}
};
Modified: upstream/trunk/src/groupmems.c
===================================================================
--- upstream/trunk/src/groupmems.c 2011-11-06 18:39:53 UTC (rev 3559)
+++ upstream/trunk/src/groupmems.c 2011-11-06 18:39:59 UTC (rev 3560)
@@ -389,13 +389,13 @@
{
int c;
static struct option long_options[] = {
- {"add", required_argument, NULL, 'a'},
+ {"add", required_argument, NULL, 'a'},
{"delete", required_argument, NULL, 'd'},
- {"group", required_argument, NULL, 'g'},
- {"help", no_argument, NULL, 'h'},
- {"list", no_argument, NULL, 'l'},
- {"purge", no_argument, NULL, 'p'},
- {"root", required_argument, NULL, 'R'},
+ {"group", required_argument, NULL, 'g'},
+ {"help", no_argument, NULL, 'h'},
+ {"list", no_argument, NULL, 'l'},
+ {"purge", no_argument, NULL, 'p'},
+ {"root", required_argument, NULL, 'R'},
{NULL, 0, NULL, '\0'}
};
Modified: upstream/trunk/src/groupmod.c
===================================================================
--- upstream/trunk/src/groupmod.c 2011-11-06 18:39:53 UTC (rev 3559)
+++ upstream/trunk/src/groupmod.c 2011-11-06 18:39:59 UTC (rev 3560)
@@ -370,12 +370,12 @@
{
int c;
static struct option long_options[] = {
- {"gid", required_argument, NULL, 'g'},
- {"help", no_argument, NULL, 'h'},
- {"new-name", required_argument, NULL, 'n'},
- {"non-unique", no_argument, NULL, 'o'},
- {"password", required_argument, NULL, 'p'},
- {"root", required_argument, NULL, 'R'},
+ {"gid", required_argument, NULL, 'g'},
+ {"help", no_argument, NULL, 'h'},
+ {"new-name", required_argument, NULL, 'n'},
+ {"non-unique", no_argument, NULL, 'o'},
+ {"password", required_argument, NULL, 'p'},
+ {"root", required_argument, NULL, 'R'},
{NULL, 0, NULL, '\0'}
};
while ((c = getopt_long (argc, argv, "g:hn:op:R:",
Modified: upstream/trunk/src/grpconv.c
===================================================================
--- upstream/trunk/src/grpconv.c 2011-11-06 18:39:53 UTC (rev 3559)
+++ upstream/trunk/src/grpconv.c 2011-11-06 18:39:59 UTC (rev 3560)
@@ -114,7 +114,7 @@
*/
int c;
static struct option long_options[] = {
- {"help", no_argument, NULL, 'h'},
+ {"help", no_argument, NULL, 'h'},
{"root", required_argument, NULL, 'R'},
{NULL, 0, NULL, '\0'}
};
Modified: upstream/trunk/src/grpunconv.c
===================================================================
--- upstream/trunk/src/grpunconv.c 2011-11-06 18:39:53 UTC (rev 3559)
+++ upstream/trunk/src/grpunconv.c 2011-11-06 18:39:59 UTC (rev 3560)
@@ -114,7 +114,7 @@
*/
int c;
static struct option long_options[] = {
- {"help", no_argument, NULL, 'h'},
+ {"help", no_argument, NULL, 'h'},
{"root", required_argument, NULL, 'R'},
{NULL, 0, NULL, '\0'}
};
Modified: upstream/trunk/src/lastlog.c
===================================================================
--- upstream/trunk/src/lastlog.c 2011-11-06 18:39:53 UTC (rev 3559)
+++ upstream/trunk/src/lastlog.c 2011-11-06 18:39:59 UTC (rev 3560)
@@ -211,20 +211,35 @@
{
int c;
static struct option const longopts[] = {
- {"help", no_argument, NULL, 'h'},
- {"time", required_argument, NULL, 't'},
{"before", required_argument, NULL, 'b'},
- {"root", required_argument, NULL, 'R'},
- {"user", required_argument, NULL, 'u'},
+ {"help", no_argument, NULL, 'h'},
+ {"root", required_argument, NULL, 'R'},
+ {"time", required_argument, NULL, 't'},
+ {"user", required_argument, NULL, 'u'},
{NULL, 0, NULL, '\0'}
};
- while ((c = getopt_long (argc, argv, "ht:b:R:u:", longopts,
+ while ((c = getopt_long (argc, argv, "b:hR:t:u:", longopts,
NULL)) != -1) {
switch (c) {
+ case 'b':
+ {
+ unsigned long inverse_days;
+ if (getulong (optarg, &inverse_days) == 0) {
+ fprintf (stderr,
+ _("%s: invalid numeric argument '%s'\n"),
+ Prog, optarg);
+ exit (EXIT_FAILURE);
+ }
+ inverse_seconds = (time_t) inverse_days * DAY;
+ bflg = true;
+ break;
+ }
case 'h':
usage (EXIT_SUCCESS);
/*@notreached@*/break;
+ case 'R': /* no-op, handled in process_root_flag () */
+ break;
case 't':
{
unsigned long days;
@@ -238,21 +253,6 @@
tflg = true;
break;
}
- case 'b':
- {
- unsigned long inverse_days;
- if (getulong (optarg, &inverse_days) == 0) {
- fprintf (stderr,
- _("%s: invalid numeric argument '%s'\n"),
- Prog, optarg);
- exit (EXIT_FAILURE);
- }
- inverse_seconds = (time_t) inverse_days * DAY;
- bflg = true;
- break;
- }
- case 'R': /* no-op, handled in process_root_flag () */
- break;
case 'u':
{
const struct passwd *pwent;
Modified: upstream/trunk/src/newusers.c
===================================================================
--- upstream/trunk/src/newusers.c 2011-11-06 18:39:53 UTC (rev 3559)
+++ upstream/trunk/src/newusers.c 2011-11-06 18:39:59 UTC (rev 3560)
@@ -527,12 +527,14 @@
static struct option long_options[] = {
#ifndef USE_PAM
{"crypt-method", required_argument, NULL, 'c'},
+#endif /* !USE_PAM */
+ {"help", no_argument, NULL, 'h'},
+ {"system", no_argument, NULL, 'r'},
+#ifndef USE_PAM
#ifdef USE_SHA_CRYPT
- {"sha-rounds", required_argument, NULL, 's'},
+ {"sha-rounds", required_argument, NULL, 's'},
#endif /* USE_SHA_CRYPT */
#endif /* !USE_PAM */
- {"help", no_argument, NULL, 'h'},
- {"system", no_argument, NULL, 'r'},
{NULL, 0, NULL, '\0'}
};
@@ -548,6 +550,11 @@
#endif
long_options, NULL)) != -1) {
switch (c) {
+#ifndef USE_PAM
+ case 'c':
+ crypt_method = optarg;
+ break;
+#endif /* !USE_PAM */
case 'h':
usage (EXIT_SUCCESS);
break;
@@ -555,9 +562,6 @@
rflg = true;
break;
#ifndef USE_PAM
- case 'c':
- crypt_method = optarg;
- break;
#ifdef USE_SHA_CRYPT
case 's':
sflg = true;
Modified: upstream/trunk/src/passwd.c
===================================================================
--- upstream/trunk/src/passwd.c 2011-11-06 18:39:53 UTC (rev 3559)
+++ upstream/trunk/src/passwd.c 2011-11-06 18:39:59 UTC (rev 3560)
@@ -802,21 +802,21 @@
*/
int c;
static struct option long_options[] = {
- {"all", no_argument, NULL, 'a'},
- {"delete", no_argument, NULL, 'd'},
- {"expire", no_argument, NULL, 'e'},
- {"help", no_argument, NULL, 'h'},
- {"inactive", required_argument, NULL, 'i'},
- {"keep-tokens", no_argument, NULL, 'k'},
- {"lock", no_argument, NULL, 'l'},
- {"mindays", required_argument, NULL, 'n'},
- {"quiet", no_argument, NULL, 'q'},
- {"repository", required_argument, NULL, 'r'},
- {"root", required_argument, NULL, 'R'},
- {"status", no_argument, NULL, 'S'},
- {"unlock", no_argument, NULL, 'u'},
- {"warndays", required_argument, NULL, 'w'},
- {"maxdays", required_argument, NULL, 'x'},
+ {"all", no_argument, NULL, 'a'},
+ {"delete", no_argument, NULL, 'd'},
+ {"expire", no_argument, NULL, 'e'},
+ {"help", no_argument, NULL, 'h'},
+ {"inactive", required_argument, NULL, 'i'},
+ {"keep-tokens", no_argument, NULL, 'k'},
+ {"lock", no_argument, NULL, 'l'},
+ {"mindays", required_argument, NULL, 'n'},
+ {"quiet", no_argument, NULL, 'q'},
+ {"repository", required_argument, NULL, 'r'},
+ {"root", required_argument, NULL, 'R'},
+ {"status", no_argument, NULL, 'S'},
+ {"unlock", no_argument, NULL, 'u'},
+ {"warndays", required_argument, NULL, 'w'},
+ {"maxdays", required_argument, NULL, 'x'},
{NULL, 0, NULL, '\0'}
};
@@ -834,6 +834,9 @@
eflg = true;
anyflag = true;
break;
+ case 'h':
+ usage (E_SUCCESS);
+ /*@notreached@*/break;
case 'i':
if ( (getlong (optarg, &inact) == 0)
|| (inact < -1)) {
@@ -908,9 +911,6 @@
xflg = true;
anyflag = true;
break;
- case 'h':
- usage (E_SUCCESS);
- /*@notreached@*/break;
default:
usage (E_BAD_ARG);
}
Modified: upstream/trunk/src/pwconv.c
===================================================================
--- upstream/trunk/src/pwconv.c 2011-11-06 18:39:53 UTC (rev 3559)
+++ upstream/trunk/src/pwconv.c 2011-11-06 18:39:59 UTC (rev 3560)
@@ -144,7 +144,7 @@
*/
int c;
static struct option long_options[] = {
- {"help", no_argument, NULL, 'h'},
+ {"help", no_argument, NULL, 'h'},
{"root", required_argument, NULL, 'R'},
{NULL, 0, NULL, '\0'}
};
Modified: upstream/trunk/src/pwunconv.c
===================================================================
--- upstream/trunk/src/pwunconv.c 2011-11-06 18:39:53 UTC (rev 3559)
+++ upstream/trunk/src/pwunconv.c 2011-11-06 18:39:59 UTC (rev 3560)
@@ -106,7 +106,7 @@
*/
int c;
static struct option long_options[] = {
- {"help", no_argument, NULL, 'h'},
+ {"help", no_argument, NULL, 'h'},
{"root", required_argument, NULL, 'R'},
{NULL, 0, NULL, '\0'}
};
Modified: upstream/trunk/src/su.c
===================================================================
--- upstream/trunk/src/su.c 2011-11-06 18:39:53 UTC (rev 3559)
+++ upstream/trunk/src/su.c 2011-11-06 18:39:59 UTC (rev 3560)
@@ -737,11 +737,11 @@
{
int c;
static struct option long_options[] = {
- {"command", required_argument, NULL, 'c'},
- {"help", no_argument, NULL, 'h'},
- {"login", no_argument, NULL, 'l'},
- {"preserve-environment", no_argument, NULL, 'p'},
- {"shell", required_argument, NULL, 's'},
+ {"command", required_argument, NULL, 'c'},
+ {"help", no_argument, NULL, 'h'},
+ {"login", no_argument, NULL, 'l'},
+ {"preserve-environment", no_argument, NULL, 'p'},
+ {"shell", required_argument, NULL, 's'},
{NULL, 0, NULL, '\0'}
};
Modified: upstream/trunk/src/useradd.c
===================================================================
--- upstream/trunk/src/useradd.c 2011-11-06 18:39:53 UTC (rev 3559)
+++ upstream/trunk/src/useradd.c 2011-11-06 18:39:59 UTC (rev 3560)
@@ -980,31 +980,31 @@
*/
int c;
static struct option long_options[] = {
- {"base-dir", required_argument, NULL, 'b'},
- {"comment", required_argument, NULL, 'c'},
- {"home-dir", required_argument, NULL, 'd'},
- {"defaults", no_argument, NULL, 'D'},
- {"expiredate", required_argument, NULL, 'e'},
- {"inactive", required_argument, NULL, 'f'},
- {"gid", required_argument, NULL, 'g'},
- {"groups", required_argument, NULL, 'G'},
- {"help", no_argument, NULL, 'h'},
- {"skel", required_argument, NULL, 'k'},
- {"key", required_argument, NULL, 'K'},
- {"create-home", no_argument, NULL, 'm'},
- {"no-create-home", no_argument, NULL, 'M'},
- {"no-log-init", no_argument, NULL, 'l'},
- {"no-user-group", no_argument, NULL, 'N'},
- {"non-unique", no_argument, NULL, 'o'},
- {"password", required_argument, NULL, 'p'},
- {"system", no_argument, NULL, 'r'},
- {"root", required_argument, NULL, 'R'},
- {"shell", required_argument, NULL, 's'},
+ {"base-dir", required_argument, NULL, 'b'},
+ {"comment", required_argument, NULL, 'c'},
+ {"home-dir", required_argument, NULL, 'd'},
+ {"defaults", no_argument, NULL, 'D'},
+ {"expiredate", required_argument, NULL, 'e'},
+ {"inactive", required_argument, NULL, 'f'},
+ {"gid", required_argument, NULL, 'g'},
+ {"groups", required_argument, NULL, 'G'},
+ {"help", no_argument, NULL, 'h'},
+ {"skel", required_argument, NULL, 'k'},
+ {"key", required_argument, NULL, 'K'},
+ {"no-log-init", no_argument, NULL, 'l'},
+ {"create-home", no_argument, NULL, 'm'},
+ {"no-create-home", no_argument, NULL, 'M'},
+ {"no-user-group", no_argument, NULL, 'N'},
+ {"non-unique", no_argument, NULL, 'o'},
+ {"password", required_argument, NULL, 'p'},
+ {"system", no_argument, NULL, 'r'},
+ {"root", required_argument, NULL, 'R'},
+ {"shell", required_argument, NULL, 's'},
+ {"uid", required_argument, NULL, 'u'},
+ {"user-group", no_argument, NULL, 'U'},
#ifdef WITH_SELINUX
- {"selinux-user", required_argument, NULL, 'Z'},
+ {"selinux-user", required_argument, NULL, 'Z'},
#endif
- {"uid", required_argument, NULL, 'u'},
- {"user-group", no_argument, NULL, 'U'},
{NULL, 0, NULL, '\0'}
};
while ((c = getopt_long (argc, argv,
Modified: upstream/trunk/src/userdel.c
===================================================================
--- upstream/trunk/src/userdel.c 2011-11-06 18:39:53 UTC (rev 3559)
+++ upstream/trunk/src/userdel.c 2011-11-06 18:39:59 UTC (rev 3560)
@@ -870,10 +870,10 @@
*/
int c;
static struct option long_options[] = {
- {"force", no_argument, NULL, 'f'},
- {"help", no_argument, NULL, 'h'},
- {"remove", no_argument, NULL, 'r'},
- {"root", required_argument, NULL, 'R'},
+ {"force", no_argument, NULL, 'f'},
+ {"help", no_argument, NULL, 'h'},
+ {"remove", no_argument, NULL, 'r'},
+ {"root", required_argument, NULL, 'R'},
{NULL, 0, NULL, '\0'}
};
while ((c = getopt_long (argc, argv, "fhrR:",
Modified: upstream/trunk/src/usermod.c
===================================================================
--- upstream/trunk/src/usermod.c 2011-11-06 18:39:53 UTC (rev 3559)
+++ upstream/trunk/src/usermod.c 2011-11-06 18:39:59 UTC (rev 3560)
@@ -875,26 +875,26 @@
*/
int c;
static struct option long_options[] = {
- {"append", no_argument, NULL, 'a'},
- {"comment", required_argument, NULL, 'c'},
- {"home", required_argument, NULL, 'd'},
- {"expiredate", required_argument, NULL, 'e'},
- {"inactive", required_argument, NULL, 'f'},
- {"gid", required_argument, NULL, 'g'},
- {"groups", required_argument, NULL, 'G'},
- {"help", no_argument, NULL, 'h'},
- {"login", required_argument, NULL, 'l'},
- {"lock", no_argument, NULL, 'L'},
- {"move-home", no_argument, NULL, 'm'},
- {"non-unique", no_argument, NULL, 'o'},
- {"password", required_argument, NULL, 'p'},
- {"root", required_argument, NULL, 'R'},
+ {"append", no_argument, NULL, 'a'},
+ {"comment", required_argument, NULL, 'c'},
+ {"home", required_argument, NULL, 'd'},
+ {"expiredate", required_argument, NULL, 'e'},
+ {"inactive", required_argument, NULL, 'f'},
+ {"gid", required_argument, NULL, 'g'},
+ {"groups", required_argument, NULL, 'G'},
+ {"help", no_argument, NULL, 'h'},
+ {"login", required_argument, NULL, 'l'},
+ {"lock", no_argument, NULL, 'L'},
+ {"move-home", no_argument, NULL, 'm'},
+ {"non-unique", no_argument, NULL, 'o'},
+ {"password", required_argument, NULL, 'p'},
+ {"root", required_argument, NULL, 'R'},
+ {"shell", required_argument, NULL, 's'},
+ {"uid", required_argument, NULL, 'u'},
+ {"unlock", no_argument, NULL, 'U'},
#ifdef WITH_SELINUX
{"selinux-user", required_argument, NULL, 'Z'},
#endif
- {"shell", required_argument, NULL, 's'},
- {"uid", required_argument, NULL, 'u'},
- {"unlock", no_argument, NULL, 'U'},
{NULL, 0, NULL, '\0'}
};
while ((c = getopt_long (argc, argv,
Modified: upstream/trunk/src/vipw.c
===================================================================
--- upstream/trunk/src/vipw.c 2011-11-06 18:39:53 UTC (rev 3559)
+++ upstream/trunk/src/vipw.c 2011-11-06 18:39:59 UTC (rev 3560)
@@ -434,14 +434,14 @@
*/
int c;
static struct option long_options[] = {
- {"group", no_argument, NULL, 'g'},
- {"help", no_argument, NULL, 'h'},
- {"passwd", no_argument, NULL, 'p'},
- {"quiet", no_argument, NULL, 'q'},
- {"root", required_argument, NULL, 'R'},
- {"shadow", no_argument, NULL, 's'},
+ {"group", no_argument, NULL, 'g'},
+ {"help", no_argument, NULL, 'h'},
+ {"passwd", no_argument, NULL, 'p'},
+ {"quiet", no_argument, NULL, 'q'},
+ {"root", required_argument, NULL, 'R'},
+ {"shadow", no_argument, NULL, 's'},
#ifdef WITH_TCB
- {"user", required_argument, NULL, 'u'},
+ {"user", required_argument, NULL, 'u'},
#endif /* WITH_TCB */
{NULL, 0, NULL, '\0'}
};
More information about the Pkg-shadow-commits
mailing list