sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

libsmbconf: add a "verbatim" parameter to smbconf_init_txt_simple().

Browse Source 
Michael
(This used to be commit b9e72b402d)
This commit is contained in:
Michael Adam 2008-04-07 22:33:01 +02:00
parent 0acf338503
commit 3d38f143df
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source3/lib/smbconf/smbconf.h
View File

@ -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

14
source3/lib/smbconf/smbconf_txt_simple.c
View File

@ -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;
}

2
source3/utils/net_conf.c
View File

@ -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;
}