From: Michael Adam <obnox@samba.org>
Date: Tue, 8 Apr 2008 23:27:30 +0000 (+0200)
Subject: net conf: don't drop config in testmode
X-Git-Tag: samba-3.3.0pre1~2773
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=74e87b977514df79e49613a0b1c5157469b3cb93;p=thirdparty%2Fsamba.git

net conf: don't drop config in testmode

Michael
---

diff --git a/source/utils/net_conf.c b/source/utils/net_conf.c
index c01a326c640..f74ba98f541 100644
--- a/source/utils/net_conf.c
+++ b/source/utils/net_conf.c
@@ -314,9 +314,11 @@ static int net_conf_import(struct smbconf_ctx *conf_ctx,
 		if (!W_ERROR_IS_OK(werr)) {
 			goto done;
 		}
-		werr = smbconf_drop(conf_ctx);
-		if (!W_ERROR_IS_OK(werr)) {
-			goto done;
+		if (!opt_testmode) {
+			werr = smbconf_drop(conf_ctx);
+			if (!W_ERROR_IS_OK(werr)) {
+				goto done;
+			}
 		}
 		for (sidx = 0; sidx < num_shares; sidx++) {
 			werr = import_process_service(conf_ctx,