[SCM] Samba Shared Repository - branch master updated

[Jim McDonough]

The branch, master has been updated
       via  a22f03e... Display an error on net conf import failures.
      from  6bf4dbb... s4-smbtorture: add spoolss DriverInfo and winreg consistency test.

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


- Log -----------------------------------------------------------------
commit a22f03e02c99c78642978c8e7a06ae92f97ad41f
Author: Jim McDonough <jmcd at samba.org>
Date:   Tue Apr 20 16:28:47 2010 -0400

    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.

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

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


Changeset truncated at 500 lines:

diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index 67e3c85..1fc07e1 100644
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -229,6 +229,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;
 			}
 		}


-- 
Samba Shared Repository