diff options
| author | Balint Reczey <balint@balintreczey.hu> | 2017-01-18 18:14:19 +0100 |
|---|---|---|
| committer | Balint Reczey <balint@balintreczey.hu> | 2017-01-18 18:14:19 +0100 |
| commit | 25df6ffc554d867c311f03c556df46b52cf1ca9f (patch) | |
| tree | b30e0a536d783777cd1482ab4b94bdb2d4c6ec45 /debian/patches | |
| parent | 9eb5f5e758635f639f5f8ae375af11809c40776b (diff) | |
| download | shadow-25df6ffc554d867c311f03c556df46b52cf1ca9f.tar.gz | |
Send 1000_configure_userns patch upstream
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/0002-Last-bits-of-enabling-subuids.patch | 29 | ||||
| -rw-r--r-- | debian/patches/1000_configure_userns | 15 | ||||
| -rw-r--r-- | debian/patches/series | 2 |
3 files changed, 30 insertions, 16 deletions
diff --git a/debian/patches/0002-Last-bits-of-enabling-subuids.patch b/debian/patches/0002-Last-bits-of-enabling-subuids.patch new file mode 100644 index 00000000..8c62c509 --- /dev/null +++ b/debian/patches/0002-Last-bits-of-enabling-subuids.patch @@ -0,0 +1,29 @@ +From 578d495f91af8dc5dd774d4310ca06f7013712e7 Mon Sep 17 00:00:00 2001 +From: Micah Anderson <micah@riseup.net> +Date: Wed, 18 Jan 2017 18:06:05 +0100 +Subject: [PATCH 2/2] Last bits of enabling subuids + +This patch has been carried by Debian, originally +submitted to BTS in #739981 +--- + src/newusers.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/newusers.c b/src/newusers.c +index 724cbb4..0c0cfe4 100644 +--- a/src/newusers.c ++++ b/src/newusers.c +@@ -988,8 +988,8 @@ int main (int argc, char **argv) + is_shadow_grp = sgr_file_present (); + #endif + #ifdef ENABLE_SUBIDS +- is_sub_uid = sub_uid_file_present (); +- is_sub_gid = sub_gid_file_present (); ++ is_sub_uid = sub_uid_file_present () && !rflg; ++ is_sub_gid = sub_gid_file_present () && !rflg; + #endif /* ENABLE_SUBIDS */ + + open_files (); +-- +2.1.4 + diff --git a/debian/patches/1000_configure_userns b/debian/patches/1000_configure_userns deleted file mode 100644 index 9a59c175..00000000 --- a/debian/patches/1000_configure_userns +++ /dev/null @@ -1,15 +0,0 @@ -Index: git/src/newusers.c -=================================================================== ---- git.orig/src/newusers.c -+++ git/src/newusers.c -@@ -988,8 +988,8 @@ - is_shadow_grp = sgr_file_present (); - #endif - #ifdef ENABLE_SUBIDS -- is_sub_uid = sub_uid_file_present (); -- is_sub_gid = sub_gid_file_present (); -+ is_sub_uid = sub_uid_file_present () && !rflg; -+ is_sub_gid = sub_gid_file_present () && !rflg; - #endif /* ENABLE_SUBIDS */ - - open_files (); diff --git a/debian/patches/series b/debian/patches/series index b2af1fd0..6b737cf0 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,5 @@ 0001-Typos-fix-in-german-translation-of-man-pages.patch +0002-Last-bits-of-enabling-subuids.patch # These patches are only for the testsuite: #900_testsuite_groupmems #901_testsuite_gcov @@ -17,6 +18,5 @@ 508_nologin_in_usr_sbin 505_useradd_recommend_adduser 501_commonio_group_shadow -1000_configure_userns # does not apply cleanly, please merge at upstream #1010_vietnamese_translation |