Attachment 9245 Details for Bug 10169 – git-am fix that went into master. Applies cleanly to 4.0.x.

[patch] git-am fix that went into master. Applies cleanly to 4.0.x.

0001-s3-smbd-smb2-scavenger-fix-format-error-for-debuggin.patch (text/plain), 1.54 KB, created by Jeremy Allison on 2013-09-27 09:07:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2013-09-27 09:07:34 UTC

Size: 1.54 KB

patch

obsolete

>From 31714c97845fff11b2997c86b5fc3a3bff8ed710 Mon Sep 17 00:00:00 2001
>From: Michael Adam <obnox@samba.org>
>Date: Thu, 18 Apr 2013 23:45:24 +0200
>Subject: [PATCH] s3:smbd:smb2:scavenger: fix format error for debugging
> open_persistent_id in scavenger_timer()
>
>Signed-off-by: Michael Adam <obnox@samba.org>
>Reviewed-by: Jeremy Allison <jra@samba.org>
>
>Autobuild-User(master): Jeremy Allison <jra@samba.org>
>Autobuild-Date(master): Fri Apr 19 01:36:15 CEST 2013 on sn-devel-104
>---
> source3/smbd/scavenger.c | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
>diff --git a/source3/smbd/scavenger.c b/source3/smbd/scavenger.c
>index fe4e56e..e6e2878 100644
>--- a/source3/smbd/scavenger.c
>+++ b/source3/smbd/scavenger.c
>@@ -480,16 +480,17 @@ static void scavenger_timer(struct tevent_context *ev,
> 					     ctx->msg.open_persistent_id);
> 	if (!ok) {
> 		DEBUG(2, ("Failed to cleanup share modes and byte range locks "
>-			  "for file %s open %lu\n",
>+			  "for file %s open %llu\n",
> 			  file_id_string_tos(&ctx->msg.file_id),
>-			  ctx->msg.open_persistent_id));
>+			  (unsigned long long)ctx->msg.open_persistent_id));
> 	}
> 
> 	status = smbXsrv_open_cleanup(ctx->msg.open_persistent_id);
> 	if (!NT_STATUS_IS_OK(status)) {
>-		DEBUG(2, ("Failed to cleanup open global for file %s open %lu:"
>+		DEBUG(2, ("Failed to cleanup open global for file %s open %llu:"
> 			  " %s\n", file_id_string_tos(&ctx->msg.file_id),
>-			  ctx->msg.open_persistent_id, nt_errstr(status)));
>+			  (unsigned long long)ctx->msg.open_persistent_id,
>+			  nt_errstr(status)));
> 	}
> }
> 
>-- 
>1.8.1.2
>

Actions: View

Attachments on bug 10169: 9242 | 9245