1 --- shadow-4.0.16/lib/getdef.c~ 2006-06-08 00:19:27.452506888 +0300
2 +++ shadow-4.0.16/lib/getdef.c 2006-06-08 00:21:20.945057953 +0300
7 + {"SYS_GID_MAX", NULL},
8 + {"SYS_GID_MIN", NULL},
9 {"HUSHLOGIN_FILE", NULL},
11 {"LOGIN_RETRIES", NULL},
13 {"TTYTYPE_FILE", NULL},
16 + {"SYS_UID_MAX", NULL},
17 + {"SYS_UID_MIN", NULL},
19 {"USERDEL_CMD", NULL},
20 {"USERGROUPS_ENAB", NULL},
21 --- shadow-4.0.6/src/useradd.c 2004-11-18 21:45:00.713398344 +0100
22 +++ shadow-4.0.16/src/useradd.c 2006-06-08 01:17:05.580340031 +0300
25 * These defaults are used if there is no defaults file.
27 -static gid_t def_group = 100;
28 +static gid_t def_group = 1000;
29 static const char *def_gname = "other";
30 -static const char *def_home = "/home";
31 -static const char *def_shell = "";
32 +static const char *def_home = "/home/users";
33 +static const char *def_shell = "/dev/null";
34 static const char *def_template = SKEL_DIR;
35 static const char *def_create_mail_spool = "no";
38 #define VALID(s) (strcspn (s, ":\n") == strlen (s))
40 static const char *user_name = "";
41 -static const char *user_pass = "!";
42 +static const char *user_pass = "!!";
44 static gid_t user_gid;
45 static const char *user_comment = "";
47 mflg = 0, /* create user's home directory if it doesn't exist */
48 nflg = 0, /* create a group having the same name as the user */
49 oflg = 0, /* permit non-unique user ID to be specified with -u */
50 + rflg = 0, /* create system account (wuth lower uid) */
51 sflg = 0, /* shell program for new account */
52 uflg = 0; /* specify user ID for new account */
56 " -p, --password PASSWORD use encrypted password for the new user\n"
58 + " -r create a system account, with uid lower than usual\n"
59 " -s, --shell SHELL the login shell for the new user account\n"
60 " -u, --uid UID force use the UID for the new user account\n"));
64 uid_min = getdef_unum ("UID_MIN", 1000);
65 uid_max = getdef_unum ("UID_MAX", 60000);
67 + uid_min = getdef_unum ("UID_MIN", 500);
68 + uid_max = getdef_unum ("UID_MAX", 60000);
70 + uid_min = getdef_unum ("SYS_UID_MIN", 1);
71 + uid_max = getdef_unum ("SYS_UID_MAX", 499);
75 * Start with some UID value if the user didn't provide us with
80 - getopt_long (argc, argv, "b:c:d:De:f:g:G:k:K:mMop:s:u:",
81 + getopt_long (argc, argv, "b:c:d:De:f:g:G:k:K:mMop:s:u:r",
82 long_options, NULL)) != -1) {
89 + case 'r': /* create system account */
95 --- shadow-4.0.16/src/groupadd.c~ 2006-06-09 21:23:35.786172809 +0300
96 +++ shadow-4.0.16/src/groupadd.c 2006-06-09 21:26:14.039716861 +0300
98 static int oflg = 0; /* permit non-unique group ID to be specified with -g */
99 static int gflg = 0; /* ID value for the new group */
100 static int fflg = 0; /* if group already exists, do nothing and exit(0) */
101 +static int rflg = 0; /* add system group (with lower gid) */
104 extern int gr_dbm_mode;
106 " -h, --help display this help message and exit\n"
107 " -K, --key KEY=VALUE overrides /etc/login.defs defaults\n"
108 " -o, --non-unique allow create group with duplicate\n"
109 + " -r create a system account, with gid lower than usual\n"
110 " (non-unique) GID\n"));
114 const struct group *grp;
115 gid_t gid_min, gid_max;
117 - gid_min = getdef_unum ("GID_MIN", 1000);
118 - gid_max = getdef_unum ("GID_MAX", 60000);
120 + gid_min = getdef_unum ("GID_MIN", 500);
121 + gid_max = getdef_unum ("GID_MAX", 60000);
123 + gid_min = getdef_unum ("SYS_GID_MIN", 10);
124 + gid_max = getdef_unum ("SYS_GID_MAX", 499);
128 * Start with some GID value if the user didn't provide us with
133 - getopt_long (argc, argv, "fg:hK:o", long_options,
134 + getopt_long (argc, argv, "fg:hK:or", long_options,
135 &option_index)) != -1) {
143 + /* create system group */
149 --- shadow-4.0.16/man/groupadd.8.xml~ 2006-06-08 01:07:41.447664461 +0300
150 +++ shadow-4.0.16/man/groupadd.8.xml 2006-06-08 01:07:45.947765703 +0300
153 <arg choice='opt'>-f </arg>
154 <arg choice='opt'>-K <replaceable>KEY</replaceable>=<replaceable>VALUE</replaceable></arg>
155 + <arg choice='opt'>-r </arg>
157 <replaceable>group</replaceable>
165 + <option>-r</option>
168 + <para>This flag is used to create a system group, with gid lower than usual
169 + (chosen between SYS_GID_MIN and SYS_GID_MAX).
175 <option>-g</option> <replaceable>GID</replaceable>
176 --- shadow-4.0.6.orig/man/pl/groupadd.8 2004-11-18 15:47:10.946299056 +0100
177 +++ shadow-4.0.6/man/pl/groupadd.8 2004-11-18 21:45:00.696400928 +0100
180 groupadd - twórz now± grupê
182 -\fBgroupadd\fR [\fB-g\fR \fIgid\fR [\fB-o\fR]] [\fB-f\fR] \fIgrupa\fR
183 +\fBgroupadd\fR [\fB-g\fR \fIgid\fR [\fB-o\fR]] [\fB-f\fR] [\fB-r\fR] \fIgrupa\fR
185 Polecenie \fBgroupadd\fR tworzy nowe konto grupy pos³uguj±c siê
186 warto¶ciami podanymi w wierszu poleceñ i domy¶lnymi warto¶ciami z systemu.
188 podana groupa ju¿ istnieje. Z opcj± \fB-g\fR, je¶li podany gid ju¿ istnieje,
189 wybierany jest inny (unikalny) gid (czyli \fB-g\fR jest wy³±czane).
192 +Ta opcja s³u¿y do zak³adania grup systemowych, z identyfikatorami ni¿szymi
193 +ni¿ zwykle (wybieranymi z przedzia³u od SYS_GID_MIN do SYS_GID_MAX).
196 Numeryczna warto¶æ identyfikatora grupy. Warto¶æ ta musi byæ niepowtarzalna,
197 chyba ¿e u¿yto opcji \fB-o\fR. Warto¶æ ID grupy nie mo¿e byæ ujemna. Domy¶lnie
198 --- shadow-4.0.6.orig/man/pl/useradd.8 2004-11-18 15:47:10.949298600 +0100
199 +++ shadow-4.0.6/man/pl/useradd.8 2004-11-18 21:45:00.697400776 +0100
201 .IP "\fB-p \fIpasswd\fR"
202 Zakodowane has³o w postaci zwracanej przez \fBcrypt\fR(3).
203 Domy¶lnym dzia³aniem jest blokowanie konta.
205 -.\" Tworzenie konta systemowego. Ta opcja pozwala na utworzenie konta o UID
206 -.\" ni¿szym ni¿ UID_MIN zdefiniowane w fI/etc/login.defs\fR. O ile nie poda siê
207 -.\" dodatkowo opcji \fB-m\fR nie jest tworzony katalog domowy dla tak tworzonego
208 -.\" u¿ytkownika niezale¿nie od tego czy tworzenie katalogu jest ustawione czy
209 -.\" nie w \fI/etc/login.defs\fR.
211 +Tworzenie konta systemowego, z identyfikatorem ni¿szym ni¿ zwykle
212 +(wybieranym z przedzia³u od SYS_UID_MIN do SYS_UID_MAX).
213 .IP "\fB-s \fIpow³oka\fR"
214 Nazwa pow³oki (shell) u¿ytkownika. Ustawienie tego pola na puste
215 powoduje, ¿e system wybierze domy¶ln± pow³okê logowania.
216 --- shadow-4.0.6.orig/man/useradd.8 2004-11-18 15:47:10.926302096 +0100
217 +++ shadow-4.0.6/man/useradd.8 2004-11-18 21:45:00.697400776 +0100
220 [[\fB-M\fR] \fB-m\fR [\fB-k\fR \fIskeleton_dir\fR]] [\fB-o\fR] [\fB-p\fR \fIpasswd\fR]
222 -[\fB-s\fR \fIshell\fR] [\fB-u\fR \fIuid\fR] \fIlogin\fR
223 +[\fB-r\fR] [\fB-s\fR \fIshell\fR] [\fB-u\fR \fIuid\fR] \fIlogin\fR
225 \fBuseradd\fR \fB-D\fR [\fB-g\fI default_group\fR] [\fB-b\fI default_home\fR]
228 .IP "\fB-p \fIpasswd\fR"
229 The encrypted password, as returned by \fBcrypt\fR(3). The default is to
232 +This flag is used to create a system account, with uid lower than
233 +usual (chosen between SYS_UID_MIN and SYS_UID_MAX).
234 .IP "\fB-s\fR \fIshell\fR"
235 The name of the user's login shell. The default is to leave this field
236 blank, which causes the system to select the default login shell.
237 --- shadow-4.0.7/po/ca.po.orig 2005-02-06 20:53:02.764551000 +0100
238 +++ shadow-4.0.7/po/ca.po 2005-02-06 21:16:22.244798552 +0100
241 #: src/groupadd.c:102
243 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
244 -msgstr "Forma d'ús: groupadd [-g gid [-o]] [-f] grup\n"
245 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
246 +msgstr "Forma d'ús: groupadd [-g gid [-o]] [-f] [-r] grup\n"
248 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
249 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
250 @@ -1714,8 +1714,8 @@
254 -msgid " [-p passwd] name\n"
255 -msgstr " [-p contrasenya] nom\n"
256 +msgid " [-p passwd] [-r] name\n"
257 +msgstr " [-p contrasenya] [-r] nom\n"
261 --- shadow-4.0.6.orig/po/cs.po 2004-11-18 15:47:10.872310304 +0100
262 +++ shadow-4.0.6/po/cs.po 2004-11-18 21:45:00.699400472 +0100
265 #: src/groupadd.c:102
267 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
268 -msgstr "Použití: groupadd [-g gid [-o]] [-f] skupina\n"
269 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
270 +msgstr "Použití: groupadd [-g gid [-o]] [-f] [-r] skupina\n"
272 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
273 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
274 @@ -1804,8 +1804,8 @@
278 -msgid " [-p passwd] name\n"
279 -msgstr " [-p heslo] jméno\n"
280 +msgid " [-p passwd] [-r] name\n"
281 +msgstr " [-p heslo] [-r] jméno\n"
285 --- shadow-4.0.7/po/da.po.orig 2005-02-06 20:53:02.782549000 +0100
286 +++ shadow-4.0.7/po/da.po 2005-02-06 21:17:02.084741960 +0100
289 #: src/groupadd.c:102
291 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
292 -msgstr "Brug: groupadd [-g gid [-o]] [-f] gruppe\n"
293 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
294 +msgstr "Brug: groupadd [-g gid [-o]] [-f] [-r] gruppe\n"
296 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
297 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
298 @@ -1730,8 +1730,8 @@
302 -msgid " [-p passwd] name\n"
303 -msgstr " [-p adgangskode] navn\n"
304 +msgid " [-p passwd] [-r] name\n"
305 +msgstr " [-p adgangskode] [-r] navn\n"
309 --- shadow-4.0.6.orig/po/de.po 2004-11-18 15:47:10.873310152 +0100
310 +++ shadow-4.0.6/po/de.po 2004-11-18 21:45:00.700400320 +0100
313 #: src/groupadd.c:102
315 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
316 -msgstr "Syntax: groupadd [-g gid [-o]] [-f] Gruppe\n"
317 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
318 +msgstr "Syntax: groupadd [-g gid [-o]] [-f] [-r] Gruppe\n"
320 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
321 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
322 @@ -1802,8 +1802,8 @@
326 -msgid " [-p passwd] name\n"
327 -msgstr " [-p Kennwort] Name\n"
328 +msgid " [-p passwd] [-r] name\n"
329 +msgstr " [-p Kennwort] [-r] Name\n"
333 --- shadow-4.0.6.orig/po/el.po 2004-11-18 15:47:10.874310000 +0100
334 +++ shadow-4.0.6/po/el.po 2004-11-18 21:45:00.702400016 +0100
337 #: src/groupadd.c:102
339 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
340 -msgstr "Χρήση: groupadd [-g gid [-o]] [-f] ομάδα\n"
341 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
342 +msgstr "Χρήση: groupadd [-g gid [-o]] [-f] [-r] ομάδα\n"
344 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
345 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
346 @@ -1823,8 +1823,8 @@
350 -msgid " [-p passwd] name\n"
351 -msgstr " [-p συνθηματικό] όνομα\n"
352 +msgid " [-p passwd] [-r] name\n"
353 +msgstr " [-p συνθηματικό] [-r] όνομα\n"
357 --- shadow-4.0.7/po/es.po.orig 2005-02-06 20:53:02.810544000 +0100
358 +++ shadow-4.0.7/po/es.po 2005-02-06 21:17:29.589560592 +0100
361 #: src/groupadd.c:102
363 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
364 -msgstr "Modo de uso: groupadd [-g gid [-o]] [-f] grupo\n"
365 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
366 +msgstr "Modo de uso: groupadd [-g gid [-o]] [-f] [-r] grupo\n"
368 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
369 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
370 @@ -1747,8 +1747,8 @@
374 -msgid " [-p passwd] name\n"
375 -msgstr " [-p contraseña] nombre\n"
376 +msgid " [-p passwd] [-r] name\n"
377 +msgstr " [-p contraseña] [-r] nombre\n"
381 --- shadow-4.0.7/po/eu.po.orig 2005-02-06 20:53:02.818543000 +0100
382 +++ shadow-4.0.7/po/eu.po 2005-02-06 21:17:44.920229976 +0100
385 #: src/groupadd.c:102
387 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
388 -msgstr "Erabilera: groupadd [-g gid [-o]] [-f] taldea\n"
389 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
390 +msgstr "Erabilera: groupadd [-g gid [-o]] [-f] [-r] taldea\n"
392 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
393 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
394 @@ -1708,8 +1708,8 @@
398 -msgid " [-p passwd] name\n"
399 -msgstr " [-p pasahitz] izena\n"
400 +msgid " [-p passwd] [-r] name\n"
401 +msgstr " [-p pasahitz] [-r] izena\n"
405 --- shadow-4.0.7/po/fi.po.orig 2005-02-06 20:53:02.828542000 +0100
406 +++ shadow-4.0.7/po/fi.po 2005-02-06 21:18:04.821204568 +0100
409 #: src/groupadd.c:102
411 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
412 -msgstr "Käyttö: groupadd [-g gid [-o]] [-f] ryhmä\n"
413 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
414 +msgstr "Käyttö: groupadd [-g gid [-o]] [-f] [-r] ryhmä\n"
416 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
417 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
418 @@ -1732,8 +1732,8 @@
422 -msgid " [-p passwd] name\n"
423 -msgstr " [-p salansana] nimi\n"
424 +msgid " [-p passwd] [-r] name\n"
425 +msgstr " [-p salansana] [-r] nimi\n"
429 --- shadow-4.0.6.orig/po/fr.po 2004-11-18 15:47:10.877309544 +0100
430 +++ shadow-4.0.6/po/fr.po 2004-11-18 21:45:00.703399864 +0100
433 #: src/groupadd.c:102
435 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
436 -msgstr "Usage: groupadd [-g gid [-o]] [-f] groupe\n"
437 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
438 +msgstr "Usage: groupadd [-g gid [-o]] [-f] [-r] groupe\n"
440 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
441 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
442 @@ -1804,8 +1804,8 @@
446 -msgid " [-p passwd] name\n"
447 -msgstr " [-p mot-de-passe] nom\n"
448 +msgid " [-p passwd] [-r] name\n"
449 +msgstr " [-p mot-de-passe] [-r] nom\n"
453 --- shadow-4.0.7/po/id.po.orig 2005-02-06 20:53:02.954523000 +0100
454 +++ shadow-4.0.7/po/id.po 2005-02-06 21:18:31.035219432 +0100
457 #: src/groupadd.c:102
459 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
460 -msgstr "Penggunaan: groupadd [-g gid [-o]] [-f] grup\n"
461 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
462 +msgstr "Penggunaan: groupadd [-g gid [-o]] [-f] [-r] grup\n"
464 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
465 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
466 @@ -1704,8 +1704,8 @@
470 -msgid " [-p passwd] name\n"
471 -msgstr " [-p kata_sandi] nama\n"
472 +msgid " [-p passwd] [-r] name\n"
473 +msgstr " [-p kata_sandi] [-r] nama\n"
477 --- shadow-4.0.7/po/it.po.orig 2005-02-06 20:53:02.963521000 +0100
478 +++ shadow-4.0.7/po/it.po 2005-02-06 21:18:46.662843672 +0100
481 #: src/groupadd.c:102
483 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
484 -msgstr "Uso: groupadd [-g GID [-o]] [-f] GRUPPO\n"
485 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
486 +msgstr "Uso: groupadd [-g GID [-o]] [-f] [-r] GRUPPO\n"
488 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
489 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
490 @@ -1775,8 +1775,8 @@
494 -msgid " [-p passwd] name\n"
495 -msgstr " [-p PASSWORD] NOME\n"
496 +msgid " [-p passwd] [-r] name\n"
497 +msgstr " [-p PASSWORD] [-r] NOME\n"
501 --- shadow-4.0.6.orig/po/ja.po 2004-11-18 15:47:10.879309240 +0100
502 +++ shadow-4.0.6/po/ja.po 2004-11-18 21:45:00.704399712 +0100
505 #: src/groupadd.c:102
507 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
508 -msgstr "使用法: groupadd [-g グループID [-o]] [-f] グループ\n"
509 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
510 +msgstr "使用法: groupadd [-g グループID [-o]] [-f] [-r] グループ\n"
512 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
513 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
514 @@ -1793,8 +1793,8 @@
518 -msgid " [-p passwd] name\n"
519 -msgstr " [-p パスワード] ユーザ名\n"
520 +msgid " [-p passwd] [-r] name\n"
521 +msgstr " [-p パスワード] [-r] ユーザ名\n"
525 --- shadow-4.0.6.orig/po/ko.po 2004-11-18 15:47:10.880309088 +0100
526 +++ shadow-4.0.6/po/ko.po 2004-11-18 21:45:00.706399408 +0100
529 #: src/groupadd.c:102
531 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
532 -msgstr "사용법: groupadd [-g GID [-o]] [-f] 그룹명\n"
533 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
534 +msgstr "사용법: groupadd [-g GID [-o]] [-f] [-r] 그룹명\n"
536 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
537 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
538 @@ -1800,8 +1800,8 @@
542 -msgid " [-p passwd] name\n"
543 -msgstr " [-p 열쇠글] 이름\n"
544 +msgid " [-p passwd] [-r] name\n"
545 +msgstr " [-p 열쇠글] [-r] 이름\n"
549 --- shadow-4.0.7/po/nb.po.orig 2005-02-06 20:53:02.989517000 +0100
550 +++ shadow-4.0.7/po/nb.po 2005-02-06 21:19:10.761180168 +0100
553 #: src/groupadd.c:102
555 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
556 -msgstr "Bruk: groupadd [-g gid [-o]] [-f] gruppe\n"
557 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
558 +msgstr "Bruk: groupadd [-g gid [-o]] [-f] [-r] gruppe\n"
560 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
561 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
562 @@ -1710,8 +1710,8 @@
566 -msgid " [-p passwd] name\n"
567 -msgstr " [-p passord] navn\n"
568 +msgid " [-p passwd] [-r] name\n"
569 +msgstr " [-p passord] [-r] navn\n"
573 --- shadow-4.0.7/po/nl.po.orig 2005-02-06 20:53:02.998516000 +0100
574 +++ shadow-4.0.7/po/nl.po 2005-02-06 21:19:23.540237456 +0100
577 #: src/groupadd.c:102
579 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
580 -msgstr "Gebruik: groupadd [-g gid [-o]] [-f] groep\n"
581 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
582 +msgstr "Gebruik: groupadd [-g gid [-o]] [-f] [-r] groep\n"
584 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
585 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
586 @@ -1739,8 +1739,8 @@
590 -msgid " [-p passwd] name\n"
591 -msgstr " [-p wachtwoord] naam\n"
592 +msgid " [-p passwd] [-r] name\n"
593 +msgstr " [-p wachtwoord] [-r] naam\n"
597 --- shadow-4.0.7/po/nn.po.orig 2005-02-06 20:53:03.008514000 +0100
598 +++ shadow-4.0.7/po/nn.po 2005-02-06 21:19:36.046336240 +0100
601 #: src/groupadd.c:102
603 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
604 -msgstr "Bruk: groupadd [-g gid [-o]] [-f] gruppe\n"
605 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
606 +msgstr "Bruk: groupadd [-g gid [-o]] [-f] [-r] gruppe\n"
608 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
609 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
610 @@ -1704,8 +1704,8 @@
614 -msgid " [-p passwd] name\n"
615 -msgstr " [-p passord] namn\n"
616 +msgid " [-p passwd] [-r] name\n"
617 +msgstr " [-p passord] [-r] namn\n"
621 --- shadow-4.0.6.orig/po/pl.po 2004-11-18 15:47:10.882308784 +0100
622 +++ shadow-4.0.6/po/pl.po 2004-11-18 21:45:00.707399256 +0100
625 #: src/groupadd.c:102
627 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
628 -msgstr "Użycie: groupadd [-g gid [-o]] [-f] grupa\n"
629 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
630 +msgstr "Użycie: groupadd [-g gid [-o]] [-f] [-r] grupa\n"
632 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
633 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
634 @@ -1805,8 +1805,8 @@
638 -msgid " [-p passwd] name\n"
639 -msgstr " [-p hasło] nazwa\n"
640 +msgid " [-p passwd] [-r] name\n"
641 +msgstr " [-p hasło] [-r] nazwa\n"
645 --- shadow-4.0.7/po/pt.po.orig 2005-02-06 20:53:03.025512000 +0100
646 +++ shadow-4.0.7/po/pt.po 2005-02-06 21:20:01.224508576 +0100
649 #: src/groupadd.c:102
651 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
652 -msgstr "Utilização: groupadd [-g gid [-o]] [-f] grupo\n"
653 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
654 +msgstr "Utilização: groupadd [-g gid [-o]] [-f] [-r] grupo\n"
656 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
657 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
658 @@ -1740,8 +1740,8 @@
662 -msgid " [-p passwd] name\n"
663 -msgstr " [-p passwd] nome\n"
664 +msgid " [-p passwd] [-r] name\n"
665 +msgstr " [-p passwd] [-r] nome\n"
669 --- shadow-4.0.7/po/pt_BR.po.orig 2005-02-06 20:53:03.035510000 +0100
670 +++ shadow-4.0.7/po/pt_BR.po 2005-02-06 21:20:14.226531968 +0100
673 #: src/groupadd.c:102
675 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
676 -msgstr "Uso : groupadd [-g gid [-o]] [-f] grupo\n"
677 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
678 +msgstr "Uso : groupadd [-g gid [-o]] [-f] [-r] grupo\n"
680 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
681 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
682 @@ -1711,8 +1711,8 @@
686 -msgid " [-p passwd] name\n"
687 -msgstr " [-p passwd] nome\n"
688 +msgid " [-p passwd] [-r] name\n"
689 +msgstr " [-p passwd] [-r] nome\n"
693 --- shadow-4.0.7/po/ro.po.orig 2005-02-06 20:53:03.144494000 +0100
694 +++ shadow-4.0.7/po/ro.po 2005-02-06 21:21:15.902155848 +0100
696 msgstr "%s: nu pot actualiza fişierele criptate DBM\n"
698 #: src/groupadd.c:102
700 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
701 -msgstr "utilizare: groupadd [-g id_grup [-o]] grup\n"
703 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
704 +msgstr "Utilizare: groupadd [-g id_grup [-o]] [-f] [-r] grup\n"
706 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
707 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
708 @@ -1721,9 +1721,9 @@
709 msgstr "\t\t[-f inactivă] [-e expiră ]\n"
713 -msgid " [-p passwd] name\n"
714 -msgstr "[-p passwd] nume\n"
716 +msgid " [-p passwd] [-r] name\n"
717 +msgstr " [-p passwd] [-r] nume\n"
721 --- shadow-4.0.6.orig/po/ru.po 2004-11-18 15:47:10.883308632 +0100
722 +++ shadow-4.0.6/po/ru.po 2004-11-18 21:45:00.708399104 +0100
725 #: src/groupadd.c:102
727 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
728 -msgstr "Запуск: groupadd [-g gid [-o]] [-f] группа\n"
729 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
730 +msgstr "Запуск: groupadd [-g gid [-o]] [-f] [-r] группа\n"
732 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
733 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
734 @@ -1792,8 +1792,8 @@
738 -msgid " [-p passwd] name\n"
739 -msgstr " [-p пароль] имя\n"
740 +msgid " [-p passwd] [-r] name\n"
741 +msgstr " [-p пароль] [-r] имя\n"
745 --- shadow-4.0.7/po/sk.po.orig 2005-02-06 20:53:03.163491000 +0100
746 +++ shadow-4.0.7/po/sk.po 2005-02-06 21:21:37.557863680 +0100
749 #: src/groupadd.c:102
751 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
752 -msgstr "Použitie: groupadd [-g gid [-o]] [-f] skupina\n"
753 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
754 +msgstr "Použitie: groupadd [-g gid [-o]] [-f] [-r] skupina\n"
756 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
757 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
758 @@ -1712,8 +1712,8 @@
762 -msgid " [-p passwd] name\n"
763 -msgstr " [-p heslo] meno\n"
764 +msgid " [-p passwd] [-r] name\n"
765 +msgstr " [-p heslo] [-r] meno\n"
769 --- shadow-4.0.6.orig/po/sv.po 2004-11-18 15:47:10.884308480 +0100
770 +++ shadow-4.0.6/po/sv.po 2004-11-18 21:45:00.710398800 +0100
773 #: src/groupadd.c:102
775 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
776 -msgstr "Användning: groupadd [-g gid [-o]] [-f] grupp\n"
777 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
778 +msgstr "Användning: groupadd [-g gid [-o]] [-f] [-r] grupp\n"
780 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
781 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
782 @@ -1795,8 +1795,8 @@
786 -msgid " [-p passwd] name\n"
787 -msgstr " [-p passwd] namn\n"
788 +msgid " [-p passwd] [-r] name\n"
789 +msgstr " [-p passwd] [-r] namn\n"
793 --- shadow-4.0.7/po/tr.po.orig 2005-02-06 20:53:03.189487000 +0100
794 +++ shadow-4.0.7/po/tr.po 2005-02-06 21:21:59.907466024 +0100
797 #: src/groupadd.c:102
799 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
800 -msgstr "Kullanım: groupadd [-g gid [-o]] [-f] grup\n"
801 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
802 +msgstr "Kullanım: groupadd [-g gid [-o]] [-f] [-r] grup\n"
804 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
805 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
806 @@ -1707,8 +1707,8 @@
810 -msgid " [-p passwd] name\n"
811 -msgstr " [-p parola] isim\n"
812 +msgid " [-p passwd] [-r] name\n"
813 +msgstr " [-p parola] [-r] isim\n"
817 --- shadow-4.0.6.orig/po/uk.po 2004-11-18 15:47:10.886308176 +0100
818 +++ shadow-4.0.6/po/uk.po 2004-11-18 21:45:00.711398648 +0100
821 #: src/groupadd.c:102
823 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
824 -msgstr "Використовуйте: groupadd [-g gid [-o]] [-f] група\n"
825 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
826 +msgstr "Використовуйте: groupadd [-g gid [-o]] [-f] [-r] група\n"
828 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
829 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
830 @@ -1805,8 +1805,8 @@
834 -msgid " [-p passwd] name\n"
835 -msgstr " [-p пароль] ім'я\n"
836 +msgid " [-p passwd] [-r] name\n"
837 +msgstr " [-p пароль] [-r] ім'я\n"
841 --- shadow-4.0.7/po/zh_CN.po.orig 2005-02-06 20:53:03.206484000 +0100
842 +++ shadow-4.0.7/po/zh_CN.po 2005-02-06 21:22:32.575499728 +0100
845 #: src/groupadd.c:102
847 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
848 -msgstr "用法:groupadd [-g gid [-o]] [-f] 组\n"
849 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
850 +msgstr "用法:groupadd [-g gid [-o]] [-f] [-r] 组\n"
852 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
853 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
854 @@ -1700,8 +1700,8 @@
858 -msgid " [-p passwd] name\n"
859 -msgstr " [-p 密码] 名称\n"
860 +msgid " [-p passwd] [-r] name\n"
861 +msgstr " [-p 密码] [-r] 名称\n"
865 --- shadow-4.0.7/po/zh_TW.po.orig 2005-02-06 20:53:03.214483000 +0100
866 +++ shadow-4.0.7/po/zh_TW.po 2005-02-06 21:23:09.122943672 +0100
868 msgstr "%s:無法更新 DBM shadow檔案\n"
870 #: src/groupadd.c:102
872 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
873 -msgstr "用法:groupadd [-g gid [-o]] 群組\n"
875 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
876 +msgstr "用法:groupadd [-g gid [-o]] [-f] [-r] 群組\n"
878 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
879 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
880 @@ -1715,9 +1715,9 @@
881 msgstr "\t\t[-f 無效日] [-e 過期日 ]\n"
885 -msgid " [-p passwd] name\n"
886 -msgstr "[-p 密碼] 名稱\n"
888 +msgid " [-p passwd] [-r] name\n"
889 +msgstr " [-p 密碼] [-r] 名稱\n"