← Back to branch summary

~serge-hallyn/ubuntu/raring/shadow/shadow-userns

« back to all changes in this revision

Viewing changes to debian/patches/542_useradd-O_option

  • Committer: Package Import Robot
  • Author(s): Colin Watson
  • Date: 2012-11-29 15:27:11 UTC
  • mfrom: (1.1.10) (49.1.2 raring-proposed)
  • Revision ID: package-import@ubuntu.com-20121129152711-yt26ue2rvo3lqy72
Tags: 1:4.1.5.1-1ubuntu2
Revert build-dependency from gettext:any to gettext, now that gettext is
Multi-Arch: foreign.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/542_useradd-O_option
7
7
 
8
8
--- a/man/useradd.8.xml
9
9
+++ b/man/useradd.8.xml
10
 
@@ -300,6 +300,11 @@
11
 
            <replaceable>UID_MIN</replaceable>=<replaceable>10</replaceable>,<replaceable>UID_MAX</replaceable>=<replaceable>499</replaceable>
12
 
            doesn't work yet.
 
10
@@ -321,6 +321,11 @@
 
11
            databases are resetted to avoid reusing the entry from a previously
 
12
            deleted user.
13
13
          </para>
14
14
+          <para>
15
15
+            For the compatibility with previous Debian's
21
21
       <varlistentry>
22
22
--- a/src/useradd.c
23
23
+++ b/src/useradd.c
24
 
@@ -996,9 +996,9 @@
 
24
@@ -1011,9 +1011,9 @@
25
25
                };
26
26
                while ((c = getopt_long (argc, argv,
27
27
 #ifdef WITH_SELINUX
28
 
-                                        "b:c:d:De:f:g:G:hk:K:lmMNop:rs:u:UZ:",
29
 
+                                        "b:c:d:De:f:g:G:hk:O:K:lmMNop:rs:u:UZ:",
30
 
 #else
31
 
-                                        "b:c:d:De:f:g:G:hk:K:lmMNop:rs:u:U",
32
 
+                                        "b:c:d:De:f:g:G:hk:O:K:lmMNop:rs:u:U",
33
 
 #endif
 
28
-                                        "b:c:d:De:f:g:G:hk:K:lmMNop:rR:s:u:UZ:",
 
29
+                                        "b:c:d:De:f:g:G:hk:O:K:lmMNop:rR:s:u:UZ:",
 
30
 #else                          /* !WITH_SELINUX */
 
31
-                                        "b:c:d:De:f:g:G:hk:K:lmMNop:rR:s:u:U",
 
32
+                                        "b:c:d:De:f:g:G:hk:O:K:lmMNop:rR:s:u:U",
 
33
 #endif                         /* !WITH_SELINUX */
34
34
                                         long_options, NULL)) != -1) {
35
35
                        switch (c) {
36
 
@@ -1120,6 +1120,7 @@
 
36
@@ -1136,6 +1136,7 @@
37
37
                                kflg = true;
38
38
                                break;
39
39
                        case 'K':