[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  23b4fb6 s3-libnet: Add missing format element
       via  a37048f s3-lib: Pass missing argument for format string
      from  a6073e6 smbd: allow reading files based on FILE_EXECUTE access right

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


- Log -----------------------------------------------------------------
commit 23b4fb681aa7c02450d0ebb06af87943163b959b
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Fri Aug 19 01:26:38 2016 +1000

    s3-libnet: Add missing format element
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=12163
    
    Signed-off-by: Amitay Isaacs <amitay at gmail.com>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    
    Autobuild-User(master): Volker Lendecke <vl at samba.org>
    Autobuild-Date(master): Thu Aug 18 23:49:42 CEST 2016 on sn-devel-144

commit a37048f8d49eb72ea89a8708032d4d04dac59f3d
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Sun Aug 7 18:17:19 2016 +1000

    s3-lib: Pass missing argument for format string
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=12163
    
    Signed-off-by: Amitay Isaacs <amitay at gmail.com>
    Reviewed-by: Volker Lendecke <vl at samba.org>

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

Summary of changes:
 source3/lib/util_tdb.c       | 2 +-
 source3/libnet/libnet_join.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/util_tdb.c b/source3/lib/util_tdb.c
index d7a8a47..7db7111 100644
--- a/source3/lib/util_tdb.c
+++ b/source3/lib/util_tdb.c
@@ -431,7 +431,7 @@ char *tdb_data_string(TALLOC_CTX *mem_ctx, TDB_DATA d)
 		return NULL;
 	}
 
-	len = cbuf_printf(ost, "%d:");
+	len = cbuf_printf(ost, "%zu:", d.dsize);
 	if (len == -1) {
 		goto done;
 	}
diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c
index a3946a3..96a4c59 100644
--- a/source3/libnet/libnet_join.c
+++ b/source3/libnet/libnet_join.c
@@ -2448,7 +2448,7 @@ static WERROR libnet_DomainJoin(TALLOC_CTX *mem_ctx,
 				     &info);
 		if (!NT_STATUS_IS_OK(status)) {
 			libnet_join_set_error_string(mem_ctx, r,
-				"failed to find DC for domain %s",
+				"failed to find DC for domain %s - %s",
 				r->in.domain_name,
 				get_friendly_nt_error_msg(status));
 			return WERR_DCNOTFOUND;
@@ -2712,7 +2712,7 @@ static WERROR libnet_DomainUnjoin(TALLOC_CTX *mem_ctx,
 				     &info);
 		if (!NT_STATUS_IS_OK(status)) {
 			libnet_unjoin_set_error_string(mem_ctx, r,
-				"failed to find DC for domain %s",
+				"failed to find DC for domain %s - %s",
 				r->in.domain_name,
 				get_friendly_nt_error_msg(status));
 			return WERR_DCNOTFOUND;


-- 
Samba Shared Repository