[Pkg-shadow-commits] r3327 - in debian/branches/lenny/debian: . patches

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2011-06-04 21:37:19 +0000 (Sat, 04 Jun 2011)
New Revision: 3327

Added:
   debian/branches/lenny/debian/patches/306_long_group_lines
Modified:
   debian/branches/lenny/debian/changelog
   debian/branches/lenny/debian/patches/series
Log:
Add missing update: 4.1.1-6+lenny1


Modified: debian/branches/lenny/debian/changelog
===================================================================
--- debian/branches/lenny/debian/changelog	2011-06-04 07:42:27 UTC (rev 3326)
+++ debian/branches/lenny/debian/changelog	2011-06-04 21:37:19 UTC (rev 3327)
@@ -1,3 +1,11 @@
+shadow (1:4.1.1-6+lenny1) stable-proposed-updates; urgency=low
+
+  * The "Soumaintrain" release.
+  * debian/patches/306_long_group_lines: Fix handling of long lines in the
+    user or group files. Closes: #552006
+
+ -- Nicolas FRANCOIS (Nekral) <nicolas.francois at centraliens.net>  Fri, 13 Nov 2009 22:13:39 +0100
+
 shadow (1:4.1.1-6) unstable; urgency=medium
 
   * The "Rollot" release.

Added: debian/branches/lenny/debian/patches/306_long_group_lines
===================================================================
--- debian/branches/lenny/debian/patches/306_long_group_lines	                        (rev 0)
+++ debian/branches/lenny/debian/patches/306_long_group_lines	2011-06-04 21:37:19 UTC (rev 3327)
@@ -0,0 +1,84 @@
+Goal: Fix handling of long user or group file lines.
+
+Closes: #552006
+
+Status wrt upstream: This patch comes from upstream
+
+--- a/libmisc/xgetXXbyYY.c
++++ b/libmisc/xgetXXbyYY.c
+@@ -50,7 +50,7 @@
+ 		exit (13);
+ 	}
+ 
+-	do {
++	while (1) {
+ 		int status;
+ 		LOOKUP_TYPE *resbuf = NULL;
+ 		buffer = (char *)realloc (buffer, length);
+@@ -77,8 +77,14 @@
+ 			return NULL;
+ 		}
+ 
+-		length *= 4;
+-	} while (length < MAX_LENGTH);
++		if (length <= ((size_t)-1 / 4)) {
++			length *= 4;
++		} else if (length == (size_t) -1) {
++			break;
++		} else {
++			length = (size_t) -1;
++		}
++	}
+ 
+ 	free(buffer);
+ 	free(result);
+--- a/libmisc/xgetpwnam.c
++++ b/libmisc/xgetpwnam.c
+@@ -27,7 +27,6 @@
+ #define ARG_TYPE	const char *
+ #define ARG_NAME	name
+ #define DUP_FUNCTION	__pw_dup
+-#define MAX_LENGTH	0x8000
+ #define HAVE_FUNCTION_R (defined HAVE_GETPWNAM_R)
+ 
+ #include "xgetXXbyYY.c"
+--- a/libmisc/xgetgrnam.c
++++ b/libmisc/xgetgrnam.c
+@@ -27,7 +27,6 @@
+ #define ARG_TYPE	const char *
+ #define ARG_NAME	name
+ #define DUP_FUNCTION	__gr_dup
+-#define MAX_LENGTH	0x8000
+ #define HAVE_FUNCTION_R (defined HAVE_GETGRNAM_R)
+ 
+ #include "xgetXXbyYY.c"
+--- a/libmisc/xgetpwuid.c
++++ b/libmisc/xgetpwuid.c
+@@ -27,7 +27,6 @@
+ #define ARG_TYPE	uid_t
+ #define ARG_NAME	uid
+ #define DUP_FUNCTION	__pw_dup
+-#define MAX_LENGTH	0x8000
+ #define HAVE_FUNCTION_R (defined HAVE_GETPWUID_R)
+ 
+ #include "xgetXXbyYY.c"
+--- a/libmisc/xgetgrgid.c
++++ b/libmisc/xgetgrgid.c
+@@ -27,7 +27,6 @@
+ #define ARG_TYPE	gid_t
+ #define ARG_NAME	gid
+ #define DUP_FUNCTION	__gr_dup
+-#define MAX_LENGTH	0x8000
+ #define HAVE_FUNCTION_R (defined HAVE_GETGRGID_R)
+ 
+ #include "xgetXXbyYY.c"
+--- a/libmisc/xgetspnam.c
++++ b/libmisc/xgetspnam.c
+@@ -27,7 +27,6 @@
+ #define ARG_TYPE	const char *
+ #define ARG_NAME	name
+ #define DUP_FUNCTION	__spw_dup
+-#define MAX_LENGTH	0x8000
+ #define HAVE_FUNCTION_R (defined HAVE_GETSPNAM_R)
+ 
+ #include "xgetXXbyYY.c"

Modified: debian/branches/lenny/debian/patches/series
===================================================================
--- debian/branches/lenny/debian/patches/series	2011-06-04 07:42:27 UTC (rev 3326)
+++ debian/branches/lenny/debian/patches/series	2011-06-04 21:37:19 UTC (rev 3327)
@@ -37,3 +37,4 @@
 303_login_symlink_attack
 304_su.1_synopsis
 305_login.1_japanese
+306_long_group_lines