[Pkg-shadow-devel] [shadow] 01/06: Fix 1000_configure_userns to avoid dropping a needed #endif Closes: #744877

[Christian Perrier]

This is an automated email from the git hooks/post-receive script.

bubulle pushed a commit to branch master
in repository shadow.

commit 25cba03d2dac565fab667884bf711439f9a70544
Author: Christian Perrier <bubulle at debian.org>
Date:   Wed Apr 16 06:27:01 2014 +0200

    Fix 1000_configure_userns to avoid dropping a needed #endif Closes: #744877
---
 debian/changelog                     | 4 ++++
 debian/patches/1000_configure_userns | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4d6e697..58b7f04 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -47,6 +47,10 @@ shadow (1:4.2-1) UNRELEASED; urgency=low
   * Switch to dpkg-source 3.0 (quilt) format
   * Add build-dependency against bison
   * Call dh-autoreconf since we need to regenerate all the autofoo files
+  
+  [ Philippe Grégoire ]
+  * Fix 1000_configure_userns to avoid dropping a needed #endif
+    Closes: #744877
 
  -- Christian Perrier <bubulle at debian.org>  Sat, 27 Jul 2013 20:07:18 +0200
 
diff --git a/debian/patches/1000_configure_userns b/debian/patches/1000_configure_userns
index 0cddc99..5cd39b6 100644
--- a/debian/patches/1000_configure_userns
+++ b/debian/patches/1000_configure_userns
@@ -51,17 +51,17 @@ Index: git/src/useradd.c
  	/*
  	 * Get my name so that I can use it to report errors.
  	 */
-@@ -2023,9 +2027,10 @@
+@@ -2023,8 +2027,10 @@
  	is_shadow_grp = sgr_file_present ();
  #endif
  #ifdef ENABLE_SUBIDS
 -	is_sub_uid = sub_uid_file_present ();
 -	is_sub_gid = sub_gid_file_present ();
--#endif				/* ENABLE_SUBIDS */
 +	is_sub_uid = sub_uid_file_present () && !rflg &&
 +	    (!user_id || (user_id <= uid_max && user_id >= uid_min));
 +	is_sub_gid = sub_gid_file_present () && !rflg &&
 +	    (!user_id || (user_id <= uid_max && user_id >= uid_min));
+ #endif				/* ENABLE_SUBIDS */
  
  	get_defaults ();
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shadow/shadow.git