summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2008-04-07 22:33:01 +0200
committerMichael Adam <obnox@samba.org>2008-04-10 01:28:56 +0200
commit3d38f143df70d9e55d7112bf3b70b6c029d9397d (patch)
tree978f7e0d57e688b9be0950708e94187775c49c42
parent0acf338503eb22640be3e02f66ce9543b775fe15 (diff)
downloadsamba-3d38f143df70d9e55d7112bf3b70b6c029d9397d.tar.gz
samba-3d38f143df70d9e55d7112bf3b70b6c029d9397d.tar.bz2
samba-3d38f143df70d9e55d7112bf3b70b6c029d9397d.zip
libsmbconf: add a "verbatim" parameter to smbconf_init_txt_simple().
Michael (This used to be commit b9e72b402de412c23702715ead96c20e9b3248cc)
-rw-r--r--source3/lib/smbconf/smbconf.h3
-rw-r--r--source3/lib/smbconf/smbconf_txt_simple.c14
-rw-r--r--source3/utils/net_conf.c2
3 files changed, 15 insertions, 4 deletions
diff --git a/source3/lib/smbconf/smbconf.h b/source3/lib/smbconf/smbconf.h
index 72729b9df8..15c2a3b7c9 100644
--- a/source3/lib/smbconf/smbconf.h
+++ b/source3/lib/smbconf/smbconf.h
@@ -40,7 +40,8 @@ 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);
+ const char *path
+ bool verbatim);
/*
* the smbconf API functions
diff --git a/source3/lib/smbconf/smbconf_txt_simple.c b/source3/lib/smbconf/smbconf_txt_simple.c
index 8c831f9f81..9a3bc784eb 100644
--- a/source3/lib/smbconf/smbconf_txt_simple.c
+++ b/source3/lib/smbconf/smbconf_txt_simple.c
@@ -40,6 +40,7 @@ struct txt_cache {
struct txt_private_data {
struct txt_cache *cache;
uint64_t csn;
+ bool verbatim;
};
/**********************************************************************
@@ -514,7 +515,16 @@ static struct smbconf_ops smbconf_ops_txt = {
*/
WERROR smbconf_init_txt_simple(TALLOC_CTX *mem_ctx,
struct smbconf_ctx **conf_ctx,
- const char *path)
+ const char *path,
+ bool verbatim)
{
- return smbconf_init(mem_ctx, conf_ctx, path, &smbconf_ops_txt);
+ WERROR werr;
+
+ werr = smbconf_init(mem_ctx, conf_ctx, path, &smbconf_ops_txt);
+ if (!W_ERROR_IS_OK(werr)) {
+ return werr;
+ }
+
+ pd(*conf_ctx)->verbatim = verbatim;
+ return WERR_OK;
}
diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index 1e4ab9b3f2..e2d88c019d 100644
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -243,7 +243,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);
+ werr = smbconf_init_txt_simple(mem_ctx, &txt_ctx, filename, true);
if (!W_ERROR_IS_OK(werr)) {
goto done;
}