diff options
| author | Balint Reczey <balint@balintreczey.hu> | 2022-08-20 18:37:02 +0200 |
|---|---|---|
| committer | Balint Reczey <balint@balintreczey.hu> | 2022-08-20 18:37:02 +0200 |
| commit | 56751ea5faeb8a3004f148e8657dea58ad6fcc9d (patch) | |
| tree | cac5400bf100cfe0c87092596ee159fe93487dc3 | |
| parent | cda8c5fa8119f44933768a4cc88887becac1113d (diff) | |
| download | shadow-56751ea5faeb8a3004f148e8657dea58ad6fcc9d.tar.gz | |
Refresh patches
| -rw-r--r-- | debian/patches/501_commonio_group_shadow | 2 | ||||
| -rw-r--r-- | debian/patches/506_relaxed_usernames | 10 | ||||
| -rw-r--r-- | debian/patches/542_useradd-O_option | 23 |
3 files changed, 16 insertions, 19 deletions
diff --git a/debian/patches/501_commonio_group_shadow b/debian/patches/501_commonio_group_shadow index fea4ea3d..0b6ccc5c 100644 --- a/debian/patches/501_commonio_group_shadow +++ b/debian/patches/501_commonio_group_shadow @@ -12,7 +12,7 @@ Fixes: #166793 #include "nscd.h" #include "sssd.h" #ifdef WITH_TCB -@@ -978,12 +979,23 @@ +@@ -976,12 +977,23 @@ goto fail; } } else { diff --git a/debian/patches/506_relaxed_usernames b/debian/patches/506_relaxed_usernames index 7a130091..11665465 100644 --- a/debian/patches/506_relaxed_usernames +++ b/debian/patches/506_relaxed_usernames @@ -54,7 +54,7 @@ Details: } --- a/man/useradd.8.xml +++ b/man/useradd.8.xml -@@ -651,12 +651,20 @@ +@@ -692,12 +692,20 @@ </para> <para> @@ -78,9 +78,9 @@ Details: </refsect1> --- a/man/groupadd.8.xml +++ b/man/groupadd.8.xml -@@ -265,12 +265,18 @@ - <refsect1 id='caveats'> - <title>CAVEATS</title> +@@ -64,12 +64,18 @@ + files as needed. + </para> <para> - Groupnames must start with a lower case letter or an underscore, + It is usually recommended to only use groupnames that begin with a lower case letter or an underscore, @@ -97,4 +97,4 @@ Details: + <para> Groupnames may only be up to &GROUP_NAME_MAX_LENGTH; characters long. </para> - <para> + </refsect1> diff --git a/debian/patches/542_useradd-O_option b/debian/patches/542_useradd-O_option index 6f555c68..d594ca9b 100644 --- a/debian/patches/542_useradd-O_option +++ b/debian/patches/542_useradd-O_option @@ -7,9 +7,9 @@ Status wrt upstream: not included as this is just specific --- a/man/useradd.8.xml +++ b/man/useradd.8.xml -@@ -302,6 +302,11 @@ - <option>-K</option> <replaceable>UID_MIN</replaceable>=<replaceable>100</replaceable> - <option>-K</option> <replaceable>UID_MAX</replaceable>=<replaceable>499</replaceable> +@@ -320,6 +320,11 @@ + =<replaceable>100</replaceable> <option>-K</option> + <replaceable>UID_MAX</replaceable>=<replaceable>499</replaceable> </para> + <para> + For the compatibility with previous Debian's @@ -21,19 +21,16 @@ Status wrt upstream: not included as this is just specific doesn't work yet. --- a/src/useradd.c +++ b/src/useradd.c -@@ -1219,9 +1219,9 @@ +@@ -1227,7 +1227,7 @@ + {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 -- "b:c:d:De:f:g:G:hk:K:lmMNop:rR:P:s:u:UZ:", -+ "b:c:d:De:f:g:G:hk:O:K:lmMNop:rR:P:s:u:UZ:", - #else /* !WITH_SELINUX */ -- "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", - #endif /* !WITH_SELINUX */ - long_options, NULL)) != -1) { - switch (c) { -@@ -1350,6 +1350,7 @@ + "Z:" + #endif /* WITH_SELINUX */ +@@ -1367,6 +1367,7 @@ kflg = true; break; case 'K': |