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.6.orig/src/groupadd.c 2004-11-18 15:47:10.972295104 +0100
96 +++ shadow-4.0.6/src/groupadd.c 2004-11-18 21:45:59.462467128 +0100
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;
107 static void usage (void)
109 - fprintf (stderr, _("Usage: groupadd [-g gid [-o]] [-f] group\n"));
110 + fprintf (stderr, _("Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"));
115 const struct group *grp;
116 gid_t gid_min, gid_max;
118 - gid_min = getdef_unum ("GID_MIN", 100);
119 - gid_max = getdef_unum ("GID_MAX", 60000);
122 + gid_min = getdef_unum ("GID_MIN", 500);
123 + gid_max = getdef_unum ("GID_MAX", 60000);
125 + gid_min = getdef_unum ("SYS_GID_MIN", 10);
126 + gid_max = getdef_unum ("SYS_GID_MAX", 499);
129 * Start with some GID value if the user didn't provide us with
135 - while ((arg = getopt (argc, argv, "og:O:f")) != EOF) {
136 + while ((arg = getopt (argc, argv, "og:O:fr")) != EOF) {
141 fail_exit (E_BAD_ARG);
146 + * create system group
153 --- shadow-4.0.16/man/groupadd.8.xml~ 2006-06-08 01:07:41.447664461 +0300
154 +++ shadow-4.0.16/man/groupadd.8.xml 2006-06-08 01:07:45.947765703 +0300
157 <arg choice='opt'>-f </arg>
158 <arg choice='opt'>-K <replaceable>KEY</replaceable>=<replaceable>VALUE</replaceable></arg>
159 + <arg choice='opt'>-r </arg>
161 <replaceable>group</replaceable>
169 + <option>-r</option>
172 + <para>This flag is used to create a system group, with gid lower than usual
173 + (chosen between SYS_GID_MIN and SYS_GID_MAX).
179 <option>-g</option> <replaceable>GID</replaceable>
180 --- shadow-4.0.6.orig/man/pl/groupadd.8 2004-11-18 15:47:10.946299056 +0100
181 +++ shadow-4.0.6/man/pl/groupadd.8 2004-11-18 21:45:00.696400928 +0100
184 groupadd - twórz now± grupê
186 -\fBgroupadd\fR [\fB-g\fR \fIgid\fR [\fB-o\fR]] [\fB-f\fR] \fIgrupa\fR
187 +\fBgroupadd\fR [\fB-g\fR \fIgid\fR [\fB-o\fR]] [\fB-f\fR] [\fB-r\fR] \fIgrupa\fR
189 Polecenie \fBgroupadd\fR tworzy nowe konto grupy pos³uguj±c siê
190 warto¶ciami podanymi w wierszu poleceñ i domy¶lnymi warto¶ciami z systemu.
192 podana groupa ju¿ istnieje. Z opcj± \fB-g\fR, je¶li podany gid ju¿ istnieje,
193 wybierany jest inny (unikalny) gid (czyli \fB-g\fR jest wy³±czane).
196 +Ta opcja s³u¿y do zak³adania grup systemowych, z identyfikatorami ni¿szymi
197 +ni¿ zwykle (wybieranymi z przedzia³u od SYS_GID_MIN do SYS_GID_MAX).
200 Numeryczna warto¶æ identyfikatora grupy. Warto¶æ ta musi byæ niepowtarzalna,
201 chyba ¿e u¿yto opcji \fB-o\fR. Warto¶æ ID grupy nie mo¿e byæ ujemna. Domy¶lnie
202 --- shadow-4.0.6.orig/man/pl/useradd.8 2004-11-18 15:47:10.949298600 +0100
203 +++ shadow-4.0.6/man/pl/useradd.8 2004-11-18 21:45:00.697400776 +0100
205 .IP "\fB-p \fIpasswd\fR"
206 Zakodowane has³o w postaci zwracanej przez \fBcrypt\fR(3).
207 Domy¶lnym dzia³aniem jest blokowanie konta.
209 -.\" Tworzenie konta systemowego. Ta opcja pozwala na utworzenie konta o UID
210 -.\" ni¿szym ni¿ UID_MIN zdefiniowane w fI/etc/login.defs\fR. O ile nie poda siê
211 -.\" dodatkowo opcji \fB-m\fR nie jest tworzony katalog domowy dla tak tworzonego
212 -.\" u¿ytkownika niezale¿nie od tego czy tworzenie katalogu jest ustawione czy
213 -.\" nie w \fI/etc/login.defs\fR.
215 +Tworzenie konta systemowego, z identyfikatorem ni¿szym ni¿ zwykle
216 +(wybieranym z przedzia³u od SYS_UID_MIN do SYS_UID_MAX).
217 .IP "\fB-s \fIpow³oka\fR"
218 Nazwa pow³oki (shell) u¿ytkownika. Ustawienie tego pola na puste
219 powoduje, ¿e system wybierze domy¶ln± pow³okê logowania.
220 --- shadow-4.0.6.orig/man/useradd.8 2004-11-18 15:47:10.926302096 +0100
221 +++ shadow-4.0.6/man/useradd.8 2004-11-18 21:45:00.697400776 +0100
224 [[\fB-M\fR] \fB-m\fR [\fB-k\fR \fIskeleton_dir\fR]] [\fB-o\fR] [\fB-p\fR \fIpasswd\fR]
226 -[\fB-s\fR \fIshell\fR] [\fB-u\fR \fIuid\fR] \fIlogin\fR
227 +[\fB-r\fR] [\fB-s\fR \fIshell\fR] [\fB-u\fR \fIuid\fR] \fIlogin\fR
229 \fBuseradd\fR \fB-D\fR [\fB-g\fI default_group\fR] [\fB-b\fI default_home\fR]
232 .IP "\fB-p \fIpasswd\fR"
233 The encrypted password, as returned by \fBcrypt\fR(3). The default is to
236 +This flag is used to create a system account, with uid lower than
237 +usual (chosen between SYS_UID_MIN and SYS_UID_MAX).
238 .IP "\fB-s\fR \fIshell\fR"
239 The name of the user's login shell. The default is to leave this field
240 blank, which causes the system to select the default login shell.
241 --- shadow-4.0.7/po/ca.po.orig 2005-02-06 20:53:02.764551000 +0100
242 +++ shadow-4.0.7/po/ca.po 2005-02-06 21:16:22.244798552 +0100
245 #: src/groupadd.c:102
247 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
248 -msgstr "Forma d'ús: groupadd [-g gid [-o]] [-f] grup\n"
249 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
250 +msgstr "Forma d'ús: groupadd [-g gid [-o]] [-f] [-r] grup\n"
252 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
253 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
254 @@ -1714,8 +1714,8 @@
258 -msgid " [-p passwd] name\n"
259 -msgstr " [-p contrasenya] nom\n"
260 +msgid " [-p passwd] [-r] name\n"
261 +msgstr " [-p contrasenya] [-r] nom\n"
265 --- shadow-4.0.6.orig/po/cs.po 2004-11-18 15:47:10.872310304 +0100
266 +++ shadow-4.0.6/po/cs.po 2004-11-18 21:45:00.699400472 +0100
269 #: src/groupadd.c:102
271 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
272 -msgstr "Použití: groupadd [-g gid [-o]] [-f] skupina\n"
273 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
274 +msgstr "Použití: groupadd [-g gid [-o]] [-f] [-r] skupina\n"
276 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
277 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
278 @@ -1804,8 +1804,8 @@
282 -msgid " [-p passwd] name\n"
283 -msgstr " [-p heslo] jméno\n"
284 +msgid " [-p passwd] [-r] name\n"
285 +msgstr " [-p heslo] [-r] jméno\n"
289 --- shadow-4.0.7/po/da.po.orig 2005-02-06 20:53:02.782549000 +0100
290 +++ shadow-4.0.7/po/da.po 2005-02-06 21:17:02.084741960 +0100
293 #: src/groupadd.c:102
295 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
296 -msgstr "Brug: groupadd [-g gid [-o]] [-f] gruppe\n"
297 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
298 +msgstr "Brug: groupadd [-g gid [-o]] [-f] [-r] gruppe\n"
300 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
301 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
302 @@ -1730,8 +1730,8 @@
306 -msgid " [-p passwd] name\n"
307 -msgstr " [-p adgangskode] navn\n"
308 +msgid " [-p passwd] [-r] name\n"
309 +msgstr " [-p adgangskode] [-r] navn\n"
313 --- shadow-4.0.6.orig/po/de.po 2004-11-18 15:47:10.873310152 +0100
314 +++ shadow-4.0.6/po/de.po 2004-11-18 21:45:00.700400320 +0100
317 #: src/groupadd.c:102
319 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
320 -msgstr "Syntax: groupadd [-g gid [-o]] [-f] Gruppe\n"
321 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
322 +msgstr "Syntax: groupadd [-g gid [-o]] [-f] [-r] Gruppe\n"
324 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
325 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
326 @@ -1802,8 +1802,8 @@
330 -msgid " [-p passwd] name\n"
331 -msgstr " [-p Kennwort] Name\n"
332 +msgid " [-p passwd] [-r] name\n"
333 +msgstr " [-p Kennwort] [-r] Name\n"
337 --- shadow-4.0.6.orig/po/el.po 2004-11-18 15:47:10.874310000 +0100
338 +++ shadow-4.0.6/po/el.po 2004-11-18 21:45:00.702400016 +0100
341 #: src/groupadd.c:102
343 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
344 -msgstr "Χρήση: groupadd [-g gid [-o]] [-f] ομάδα\n"
345 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
346 +msgstr "Χρήση: groupadd [-g gid [-o]] [-f] [-r] ομάδα\n"
348 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
349 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
350 @@ -1823,8 +1823,8 @@
354 -msgid " [-p passwd] name\n"
355 -msgstr " [-p συνθηματικό] όνομα\n"
356 +msgid " [-p passwd] [-r] name\n"
357 +msgstr " [-p συνθηματικό] [-r] όνομα\n"
361 --- shadow-4.0.7/po/es.po.orig 2005-02-06 20:53:02.810544000 +0100
362 +++ shadow-4.0.7/po/es.po 2005-02-06 21:17:29.589560592 +0100
365 #: src/groupadd.c:102
367 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
368 -msgstr "Modo de uso: groupadd [-g gid [-o]] [-f] grupo\n"
369 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
370 +msgstr "Modo de uso: groupadd [-g gid [-o]] [-f] [-r] grupo\n"
372 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
373 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
374 @@ -1747,8 +1747,8 @@
378 -msgid " [-p passwd] name\n"
379 -msgstr " [-p contraseña] nombre\n"
380 +msgid " [-p passwd] [-r] name\n"
381 +msgstr " [-p contraseña] [-r] nombre\n"
385 --- shadow-4.0.7/po/eu.po.orig 2005-02-06 20:53:02.818543000 +0100
386 +++ shadow-4.0.7/po/eu.po 2005-02-06 21:17:44.920229976 +0100
389 #: src/groupadd.c:102
391 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
392 -msgstr "Erabilera: groupadd [-g gid [-o]] [-f] taldea\n"
393 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
394 +msgstr "Erabilera: groupadd [-g gid [-o]] [-f] [-r] taldea\n"
396 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
397 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
398 @@ -1708,8 +1708,8 @@
402 -msgid " [-p passwd] name\n"
403 -msgstr " [-p pasahitz] izena\n"
404 +msgid " [-p passwd] [-r] name\n"
405 +msgstr " [-p pasahitz] [-r] izena\n"
409 --- shadow-4.0.7/po/fi.po.orig 2005-02-06 20:53:02.828542000 +0100
410 +++ shadow-4.0.7/po/fi.po 2005-02-06 21:18:04.821204568 +0100
413 #: src/groupadd.c:102
415 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
416 -msgstr "Käyttö: groupadd [-g gid [-o]] [-f] ryhmä\n"
417 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
418 +msgstr "Käyttö: groupadd [-g gid [-o]] [-f] [-r] ryhmä\n"
420 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
421 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
422 @@ -1732,8 +1732,8 @@
426 -msgid " [-p passwd] name\n"
427 -msgstr " [-p salansana] nimi\n"
428 +msgid " [-p passwd] [-r] name\n"
429 +msgstr " [-p salansana] [-r] nimi\n"
433 --- shadow-4.0.6.orig/po/fr.po 2004-11-18 15:47:10.877309544 +0100
434 +++ shadow-4.0.6/po/fr.po 2004-11-18 21:45:00.703399864 +0100
437 #: src/groupadd.c:102
439 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
440 -msgstr "Usage: groupadd [-g gid [-o]] [-f] groupe\n"
441 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
442 +msgstr "Usage: groupadd [-g gid [-o]] [-f] [-r] groupe\n"
444 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
445 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
446 @@ -1804,8 +1804,8 @@
450 -msgid " [-p passwd] name\n"
451 -msgstr " [-p mot-de-passe] nom\n"
452 +msgid " [-p passwd] [-r] name\n"
453 +msgstr " [-p mot-de-passe] [-r] nom\n"
457 --- shadow-4.0.7/po/id.po.orig 2005-02-06 20:53:02.954523000 +0100
458 +++ shadow-4.0.7/po/id.po 2005-02-06 21:18:31.035219432 +0100
461 #: src/groupadd.c:102
463 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
464 -msgstr "Penggunaan: groupadd [-g gid [-o]] [-f] grup\n"
465 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
466 +msgstr "Penggunaan: groupadd [-g gid [-o]] [-f] [-r] grup\n"
468 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
469 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
470 @@ -1704,8 +1704,8 @@
474 -msgid " [-p passwd] name\n"
475 -msgstr " [-p kata_sandi] nama\n"
476 +msgid " [-p passwd] [-r] name\n"
477 +msgstr " [-p kata_sandi] [-r] nama\n"
481 --- shadow-4.0.7/po/it.po.orig 2005-02-06 20:53:02.963521000 +0100
482 +++ shadow-4.0.7/po/it.po 2005-02-06 21:18:46.662843672 +0100
485 #: src/groupadd.c:102
487 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
488 -msgstr "Uso: groupadd [-g GID [-o]] [-f] GRUPPO\n"
489 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
490 +msgstr "Uso: groupadd [-g GID [-o]] [-f] [-r] GRUPPO\n"
492 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
493 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
494 @@ -1775,8 +1775,8 @@
498 -msgid " [-p passwd] name\n"
499 -msgstr " [-p PASSWORD] NOME\n"
500 +msgid " [-p passwd] [-r] name\n"
501 +msgstr " [-p PASSWORD] [-r] NOME\n"
505 --- shadow-4.0.6.orig/po/ja.po 2004-11-18 15:47:10.879309240 +0100
506 +++ shadow-4.0.6/po/ja.po 2004-11-18 21:45:00.704399712 +0100
509 #: src/groupadd.c:102
511 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
512 -msgstr "使用法: groupadd [-g グループID [-o]] [-f] グループ\n"
513 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
514 +msgstr "使用法: groupadd [-g グループID [-o]] [-f] [-r] グループ\n"
516 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
517 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
518 @@ -1793,8 +1793,8 @@
522 -msgid " [-p passwd] name\n"
523 -msgstr " [-p パスワード] ユーザ名\n"
524 +msgid " [-p passwd] [-r] name\n"
525 +msgstr " [-p パスワード] [-r] ユーザ名\n"
529 --- shadow-4.0.6.orig/po/ko.po 2004-11-18 15:47:10.880309088 +0100
530 +++ shadow-4.0.6/po/ko.po 2004-11-18 21:45:00.706399408 +0100
533 #: src/groupadd.c:102
535 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
536 -msgstr "사용법: groupadd [-g GID [-o]] [-f] 그룹명\n"
537 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
538 +msgstr "사용법: groupadd [-g GID [-o]] [-f] [-r] 그룹명\n"
540 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
541 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
542 @@ -1800,8 +1800,8 @@
546 -msgid " [-p passwd] name\n"
547 -msgstr " [-p 열쇠글] 이름\n"
548 +msgid " [-p passwd] [-r] name\n"
549 +msgstr " [-p 열쇠글] [-r] 이름\n"
553 --- shadow-4.0.7/po/nb.po.orig 2005-02-06 20:53:02.989517000 +0100
554 +++ shadow-4.0.7/po/nb.po 2005-02-06 21:19:10.761180168 +0100
557 #: src/groupadd.c:102
559 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
560 -msgstr "Bruk: groupadd [-g gid [-o]] [-f] gruppe\n"
561 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
562 +msgstr "Bruk: groupadd [-g gid [-o]] [-f] [-r] gruppe\n"
564 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
565 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
566 @@ -1710,8 +1710,8 @@
570 -msgid " [-p passwd] name\n"
571 -msgstr " [-p passord] navn\n"
572 +msgid " [-p passwd] [-r] name\n"
573 +msgstr " [-p passord] [-r] navn\n"
577 --- shadow-4.0.7/po/nl.po.orig 2005-02-06 20:53:02.998516000 +0100
578 +++ shadow-4.0.7/po/nl.po 2005-02-06 21:19:23.540237456 +0100
581 #: src/groupadd.c:102
583 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
584 -msgstr "Gebruik: groupadd [-g gid [-o]] [-f] groep\n"
585 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
586 +msgstr "Gebruik: groupadd [-g gid [-o]] [-f] [-r] groep\n"
588 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
589 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
590 @@ -1739,8 +1739,8 @@
594 -msgid " [-p passwd] name\n"
595 -msgstr " [-p wachtwoord] naam\n"
596 +msgid " [-p passwd] [-r] name\n"
597 +msgstr " [-p wachtwoord] [-r] naam\n"
601 --- shadow-4.0.7/po/nn.po.orig 2005-02-06 20:53:03.008514000 +0100
602 +++ shadow-4.0.7/po/nn.po 2005-02-06 21:19:36.046336240 +0100
605 #: src/groupadd.c:102
607 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
608 -msgstr "Bruk: groupadd [-g gid [-o]] [-f] gruppe\n"
609 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
610 +msgstr "Bruk: groupadd [-g gid [-o]] [-f] [-r] gruppe\n"
612 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
613 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
614 @@ -1704,8 +1704,8 @@
618 -msgid " [-p passwd] name\n"
619 -msgstr " [-p passord] namn\n"
620 +msgid " [-p passwd] [-r] name\n"
621 +msgstr " [-p passord] [-r] namn\n"
625 --- shadow-4.0.6.orig/po/pl.po 2004-11-18 15:47:10.882308784 +0100
626 +++ shadow-4.0.6/po/pl.po 2004-11-18 21:45:00.707399256 +0100
629 #: src/groupadd.c:102
631 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
632 -msgstr "Użycie: groupadd [-g gid [-o]] [-f] grupa\n"
633 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
634 +msgstr "Użycie: groupadd [-g gid [-o]] [-f] [-r] grupa\n"
636 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
637 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
638 @@ -1805,8 +1805,8 @@
642 -msgid " [-p passwd] name\n"
643 -msgstr " [-p hasło] nazwa\n"
644 +msgid " [-p passwd] [-r] name\n"
645 +msgstr " [-p hasło] [-r] nazwa\n"
649 --- shadow-4.0.7/po/pt.po.orig 2005-02-06 20:53:03.025512000 +0100
650 +++ shadow-4.0.7/po/pt.po 2005-02-06 21:20:01.224508576 +0100
653 #: src/groupadd.c:102
655 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
656 -msgstr "Utilização: groupadd [-g gid [-o]] [-f] grupo\n"
657 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
658 +msgstr "Utilização: groupadd [-g gid [-o]] [-f] [-r] grupo\n"
660 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
661 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
662 @@ -1740,8 +1740,8 @@
666 -msgid " [-p passwd] name\n"
667 -msgstr " [-p passwd] nome\n"
668 +msgid " [-p passwd] [-r] name\n"
669 +msgstr " [-p passwd] [-r] nome\n"
673 --- shadow-4.0.7/po/pt_BR.po.orig 2005-02-06 20:53:03.035510000 +0100
674 +++ shadow-4.0.7/po/pt_BR.po 2005-02-06 21:20:14.226531968 +0100
677 #: src/groupadd.c:102
679 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
680 -msgstr "Uso : groupadd [-g gid [-o]] [-f] grupo\n"
681 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
682 +msgstr "Uso : groupadd [-g gid [-o]] [-f] [-r] grupo\n"
684 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
685 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
686 @@ -1711,8 +1711,8 @@
690 -msgid " [-p passwd] name\n"
691 -msgstr " [-p passwd] nome\n"
692 +msgid " [-p passwd] [-r] name\n"
693 +msgstr " [-p passwd] [-r] nome\n"
697 --- shadow-4.0.7/po/ro.po.orig 2005-02-06 20:53:03.144494000 +0100
698 +++ shadow-4.0.7/po/ro.po 2005-02-06 21:21:15.902155848 +0100
700 msgstr "%s: nu pot actualiza fişierele criptate DBM\n"
702 #: src/groupadd.c:102
704 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
705 -msgstr "utilizare: groupadd [-g id_grup [-o]] grup\n"
707 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
708 +msgstr "Utilizare: groupadd [-g id_grup [-o]] [-f] [-r] grup\n"
710 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
711 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
712 @@ -1721,9 +1721,9 @@
713 msgstr "\t\t[-f inactivă] [-e expiră ]\n"
717 -msgid " [-p passwd] name\n"
718 -msgstr "[-p passwd] nume\n"
720 +msgid " [-p passwd] [-r] name\n"
721 +msgstr " [-p passwd] [-r] nume\n"
725 --- shadow-4.0.6.orig/po/ru.po 2004-11-18 15:47:10.883308632 +0100
726 +++ shadow-4.0.6/po/ru.po 2004-11-18 21:45:00.708399104 +0100
729 #: src/groupadd.c:102
731 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
732 -msgstr "Запуск: groupadd [-g gid [-o]] [-f] группа\n"
733 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
734 +msgstr "Запуск: groupadd [-g gid [-o]] [-f] [-r] группа\n"
736 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
737 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
738 @@ -1792,8 +1792,8 @@
742 -msgid " [-p passwd] name\n"
743 -msgstr " [-p пароль] имя\n"
744 +msgid " [-p passwd] [-r] name\n"
745 +msgstr " [-p пароль] [-r] имя\n"
749 --- shadow-4.0.7/po/sk.po.orig 2005-02-06 20:53:03.163491000 +0100
750 +++ shadow-4.0.7/po/sk.po 2005-02-06 21:21:37.557863680 +0100
753 #: src/groupadd.c:102
755 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
756 -msgstr "Použitie: groupadd [-g gid [-o]] [-f] skupina\n"
757 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
758 +msgstr "Použitie: groupadd [-g gid [-o]] [-f] [-r] skupina\n"
760 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
761 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
762 @@ -1712,8 +1712,8 @@
766 -msgid " [-p passwd] name\n"
767 -msgstr " [-p heslo] meno\n"
768 +msgid " [-p passwd] [-r] name\n"
769 +msgstr " [-p heslo] [-r] meno\n"
773 --- shadow-4.0.6.orig/po/sv.po 2004-11-18 15:47:10.884308480 +0100
774 +++ shadow-4.0.6/po/sv.po 2004-11-18 21:45:00.710398800 +0100
777 #: src/groupadd.c:102
779 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
780 -msgstr "Användning: groupadd [-g gid [-o]] [-f] grupp\n"
781 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
782 +msgstr "Användning: groupadd [-g gid [-o]] [-f] [-r] grupp\n"
784 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
785 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
786 @@ -1795,8 +1795,8 @@
790 -msgid " [-p passwd] name\n"
791 -msgstr " [-p passwd] namn\n"
792 +msgid " [-p passwd] [-r] name\n"
793 +msgstr " [-p passwd] [-r] namn\n"
797 --- shadow-4.0.7/po/tr.po.orig 2005-02-06 20:53:03.189487000 +0100
798 +++ shadow-4.0.7/po/tr.po 2005-02-06 21:21:59.907466024 +0100
801 #: src/groupadd.c:102
803 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
804 -msgstr "Kullanım: groupadd [-g gid [-o]] [-f] grup\n"
805 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
806 +msgstr "Kullanım: groupadd [-g gid [-o]] [-f] [-r] grup\n"
808 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
809 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
810 @@ -1707,8 +1707,8 @@
814 -msgid " [-p passwd] name\n"
815 -msgstr " [-p parola] isim\n"
816 +msgid " [-p passwd] [-r] name\n"
817 +msgstr " [-p parola] [-r] isim\n"
821 --- shadow-4.0.6.orig/po/uk.po 2004-11-18 15:47:10.886308176 +0100
822 +++ shadow-4.0.6/po/uk.po 2004-11-18 21:45:00.711398648 +0100
825 #: src/groupadd.c:102
827 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
828 -msgstr "Використовуйте: groupadd [-g gid [-o]] [-f] група\n"
829 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
830 +msgstr "Використовуйте: groupadd [-g gid [-o]] [-f] [-r] група\n"
832 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
833 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
834 @@ -1805,8 +1805,8 @@
838 -msgid " [-p passwd] name\n"
839 -msgstr " [-p пароль] ім'я\n"
840 +msgid " [-p passwd] [-r] name\n"
841 +msgstr " [-p пароль] [-r] ім'я\n"
845 --- shadow-4.0.7/po/zh_CN.po.orig 2005-02-06 20:53:03.206484000 +0100
846 +++ shadow-4.0.7/po/zh_CN.po 2005-02-06 21:22:32.575499728 +0100
849 #: src/groupadd.c:102
851 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
852 -msgstr "用法:groupadd [-g gid [-o]] [-f] 组\n"
853 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
854 +msgstr "用法:groupadd [-g gid [-o]] [-f] [-r] 组\n"
856 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
857 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
858 @@ -1700,8 +1700,8 @@
862 -msgid " [-p passwd] name\n"
863 -msgstr " [-p 密码] 名称\n"
864 +msgid " [-p passwd] [-r] name\n"
865 +msgstr " [-p 密码] [-r] 名称\n"
869 --- shadow-4.0.7/po/zh_TW.po.orig 2005-02-06 20:53:03.214483000 +0100
870 +++ shadow-4.0.7/po/zh_TW.po 2005-02-06 21:23:09.122943672 +0100
872 msgstr "%s:無法更新 DBM shadow檔案\n"
874 #: src/groupadd.c:102
876 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
877 -msgstr "用法:groupadd [-g gid [-o]] 群組\n"
879 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
880 +msgstr "用法:groupadd [-g gid [-o]] [-f] [-r] 群組\n"
882 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
883 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
884 @@ -1715,9 +1715,9 @@
885 msgstr "\t\t[-f 無效日] [-e 過期日 ]\n"
889 -msgid " [-p passwd] name\n"
890 -msgstr "[-p 密碼] 名稱\n"
892 +msgid " [-p passwd] [-r] name\n"
893 +msgstr " [-p 密碼] [-r] 名稱\n"