X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=debian%2Fpatches%2Fsupport_large_numbers_in_config;h=e59cecab4f32fad4d68525199942259067abffbe;hb=84b6340522619dbc6132373876d1cea2dd7ee7b7;hp=fbc7813b266d58b4a404c82e14272e0f206161ac;hpb=4e57a2834ee0b002d32bd63942630afef1876681;p=unscd.git

diff --git a/debian/patches/support_large_numbers_in_config b/debian/patches/support_large_numbers_in_config
index fbc7813..e59ceca 100644
--- a/debian/patches/support_large_numbers_in_config
+++ b/debian/patches/support_large_numbers_in_config
@@ -4,7 +4,7 @@ Origin: debian
 Bug-Debian: http://bugs.debian.org/676689
 --- a/nscd.c
 +++ b/nscd.c
-@@ -439,7 +439,8 @@
+@@ -443,7 +443,8 @@
  		char *p;
  		unsigned long l = strtoul(str, &p, 10);
  		/* must not overflow int even after x1000 */
@@ -14,7 +14,7 @@ Bug-Debian: http://bugs.debian.org/676689
  			return l;
  	}
  	error_and_die("malformed or too big number '%s'", str);
-@@ -511,8 +512,8 @@
+@@ -515,8 +516,8 @@
  	const char *user;
  	smallint srv_enable[3];
  	smallint check_files[3];
@@ -25,7 +25,7 @@ Bug-Debian: http://bugs.debian.org/676689
  	unsigned size[3];
  } config = {
  	/* We try to closely mimic glibc nscd */
-@@ -747,11 +748,11 @@
+@@ -751,11 +752,11 @@
  	return sizeof(user_req_header) + ureq->key_len;
  }
  
@@ -39,7 +39,7 @@ Bug-Debian: http://bugs.debian.org/676689
  }
  
  static void set_cache_timestamp(user_req *ureq)
-@@ -1276,9 +1277,9 @@
+@@ -1280,9 +1281,9 @@
  	}
  
  	unsigned oldest_idx = 0;
@@ -51,7 +51,7 @@ Bug-Debian: http://bugs.debian.org/676689
  		if (age > oldest_age) {
  			oldest_age = age;
  			oldest_idx = i;
-@@ -1295,7 +1296,7 @@
+@@ -1299,7 +1300,7 @@
  		return NULL;
  	}
  	i = oldest_idx;
@@ -60,7 +60,7 @@ Bug-Debian: http://bugs.debian.org/676689
  	free_refcounted_ureq(&cacheline[i]);
  
   ret:
-@@ -1322,11 +1323,11 @@
+@@ -1326,11 +1327,11 @@
  					cached_cnt--;
  					free_refcounted_ureq(cp);
  				} else {
@@ -75,7 +75,7 @@ Bug-Debian: http://bugs.debian.org/676689
  						cached_cnt--;
  						free_refcounted_ureq(cp);
  					} else if (srv == -1) {
-@@ -2646,7 +2647,7 @@
+@@ -2650,7 +2651,7 @@
  	}
  
  	for (n = 0; n < 3; n++) {