From 1a1e7474b6081afd44de5a15924af8d787982970 Mon Sep 17 00:00:00 2001 From: Tomas Mraz Date: Tue, 6 Nov 2018 10:53:00 +0100 Subject: [PATCH] Fix malformed patch. --- shadow-4.6-sysugid-min-limit.patch | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/shadow-4.6-sysugid-min-limit.patch b/shadow-4.6-sysugid-min-limit.patch index c03adde..4cea6ef 100644 --- a/shadow-4.6-sysugid-min-limit.patch +++ b/shadow-4.6-sysugid-min-limit.patch @@ -1,32 +1,34 @@ diff -up shadow-4.6/libmisc/find_new_gid.c.min-limit shadow-4.6/libmisc/find_new_gid.c --- shadow-4.6/libmisc/find_new_gid.c.min-limit 2018-04-29 18:42:37.000000001 +0200 -+++ shadow-4.6/libmisc/find_new_gid.c 2018-11-06 10:07:14.567611067 +0100 -@@ -81,6 +81,12 @@ static int get_ranges (bool sys_group, g - getdef_ulong ("GID_MIN", 1000UL), ++++ shadow-4.6/libmisc/find_new_gid.c 2018-11-06 10:51:20.554963292 +0100 +@@ -82,6 +82,13 @@ static int get_ranges (bool sys_group, g (unsigned long) *max_id); return EINVAL; + } + /* + * Zero is reserved for root and the allocation algorithm does not + * work right with it. + */ + if (*min_id == 0) { + *min_id = (gid_t) 1; - } ++ } } else { /* Non-system groups */ + diff -up shadow-4.6/libmisc/find_new_uid.c.min-limit shadow-4.6/libmisc/find_new_uid.c --- shadow-4.6/libmisc/find_new_uid.c.min-limit 2018-04-29 18:42:37.000000001 +0200 -+++ shadow-4.6/libmisc/find_new_uid.c 2018-11-06 10:07:34.392075491 +0100 -@@ -81,6 +81,12 @@ static int get_ranges (bool sys_user, ui - getdef_ulong ("UID_MIN", 1000UL), ++++ shadow-4.6/libmisc/find_new_uid.c 2018-11-06 10:51:39.341399569 +0100 +@@ -82,6 +82,13 @@ static int get_ranges (bool sys_user, ui (unsigned long) *max_id); return EINVAL; + } + /* + * Zero is reserved for root and the allocation algorithm does not + * work right with it. + */ + if (*min_id == 0) { + *min_id = (uid_t) 1; - } ++ } } else { /* Non-system users */ +