diff options
| author | Michael Adam <obnox@samba.org> | 2008-04-07 23:28:48 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2008-04-10 01:28:56 +0200 |
| commit | a01e840814614a1061eeb9c3a137d0657efcb286 (patch) | |
| tree | 3ae5a7ecce07c3f5ad4be40379402a6d39468a67 | |
| parent | 3d38f143df70d9e55d7112bf3b70b6c029d9397d (diff) | |
| download | samba-a01e840814614a1061eeb9c3a137d0657efcb286.tar.gz samba-a01e840814614a1061eeb9c3a137d0657efcb286.tar.bz2 samba-a01e840814614a1061eeb9c3a137d0657efcb286.zip | |
libsmbconf: load file after special initialization
otherwise verbatim parameter can have no effect.
Michael
(This used to be commit 2ff0b693d7fc7e130a2fb14c06ae8bc28f4b5c57)
| -rw-r--r-- | source3/lib/smbconf/smbconf_txt_simple.c | 5 |
1 files changed, 3 insertions, 2 deletions
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); } |