From 6fee26fe9f9c1d83acc69fe6d70268487d0dddd9 Mon Sep 17 00:00:00 2001 From: Don Armstrong Date: Thu, 26 Oct 2017 15:51:45 -0700 Subject: [PATCH] refresh patches --- .../patches/change_invalidate_request_info_output | 4 ++-- debian/patches/support_large_numbers_in_config | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/debian/patches/change_invalidate_request_info_output b/debian/patches/change_invalidate_request_info_output index b4f98a3..01b0396 100644 --- a/debian/patches/change_invalidate_request_info_output +++ b/debian/patches/change_invalidate_request_info_output @@ -4,7 +4,7 @@ Origin: debian Bug-Debian: http://bugs.debian.org/622230 --- a/nscd.c +++ b/nscd.c -@@ -2432,7 +2432,7 @@ +@@ -2437,7 +2437,7 @@ if (!arg) { /* shutdown */ xfull_write(sock, &ureq, sizeof(ureq)); @@ -13,7 +13,7 @@ Bug-Debian: http://bugs.debian.org/622230 } else { /* invalidate */ size_t arg_len = strlen(arg) + 1; struct { -@@ -2444,7 +2444,9 @@ +@@ -2449,7 +2449,9 @@ reqdata.req.key_len = arg_len; memcpy(reqdata.arg, arg, arg_len); xfull_write(sock, &reqdata, arg_len + sizeof(ureq)); diff --git a/debian/patches/support_large_numbers_in_config b/debian/patches/support_large_numbers_in_config index 3659b6b..fbc7813 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 -@@ -438,7 +438,8 @@ +@@ -439,7 +439,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); -@@ -510,8 +511,8 @@ +@@ -511,8 +512,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 */ -@@ -746,11 +747,11 @@ +@@ -747,11 +748,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) -@@ -1271,9 +1272,9 @@ +@@ -1276,9 +1277,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; -@@ -1290,7 +1291,7 @@ +@@ -1295,7 +1296,7 @@ return NULL; } i = oldest_idx; @@ -60,7 +60,7 @@ Bug-Debian: http://bugs.debian.org/676689 free_refcounted_ureq(&cacheline[i]); ret: -@@ -1317,11 +1318,11 @@ +@@ -1322,11 +1323,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) { -@@ -2641,7 +2642,7 @@ +@@ -2646,7 +2647,7 @@ } for (n = 0; n < 3; n++) { -- 2.39.2