From 46d443c3caf420b711a5ea9f77c22023f75edd7f Mon Sep 17 00:00:00 2001 From: Amitay Isaacs Date: Sun, 7 Aug 2016 18:17:19 +1000 Subject: [PATCH 1/2] s3-lib: Pass missing argument for format string BUG: https://bugzilla.samba.org/show_bug.cgi?id=12163 Signed-off-by: Amitay Isaacs Reviewed-by: Volker Lendecke (cherry picked from commit a37048f8d49eb72ea89a8708032d4d04dac59f3d) --- source3/lib/util_tdb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; } -- 2.7.4 From 6ab7ff7a035a40b831aa9da26d68e1f4b632ec67 Mon Sep 17 00:00:00 2001 From: Amitay Isaacs Date: Fri, 19 Aug 2016 01:26:38 +1000 Subject: [PATCH 2/2] s3-libnet: Add missing format element BUG: https://bugzilla.samba.org/show_bug.cgi?id=12163 Signed-off-by: Amitay Isaacs Reviewed-by: Volker Lendecke Autobuild-User(master): Volker Lendecke Autobuild-Date(master): Thu Aug 18 23:49:42 CEST 2016 on sn-devel-144 (cherry picked from commit 23b4fb681aa7c02450d0ebb06af87943163b959b) --- source3/libnet/libnet_join.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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; -- 2.7.4