[SCM] Samba Shared Repository - branch v3-5-test updated

[Karolin Seeger]

The branch, v3-5-test has been updated
       via  c1ae6d3... s3-net_conf: Display an error on net conf import failures.
      from  db51127... s3 torture: Prevent smbcli segfault when running smbtorture3 against an smbd with security=share

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test


- Log -----------------------------------------------------------------
commit c1ae6d36d09569732408fdd6c079a1db7a5a65a5
Author: Jim McDonough <jmcd at samba.org>
Date:   Wed Apr 21 20:51:54 2010 +0200

    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).

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

Summary of changes:
 source3/utils/net_conf.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index 67e3c85..6fc03bf 100644
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -229,6 +229,10 @@ static WERROR import_process_service(struct net_context *c,
 						     service->param_names[idx],
 						     service->param_values[idx]);
 			if (!W_ERROR_IS_OK(werr)) {
+				d_fprintf(stderr,
+					  _("Error in section [%s], parameter \"%s\": %s\n"),
+					  service->name, service->param_names[idx],
+					  win_errstr(werr));
 				goto done;
 			}
 		}


-- 
Samba Shared Repository