sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-26 10:04:02 +03:00
Code

libsmbconf: remove the bool verbatim parameter from txt backend init function.

Browse Source 
Always be verbatim for now. Backend config options may be added later
via some private data pointer.

Michael
(This used to be commit e8bafcfbf4a7ab1dc1ce4f2acd24b0eb74933256)
This commit is contained in:
Michael Adam 2008-04-13 16:32:05 +02:00
parent 611b6bfa3b
commit 35d6068f25
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

2
source3/lib/smbconf/testsuite.c
View File

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

2
source3/utils/net_conf.c
View File

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