[Pkg-shadow-devel] Ubuntu shadow 1:4.1.5.1-1.1ubuntu4

[Ubuntu Merge-o-Matic]

This e-mail has been sent due to an upload to Ubuntu that contains Ubuntu
changes.  It contains the difference between the new version and the
previous version of the same source package in Ubuntu.
-------------- next part --------------
Format: 1.8
Date: Mon, 20 Apr 2015 18:41:47 +0100
Source: shadow
Binary: passwd login uidmap
Architecture: source
Version: 1:4.1.5.1-1.1ubuntu4
Distribution: vivid
Urgency: medium
Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
Changed-By: William Grant <wgrant at ubuntu.com>
Description: 
 login      - system login tools
 passwd     - change and administer password and group data
 uidmap     - programs to help use subuids
Launchpad-Bugs-Fixed: 1436937
Changes: 
 shadow (1:4.1.5.1-1.1ubuntu4) vivid; urgency=medium
 .
   * debian/patches/1020_fix_user_busy_errors:
     - libmisc/user_busy.c: Call sub_uid_close in all error cases, otherwise
       code that later opens it as RW fails obscurely. (LP: #1436937)
Checksums-Sha1: 
 ad72f2ea21121ce904a416284279e25150c9b11b 2384 shadow_4.1.5.1-1.1ubuntu4.dsc
 557a340a4f7893b38f6f99e349eaf9ee2afc3e41 114256 shadow_4.1.5.1-1.1ubuntu4.diff.gz
Checksums-Sha256: 
 2123e10f7139a3aaab65511f8fca6e0fe1e634fc56e7951523ba029fde529d70 2384 shadow_4.1.5.1-1.1ubuntu4.dsc
 4c5f5f7606dc657de5cc61f93d7bb060887062c0f864421ce6186cc06368f6ac 114256 shadow_4.1.5.1-1.1ubuntu4.diff.gz
Files: 
 bd2d5685151f33d4c251c08fc138d53b 2384 admin required shadow_4.1.5.1-1.1ubuntu4.dsc
 baee6ee09533e4fb1b6b50eb490bbea0 114256 admin required shadow_4.1.5.1-1.1ubuntu4.diff.gz
Original-Maintainer: Shadow package maintainers <pkg-shadow-devel at lists.alioth.debian.org>
-------------- next part --------------
diff -pruN 1:4.1.5.1-1.1ubuntu3/debian/changelog 1:4.1.5.1-1.1ubuntu4/debian/changelog
--- 1:4.1.5.1-1.1ubuntu3/debian/changelog	2015-04-20 20:35:43.000000000 +0000
+++ 1:4.1.5.1-1.1ubuntu4/debian/changelog	2015-04-20 20:35:42.000000000 +0000
@@ -1,3 +1,11 @@
+shadow (1:4.1.5.1-1.1ubuntu4) vivid; urgency=medium
+
+  * debian/patches/1020_fix_user_busy_errors:
+    - libmisc/user_busy.c: Call sub_uid_close in all error cases, otherwise
+      code that later opens it as RW fails obscurely. (LP: #1436937)
+
+ -- William Grant <wgrant at ubuntu.com>  Mon, 20 Apr 2015 18:41:47 +0100
+
 shadow (1:4.1.5.1-1.1ubuntu3) vivid; urgency=medium
 
   * No change rebuild to get debug symbols for all architectures.
diff -pruN 1:4.1.5.1-1.1ubuntu3/debian/patches/1020_fix_user_busy_errors 1:4.1.5.1-1.1ubuntu4/debian/patches/1020_fix_user_busy_errors
--- 1:4.1.5.1-1.1ubuntu3/debian/patches/1020_fix_user_busy_errors	1970-01-01 00:00:00.000000000 +0000
+++ 1:4.1.5.1-1.1ubuntu4/debian/patches/1020_fix_user_busy_errors	2015-04-20 20:35:42.000000000 +0000
@@ -0,0 +1,24 @@
+Description: Fix user_busy to not leave subuid open in case of error.
+Author: William Grant <wgrant at ubuntu.com>
+Bug: https://bugs.launchpad.net/ubuntu/vivid/+source/shadow/+bug/1436937
+
+Index: shadow-4.1.5.1/libmisc/user_busy.c
+===================================================================
+--- shadow-4.1.5.1.orig/libmisc/user_busy.c
++++ shadow-4.1.5.1/libmisc/user_busy.c
+@@ -168,6 +168,7 @@ static int user_busy_processes (const ch
+ 	if (stat ("/", &sbroot) != 0) {
+ 		perror ("stat (\"/\")");
+ 		(void) closedir (proc);
++	        sub_uid_close();
+ 		return 0;
+ 	}
+ 
+@@ -205,6 +206,7 @@ static int user_busy_processes (const ch
+ 
+ 		if (check_status (name, tmp_d_name, uid) != 0) {
+ 			(void) closedir (proc);
++	                sub_uid_close();
+ 			fprintf (stderr,
+ 			         _("%s: user %s is currently used by process %d\n"),
+ 			         Prog, name, pid);
diff -pruN 1:4.1.5.1-1.1ubuntu3/debian/patches/series 1:4.1.5.1-1.1ubuntu4/debian/patches/series
--- 1:4.1.5.1-1.1ubuntu3/debian/patches/series	2015-04-20 20:35:43.000000000 +0000
+++ 1:4.1.5.1-1.1ubuntu4/debian/patches/series	2015-04-20 20:35:42.000000000 +0000
@@ -36,3 +36,4 @@ userns/16_add-argument-sanity-checking.p
 496_su_kill_process_group
 1000_configure_userns
 1010_extrausers.patch
+1020_fix_user_busy_errors