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

libsmbconf: add includes at the end of parameter list in reg_get_share().

Browse Source 
Michael
(This used to be commit 9bd06d5737)
This commit is contained in:
Michael Adam 2008-04-09 00:47:27 +02:00
parent bb39d5c14b
commit 7bf407c711
1 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
source3/lib/smbconf/smbconf_reg.c
View File

@ -457,6 +457,8 @@ static WERROR smbconf_reg_get_values(TALLOC_CTX *mem_ctx,
uint32_t tmp_num_values = 0;
char **tmp_valnames = NULL;
char **tmp_valstrings = NULL;
uint32_t num_includes = 0;
char **includes = NULL;
if ((num_values == NULL) || (value_names == NULL) ||
(value_strings == NULL))
@ -501,7 +503,28 @@ static WERROR smbconf_reg_get_values(TALLOC_CTX *mem_ctx,
goto done;
}
werr = WERR_OK;
/* now add the includes at the end */
werr = smbconf_reg_get_includes_internal(tmp_ctx, key, &num_includes,
&includes);
if (!W_ERROR_IS_OK(werr)) {
goto done;
}
for (count = 0; count < num_includes; count++) {
werr = smbconf_add_string_to_array(tmp_ctx, &tmp_valnames,
tmp_num_values, "include");
if (!W_ERROR_IS_OK(werr)) {
goto done;
}
werr = smbconf_add_string_to_array(tmp_ctx, &tmp_valstrings,
tmp_num_values,
includes[count]);
if (!W_ERROR_IS_OK(werr)) {
goto done;
}
tmp_num_values++;
}
*num_values = tmp_num_values;
if (tmp_num_values > 0) {