From: Michael Adam <obnox@samba.org>
Date: Mon, 7 Apr 2008 21:28:48 +0000 (+0200)
Subject: libsmbconf: load file after special initialization
X-Git-Tag: samba-3.3.0pre1~2809
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2ff0b693d7fc7e130a2fb14c06ae8bc28f4b5c57;p=thirdparty%2Fsamba.git

libsmbconf: load file after special initialization

otherwise verbatim parameter can have no effect.

Michael
---

diff --git a/source/lib/smbconf/smbconf_txt_simple.c b/source/lib/smbconf/smbconf_txt_simple.c
index 9a3bc784eb4..e56b986025a 100644
--- a/source/lib/smbconf/smbconf_txt_simple.c
+++ b/source/lib/smbconf/smbconf_txt_simple.c
@@ -216,7 +216,7 @@ static WERROR smbconf_txt_init(struct smbconf_ctx *ctx, const char *path)
 
 	ctx->data = TALLOC_ZERO_P(ctx, struct txt_private_data);
 
-	return smbconf_txt_load_file(ctx);
+	return WERR_OK;
 }
 
 static int smbconf_txt_shutdown(struct smbconf_ctx *ctx)
@@ -526,5 +526,6 @@ WERROR smbconf_init_txt_simple(TALLOC_CTX *mem_ctx,
 	}
 
 	pd(*conf_ctx)->verbatim = verbatim;
-	return WERR_OK;
+
+	return smbconf_txt_load_file(*conf_ctx);
 }