Attachment 14970 Details for Bug 13848 – patch for 4.9

[patch] patch for 4.9

v4-9-fix-cache-debug-message.patch (text/plain), 1.59 KB, created by Andreas Schneider on 2019-03-21 15:11:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andreas Schneider

Created: 2019-03-21 15:11:11 UTC

Size: 1.59 KB

patch

obsolete

>From af88a9447d33051ce88e30098c210e981e0f2c96 Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Thu, 17 Jan 2019 13:58:14 +0100
>Subject: [PATCH] s3:lib: Fix the debug message for adding cache entries.
>
>To get correct values, we need to cast 'timeout' to 'long int' first in
>order to do calculation in that integer space! Calculations are don in
>the space of the lvalue!
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=13848
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>Reviewed-by: Volker Lendecke <vl@samba.org>
>(cherry picked from commit 5822449a7340f53987ce4c04851652427f5b49e8)
>---
> source3/lib/gencache.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
>diff --git a/source3/lib/gencache.c b/source3/lib/gencache.c
>index ab12fc1c531..9f4e1cfcaa3 100644
>--- a/source3/lib/gencache.c
>+++ b/source3/lib/gencache.c
>@@ -294,11 +294,11 @@ bool gencache_set_data_blob(const char *keystr, DATA_BLOB blob,
> 	dbufs[0] = (TDB_DATA) { .dptr = (uint8_t *)hdr, .dsize = hdr_len };
> 	dbufs[1] = (TDB_DATA) { .dptr = blob.data, .dsize = blob.length };
> 
>-	DEBUG(10, ("Adding cache entry with key=[%s] and timeout="
>-	           "[%s] (%d seconds %s)\n", keystr,
>+	DBG_DEBUG("Adding cache entry with key=[%s] and timeout="
>+	           "[%s] (%ld seconds %s)\n", keystr,
> 		   timestring(talloc_tos(), timeout),
>-		   (int)(timeout - time(NULL)), 
>-		   timeout > time(NULL) ? "ahead" : "in the past"));
>+		   ((long int)timeout) - time(NULL),
>+		   timeout > time(NULL) ? "ahead" : "in the past");
> 
> 	ret = tdb_storev(cache_notrans->tdb, string_term_tdb_data(keystr),
> 			 dbufs, 2, 0);
>-- 
>2.21.0
>

Flags:

ab: review+

Actions: View

Attachments on bug 13848: 14962 | 14963 | 14970 | 14971