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.16/man/pl/groupadd.8~ 2006-06-09 21:27:27.071352380 +0300
177 +++ shadow-4.0.16/man/pl/groupadd.8 2006-06-09 21:29:35.034218035 +0300
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.16/man/pl/useradd.8~ 2006-06-09 22:52:54.696249131 +0300
199 +++ shadow-4.0.16/man/pl/useradd.8 2006-06-09 23:00:57.427074349 +0300
201 .IP "\fB\-p\fR \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, z identyfikatorem ni¿szym ni¿ zwykle
206 +(wybieranym z przedzia¿u od SYS_UID_MIN do SYS_UID_MAX).
207 .IP "\fB\-s\fR \fIpowłoka\fR"
208 Nazwa powłoki (shell) użytkownika. Ustawienie tego pola na puste
209 powoduje, że system wybierze domyślną powłokę logowania.
210 --- shadow-4.0.16/man/useradd.8~ 2006-06-09 23:05:41.393444193 +0300
211 +++ shadow-4.0.16/man/useradd.8 2006-06-09 23:05:43.273486388 +0300
213 The encrypted password, as returned by
214 \fBcrypt\fR(3). The default is to disable the account.
217 +The number of days after a password has expired before the account will be disabled.
219 \fB\-s\fR, \fB\-\-shell\fR \fISHELL\fR
220 The name of the user's login shell. The default is to leave this field blank, which causes the system to select the default login shell.
222 --- shadow-4.0.7/po/ca.po.orig 2005-02-06 20:53:02.764551000 +0100
223 +++ shadow-4.0.7/po/ca.po 2005-02-06 21:16:22.244798552 +0100
226 #: src/groupadd.c:102
228 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
229 -msgstr "Forma d'ús: groupadd [-g gid [-o]] [-f] grup\n"
230 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
231 +msgstr "Forma d'ús: groupadd [-g gid [-o]] [-f] [-r] grup\n"
233 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
234 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
235 @@ -1714,8 +1714,8 @@
239 -msgid " [-p passwd] name\n"
240 -msgstr " [-p contrasenya] nom\n"
241 +msgid " [-p passwd] [-r] name\n"
242 +msgstr " [-p contrasenya] [-r] nom\n"
246 --- shadow-4.0.6.orig/po/cs.po 2004-11-18 15:47:10.872310304 +0100
247 +++ shadow-4.0.6/po/cs.po 2004-11-18 21:45:00.699400472 +0100
250 #: src/groupadd.c:102
252 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
253 -msgstr "Použití: groupadd [-g gid [-o]] [-f] skupina\n"
254 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
255 +msgstr "Použití: groupadd [-g gid [-o]] [-f] [-r] skupina\n"
257 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
258 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
259 @@ -1804,8 +1804,8 @@
263 -msgid " [-p passwd] name\n"
264 -msgstr " [-p heslo] jméno\n"
265 +msgid " [-p passwd] [-r] name\n"
266 +msgstr " [-p heslo] [-r] jméno\n"
270 --- shadow-4.0.7/po/da.po.orig 2005-02-06 20:53:02.782549000 +0100
271 +++ shadow-4.0.7/po/da.po 2005-02-06 21:17:02.084741960 +0100
274 #: src/groupadd.c:102
276 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
277 -msgstr "Brug: groupadd [-g gid [-o]] [-f] gruppe\n"
278 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
279 +msgstr "Brug: groupadd [-g gid [-o]] [-f] [-r] gruppe\n"
281 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
282 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
283 @@ -1730,8 +1730,8 @@
287 -msgid " [-p passwd] name\n"
288 -msgstr " [-p adgangskode] navn\n"
289 +msgid " [-p passwd] [-r] name\n"
290 +msgstr " [-p adgangskode] [-r] navn\n"
294 --- shadow-4.0.6.orig/po/de.po 2004-11-18 15:47:10.873310152 +0100
295 +++ shadow-4.0.6/po/de.po 2004-11-18 21:45:00.700400320 +0100
298 #: src/groupadd.c:102
300 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
301 -msgstr "Syntax: groupadd [-g gid [-o]] [-f] Gruppe\n"
302 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
303 +msgstr "Syntax: groupadd [-g gid [-o]] [-f] [-r] Gruppe\n"
305 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
306 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
307 @@ -1802,8 +1802,8 @@
311 -msgid " [-p passwd] name\n"
312 -msgstr " [-p Kennwort] Name\n"
313 +msgid " [-p passwd] [-r] name\n"
314 +msgstr " [-p Kennwort] [-r] Name\n"
318 --- shadow-4.0.6.orig/po/el.po 2004-11-18 15:47:10.874310000 +0100
319 +++ shadow-4.0.6/po/el.po 2004-11-18 21:45:00.702400016 +0100
322 #: src/groupadd.c:102
324 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
325 -msgstr "Χρήση: groupadd [-g gid [-o]] [-f] ομάδα\n"
326 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
327 +msgstr "Χρήση: groupadd [-g gid [-o]] [-f] [-r] ομάδα\n"
329 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
330 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
331 @@ -1823,8 +1823,8 @@
335 -msgid " [-p passwd] name\n"
336 -msgstr " [-p συνθηματικό] όνομα\n"
337 +msgid " [-p passwd] [-r] name\n"
338 +msgstr " [-p συνθηματικό] [-r] όνομα\n"
342 --- shadow-4.0.7/po/es.po.orig 2005-02-06 20:53:02.810544000 +0100
343 +++ shadow-4.0.7/po/es.po 2005-02-06 21:17:29.589560592 +0100
346 #: src/groupadd.c:102
348 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
349 -msgstr "Modo de uso: groupadd [-g gid [-o]] [-f] grupo\n"
350 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
351 +msgstr "Modo de uso: groupadd [-g gid [-o]] [-f] [-r] grupo\n"
353 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
354 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
355 @@ -1747,8 +1747,8 @@
359 -msgid " [-p passwd] name\n"
360 -msgstr " [-p contraseña] nombre\n"
361 +msgid " [-p passwd] [-r] name\n"
362 +msgstr " [-p contraseña] [-r] nombre\n"
366 --- shadow-4.0.7/po/eu.po.orig 2005-02-06 20:53:02.818543000 +0100
367 +++ shadow-4.0.7/po/eu.po 2005-02-06 21:17:44.920229976 +0100
370 #: src/groupadd.c:102
372 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
373 -msgstr "Erabilera: groupadd [-g gid [-o]] [-f] taldea\n"
374 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
375 +msgstr "Erabilera: groupadd [-g gid [-o]] [-f] [-r] taldea\n"
377 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
378 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
379 @@ -1708,8 +1708,8 @@
383 -msgid " [-p passwd] name\n"
384 -msgstr " [-p pasahitz] izena\n"
385 +msgid " [-p passwd] [-r] name\n"
386 +msgstr " [-p pasahitz] [-r] izena\n"
390 --- shadow-4.0.7/po/fi.po.orig 2005-02-06 20:53:02.828542000 +0100
391 +++ shadow-4.0.7/po/fi.po 2005-02-06 21:18:04.821204568 +0100
394 #: src/groupadd.c:102
396 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
397 -msgstr "Käyttö: groupadd [-g gid [-o]] [-f] ryhmä\n"
398 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
399 +msgstr "Käyttö: groupadd [-g gid [-o]] [-f] [-r] ryhmä\n"
401 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
402 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
403 @@ -1732,8 +1732,8 @@
407 -msgid " [-p passwd] name\n"
408 -msgstr " [-p salansana] nimi\n"
409 +msgid " [-p passwd] [-r] name\n"
410 +msgstr " [-p salansana] [-r] nimi\n"
414 --- shadow-4.0.6.orig/po/fr.po 2004-11-18 15:47:10.877309544 +0100
415 +++ shadow-4.0.6/po/fr.po 2004-11-18 21:45:00.703399864 +0100
418 #: src/groupadd.c:102
420 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
421 -msgstr "Usage: groupadd [-g gid [-o]] [-f] groupe\n"
422 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
423 +msgstr "Usage: groupadd [-g gid [-o]] [-f] [-r] groupe\n"
425 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
426 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
427 @@ -1804,8 +1804,8 @@
431 -msgid " [-p passwd] name\n"
432 -msgstr " [-p mot-de-passe] nom\n"
433 +msgid " [-p passwd] [-r] name\n"
434 +msgstr " [-p mot-de-passe] [-r] nom\n"
438 --- shadow-4.0.7/po/id.po.orig 2005-02-06 20:53:02.954523000 +0100
439 +++ shadow-4.0.7/po/id.po 2005-02-06 21:18:31.035219432 +0100
442 #: src/groupadd.c:102
444 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
445 -msgstr "Penggunaan: groupadd [-g gid [-o]] [-f] grup\n"
446 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
447 +msgstr "Penggunaan: groupadd [-g gid [-o]] [-f] [-r] grup\n"
449 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
450 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
451 @@ -1704,8 +1704,8 @@
455 -msgid " [-p passwd] name\n"
456 -msgstr " [-p kata_sandi] nama\n"
457 +msgid " [-p passwd] [-r] name\n"
458 +msgstr " [-p kata_sandi] [-r] nama\n"
462 --- shadow-4.0.7/po/it.po.orig 2005-02-06 20:53:02.963521000 +0100
463 +++ shadow-4.0.7/po/it.po 2005-02-06 21:18:46.662843672 +0100
466 #: src/groupadd.c:102
468 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
469 -msgstr "Uso: groupadd [-g GID [-o]] [-f] GRUPPO\n"
470 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
471 +msgstr "Uso: groupadd [-g GID [-o]] [-f] [-r] GRUPPO\n"
473 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
474 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
475 @@ -1775,8 +1775,8 @@
479 -msgid " [-p passwd] name\n"
480 -msgstr " [-p PASSWORD] NOME\n"
481 +msgid " [-p passwd] [-r] name\n"
482 +msgstr " [-p PASSWORD] [-r] NOME\n"
486 --- shadow-4.0.6.orig/po/ja.po 2004-11-18 15:47:10.879309240 +0100
487 +++ shadow-4.0.6/po/ja.po 2004-11-18 21:45:00.704399712 +0100
490 #: src/groupadd.c:102
492 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
493 -msgstr "使用法: groupadd [-g グループID [-o]] [-f] グループ\n"
494 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
495 +msgstr "使用法: groupadd [-g グループID [-o]] [-f] [-r] グループ\n"
497 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
498 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
499 @@ -1793,8 +1793,8 @@
503 -msgid " [-p passwd] name\n"
504 -msgstr " [-p パスワード] ユーザ名\n"
505 +msgid " [-p passwd] [-r] name\n"
506 +msgstr " [-p パスワード] [-r] ユーザ名\n"
510 --- shadow-4.0.6.orig/po/ko.po 2004-11-18 15:47:10.880309088 +0100
511 +++ shadow-4.0.6/po/ko.po 2004-11-18 21:45:00.706399408 +0100
514 #: src/groupadd.c:102
516 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
517 -msgstr "사용법: groupadd [-g GID [-o]] [-f] 그룹명\n"
518 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
519 +msgstr "사용법: groupadd [-g GID [-o]] [-f] [-r] 그룹명\n"
521 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
522 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
523 @@ -1800,8 +1800,8 @@
527 -msgid " [-p passwd] name\n"
528 -msgstr " [-p 열쇠글] 이름\n"
529 +msgid " [-p passwd] [-r] name\n"
530 +msgstr " [-p 열쇠글] [-r] 이름\n"
534 --- shadow-4.0.7/po/nb.po.orig 2005-02-06 20:53:02.989517000 +0100
535 +++ shadow-4.0.7/po/nb.po 2005-02-06 21:19:10.761180168 +0100
538 #: src/groupadd.c:102
540 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
541 -msgstr "Bruk: groupadd [-g gid [-o]] [-f] gruppe\n"
542 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
543 +msgstr "Bruk: groupadd [-g gid [-o]] [-f] [-r] gruppe\n"
545 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
546 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
547 @@ -1710,8 +1710,8 @@
551 -msgid " [-p passwd] name\n"
552 -msgstr " [-p passord] navn\n"
553 +msgid " [-p passwd] [-r] name\n"
554 +msgstr " [-p passord] [-r] navn\n"
558 --- shadow-4.0.7/po/nl.po.orig 2005-02-06 20:53:02.998516000 +0100
559 +++ shadow-4.0.7/po/nl.po 2005-02-06 21:19:23.540237456 +0100
562 #: src/groupadd.c:102
564 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
565 -msgstr "Gebruik: groupadd [-g gid [-o]] [-f] groep\n"
566 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
567 +msgstr "Gebruik: groupadd [-g gid [-o]] [-f] [-r] groep\n"
569 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
570 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
571 @@ -1739,8 +1739,8 @@
575 -msgid " [-p passwd] name\n"
576 -msgstr " [-p wachtwoord] naam\n"
577 +msgid " [-p passwd] [-r] name\n"
578 +msgstr " [-p wachtwoord] [-r] naam\n"
582 --- shadow-4.0.7/po/nn.po.orig 2005-02-06 20:53:03.008514000 +0100
583 +++ shadow-4.0.7/po/nn.po 2005-02-06 21:19:36.046336240 +0100
586 #: src/groupadd.c:102
588 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
589 -msgstr "Bruk: groupadd [-g gid [-o]] [-f] gruppe\n"
590 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
591 +msgstr "Bruk: groupadd [-g gid [-o]] [-f] [-r] gruppe\n"
593 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
594 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
595 @@ -1704,8 +1704,8 @@
599 -msgid " [-p passwd] name\n"
600 -msgstr " [-p passord] namn\n"
601 +msgid " [-p passwd] [-r] name\n"
602 +msgstr " [-p passord] [-r] namn\n"
606 --- shadow-4.0.6.orig/po/pl.po 2004-11-18 15:47:10.882308784 +0100
607 +++ shadow-4.0.6/po/pl.po 2004-11-18 21:45:00.707399256 +0100
610 #: src/groupadd.c:102
612 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
613 -msgstr "Użycie: groupadd [-g gid [-o]] [-f] grupa\n"
614 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
615 +msgstr "Użycie: groupadd [-g gid [-o]] [-f] [-r] grupa\n"
617 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
618 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
619 @@ -1805,8 +1805,8 @@
623 -msgid " [-p passwd] name\n"
624 -msgstr " [-p hasło] nazwa\n"
625 +msgid " [-p passwd] [-r] name\n"
626 +msgstr " [-p hasło] [-r] nazwa\n"
630 --- shadow-4.0.7/po/pt.po.orig 2005-02-06 20:53:03.025512000 +0100
631 +++ shadow-4.0.7/po/pt.po 2005-02-06 21:20:01.224508576 +0100
634 #: src/groupadd.c:102
636 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
637 -msgstr "Utilização: groupadd [-g gid [-o]] [-f] grupo\n"
638 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
639 +msgstr "Utilização: groupadd [-g gid [-o]] [-f] [-r] grupo\n"
641 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
642 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
643 @@ -1740,8 +1740,8 @@
647 -msgid " [-p passwd] name\n"
648 -msgstr " [-p passwd] nome\n"
649 +msgid " [-p passwd] [-r] name\n"
650 +msgstr " [-p passwd] [-r] nome\n"
654 --- shadow-4.0.7/po/pt_BR.po.orig 2005-02-06 20:53:03.035510000 +0100
655 +++ shadow-4.0.7/po/pt_BR.po 2005-02-06 21:20:14.226531968 +0100
658 #: src/groupadd.c:102
660 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
661 -msgstr "Uso : groupadd [-g gid [-o]] [-f] grupo\n"
662 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
663 +msgstr "Uso : groupadd [-g gid [-o]] [-f] [-r] grupo\n"
665 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
666 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
667 @@ -1711,8 +1711,8 @@
671 -msgid " [-p passwd] name\n"
672 -msgstr " [-p passwd] nome\n"
673 +msgid " [-p passwd] [-r] name\n"
674 +msgstr " [-p passwd] [-r] nome\n"
678 --- shadow-4.0.7/po/ro.po.orig 2005-02-06 20:53:03.144494000 +0100
679 +++ shadow-4.0.7/po/ro.po 2005-02-06 21:21:15.902155848 +0100
681 msgstr "%s: nu pot actualiza fişierele criptate DBM\n"
683 #: src/groupadd.c:102
685 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
686 -msgstr "utilizare: groupadd [-g id_grup [-o]] grup\n"
688 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
689 +msgstr "Utilizare: groupadd [-g id_grup [-o]] [-f] [-r] grup\n"
691 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
692 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
693 @@ -1721,9 +1721,9 @@
694 msgstr "\t\t[-f inactivă] [-e expiră ]\n"
698 -msgid " [-p passwd] name\n"
699 -msgstr "[-p passwd] nume\n"
701 +msgid " [-p passwd] [-r] name\n"
702 +msgstr " [-p passwd] [-r] nume\n"
706 --- shadow-4.0.6.orig/po/ru.po 2004-11-18 15:47:10.883308632 +0100
707 +++ shadow-4.0.6/po/ru.po 2004-11-18 21:45:00.708399104 +0100
710 #: src/groupadd.c:102
712 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
713 -msgstr "Запуск: groupadd [-g gid [-o]] [-f] группа\n"
714 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
715 +msgstr "Запуск: groupadd [-g gid [-o]] [-f] [-r] группа\n"
717 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
718 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
719 @@ -1792,8 +1792,8 @@
723 -msgid " [-p passwd] name\n"
724 -msgstr " [-p пароль] имя\n"
725 +msgid " [-p passwd] [-r] name\n"
726 +msgstr " [-p пароль] [-r] имя\n"
730 --- shadow-4.0.7/po/sk.po.orig 2005-02-06 20:53:03.163491000 +0100
731 +++ shadow-4.0.7/po/sk.po 2005-02-06 21:21:37.557863680 +0100
734 #: src/groupadd.c:102
736 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
737 -msgstr "Použitie: groupadd [-g gid [-o]] [-f] skupina\n"
738 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
739 +msgstr "Použitie: groupadd [-g gid [-o]] [-f] [-r] skupina\n"
741 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
742 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
743 @@ -1712,8 +1712,8 @@
747 -msgid " [-p passwd] name\n"
748 -msgstr " [-p heslo] meno\n"
749 +msgid " [-p passwd] [-r] name\n"
750 +msgstr " [-p heslo] [-r] meno\n"
754 --- shadow-4.0.6.orig/po/sv.po 2004-11-18 15:47:10.884308480 +0100
755 +++ shadow-4.0.6/po/sv.po 2004-11-18 21:45:00.710398800 +0100
758 #: src/groupadd.c:102
760 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
761 -msgstr "Användning: groupadd [-g gid [-o]] [-f] grupp\n"
762 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
763 +msgstr "Användning: groupadd [-g gid [-o]] [-f] [-r] grupp\n"
765 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
766 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
767 @@ -1795,8 +1795,8 @@
771 -msgid " [-p passwd] name\n"
772 -msgstr " [-p passwd] namn\n"
773 +msgid " [-p passwd] [-r] name\n"
774 +msgstr " [-p passwd] [-r] namn\n"
778 --- shadow-4.0.7/po/tr.po.orig 2005-02-06 20:53:03.189487000 +0100
779 +++ shadow-4.0.7/po/tr.po 2005-02-06 21:21:59.907466024 +0100
782 #: src/groupadd.c:102
784 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
785 -msgstr "Kullanım: groupadd [-g gid [-o]] [-f] grup\n"
786 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
787 +msgstr "Kullanım: groupadd [-g gid [-o]] [-f] [-r] grup\n"
789 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
790 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
791 @@ -1707,8 +1707,8 @@
795 -msgid " [-p passwd] name\n"
796 -msgstr " [-p parola] isim\n"
797 +msgid " [-p passwd] [-r] name\n"
798 +msgstr " [-p parola] [-r] isim\n"
802 --- shadow-4.0.6.orig/po/uk.po 2004-11-18 15:47:10.886308176 +0100
803 +++ shadow-4.0.6/po/uk.po 2004-11-18 21:45:00.711398648 +0100
806 #: src/groupadd.c:102
808 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
809 -msgstr "Використовуйте: groupadd [-g gid [-o]] [-f] група\n"
810 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
811 +msgstr "Використовуйте: groupadd [-g gid [-o]] [-f] [-r] група\n"
813 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
814 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
815 @@ -1805,8 +1805,8 @@
819 -msgid " [-p passwd] name\n"
820 -msgstr " [-p пароль] ім'я\n"
821 +msgid " [-p passwd] [-r] name\n"
822 +msgstr " [-p пароль] [-r] ім'я\n"
826 --- shadow-4.0.7/po/zh_CN.po.orig 2005-02-06 20:53:03.206484000 +0100
827 +++ shadow-4.0.7/po/zh_CN.po 2005-02-06 21:22:32.575499728 +0100
830 #: src/groupadd.c:102
832 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
833 -msgstr "用法:groupadd [-g gid [-o]] [-f] 组\n"
834 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
835 +msgstr "用法:groupadd [-g gid [-o]] [-f] [-r] 组\n"
837 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
838 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
839 @@ -1700,8 +1700,8 @@
843 -msgid " [-p passwd] name\n"
844 -msgstr " [-p 密码] 名称\n"
845 +msgid " [-p passwd] [-r] name\n"
846 +msgstr " [-p 密码] [-r] 名称\n"
850 --- shadow-4.0.7/po/zh_TW.po.orig 2005-02-06 20:53:03.214483000 +0100
851 +++ shadow-4.0.7/po/zh_TW.po 2005-02-06 21:23:09.122943672 +0100
853 msgstr "%s:無法更新 DBM shadow檔案\n"
855 #: src/groupadd.c:102
857 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
858 -msgstr "用法:groupadd [-g gid [-o]] 群組\n"
860 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
861 +msgstr "用法:groupadd [-g gid [-o]] [-f] [-r] 群組\n"
863 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
864 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
865 @@ -1715,9 +1715,9 @@
866 msgstr "\t\t[-f 無效日] [-e 過期日 ]\n"
870 -msgid " [-p passwd] name\n"
871 -msgstr "[-p 密碼] 名稱\n"
873 +msgid " [-p passwd] [-r] name\n"
874 +msgstr " [-p 密碼] [-r] 名稱\n"