summaryrefslogtreecommitdiffstats
path: root/debian/patches/useradd-accept-the-O-flag-for-backward-compatibility.patch
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-26 16:18:38 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-26 16:18:38 +0000
commit37112ff6dd482edb8af60f110971e4c91d035f30 (patch)
tree30de6e55c07318a1321a213719470f542513c768 /debian/patches/useradd-accept-the-O-flag-for-backward-compatibility.patch
parentMerging upstream version 1:4.15.2. (diff)
downloadshadow-37112ff6dd482edb8af60f110971e4c91d035f30.tar.xz
shadow-37112ff6dd482edb8af60f110971e4c91d035f30.zip
Adding debian version 1:4.15.2-1.debian/1%4.15.2-1
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/useradd-accept-the-O-flag-for-backward-compatibility.patch')
-rw-r--r--debian/patches/useradd-accept-the-O-flag-for-backward-compatibility.patch52
1 files changed, 52 insertions, 0 deletions
diff --git a/debian/patches/useradd-accept-the-O-flag-for-backward-compatibility.patch b/debian/patches/useradd-accept-the-O-flag-for-backward-compatibility.patch
new file mode 100644
index 0000000..74b41c8
--- /dev/null
+++ b/debian/patches/useradd-accept-the-O-flag-for-backward-compatibility.patch
@@ -0,0 +1,52 @@
+From: Shadow package maintainers <pkg-shadow-devel@lists.alioth.debian.org>
+Date: Sat, 22 Jun 2024 17:39:41 +0200
+Subject: useradd: accept the -O flag for backward compatibility
+
+Note: useradd.8 needs to be regenerated.
+
+Status wrt upstream: not included as this is just specific
+ backward compatibility for Debian
+
+Gbp-Topic: debian
+---
+ man/useradd.8.xml | 5 +++++
+ src/useradd.c | 3 ++-
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/man/useradd.8.xml b/man/useradd.8.xml
+index 4fc95d1..c513e56 100644
+--- a/man/useradd.8.xml
++++ b/man/useradd.8.xml
+@@ -333,6 +333,11 @@
+ =<replaceable>100</replaceable>&nbsp;<option>-K</option>&nbsp;
+ <replaceable>UID_MAX</replaceable>=<replaceable>499</replaceable>
+ </para>
++ <para>
++ For the compatibility with previous Debian's
++ <command>useradd</command>, the <option>-O</option> option is
++ also supported.
++ </para>
+ <!--para>
+ Note: <option>-K</option>&nbsp;<replaceable>UID_MIN</replaceable>=<replaceable>10</replaceable>,<replaceable>UID_MAX</replaceable>=<replaceable>499</replaceable>
+ doesn't work yet.
+diff --git a/src/useradd.c b/src/useradd.c
+index ac43edd..1cf3349 100644
+--- a/src/useradd.c
++++ b/src/useradd.c
+@@ -1215,7 +1215,7 @@ static void process_flags (int argc, char **argv)
+ {NULL, 0, NULL, '\0'}
+ };
+ while ((c = getopt_long (argc, argv,
+- "b:c:d:De:f:g:G:hk:K:lmMNop:rR:P:s:u:U"
++ "b:c:d:De:f:g:G:hk:O:K:lmMNop:rR:P:s:u:U"
+ #ifdef WITH_SELINUX
+ "Z:"
+ #endif /* WITH_SELINUX */
+@@ -1355,6 +1355,7 @@ static void process_flags (int argc, char **argv)
+ kflg = true;
+ break;
+ case 'K':
++ case 'O': /* compatibility with previous Debian useradd */
+ /*
+ * override login.defs defaults (-K name=value)
+ * example: -K UID_MIN=100 -K UID_MAX=499