Rebase patch 542_useradd-O_option

This commit is contained in:
Chris Hofstaedtler
2024-06-22 15:12:39 +02:00
parent e3549c3f90
commit 3bf1270130
2 changed files with 12 additions and 8 deletions
@@ -5,9 +5,11 @@ Note: useradd.8 needs to be regenerated.
Status wrt upstream: not included as this is just specific
backward compatibility for Debian
--- a/man/useradd.8.xml
+++ b/man/useradd.8.xml
@@ -326,6 +326,11 @@
Index: shadow/man/useradd.8.xml
===================================================================
--- shadow.orig/man/useradd.8.xml
+++ shadow/man/useradd.8.xml
@@ -333,6 +333,11 @@
=<replaceable>100</replaceable>&nbsp;<option>-K</option>&nbsp;
<replaceable>UID_MAX</replaceable>=<replaceable>499</replaceable>
</para>
@@ -19,9 +21,11 @@ Status wrt upstream: not included as this is just specific
<!--para>
Note: <option>-K</option>&nbsp;<replaceable>UID_MIN</replaceable>=<replaceable>10</replaceable>,<replaceable>UID_MAX</replaceable>=<replaceable>499</replaceable>
doesn't work yet.
--- a/src/useradd.c
+++ b/src/useradd.c
@@ -1227,7 +1227,7 @@
Index: shadow/src/useradd.c
===================================================================
--- shadow.orig/src/useradd.c
+++ shadow/src/useradd.c
@@ -1218,7 +1218,7 @@ static void process_flags (int argc, cha
{NULL, 0, NULL, '\0'}
};
while ((c = getopt_long (argc, argv,
@@ -30,7 +34,7 @@ Status wrt upstream: not included as this is just specific
#ifdef WITH_SELINUX
"Z:"
#endif /* WITH_SELINUX */
@@ -1367,6 +1367,7 @@
@@ -1358,6 +1358,7 @@ static void process_flags (int argc, cha
kflg = true;
break;
case 'K':
+1 -1
View File
@@ -11,4 +11,4 @@
503_shadowconfig.8
505_useradd_recommend_adduser
506_relaxed_usernames.patch
542_useradd-O_option
542_useradd-O_option.patch