From a01e840814614a1061eeb9c3a137d0657efcb286 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Mon, 7 Apr 2008 23:28:48 +0200 Subject: libsmbconf: load file after special initialization otherwise verbatim parameter can have no effect. Michael (This used to be commit 2ff0b693d7fc7e130a2fb14c06ae8bc28f4b5c57) --- source3/lib/smbconf/smbconf_txt_simple.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'source3/lib/smbconf') diff --git a/source3/lib/smbconf/smbconf_txt_simple.c b/source3/lib/smbconf/smbconf_txt_simple.c index 9a3bc784eb..e56b986025 100644 --- a/source3/lib/smbconf/smbconf_txt_simple.c +++ b/source3/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); } -- cgit