summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim McDonough <jmcd@samba.org>2010-04-21 20:53:51 +0200
committerKarolin Seeger <kseeger@samba.org>2010-05-06 14:08:39 +0200
commita901405b93a08c299569d0247bf76829d3258fad (patch)
tree69f5942865c50b2d95cd4c422a0a0ba837f0f916
parenta9221148fc9b4c390cbf7b9a115a843ada4db189 (diff)
downloadsamba-a901405b93a08c299569d0247bf76829d3258fad.tar.gz
s3-net_conf: Display an error on net conf import failures.
When something goes wrong, such as a typo in a parameter name, we'll now display the failure instead of just returning with -1 and no message. Fix bug #7378 ("net conf import" fails silently on parameter typo). (cherry picked from commit d983085cee01fcf6e6176d395400075e6d5df937)
-rw-r--r--source3/utils/net_conf.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index 1dd8c1fc102..e30c0abccf3 100644
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -209,6 +209,9 @@ static WERROR import_process_service(struct net_context *c,
service->param_names[idx],
service->param_values[idx]);
if (!W_ERROR_IS_OK(werr)) {
+ d_printf("Error in section [%s], parameter \"%s\": %s\n",
+ service->name, service->param_names[idx],
+ win_errstr(werr));
goto done;
}
}