libsmbconf: load file after special initialization
authorMichael Adam <obnox@samba.org>
Mon, 7 Apr 2008 21:28:48 +0000 (23:28 +0200)
committerMichael Adam <obnox@samba.org>
Wed, 9 Apr 2008 23:28:56 +0000 (01:28 +0200)
otherwise verbatim parameter can have no effect.

Michael

source/lib/smbconf/smbconf_txt_simple.c

index 9a3bc784eb41186c90dd9b5b0a599a1074abd810..e56b986025aca4f068b334bf22865370d0b34de9 100644 (file)
@@ -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);
 }