diff options
| -rw-r--r-- | source3/lib/smbconf/smbconf.h | 3 | ||||
| -rw-r--r-- | source3/lib/smbconf/smbconf_txt_simple.c | 5 | ||||
| -rw-r--r-- | source3/lib/smbconf/testsuite.c | 2 | ||||
| -rw-r--r-- | source3/utils/net_conf.c | 2 |
4 files changed, 5 insertions, 7 deletions
diff --git a/source3/lib/smbconf/smbconf.h b/source3/lib/smbconf/smbconf.h index c04be7f981..e48a0cce97 100644 --- a/source3/lib/smbconf/smbconf.h +++ b/source3/lib/smbconf/smbconf.h @@ -36,8 +36,7 @@ WERROR smbconf_init_reg(TALLOC_CTX *mem_ctx, struct smbconf_ctx **conf_ctx, WERROR smbconf_init_txt_simple(TALLOC_CTX *mem_ctx, struct smbconf_ctx **conf_ctx, - const char *path, - bool verbatim); + const char *path); /* * the smbconf API functions diff --git a/source3/lib/smbconf/smbconf_txt_simple.c b/source3/lib/smbconf/smbconf_txt_simple.c index 7f70a5f34b..968860eaa8 100644 --- a/source3/lib/smbconf/smbconf_txt_simple.c +++ b/source3/lib/smbconf/smbconf_txt_simple.c @@ -602,8 +602,7 @@ static struct smbconf_ops smbconf_ops_txt = { */ WERROR smbconf_init_txt_simple(TALLOC_CTX *mem_ctx, struct smbconf_ctx **conf_ctx, - const char *path, - bool verbatim) + const char *path) { WERROR werr; @@ -612,7 +611,7 @@ WERROR smbconf_init_txt_simple(TALLOC_CTX *mem_ctx, return werr; } - pd(*conf_ctx)->verbatim = verbatim; + pd(*conf_ctx)->verbatim = true; return smbconf_txt_load_file(*conf_ctx); } diff --git a/source3/lib/smbconf/testsuite.c b/source3/lib/smbconf/testsuite.c index af24dff715..6f7ce10d9c 100644 --- a/source3/lib/smbconf/testsuite.c +++ b/source3/lib/smbconf/testsuite.c @@ -183,7 +183,7 @@ static bool torture_smbconf_txt(void) printf("test: text backend\n"); printf("test: init\n"); - werr = smbconf_init_txt_simple(mem_ctx, &conf_ctx, NULL, true); + werr = smbconf_init_txt_simple(mem_ctx, &conf_ctx, NULL); if (!W_ERROR_IS_OK(werr)) { printf("failure: init failed: %s\n", dos_errstr(werr)); ret = false; diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c index 7221f3bd68..245a91fa3e 100644 --- a/source3/utils/net_conf.c +++ b/source3/utils/net_conf.c @@ -291,7 +291,7 @@ static int net_conf_import(struct smbconf_ctx *conf_ctx, DEBUG(3,("net_conf_import: reading configuration from file %s.\n", filename)); - werr = smbconf_init_txt_simple(mem_ctx, &txt_ctx, filename, true); + werr = smbconf_init_txt_simple(mem_ctx, &txt_ctx, filename); if (!W_ERROR_IS_OK(werr)) { d_printf("error loading file '%s': %s\n", filename, dos_errstr(werr)); |