[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  31714c9 s3:smbd:smb2:scavenger: fix format error for debugging open_persistent_id in scavenger_timer()
      from  79fe138 talloc: Simplify _talloc_free_poolmem a bit

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 31714c97845fff11b2997c86b5fc3a3bff8ed710
Author: Michael Adam <obnox at samba.org>
Date:   Thu Apr 18 23:45:24 2013 +0200

    s3:smbd:smb2:scavenger: fix format error for debugging open_persistent_id in scavenger_timer()
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Fri Apr 19 01:36:15 CEST 2013 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 source3/smbd/scavenger.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

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)));
 	}
 }
 


-- 
Samba Shared Repository