Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 9e93a3348b | |||
| de176e27ed |
Vendored
+7
@@ -1,3 +1,10 @@
|
||||
shadow (1:4.17.3-3) unstable; urgency=medium
|
||||
|
||||
* Accept /usr/sbin/nologin as an alternate to /sbin/nologin.
|
||||
Thanks to Marc Haber
|
||||
|
||||
-- Chris Hofstaedtler <zeha@debian.org> Fri, 28 Mar 2025 12:13:03 +0100
|
||||
|
||||
shadow (1:4.17.3-2) unstable; urgency=medium
|
||||
|
||||
* Do not warn about useradd --system with Debian-globally allocated uids
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
From: Chris Hofstaedtler <zeha@debian.org>
|
||||
Date: Fri, 28 Mar 2025 12:12:13 +0100
|
||||
Subject: Accept /usr/sbin/nologin as an alternate to /sbin/nologin
|
||||
|
||||
Noticed by adduser's autopkgtests, thanks: Marc Haber
|
||||
---
|
||||
src/useradd.c | 1 +
|
||||
src/usermod.c | 1 +
|
||||
2 files changed, 2 insertions(+)
|
||||
|
||||
diff --git a/src/useradd.c b/src/useradd.c
|
||||
index ba0eb50..f654dd9 100644
|
||||
--- a/src/useradd.c
|
||||
+++ b/src/useradd.c
|
||||
@@ -1419,6 +1419,7 @@ static void process_flags (int argc, char **argv)
|
||||
if (!streq(optarg, "")
|
||||
&& '*' != optarg[0]
|
||||
&& !streq(optarg, "/sbin/nologin")
|
||||
+ && !streq(optarg, "/usr/sbin/nologin")
|
||||
&& ( stat(optarg, &st) != 0
|
||||
|| S_ISDIR(st.st_mode)
|
||||
|| access(optarg, X_OK) != 0)) {
|
||||
diff --git a/src/usermod.c b/src/usermod.c
|
||||
index 3e9e046..bfc7738 100644
|
||||
--- a/src/usermod.c
|
||||
+++ b/src/usermod.c
|
||||
@@ -1168,6 +1168,7 @@ process_flags(int argc, char **argv)
|
||||
if (!streq(optarg, "")
|
||||
&& '*' != optarg[0]
|
||||
&& !streq(optarg, "/sbin/nologin")
|
||||
+ && !streq(optarg, "/usr/sbin/nologin")
|
||||
&& ( stat(optarg, &st) != 0
|
||||
|| S_ISDIR(st.st_mode)
|
||||
|| access(optarg, X_OK) != 0)) {
|
||||
Vendored
+1
@@ -16,3 +16,4 @@ upstream/src-chfn.c-Use-stpsep-instead-of-its-pattern.patch
|
||||
upstream/src-chfn.c-Add-local-variable-to-refer-to-the-separated-f.patch
|
||||
upstream/src-chfn.c-copy_field-Rename-local-variable.patch
|
||||
upstream/lib-getdate.y-Ignore-time-zone-information-and-use-UTC.patch
|
||||
Accept-usr-sbin-nologin-as-an-alternate-to-sbin-nologin.patch
|
||||
|
||||
Reference in New Issue
Block a user