1 diff -urN shadow-4.0.6.orig/lib/getdef.c shadow-4.0.6/lib/getdef.c
2 --- shadow-4.0.6.orig/lib/getdef.c 2004-11-18 15:47:10.965296168 +0100
3 +++ shadow-4.0.6/lib/getdef.c 2004-11-18 21:45:00.695401080 +0100
5 { "SYSLOG_SG_ENAB", NULL },
6 { "SYSLOG_SU_ENAB", NULL },
8 + { "SYS_GID_MAX", NULL },
9 + { "SYS_GID_MIN", NULL },
10 + { "SYS_UID_MAX", NULL },
11 + { "SYS_UID_MIN", NULL },
14 { "TTYTYPE_FILE", NULL },
15 diff -urN shadow-4.0.6.orig/man/groupadd.8 shadow-4.0.6/man/groupadd.8
16 --- shadow-4.0.6.orig/man/groupadd.8 2004-11-18 15:47:10.923302552 +0100
17 +++ shadow-4.0.6/man/groupadd.8 2004-11-18 21:45:00.695401080 +0100
19 groupadd \- Create a new group
22 -\fBgroupadd\fR [\fB-g\fI gid \fR[\fB-o\fR]] [\fB-f\fR] \fIgroup\fR
23 +\fBgroupadd\fR [\fB-g\fI gid \fR[\fB-o\fR]] [\fB-f\fR] [\fB-r\fR] \fIgroup\fR
25 The \fBgroupadd\fR command creates a new group account using the values
26 specified on the command line and the default values from the system. The
28 This option causes to just exit with success status if the specified
29 group already exists. With \fB-g\fR, if specified gid already exists,
30 other (unique) gid is chosen (i.e. \fB-g\fR is turned off).
32 +This flag is used to create a system group, with gid lower than usual
33 +(chosen between SYS_GID_MIN and SYS_GID_MAX).
34 .IP "\fB-g\fR \fIgid\fR"
35 The numerical value of the group's ID. This value must be unique, unless the
36 \fB-o\fR option is used. The value must be non-negative. The default is to
37 diff -urN shadow-4.0.6.orig/man/pl/groupadd.8 shadow-4.0.6/man/pl/groupadd.8
38 --- shadow-4.0.6.orig/man/pl/groupadd.8 2004-11-18 15:47:10.946299056 +0100
39 +++ shadow-4.0.6/man/pl/groupadd.8 2004-11-18 21:45:00.696400928 +0100
42 groupadd - twórz now± grupê
44 -\fBgroupadd\fR [\fB-g\fR \fIgid\fR [\fB-o\fR]] [\fB-f\fR] \fIgrupa\fR
45 +\fBgroupadd\fR [\fB-g\fR \fIgid\fR [\fB-o\fR]] [\fB-f\fR] [\fB-r\fR] \fIgrupa\fR
47 Polecenie \fBgroupadd\fR tworzy nowe konto grupy pos³uguj±c siê
48 warto¶ciami podanymi w wierszu poleceñ i domy¶lnymi warto¶ciami z systemu.
50 podana groupa ju¿ istnieje. Z opcj± \fB-g\fR, je¶li podany gid ju¿ istnieje,
51 wybierany jest inny (unikalny) gid (czyli \fB-g\fR jest wy³±czane).
54 +Ta opcja s³u¿y do zak³adania grup systemowych, z identyfikatorami ni¿szymi
55 +ni¿ zwykle (wybieranymi z przedzia³u od SYS_GID_MIN do SYS_GID_MAX).
58 Numeryczna warto¶æ identyfikatora grupy. Warto¶æ ta musi byæ niepowtarzalna,
59 chyba ¿e u¿yto opcji \fB-o\fR. Warto¶æ ID grupy nie mo¿e byæ ujemna. Domy¶lnie
60 diff -urN shadow-4.0.6.orig/man/pl/useradd.8 shadow-4.0.6/man/pl/useradd.8
61 --- shadow-4.0.6.orig/man/pl/useradd.8 2004-11-18 15:47:10.949298600 +0100
62 +++ shadow-4.0.6/man/pl/useradd.8 2004-11-18 21:45:00.697400776 +0100
64 .IP "\fB-p \fIpasswd\fR"
65 Zakodowane has³o w postaci zwracanej przez \fBcrypt\fR(3).
66 Domy¶lnym dzia³aniem jest blokowanie konta.
68 -.\" Tworzenie konta systemowego. Ta opcja pozwala na utworzenie konta o UID
69 -.\" ni¿szym ni¿ UID_MIN zdefiniowane w fI/etc/login.defs\fR. O ile nie poda siê
70 -.\" dodatkowo opcji \fB-m\fR nie jest tworzony katalog domowy dla tak tworzonego
71 -.\" u¿ytkownika niezale¿nie od tego czy tworzenie katalogu jest ustawione czy
72 -.\" nie w \fI/etc/login.defs\fR.
74 +Tworzenie konta systemowego, z identyfikatorem ni¿szym ni¿ zwykle
75 +(wybieranym z przedzia³u od SYS_UID_MIN do SYS_UID_MAX).
76 .IP "\fB-s \fIpow³oka\fR"
77 Nazwa pow³oki (shell) u¿ytkownika. Ustawienie tego pola na puste
78 powoduje, ¿e system wybierze domy¶ln± pow³okê logowania.
79 diff -urN shadow-4.0.6.orig/man/useradd.8 shadow-4.0.6/man/useradd.8
80 --- shadow-4.0.6.orig/man/useradd.8 2004-11-18 15:47:10.926302096 +0100
81 +++ shadow-4.0.6/man/useradd.8 2004-11-18 21:45:00.697400776 +0100
84 [[\fB-M\fR] \fB-m\fR [\fB-k\fR \fIskeleton_dir\fR]] [\fB-o\fR] [\fB-p\fR \fIpasswd\fR]
86 -[\fB-s\fR \fIshell\fR] [\fB-u\fR \fIuid\fR] \fIlogin\fR
87 +[\fB-r\fR] [\fB-s\fR \fIshell\fR] [\fB-u\fR \fIuid\fR] \fIlogin\fR
89 \fBuseradd\fR \fB-D\fR [\fB-g\fI default_group\fR] [\fB-b\fI default_home\fR]
92 .IP "\fB-p \fIpasswd\fR"
93 The encrypted password, as returned by \fBcrypt\fR(3). The default is to
96 +This flag is used to create a system account, with uid lower than
97 +usual (chosen between SYS_UID_MIN and SYS_UID_MAX).
98 .IP "\fB-s\fR \fIshell\fR"
99 The name of the user's login shell. The default is to leave this field
100 blank, which causes the system to select the default login shell.
101 --- shadow-4.0.7/po/ca.po.orig 2005-02-06 20:53:02.764551000 +0100
102 +++ shadow-4.0.7/po/ca.po 2005-02-06 21:16:22.244798552 +0100
105 #: src/groupadd.c:102
107 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
108 -msgstr "Forma d'ús: groupadd [-g gid [-o]] [-f] grup\n"
109 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
110 +msgstr "Forma d'ús: groupadd [-g gid [-o]] [-f] [-r] grup\n"
112 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
113 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
114 @@ -1714,8 +1714,8 @@
118 -msgid " [-p passwd] name\n"
119 -msgstr " [-p contrasenya] nom\n"
120 +msgid " [-p passwd] [-r] name\n"
121 +msgstr " [-p contrasenya] [-r] nom\n"
125 diff -urN shadow-4.0.6.orig/po/cs.po shadow-4.0.6/po/cs.po
126 --- shadow-4.0.6.orig/po/cs.po 2004-11-18 15:47:10.872310304 +0100
127 +++ shadow-4.0.6/po/cs.po 2004-11-18 21:45:00.699400472 +0100
130 #: src/groupadd.c:102
132 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
133 -msgstr "Použití: groupadd [-g gid [-o]] [-f] skupina\n"
134 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
135 +msgstr "Použití: groupadd [-g gid [-o]] [-f] [-r] skupina\n"
137 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
138 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
139 @@ -1804,8 +1804,8 @@
143 -msgid " [-p passwd] name\n"
144 -msgstr " [-p heslo] jméno\n"
145 +msgid " [-p passwd] [-r] name\n"
146 +msgstr " [-p heslo] [-r] jméno\n"
150 --- shadow-4.0.7/po/da.po.orig 2005-02-06 20:53:02.782549000 +0100
151 +++ shadow-4.0.7/po/da.po 2005-02-06 21:17:02.084741960 +0100
154 #: src/groupadd.c:102
156 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
157 -msgstr "Brug: groupadd [-g gid [-o]] [-f] gruppe\n"
158 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
159 +msgstr "Brug: groupadd [-g gid [-o]] [-f] [-r] gruppe\n"
161 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
162 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
163 @@ -1730,8 +1730,8 @@
167 -msgid " [-p passwd] name\n"
168 -msgstr " [-p adgangskode] navn\n"
169 +msgid " [-p passwd] [-r] name\n"
170 +msgstr " [-p adgangskode] [-r] navn\n"
174 diff -urN shadow-4.0.6.orig/po/de.po shadow-4.0.6/po/de.po
175 --- shadow-4.0.6.orig/po/de.po 2004-11-18 15:47:10.873310152 +0100
176 +++ shadow-4.0.6/po/de.po 2004-11-18 21:45:00.700400320 +0100
179 #: src/groupadd.c:102
181 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
182 -msgstr "Syntax: groupadd [-g gid [-o]] [-f] Gruppe\n"
183 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
184 +msgstr "Syntax: groupadd [-g gid [-o]] [-f] [-r] Gruppe\n"
186 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
187 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
188 @@ -1802,8 +1802,8 @@
192 -msgid " [-p passwd] name\n"
193 -msgstr " [-p Kennwort] Name\n"
194 +msgid " [-p passwd] [-r] name\n"
195 +msgstr " [-p Kennwort] [-r] Name\n"
199 diff -urN shadow-4.0.6.orig/po/el.po shadow-4.0.6/po/el.po
200 --- shadow-4.0.6.orig/po/el.po 2004-11-18 15:47:10.874310000 +0100
201 +++ shadow-4.0.6/po/el.po 2004-11-18 21:45:00.702400016 +0100
204 #: src/groupadd.c:102
206 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
207 -msgstr "Χρήση: groupadd [-g gid [-o]] [-f] ομάδα\n"
208 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
209 +msgstr "Χρήση: groupadd [-g gid [-o]] [-f] [-r] ομάδα\n"
211 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
212 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
213 @@ -1823,8 +1823,8 @@
217 -msgid " [-p passwd] name\n"
218 -msgstr " [-p συνθηματικό] όνομα\n"
219 +msgid " [-p passwd] [-r] name\n"
220 +msgstr " [-p συνθηματικό] [-r] όνομα\n"
224 --- shadow-4.0.7/po/es.po.orig 2005-02-06 20:53:02.810544000 +0100
225 +++ shadow-4.0.7/po/es.po 2005-02-06 21:17:29.589560592 +0100
228 #: src/groupadd.c:102
230 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
231 -msgstr "Modo de uso: groupadd [-g gid [-o]] [-f] grupo\n"
232 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
233 +msgstr "Modo de uso: groupadd [-g gid [-o]] [-f] [-r] grupo\n"
235 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
236 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
237 @@ -1747,8 +1747,8 @@
241 -msgid " [-p passwd] name\n"
242 -msgstr " [-p contraseña] nombre\n"
243 +msgid " [-p passwd] [-r] name\n"
244 +msgstr " [-p contraseña] [-r] nombre\n"
248 --- shadow-4.0.7/po/eu.po.orig 2005-02-06 20:53:02.818543000 +0100
249 +++ shadow-4.0.7/po/eu.po 2005-02-06 21:17:44.920229976 +0100
252 #: src/groupadd.c:102
254 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
255 -msgstr "Erabilera: groupadd [-g gid [-o]] [-f] taldea\n"
256 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
257 +msgstr "Erabilera: groupadd [-g gid [-o]] [-f] [-r] taldea\n"
259 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
260 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
261 @@ -1708,8 +1708,8 @@
265 -msgid " [-p passwd] name\n"
266 -msgstr " [-p pasahitz] izena\n"
267 +msgid " [-p passwd] [-r] name\n"
268 +msgstr " [-p pasahitz] [-r] izena\n"
272 --- shadow-4.0.7/po/fi.po.orig 2005-02-06 20:53:02.828542000 +0100
273 +++ shadow-4.0.7/po/fi.po 2005-02-06 21:18:04.821204568 +0100
276 #: src/groupadd.c:102
278 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
279 -msgstr "Käyttö: groupadd [-g gid [-o]] [-f] ryhmä\n"
280 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
281 +msgstr "Käyttö: groupadd [-g gid [-o]] [-f] [-r] ryhmä\n"
283 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
284 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
285 @@ -1732,8 +1732,8 @@
289 -msgid " [-p passwd] name\n"
290 -msgstr " [-p salansana] nimi\n"
291 +msgid " [-p passwd] [-r] name\n"
292 +msgstr " [-p salansana] [-r] nimi\n"
296 diff -urN shadow-4.0.6.orig/po/fr.po shadow-4.0.6/po/fr.po
297 --- shadow-4.0.6.orig/po/fr.po 2004-11-18 15:47:10.877309544 +0100
298 +++ shadow-4.0.6/po/fr.po 2004-11-18 21:45:00.703399864 +0100
301 #: src/groupadd.c:102
303 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
304 -msgstr "Usage: groupadd [-g gid [-o]] [-f] groupe\n"
305 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
306 +msgstr "Usage: groupadd [-g gid [-o]] [-f] [-r] groupe\n"
308 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
309 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
310 @@ -1804,8 +1804,8 @@
314 -msgid " [-p passwd] name\n"
315 -msgstr " [-p mot-de-passe] nom\n"
316 +msgid " [-p passwd] [-r] name\n"
317 +msgstr " [-p mot-de-passe] [-r] nom\n"
321 --- shadow-4.0.7/po/id.po.orig 2005-02-06 20:53:02.954523000 +0100
322 +++ shadow-4.0.7/po/id.po 2005-02-06 21:18:31.035219432 +0100
325 #: src/groupadd.c:102
327 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
328 -msgstr "Penggunaan: groupadd [-g gid [-o]] [-f] grup\n"
329 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
330 +msgstr "Penggunaan: groupadd [-g gid [-o]] [-f] [-r] grup\n"
332 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
333 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
334 @@ -1704,8 +1704,8 @@
338 -msgid " [-p passwd] name\n"
339 -msgstr " [-p kata_sandi] nama\n"
340 +msgid " [-p passwd] [-r] name\n"
341 +msgstr " [-p kata_sandi] [-r] nama\n"
345 --- shadow-4.0.7/po/it.po.orig 2005-02-06 20:53:02.963521000 +0100
346 +++ shadow-4.0.7/po/it.po 2005-02-06 21:18:46.662843672 +0100
349 #: src/groupadd.c:102
351 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
352 -msgstr "Uso: groupadd [-g GID [-o]] [-f] GRUPPO\n"
353 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
354 +msgstr "Uso: groupadd [-g GID [-o]] [-f] [-r] GRUPPO\n"
356 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
357 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
358 @@ -1775,8 +1775,8 @@
362 -msgid " [-p passwd] name\n"
363 -msgstr " [-p PASSWORD] NOME\n"
364 +msgid " [-p passwd] [-r] name\n"
365 +msgstr " [-p PASSWORD] [-r] NOME\n"
369 diff -urN shadow-4.0.6.orig/po/ja.po shadow-4.0.6/po/ja.po
370 --- shadow-4.0.6.orig/po/ja.po 2004-11-18 15:47:10.879309240 +0100
371 +++ shadow-4.0.6/po/ja.po 2004-11-18 21:45:00.704399712 +0100
374 #: src/groupadd.c:102
376 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
377 -msgstr "使用法: groupadd [-g グループID [-o]] [-f] グループ\n"
378 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
379 +msgstr "使用法: groupadd [-g グループID [-o]] [-f] [-r] グループ\n"
381 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
382 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
383 @@ -1793,8 +1793,8 @@
387 -msgid " [-p passwd] name\n"
388 -msgstr " [-p パスワード] ユーザ名\n"
389 +msgid " [-p passwd] [-r] name\n"
390 +msgstr " [-p パスワード] [-r] ユーザ名\n"
394 diff -urN shadow-4.0.6.orig/po/ko.po shadow-4.0.6/po/ko.po
395 --- shadow-4.0.6.orig/po/ko.po 2004-11-18 15:47:10.880309088 +0100
396 +++ shadow-4.0.6/po/ko.po 2004-11-18 21:45:00.706399408 +0100
399 #: src/groupadd.c:102
401 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
402 -msgstr "사용법: groupadd [-g GID [-o]] [-f] 그룹명\n"
403 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
404 +msgstr "사용법: groupadd [-g GID [-o]] [-f] [-r] 그룹명\n"
406 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
407 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
408 @@ -1800,8 +1800,8 @@
412 -msgid " [-p passwd] name\n"
413 -msgstr " [-p 열쇠글] 이름\n"
414 +msgid " [-p passwd] [-r] name\n"
415 +msgstr " [-p 열쇠글] [-r] 이름\n"
419 --- shadow-4.0.7/po/nb.po.orig 2005-02-06 20:53:02.989517000 +0100
420 +++ shadow-4.0.7/po/nb.po 2005-02-06 21:19:10.761180168 +0100
423 #: src/groupadd.c:102
425 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
426 -msgstr "Bruk: groupadd [-g gid [-o]] [-f] gruppe\n"
427 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
428 +msgstr "Bruk: groupadd [-g gid [-o]] [-f] [-r] gruppe\n"
430 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
431 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
432 @@ -1710,8 +1710,8 @@
436 -msgid " [-p passwd] name\n"
437 -msgstr " [-p passord] navn\n"
438 +msgid " [-p passwd] [-r] name\n"
439 +msgstr " [-p passord] [-r] navn\n"
443 --- shadow-4.0.7/po/nl.po.orig 2005-02-06 20:53:02.998516000 +0100
444 +++ shadow-4.0.7/po/nl.po 2005-02-06 21:19:23.540237456 +0100
447 #: src/groupadd.c:102
449 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
450 -msgstr "Gebruik: groupadd [-g gid [-o]] [-f] groep\n"
451 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
452 +msgstr "Gebruik: groupadd [-g gid [-o]] [-f] [-r] groep\n"
454 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
455 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
456 @@ -1739,8 +1739,8 @@
460 -msgid " [-p passwd] name\n"
461 -msgstr " [-p wachtwoord] naam\n"
462 +msgid " [-p passwd] [-r] name\n"
463 +msgstr " [-p wachtwoord] [-r] naam\n"
467 --- shadow-4.0.7/po/nn.po.orig 2005-02-06 20:53:03.008514000 +0100
468 +++ shadow-4.0.7/po/nn.po 2005-02-06 21:19:36.046336240 +0100
471 #: src/groupadd.c:102
473 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
474 -msgstr "Bruk: groupadd [-g gid [-o]] [-f] gruppe\n"
475 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
476 +msgstr "Bruk: groupadd [-g gid [-o]] [-f] [-r] gruppe\n"
478 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
479 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
480 @@ -1704,8 +1704,8 @@
484 -msgid " [-p passwd] name\n"
485 -msgstr " [-p passord] namn\n"
486 +msgid " [-p passwd] [-r] name\n"
487 +msgstr " [-p passord] [-r] namn\n"
491 diff -urN shadow-4.0.6.orig/po/pl.po shadow-4.0.6/po/pl.po
492 --- shadow-4.0.6.orig/po/pl.po 2004-11-18 15:47:10.882308784 +0100
493 +++ shadow-4.0.6/po/pl.po 2004-11-18 21:45:00.707399256 +0100
496 #: src/groupadd.c:102
498 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
499 -msgstr "Użycie: groupadd [-g gid [-o]] [-f] grupa\n"
500 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
501 +msgstr "Użycie: groupadd [-g gid [-o]] [-f] [-r] grupa\n"
503 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
504 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
505 @@ -1805,8 +1805,8 @@
509 -msgid " [-p passwd] name\n"
510 -msgstr " [-p hasło] nazwa\n"
511 +msgid " [-p passwd] [-r] name\n"
512 +msgstr " [-p hasło] [-r] nazwa\n"
516 --- shadow-4.0.7/po/pt.po.orig 2005-02-06 20:53:03.025512000 +0100
517 +++ shadow-4.0.7/po/pt.po 2005-02-06 21:20:01.224508576 +0100
520 #: src/groupadd.c:102
522 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
523 -msgstr "Utilização: groupadd [-g gid [-o]] [-f] grupo\n"
524 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
525 +msgstr "Utilização: groupadd [-g gid [-o]] [-f] [-r] grupo\n"
527 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
528 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
529 @@ -1740,8 +1740,8 @@
533 -msgid " [-p passwd] name\n"
534 -msgstr " [-p passwd] nome\n"
535 +msgid " [-p passwd] [-r] name\n"
536 +msgstr " [-p passwd] [-r] nome\n"
540 --- shadow-4.0.7/po/pt_BR.po.orig 2005-02-06 20:53:03.035510000 +0100
541 +++ shadow-4.0.7/po/pt_BR.po 2005-02-06 21:20:14.226531968 +0100
544 #: src/groupadd.c:102
546 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
547 -msgstr "Uso : groupadd [-g gid [-o]] [-f] grupo\n"
548 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
549 +msgstr "Uso : groupadd [-g gid [-o]] [-f] [-r] grupo\n"
551 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
552 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
553 @@ -1711,8 +1711,8 @@
557 -msgid " [-p passwd] name\n"
558 -msgstr " [-p passwd] nome\n"
559 +msgid " [-p passwd] [-r] name\n"
560 +msgstr " [-p passwd] [-r] nome\n"
564 --- shadow-4.0.7/po/ro.po.orig 2005-02-06 20:53:03.144494000 +0100
565 +++ shadow-4.0.7/po/ro.po 2005-02-06 21:21:15.902155848 +0100
567 msgstr "%s: nu pot actualiza fişierele criptate DBM\n"
569 #: src/groupadd.c:102
571 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
572 -msgstr "utilizare: groupadd [-g id_grup [-o]] grup\n"
574 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
575 +msgstr "Utilizare: groupadd [-g id_grup [-o]] [-f] [-r] grup\n"
577 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
578 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
579 @@ -1721,9 +1721,9 @@
580 msgstr "\t\t[-f inactivă] [-e expiră ]\n"
584 -msgid " [-p passwd] name\n"
585 -msgstr "[-p passwd] nume\n"
587 +msgid " [-p passwd] [-r] name\n"
588 +msgstr " [-p passwd] [-r] nume\n"
592 diff -urN shadow-4.0.6.orig/po/ru.po shadow-4.0.6/po/ru.po
593 --- shadow-4.0.6.orig/po/ru.po 2004-11-18 15:47:10.883308632 +0100
594 +++ shadow-4.0.6/po/ru.po 2004-11-18 21:45:00.708399104 +0100
597 #: src/groupadd.c:102
599 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
600 -msgstr "Запуск: groupadd [-g gid [-o]] [-f] группа\n"
601 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
602 +msgstr "Запуск: groupadd [-g gid [-o]] [-f] [-r] группа\n"
604 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
605 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
606 @@ -1792,8 +1792,8 @@
610 -msgid " [-p passwd] name\n"
611 -msgstr " [-p пароль] имя\n"
612 +msgid " [-p passwd] [-r] name\n"
613 +msgstr " [-p пароль] [-r] имя\n"
617 --- shadow-4.0.7/po/sk.po.orig 2005-02-06 20:53:03.163491000 +0100
618 +++ shadow-4.0.7/po/sk.po 2005-02-06 21:21:37.557863680 +0100
621 #: src/groupadd.c:102
623 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
624 -msgstr "Použitie: groupadd [-g gid [-o]] [-f] skupina\n"
625 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
626 +msgstr "Použitie: groupadd [-g gid [-o]] [-f] [-r] skupina\n"
628 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
629 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
630 @@ -1712,8 +1712,8 @@
634 -msgid " [-p passwd] name\n"
635 -msgstr " [-p heslo] meno\n"
636 +msgid " [-p passwd] [-r] name\n"
637 +msgstr " [-p heslo] [-r] meno\n"
641 diff -urN shadow-4.0.6.orig/po/sv.po shadow-4.0.6/po/sv.po
642 --- shadow-4.0.6.orig/po/sv.po 2004-11-18 15:47:10.884308480 +0100
643 +++ shadow-4.0.6/po/sv.po 2004-11-18 21:45:00.710398800 +0100
646 #: src/groupadd.c:102
648 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
649 -msgstr "Användning: groupadd [-g gid [-o]] [-f] grupp\n"
650 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
651 +msgstr "Användning: groupadd [-g gid [-o]] [-f] [-r] grupp\n"
653 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
654 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
655 @@ -1795,8 +1795,8 @@
659 -msgid " [-p passwd] name\n"
660 -msgstr " [-p passwd] namn\n"
661 +msgid " [-p passwd] [-r] name\n"
662 +msgstr " [-p passwd] [-r] namn\n"
666 --- shadow-4.0.7/po/tr.po.orig 2005-02-06 20:53:03.189487000 +0100
667 +++ shadow-4.0.7/po/tr.po 2005-02-06 21:21:59.907466024 +0100
670 #: src/groupadd.c:102
672 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
673 -msgstr "Kullanım: groupadd [-g gid [-o]] [-f] grup\n"
674 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
675 +msgstr "Kullanım: groupadd [-g gid [-o]] [-f] [-r] grup\n"
677 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
678 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
679 @@ -1707,8 +1707,8 @@
683 -msgid " [-p passwd] name\n"
684 -msgstr " [-p parola] isim\n"
685 +msgid " [-p passwd] [-r] name\n"
686 +msgstr " [-p parola] [-r] isim\n"
690 diff -urN shadow-4.0.6.orig/po/uk.po shadow-4.0.6/po/uk.po
691 --- shadow-4.0.6.orig/po/uk.po 2004-11-18 15:47:10.886308176 +0100
692 +++ shadow-4.0.6/po/uk.po 2004-11-18 21:45:00.711398648 +0100
695 #: src/groupadd.c:102
697 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
698 -msgstr "Використовуйте: groupadd [-g gid [-o]] [-f] група\n"
699 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
700 +msgstr "Використовуйте: groupadd [-g gid [-o]] [-f] [-r] група\n"
702 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
703 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
704 @@ -1805,8 +1805,8 @@
708 -msgid " [-p passwd] name\n"
709 -msgstr " [-p пароль] ім'я\n"
710 +msgid " [-p passwd] [-r] name\n"
711 +msgstr " [-p пароль] [-r] ім'я\n"
715 --- shadow-4.0.7/po/zh_CN.po.orig 2005-02-06 20:53:03.206484000 +0100
716 +++ shadow-4.0.7/po/zh_CN.po 2005-02-06 21:22:32.575499728 +0100
719 #: src/groupadd.c:102
721 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
722 -msgstr "用法:groupadd [-g gid [-o]] [-f] 组\n"
723 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
724 +msgstr "用法:groupadd [-g gid [-o]] [-f] [-r] 组\n"
726 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
727 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
728 @@ -1700,8 +1700,8 @@
732 -msgid " [-p passwd] name\n"
733 -msgstr " [-p 密码] 名称\n"
734 +msgid " [-p passwd] [-r] name\n"
735 +msgstr " [-p 密码] [-r] 名称\n"
739 --- shadow-4.0.7/po/zh_TW.po.orig 2005-02-06 20:53:03.214483000 +0100
740 +++ shadow-4.0.7/po/zh_TW.po 2005-02-06 21:23:09.122943672 +0100
742 msgstr "%s:無法更新 DBM shadow檔案\n"
744 #: src/groupadd.c:102
746 -msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
747 -msgstr "用法:groupadd [-g gid [-o]] 群組\n"
749 +msgid "Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"
750 +msgstr "用法:groupadd [-g gid [-o]] [-f] [-r] 群組\n"
752 #: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229
753 #: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676
754 @@ -1715,9 +1715,9 @@
755 msgstr "\t\t[-f 無效日] [-e 過期日 ]\n"
759 -msgid " [-p passwd] name\n"
760 -msgstr "[-p 密碼] 名稱\n"
762 +msgid " [-p passwd] [-r] name\n"
763 +msgstr " [-p 密碼] [-r] 名稱\n"
767 diff -urN shadow-4.0.6.orig/src/groupadd.c shadow-4.0.6/src/groupadd.c
768 --- shadow-4.0.6.orig/src/groupadd.c 2004-11-18 15:47:10.972295104 +0100
769 +++ shadow-4.0.6/src/groupadd.c 2004-11-18 21:45:59.462467128 +0100
771 static int oflg = 0; /* permit non-unique group ID to be specified with -g */
772 static int gflg = 0; /* ID value for the new group */
773 static int fflg = 0; /* if group already exists, do nothing and exit(0) */
774 +static int rflg = 0; /* add system group (with lower gid) */
777 extern int gr_dbm_mode;
780 static void usage (void)
782 - fprintf (stderr, _("Usage: groupadd [-g gid [-o]] [-f] group\n"));
783 + fprintf (stderr, _("Usage: groupadd [-g gid [-o]] [-f] [-r] group\n"));
788 const struct group *grp;
789 gid_t gid_min, gid_max;
791 - gid_min = getdef_unum ("GID_MIN", 100);
792 - gid_max = getdef_unum ("GID_MAX", 60000);
795 + gid_min = getdef_unum ("GID_MIN", 500);
796 + gid_max = getdef_unum ("GID_MAX", 60000);
798 + gid_min = getdef_unum ("SYS_GID_MIN", 10);
799 + gid_max = getdef_unum ("SYS_GID_MAX", 499);
802 * Start with some GID value if the user didn't provide us with
808 - while ((arg = getopt (argc, argv, "og:O:f")) != EOF) {
809 + while ((arg = getopt (argc, argv, "og:O:fr")) != EOF) {
814 fail_exit (E_BAD_ARG);
819 + * create system group
826 diff -urN shadow-4.0.6.orig/src/useradd.c shadow-4.0.6/src/useradd.c
827 --- shadow-4.0.6.orig/src/useradd.c 2004-11-18 15:47:10.975294648 +0100
828 +++ shadow-4.0.6/src/useradd.c 2004-11-18 21:45:00.713398344 +0100
831 * These defaults are used if there is no defaults file.
833 -static gid_t def_group = 100;
834 +static gid_t def_group = 1000;
835 static const char *def_gname = "other";
836 -static const char *def_home = "/home";
837 -static const char *def_shell = "";
838 +static const char *def_home = "/home/users";
839 +static const char *def_shell = "/dev/null";
840 static const char *def_template = SKEL_DIR;
841 static const char *def_create_mail_spool = "no";
844 #define VALID(s) (strcspn (s, ":\n") == strlen (s))
846 static const char *user_name = "";
847 -static const char *user_pass = "!";
848 +static const char *user_pass = "!!";
849 static uid_t user_id;
850 static gid_t user_gid;
851 static const char *user_comment = "";
853 mflg = 0, /* create user's home directory if it doesn't exist */
854 nflg = 0, /* create a group having the same name as the user */
855 oflg = 0, /* permit non-unique user ID to be specified with -u */
856 + rflg = 0, /* create system account (wuth lower uid) */
857 sflg = 0, /* shell program for new account */
858 uflg = 0; /* specify user ID for new account */
862 fprintf (stderr, _(" [-f inactive] [-e expire]\n"));
864 - fprintf (stderr, _(" [-p passwd] name\n"));
865 + fprintf (stderr, _(" [-p passwd] [-r] name\n"));
867 _(" useradd -D [-g group] [-b base] [-s shell]\n"));
870 const struct passwd *pwd;
871 uid_t uid_min, uid_max;
873 - uid_min = getdef_unum ("UID_MIN", 100);
874 - uid_max = getdef_unum ("UID_MAX", 60000);
877 + uid_min = getdef_unum ("UID_MIN", 500);
878 + uid_max = getdef_unum ("UID_MAX", 60000);
880 + uid_min = getdef_unum ("SYS_UID_MIN", 1);
881 + uid_max = getdef_unum ("SYS_UID_MAX", 499);
884 * Start with some UID value if the user didn't provide us with
886 @@ -1056,9 +1061,9 @@
890 -#define FLAGS "A:Du:og:G:d:s:c:mk:p:f:e:b:O:M"
891 +#define FLAGS "A:Du:og:G:d:s:c:mk:p:f:e:b:O:Mr"
893 -#define FLAGS "A:Du:og:G:d:s:c:mk:p:b:O:M"
894 +#define FLAGS "A:Du:og:G:d:s:c:mk:p:b:O:Mr"
896 while ((arg = getopt (argc, argv, FLAGS)) != EOF) {
898 @@ -1077,6 +1082,9 @@
902 + case 'r': /* create system account */
906 if (!VALID (optarg)) {