From 2a94369946a896e12d6527a299f39c265d8dbaa2 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Wed, 9 Apr 2008 01:27:30 +0200 Subject: net conf: don't drop config in testmode Michael (This used to be commit 74e87b977514df79e49613a0b1c5157469b3cb93) --- source3/utils/net_conf.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'source3/utils/net_conf.c') diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c index c01a326c64..f74ba98f54 100644 --- a/source3/utils/net_conf.c +++ b/source3/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, -- cgit