From: Michael Adam <obnox@samba.org>
Date: Tue, 15 Apr 2008 12:38:36 +0000 (+0200)
Subject: net conf: fix output of out-of-share parameters in test mode import
X-Git-Tag: samba-3.3.0pre1~2648
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5424e07e7d3e842488cba7ae389124f01221c5ba;p=thirdparty%2Fsamba.git

net conf: fix output of out-of-share parameters in test mode import

Michael
---

diff --git a/source/utils/net_conf.c b/source/utils/net_conf.c
index 88cc15e0eb7..7d1658ba94a 100644
--- a/source/utils/net_conf.c
+++ b/source/utils/net_conf.c
@@ -150,10 +150,18 @@ static WERROR import_process_service(struct smbconf_ctx *conf_ctx,
 	TALLOC_CTX *mem_ctx = talloc_stackframe();
 
 	if (opt_testmode) {
-		d_printf("[%s]\n", servicename);
-		for (idx = 0; idx < num_params; idx ++) {
-			d_printf("\t%s = %s\n", param_names[idx],
-				 param_values[idx]);
+		if (servicename != NULL) {
+			d_printf("[%s]\n", servicename);
+			for (idx = 0; idx < num_params; idx++) {
+				d_printf("\t%s = %s\n", param_names[idx],
+					 param_values[idx]);
+			}
+		}
+		else {
+			for (idx = 0; idx < num_params; idx++) {
+				d_printf("%s = %s\n", param_names[idx],
+					 param_values[idx]);
+			}
 		}
 		d_printf("\n");
 		goto done;