From fed37291cb080a59b18c1a85b299d58da21b29de Mon Sep 17 00:00:00 2001 From: =?utf8?q?G=C3=BCnther=20Deschner?= Date: Wed, 15 Jun 2016 16:04:29 +0200 Subject: [PATCH] s3-libnet: Print error string even on successfuly completion of libnetjoin. Sometimes useful information should be printed to the users. BUG: https://bugzilla.samba.org/show_bug.cgi?id=11977 Guenther Signed-off-by: Guenther Deschner (cherry picked from commit 632faa87610b3afca3f8d3e9f3f46ee6b87f362a) --- source3/utils/net_ads.c | 5 +++++ source3/utils/net_rpc.c | 10 ++++++++++ 2 files changed, 15 insertions(+) diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c index 5ed31296322..e0a204ba0e3 100644 --- a/source3/utils/net_ads.c +++ b/source3/utils/net_ads.c @@ -1587,6 +1587,11 @@ int net_ads_join(struct net_context *c, int argc, const char **argv) r->out.netbios_domain_name); } + /* print out informative error string in case there is one */ + if (r->out.error_string != NULL) { + d_printf("%s\n", r->out.error_string); + } + /* * We try doing the dns update (if it was compiled in). * If the dns update fails, we still consider the join diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c index 93caf046813..1e3e2866ae4 100644 --- a/source3/utils/net_rpc.c +++ b/source3/utils/net_rpc.c @@ -428,6 +428,11 @@ static int net_rpc_oldjoin(struct net_context *c, int argc, const char **argv) r->out.netbios_domain_name); } + /* print out informative error string in case there is one */ + if (r->out.error_string != NULL) { + d_printf("%s\n", r->out.error_string); + } + TALLOC_FREE(mem_ctx); return 0; @@ -607,6 +612,11 @@ static int net_rpc_join_newstyle(struct net_context *c, int argc, const char **a r->out.netbios_domain_name); } + /* print out informative error string in case there is one */ + if (r->out.error_string != NULL) { + d_printf("%s\n", r->out.error_string); + } + TALLOC_FREE(mem_ctx); return 0; -- 2.47.2