summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2008-04-09 01:27:30 +0200
committerMichael Adam <obnox@samba.org>2008-04-10 01:29:02 +0200
commit2a94369946a896e12d6527a299f39c265d8dbaa2 (patch)
tree5b7ac543c59c6bc8e752cffd71ddc04a80bd6dae /source3
parenta98c08c151b04b5e4a75abdb201d6a554137de39 (diff)
downloadsamba-2a94369946a896e12d6527a299f39c265d8dbaa2.tar.gz
samba-2a94369946a896e12d6527a299f39c265d8dbaa2.tar.bz2
samba-2a94369946a896e12d6527a299f39c265d8dbaa2.zip
net conf: don't drop config in testmode
Michael (This used to be commit 74e87b977514df79e49613a0b1c5157469b3cb93)
Diffstat (limited to 'source3')
-rw-r--r--source3/utils/net_conf.c8
1 files changed, 5 insertions, 3 deletions
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,