[SCM] Samba Shared Repository - branch master updated

Ralph Böhme slow at samba.org
Tue May 2 19:15:07 UTC 2017


The branch, master has been updated
       via  ae8f349 lib: FreeBSD needs sys/wait.h for WIFEXITED
       via  b19f373 smbd: Fix a 32-bit problem
      from  09bc5b5 systemd: fix detection of libsystemd

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


- Log -----------------------------------------------------------------
commit ae8f34984fee60dc7aeeda38054cc51426f782d1
Author: Volker Lendecke <vl at samba.org>
Date:   Mon May 1 17:09:35 2017 +0200

    lib: FreeBSD needs sys/wait.h for WIFEXITED
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    
    Autobuild-User(master): Ralph Böhme <slow at samba.org>
    Autobuild-Date(master): Tue May  2 21:14:22 CEST 2017 on sn-devel-144

commit b19f3730fc479cbc00ddbae47d170c0e33c599c6
Author: Volker Lendecke <vl at samba.org>
Date:   Mon May 1 17:14:26 2017 +0200

    smbd: Fix a 32-bit problem
    
    On 32-bit freebsd11, size_t is 32 bit. %zu does not cover
    64 bits.
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>

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

Summary of changes:
 lib/util/tests/tfork.c              | 1 +
 source3/smbd/smb2_query_directory.c | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/util/tests/tfork.c b/lib/util/tests/tfork.c
index 7a96928..bd5809d 100644
--- a/lib/util/tests/tfork.c
+++ b/lib/util/tests/tfork.c
@@ -21,6 +21,7 @@
 #include <talloc.h>
 #include <tevent.h>
 #include "system/filesys.h"
+#include "system/wait.h"
 #include "libcli/util/ntstatus.h"
 #include "torture/torture.h"
 #include "lib/util/data_blob.h"
diff --git a/source3/smbd/smb2_query_directory.c b/source3/smbd/smb2_query_directory.c
index 9150673..6b6dae7 100644
--- a/source3/smbd/smb2_query_directory.c
+++ b/source3/smbd/smb2_query_directory.c
@@ -584,8 +584,8 @@ static struct tevent_req *smbd_smb2_query_directory_send(TALLOC_CTX *mem_ctx,
 last_entry_done:
 		SIVAL(state->out_output_buffer.data, last_entry_off, 0);
 		if (state->async_count > 0) {
-			DBG_DEBUG("Stopping after %zu async mtime updates\n",
-				  state->async_count);
+			DBG_DEBUG("Stopping after %"PRIu64" async mtime "
+				  "updates\n", state->async_count);
 			return req;
 		}
 


-- 
Samba Shared Repository



More information about the samba-cvs mailing list