diff options
Diffstat (limited to 'meta/recipes-extended/shadow/files/allow-for-setting-password-in-clear-text.patch')
-rw-r--r-- | meta/recipes-extended/shadow/files/allow-for-setting-password-in-clear-text.patch | 181 |
1 files changed, 140 insertions, 41 deletions
diff --git a/meta/recipes-extended/shadow/files/allow-for-setting-password-in-clear-text.patch b/meta/recipes-extended/shadow/files/allow-for-setting-password-in-clear-text.patch index 615c6e002d..fa7eb07aa5 100644 --- a/meta/recipes-extended/shadow/files/allow-for-setting-password-in-clear-text.patch +++ b/meta/recipes-extended/shadow/files/allow-for-setting-password-in-clear-text.patch | |||
@@ -1,21 +1,21 @@ | |||
1 | Upstream-Status: Inappropriate [OE specific] | 1 | Subject: [PATCH] Allow for setting password in clear text |
2 | 2 | ||
3 | Allow for setting password in clear text. | 3 | Upstream-Status: Inappropriate [OE specific] |
4 | 4 | ||
5 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | 5 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
6 | --- | 6 | --- |
7 | src/Makefile.am | 8 ++++---- | 7 | src/Makefile.am | 8 ++++---- |
8 | src/groupadd.c | 8 +++++++- | 8 | src/groupadd.c | 20 +++++++++++++++----- |
9 | src/groupmod.c | 8 +++++++- | 9 | src/groupmod.c | 20 +++++++++++++++----- |
10 | src/useradd.c | 9 +++++++-- | 10 | src/useradd.c | 21 +++++++++++++++------ |
11 | src/usermod.c | 8 +++++++- | 11 | src/usermod.c | 20 +++++++++++++++----- |
12 | 5 files changed, 32 insertions(+), 9 deletions(-) | 12 | 5 files changed, 64 insertions(+), 25 deletions(-) |
13 | 13 | ||
14 | diff --git a/src/Makefile.am b/src/Makefile.am | 14 | diff --git a/src/Makefile.am b/src/Makefile.am |
15 | index 25e288d..856b087 100644 | 15 | index 3c98a8d..b8093d5 100644 |
16 | --- a/src/Makefile.am | 16 | --- a/src/Makefile.am |
17 | +++ b/src/Makefile.am | 17 | +++ b/src/Makefile.am |
18 | @@ -88,10 +88,10 @@ chgpasswd_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBSELINUX) $(LIBCRYPT) | 18 | @@ -93,10 +93,10 @@ chgpasswd_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBSELINUX) $(LIBCRYPT) |
19 | chsh_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX) $(LIBCRYPT_NOPAM) $(LIBSKEY) $(LIBMD) | 19 | chsh_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX) $(LIBCRYPT_NOPAM) $(LIBSKEY) $(LIBMD) |
20 | chpasswd_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX) $(LIBCRYPT) | 20 | chpasswd_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX) $(LIBCRYPT) |
21 | gpasswd_LDADD = $(LDADD) $(LIBAUDIT) $(LIBSELINUX) $(LIBCRYPT) | 21 | gpasswd_LDADD = $(LDADD) $(LIBAUDIT) $(LIBSELINUX) $(LIBCRYPT) |
@@ -28,9 +28,9 @@ index 25e288d..856b087 100644 | |||
28 | grpck_LDADD = $(LDADD) $(LIBSELINUX) | 28 | grpck_LDADD = $(LDADD) $(LIBSELINUX) |
29 | grpconv_LDADD = $(LDADD) $(LIBSELINUX) | 29 | grpconv_LDADD = $(LDADD) $(LIBSELINUX) |
30 | grpunconv_LDADD = $(LDADD) $(LIBSELINUX) | 30 | grpunconv_LDADD = $(LDADD) $(LIBSELINUX) |
31 | @@ -111,9 +111,9 @@ su_SOURCES = \ | 31 | @@ -117,9 +117,9 @@ su_SOURCES = \ |
32 | suauth.c | 32 | suauth.c |
33 | su_LDADD = $(LDADD) $(LIBPAM) $(LIBCRYPT_NOPAM) $(LIBSKEY) $(LIBMD) | 33 | su_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBCRYPT_NOPAM) $(LIBSKEY) $(LIBMD) |
34 | sulogin_LDADD = $(LDADD) $(LIBCRYPT) | 34 | sulogin_LDADD = $(LDADD) $(LIBCRYPT) |
35 | -useradd_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX) $(LIBSEMANAGE) $(LIBACL) $(LIBATTR) | 35 | -useradd_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX) $(LIBSEMANAGE) $(LIBACL) $(LIBATTR) |
36 | +useradd_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX) $(LIBSEMANAGE) $(LIBACL) $(LIBATTR) $(LIBCRYPT) | 36 | +useradd_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX) $(LIBSEMANAGE) $(LIBACL) $(LIBATTR) $(LIBCRYPT) |
@@ -41,33 +41,39 @@ index 25e288d..856b087 100644 | |||
41 | 41 | ||
42 | install-am: all-am | 42 | install-am: all-am |
43 | diff --git a/src/groupadd.c b/src/groupadd.c | 43 | diff --git a/src/groupadd.c b/src/groupadd.c |
44 | index f716f57..4e28c26 100644 | 44 | index b57006c..63e1c48 100644 |
45 | --- a/src/groupadd.c | 45 | --- a/src/groupadd.c |
46 | +++ b/src/groupadd.c | 46 | +++ b/src/groupadd.c |
47 | @@ -124,6 +124,7 @@ static /*@noreturn@*/void usage (int status) | 47 | @@ -123,9 +123,10 @@ static /*@noreturn@*/void usage (int status) |
48 | (void) fputs (_(" -o, --non-unique allow to create groups with duplicate\n" | 48 | (void) fputs (_(" -o, --non-unique allow to create groups with duplicate\n" |
49 | " (non-unique) GID\n"), usageout); | 49 | " (non-unique) GID\n"), usageout); |
50 | (void) fputs (_(" -p, --password PASSWORD use this encrypted password for the new group\n"), usageout); | 50 | (void) fputs (_(" -p, --password PASSWORD use this encrypted password for the new group\n"), usageout); |
51 | + (void) fputs (_(" -P, --clear-password PASSWORD use this clear password for the new group\n"), usageout); | 51 | + (void) fputs (_(" -P, --clear-password PASSWORD use this clear password for the new group\n"), usageout); |
52 | (void) fputs (_(" -r, --system create a system account\n"), usageout); | 52 | (void) fputs (_(" -r, --system create a system account\n"), usageout); |
53 | (void) fputs (_(" -R, --root CHROOT_DIR directory to chroot into\n"), usageout); | 53 | (void) fputs (_(" -R, --root CHROOT_DIR directory to chroot into\n"), usageout); |
54 | - (void) fputs (_(" -P, --prefix PREFIX_DIR directory prefix\n"), usageout); | ||
55 | + (void) fputs (_(" -A, --prefix PREFIX_DIR directory prefix\n"), usageout); | ||
54 | (void) fputs ("\n", usageout); | 56 | (void) fputs ("\n", usageout); |
55 | @@ -387,12 +388,13 @@ static void process_flags (int argc, char **argv) | 57 | exit (status); |
58 | } | ||
59 | @@ -387,13 +388,14 @@ static void process_flags (int argc, char **argv) | ||
56 | {"key", required_argument, NULL, 'K'}, | 60 | {"key", required_argument, NULL, 'K'}, |
57 | {"non-unique", no_argument, NULL, 'o'}, | 61 | {"non-unique", no_argument, NULL, 'o'}, |
58 | {"password", required_argument, NULL, 'p'}, | 62 | {"password", required_argument, NULL, 'p'}, |
59 | + {"clear-password", required_argument, NULL, 'P'}, | 63 | + {"clear-password", required_argument, NULL, 'P'}, |
60 | {"system", no_argument, NULL, 'r'}, | 64 | {"system", no_argument, NULL, 'r'}, |
61 | {"root", required_argument, NULL, 'R'}, | 65 | {"root", required_argument, NULL, 'R'}, |
66 | - {"prefix", required_argument, NULL, 'P'}, | ||
67 | + {"prefix", required_argument, NULL, 'A'}, | ||
62 | {NULL, 0, NULL, '\0'} | 68 | {NULL, 0, NULL, '\0'} |
63 | }; | 69 | }; |
64 | 70 | ||
65 | - while ((c = getopt_long (argc, argv, "fg:hK:op:rR:", | 71 | - while ((c = getopt_long (argc, argv, "fg:hK:op:rR:P:", |
66 | + while ((c = getopt_long (argc, argv, "fg:hK:op:P:rR:", | 72 | + while ((c = getopt_long (argc, argv, "fg:hK:op:P:rR:A:", |
67 | long_options, NULL)) != -1) { | 73 | long_options, NULL)) != -1) { |
68 | switch (c) { | 74 | switch (c) { |
69 | case 'f': | 75 | case 'f': |
70 | @@ -444,6 +446,10 @@ static void process_flags (int argc, char **argv) | 76 | @@ -445,12 +447,20 @@ static void process_flags (int argc, char **argv) |
71 | pflg = true; | 77 | pflg = true; |
72 | group_passwd = optarg; | 78 | group_passwd = optarg; |
73 | break; | 79 | break; |
@@ -78,32 +84,57 @@ index f716f57..4e28c26 100644 | |||
78 | case 'r': | 84 | case 'r': |
79 | rflg = true; | 85 | rflg = true; |
80 | break; | 86 | break; |
87 | case 'R': /* no-op, handled in process_root_flag () */ | ||
88 | break; | ||
89 | - case 'P': /* no-op, handled in process_prefix_flag () */ | ||
90 | + case 'A': /* no-op, handled in process_prefix_flag () */ | ||
91 | + fprintf (stderr, | ||
92 | + _("%s: -A is deliberately not supported \n"), | ||
93 | + Prog); | ||
94 | + exit (E_BAD_ARG); | ||
95 | break; | ||
96 | default: | ||
97 | usage (E_USAGE); | ||
98 | @@ -584,7 +594,7 @@ int main (int argc, char **argv) | ||
99 | (void) textdomain (PACKAGE); | ||
100 | |||
101 | process_root_flag ("-R", argc, argv); | ||
102 | - prefix = process_prefix_flag ("-P", argc, argv); | ||
103 | + prefix = process_prefix_flag ("-A", argc, argv); | ||
104 | |||
105 | OPENLOG ("groupadd"); | ||
106 | #ifdef WITH_AUDIT | ||
81 | diff --git a/src/groupmod.c b/src/groupmod.c | 107 | diff --git a/src/groupmod.c b/src/groupmod.c |
82 | index d9d3807..68f49d1 100644 | 108 | index b293b98..72daf2c 100644 |
83 | --- a/src/groupmod.c | 109 | --- a/src/groupmod.c |
84 | +++ b/src/groupmod.c | 110 | +++ b/src/groupmod.c |
85 | @@ -127,6 +127,7 @@ static void usage (int status) | 111 | @@ -134,8 +134,9 @@ static void usage (int status) |
86 | (void) fputs (_(" -o, --non-unique allow to use a duplicate (non-unique) GID\n"), usageout); | 112 | (void) fputs (_(" -o, --non-unique allow to use a duplicate (non-unique) GID\n"), usageout); |
87 | (void) fputs (_(" -p, --password PASSWORD change the password to this (encrypted)\n" | 113 | (void) fputs (_(" -p, --password PASSWORD change the password to this (encrypted)\n" |
88 | " PASSWORD\n"), usageout); | 114 | " PASSWORD\n"), usageout); |
89 | + (void) fputs (_(" -P, --clear-password PASSWORD change the password to this clear PASSWORD\n"), usageout); | 115 | + (void) fputs (_(" -P, --clear-password PASSWORD change the password to this clear PASSWORD\n"), usageout); |
90 | (void) fputs (_(" -R, --root CHROOT_DIR directory to chroot into\n"), usageout); | 116 | (void) fputs (_(" -R, --root CHROOT_DIR directory to chroot into\n"), usageout); |
117 | - (void) fputs (_(" -P, --prefix PREFIX_DIR prefix directory where are located the /etc/* files\n"), usageout); | ||
118 | + (void) fputs (_(" -A, --prefix PREFIX_DIR prefix directory where are located the /etc/* files\n"), usageout); | ||
91 | (void) fputs ("\n", usageout); | 119 | (void) fputs ("\n", usageout); |
92 | exit (status); | 120 | exit (status); |
93 | @@ -375,10 +376,11 @@ static void process_flags (int argc, char **argv) | 121 | } |
122 | @@ -383,11 +384,12 @@ static void process_flags (int argc, char **argv) | ||
94 | {"new-name", required_argument, NULL, 'n'}, | 123 | {"new-name", required_argument, NULL, 'n'}, |
95 | {"non-unique", no_argument, NULL, 'o'}, | 124 | {"non-unique", no_argument, NULL, 'o'}, |
96 | {"password", required_argument, NULL, 'p'}, | 125 | {"password", required_argument, NULL, 'p'}, |
97 | + {"clear-password", required_argument, NULL, 'P'}, | 126 | + {"clear-password", required_argument, NULL, 'P'}, |
98 | {"root", required_argument, NULL, 'R'}, | 127 | {"root", required_argument, NULL, 'R'}, |
128 | - {"prefix", required_argument, NULL, 'P'}, | ||
129 | + {"prefix", required_argument, NULL, 'A'}, | ||
99 | {NULL, 0, NULL, '\0'} | 130 | {NULL, 0, NULL, '\0'} |
100 | }; | 131 | }; |
101 | - while ((c = getopt_long (argc, argv, "g:hn:op:R:", | 132 | - while ((c = getopt_long (argc, argv, "g:hn:op:R:P:", |
102 | + while ((c = getopt_long (argc, argv, "g:hn:op:P:R:", | 133 | + while ((c = getopt_long (argc, argv, "g:hn:op:P:R:A:", |
103 | long_options, NULL)) != -1) { | 134 | long_options, NULL)) != -1) { |
104 | switch (c) { | 135 | switch (c) { |
105 | case 'g': | 136 | case 'g': |
106 | @@ -405,6 +407,10 @@ static void process_flags (int argc, char **argv) | 137 | @@ -414,9 +416,17 @@ static void process_flags (int argc, char **argv) |
107 | group_passwd = optarg; | 138 | group_passwd = optarg; |
108 | pflg = true; | 139 | pflg = true; |
109 | break; | 140 | break; |
@@ -113,40 +144,65 @@ index d9d3807..68f49d1 100644 | |||
113 | + break; | 144 | + break; |
114 | case 'R': /* no-op, handled in process_root_flag () */ | 145 | case 'R': /* no-op, handled in process_root_flag () */ |
115 | break; | 146 | break; |
147 | - case 'P': /* no-op, handled in process_prefix_flag () */ | ||
148 | + case 'A': /* no-op, handled in process_prefix_flag () */ | ||
149 | + fprintf (stderr, | ||
150 | + _("%s: -A is deliberately not supported \n"), | ||
151 | + Prog); | ||
152 | + exit (E_BAD_ARG); | ||
153 | break; | ||
116 | default: | 154 | default: |
155 | usage (E_USAGE); | ||
156 | @@ -757,7 +767,7 @@ int main (int argc, char **argv) | ||
157 | (void) textdomain (PACKAGE); | ||
158 | |||
159 | process_root_flag ("-R", argc, argv); | ||
160 | - prefix = process_prefix_flag ("-P", argc, argv); | ||
161 | + prefix = process_prefix_flag ("-A", argc, argv); | ||
162 | |||
163 | OPENLOG ("groupmod"); | ||
164 | #ifdef WITH_AUDIT | ||
117 | diff --git a/src/useradd.c b/src/useradd.c | 165 | diff --git a/src/useradd.c b/src/useradd.c |
118 | index b3bd451..4416f90 100644 | 166 | index c74e491..7214e72 100644 |
119 | --- a/src/useradd.c | 167 | --- a/src/useradd.c |
120 | +++ b/src/useradd.c | 168 | +++ b/src/useradd.c |
121 | @@ -776,6 +776,7 @@ static void usage (int status) | 169 | @@ -829,9 +829,10 @@ static void usage (int status) |
122 | (void) fputs (_(" -o, --non-unique allow to create users with duplicate\n" | 170 | (void) fputs (_(" -o, --non-unique allow to create users with duplicate\n" |
123 | " (non-unique) UID\n"), usageout); | 171 | " (non-unique) UID\n"), usageout); |
124 | (void) fputs (_(" -p, --password PASSWORD encrypted password of the new account\n"), usageout); | 172 | (void) fputs (_(" -p, --password PASSWORD encrypted password of the new account\n"), usageout); |
125 | + (void) fputs (_(" -P, --clear-password PASSWORD clear password of the new account\n"), usageout); | 173 | + (void) fputs (_(" -P, --clear-password PASSWORD clear password of the new account\n"), usageout); |
126 | (void) fputs (_(" -r, --system create a system account\n"), usageout); | 174 | (void) fputs (_(" -r, --system create a system account\n"), usageout); |
127 | (void) fputs (_(" -R, --root CHROOT_DIR directory to chroot into\n"), usageout); | 175 | (void) fputs (_(" -R, --root CHROOT_DIR directory to chroot into\n"), usageout); |
176 | - (void) fputs (_(" -P, --prefix PREFIX_DIR prefix directory where are located the /etc/* files\n"), usageout); | ||
177 | + (void) fputs (_(" -A, --prefix PREFIX_DIR prefix directory where are located the /etc/* files\n"), usageout); | ||
128 | (void) fputs (_(" -s, --shell SHELL login shell of the new account\n"), usageout); | 178 | (void) fputs (_(" -s, --shell SHELL login shell of the new account\n"), usageout); |
129 | @@ -1050,6 +1051,7 @@ static void process_flags (int argc, char **argv) | 179 | (void) fputs (_(" -u, --uid UID user ID of the new account\n"), usageout); |
180 | (void) fputs (_(" -U, --user-group create a group with the same name as the user\n"), usageout); | ||
181 | @@ -1104,9 +1105,10 @@ static void process_flags (int argc, char **argv) | ||
130 | {"no-user-group", no_argument, NULL, 'N'}, | 182 | {"no-user-group", no_argument, NULL, 'N'}, |
131 | {"non-unique", no_argument, NULL, 'o'}, | 183 | {"non-unique", no_argument, NULL, 'o'}, |
132 | {"password", required_argument, NULL, 'p'}, | 184 | {"password", required_argument, NULL, 'p'}, |
133 | + {"clear-password", required_argument, NULL, 'P'}, | 185 | + {"clear-password", required_argument, NULL, 'P'}, |
134 | {"system", no_argument, NULL, 'r'}, | 186 | {"system", no_argument, NULL, 'r'}, |
135 | {"root", required_argument, NULL, 'R'}, | 187 | {"root", required_argument, NULL, 'R'}, |
188 | - {"prefix", required_argument, NULL, 'P'}, | ||
189 | + {"prefix", required_argument, NULL, 'A'}, | ||
136 | {"shell", required_argument, NULL, 's'}, | 190 | {"shell", required_argument, NULL, 's'}, |
137 | @@ -1062,9 +1064,9 @@ static void process_flags (int argc, char **argv) | 191 | {"uid", required_argument, NULL, 'u'}, |
192 | {"user-group", no_argument, NULL, 'U'}, | ||
193 | @@ -1117,9 +1119,9 @@ static void process_flags (int argc, char **argv) | ||
138 | }; | 194 | }; |
139 | while ((c = getopt_long (argc, argv, | 195 | while ((c = getopt_long (argc, argv, |
140 | #ifdef WITH_SELINUX | 196 | #ifdef WITH_SELINUX |
141 | - "b:c:d:De:f:g:G:hk:K:lmMNop:rR:s:u:UZ:", | 197 | - "b:c:d:De:f:g:G:hk:K:lmMNop:rR:P:s:u:UZ:", |
142 | + "b:c:d:De:f:g:G:hk:K:lmMNop:P:rR:s:u:UZ:", | 198 | + "b:c:d:De:f:g:G:hk:K:lmMNop:P:rR:A:s:u:UZ:", |
143 | #else /* !WITH_SELINUX */ | 199 | #else /* !WITH_SELINUX */ |
144 | - "b:c:d:De:f:g:G:hk:K:lmMNop:rR:s:u:U", | 200 | - "b:c:d:De:f:g:G:hk:K:lmMNop:rR:P:s:u:U", |
145 | + "b:c:d:De:f:g:G:hk:K:lmMNop:P:rR:s:u:U", | 201 | + "b:c:d:De:f:g:G:hk:K:lmMNop:P:rR:A:s:u:U", |
146 | #endif /* !WITH_SELINUX */ | 202 | #endif /* !WITH_SELINUX */ |
147 | long_options, NULL)) != -1) { | 203 | long_options, NULL)) != -1) { |
148 | switch (c) { | 204 | switch (c) { |
149 | @@ -1230,6 +1232,9 @@ static void process_flags (int argc, char **argv) | 205 | @@ -1285,12 +1287,19 @@ static void process_flags (int argc, char **argv) |
150 | } | 206 | } |
151 | user_pass = optarg; | 207 | user_pass = optarg; |
152 | break; | 208 | break; |
@@ -156,36 +212,62 @@ index b3bd451..4416f90 100644 | |||
156 | case 'r': | 212 | case 'r': |
157 | rflg = true; | 213 | rflg = true; |
158 | break; | 214 | break; |
215 | case 'R': /* no-op, handled in process_root_flag () */ | ||
216 | break; | ||
217 | - case 'P': /* no-op, handled in process_prefix_flag () */ | ||
218 | + case 'A': /* no-op, handled in process_prefix_flag () */ | ||
219 | + fprintf (stderr, | ||
220 | + _("%s: -A is deliberately not supported \n"), | ||
221 | + Prog); | ||
222 | + exit (E_BAD_ARG); | ||
223 | break; | ||
224 | case 's': | ||
225 | if ( ( !VALID (optarg) ) | ||
226 | @@ -2148,7 +2157,7 @@ int main (int argc, char **argv) | ||
227 | |||
228 | process_root_flag ("-R", argc, argv); | ||
229 | |||
230 | - prefix = process_prefix_flag("-P", argc, argv); | ||
231 | + prefix = process_prefix_flag("-A", argc, argv); | ||
232 | |||
233 | OPENLOG ("useradd"); | ||
234 | #ifdef WITH_AUDIT | ||
159 | diff --git a/src/usermod.c b/src/usermod.c | 235 | diff --git a/src/usermod.c b/src/usermod.c |
160 | index e7d4351..b79f7a3 100644 | 236 | index e571426..ccfbb99 100644 |
161 | --- a/src/usermod.c | 237 | --- a/src/usermod.c |
162 | +++ b/src/usermod.c | 238 | +++ b/src/usermod.c |
163 | @@ -419,6 +419,7 @@ static /*@noreturn@*/void usage (int status) | 239 | @@ -424,8 +424,9 @@ static /*@noreturn@*/void usage (int status) |
164 | " new location (use only with -d)\n"), usageout); | 240 | " new location (use only with -d)\n"), usageout); |
165 | (void) fputs (_(" -o, --non-unique allow using duplicate (non-unique) UID\n"), usageout); | 241 | (void) fputs (_(" -o, --non-unique allow using duplicate (non-unique) UID\n"), usageout); |
166 | (void) fputs (_(" -p, --password PASSWORD use encrypted password for the new password\n"), usageout); | 242 | (void) fputs (_(" -p, --password PASSWORD use encrypted password for the new password\n"), usageout); |
167 | + (void) fputs (_(" -P, --clear-password PASSWORD use clear password for the new password\n"), usageout); | 243 | + (void) fputs (_(" -P, --clear-password PASSWORD use clear password for the new password\n"), usageout); |
168 | (void) fputs (_(" -R, --root CHROOT_DIR directory to chroot into\n"), usageout); | 244 | (void) fputs (_(" -R, --root CHROOT_DIR directory to chroot into\n"), usageout); |
245 | - (void) fputs (_(" -P, --prefix PREFIX_DIR prefix directory where are located the /etc/* files\n"), usageout); | ||
246 | + (void) fputs (_(" -A, --prefix PREFIX_DIR prefix directory where are located the /etc/* files\n"), usageout); | ||
169 | (void) fputs (_(" -s, --shell SHELL new login shell for the user account\n"), usageout); | 247 | (void) fputs (_(" -s, --shell SHELL new login shell for the user account\n"), usageout); |
170 | (void) fputs (_(" -u, --uid UID new UID for the user account\n"), usageout); | 248 | (void) fputs (_(" -u, --uid UID new UID for the user account\n"), usageout); |
171 | @@ -996,6 +997,7 @@ static void process_flags (int argc, char **argv) | 249 | (void) fputs (_(" -U, --unlock unlock the user account\n"), usageout); |
250 | @@ -1002,8 +1003,9 @@ static void process_flags (int argc, char **argv) | ||
172 | {"move-home", no_argument, NULL, 'm'}, | 251 | {"move-home", no_argument, NULL, 'm'}, |
173 | {"non-unique", no_argument, NULL, 'o'}, | 252 | {"non-unique", no_argument, NULL, 'o'}, |
174 | {"password", required_argument, NULL, 'p'}, | 253 | {"password", required_argument, NULL, 'p'}, |
175 | + {"clear-password", required_argument, NULL, 'P'}, | 254 | + {"clear-password", required_argument, NULL, 'P'}, |
176 | {"root", required_argument, NULL, 'R'}, | 255 | {"root", required_argument, NULL, 'R'}, |
256 | - {"prefix", required_argument, NULL, 'P'}, | ||
257 | + {"prefix", required_argument, NULL, 'A'}, | ||
177 | {"shell", required_argument, NULL, 's'}, | 258 | {"shell", required_argument, NULL, 's'}, |
178 | {"uid", required_argument, NULL, 'u'}, | 259 | {"uid", required_argument, NULL, 'u'}, |
179 | @@ -1012,7 +1014,7 @@ static void process_flags (int argc, char **argv) | 260 | {"unlock", no_argument, NULL, 'U'}, |
261 | @@ -1019,7 +1021,7 @@ static void process_flags (int argc, char **argv) | ||
180 | {NULL, 0, NULL, '\0'} | 262 | {NULL, 0, NULL, '\0'} |
181 | }; | 263 | }; |
182 | while ((c = getopt_long (argc, argv, | 264 | while ((c = getopt_long (argc, argv, |
183 | - "ac:d:e:f:g:G:hl:Lmop:R:s:u:U" | 265 | - "ac:d:e:f:g:G:hl:Lmop:R:s:u:UP:" |
184 | + "ac:d:e:f:g:G:hl:Lmop:P:R:s:u:U" | 266 | + "ac:d:e:f:g:G:hl:Lmop:P:R:s:u:UA:" |
185 | #ifdef ENABLE_SUBIDS | 267 | #ifdef ENABLE_SUBIDS |
186 | "v:w:V:W:" | 268 | "v:w:V:W:" |
187 | #endif /* ENABLE_SUBIDS */ | 269 | #endif /* ENABLE_SUBIDS */ |
188 | @@ -1112,6 +1114,10 @@ static void process_flags (int argc, char **argv) | 270 | @@ -1119,9 +1121,17 @@ static void process_flags (int argc, char **argv) |
189 | user_pass = optarg; | 271 | user_pass = optarg; |
190 | pflg = true; | 272 | pflg = true; |
191 | break; | 273 | break; |
@@ -195,7 +277,24 @@ index e7d4351..b79f7a3 100644 | |||
195 | + break; | 277 | + break; |
196 | case 'R': /* no-op, handled in process_root_flag () */ | 278 | case 'R': /* no-op, handled in process_root_flag () */ |
197 | break; | 279 | break; |
280 | - case 'P': /* no-op, handled in process_prefix_flag () */ | ||
281 | + case 'A': /* no-op, handled in process_prefix_flag () */ | ||
282 | + fprintf (stderr, | ||
283 | + _("%s: -A is deliberately not supported \n"), | ||
284 | + Prog); | ||
285 | + exit (E_BAD_ARG); | ||
286 | break; | ||
198 | case 's': | 287 | case 's': |
288 | if (!VALID (optarg)) { | ||
289 | @@ -2098,7 +2108,7 @@ int main (int argc, char **argv) | ||
290 | (void) textdomain (PACKAGE); | ||
291 | |||
292 | process_root_flag ("-R", argc, argv); | ||
293 | - prefix = process_prefix_flag ("-P", argc, argv); | ||
294 | + prefix = process_prefix_flag ("-A", argc, argv); | ||
295 | |||
296 | OPENLOG ("usermod"); | ||
297 | #ifdef WITH_AUDIT | ||
199 | -- | 298 | -- |
200 | 1.7.9.5 | 299 | 2.11.0 |
201 | 300 | ||