summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--source3/lib/smbconf/smbconf.c26
-rw-r--r--source3/lib/smbconf/smbconf.h20
-rw-r--r--source3/param/loadparm.c2
-rw-r--r--source3/utils/net_conf.c8
4 files changed, 30 insertions, 26 deletions
diff --git a/source3/lib/smbconf/smbconf.c b/source3/lib/smbconf/smbconf.c
index 549fdc5285..804b1b8c28 100644
--- a/source3/lib/smbconf/smbconf.c
+++ b/source3/lib/smbconf/smbconf.c
@@ -558,8 +558,9 @@ done:
* param_names : list of lists of parameter names for each share
* param_values : list of lists of parameter values for each share
*/
-WERROR smbconf_get_config(TALLOC_CTX *mem_ctx,
- struct smbconf_ctx *ctx, uint32_t *num_shares,
+WERROR smbconf_get_config(struct smbconf_ctx *ctx,
+ TALLOC_CTX *mem_ctx,
+ uint32_t *num_shares,
char ***share_names, uint32_t **num_params,
char ****param_names, char ****param_values)
{
@@ -586,7 +587,7 @@ WERROR smbconf_get_config(TALLOC_CTX *mem_ctx,
goto done;
}
- werr = smbconf_get_share_names(tmp_ctx, ctx, &tmp_num_shares,
+ werr = smbconf_get_share_names(ctx, tmp_ctx, &tmp_num_shares,
&tmp_share_names);
if (!W_ERROR_IS_OK(werr)) {
goto done;
@@ -604,7 +605,7 @@ WERROR smbconf_get_config(TALLOC_CTX *mem_ctx,
}
for (count = 0; count < tmp_num_shares; count++) {
- werr = smbconf_get_share(mem_ctx, ctx,
+ werr = smbconf_get_share(ctx, mem_ctx,
tmp_share_names[count],
&tmp_num_params[count],
&tmp_param_names[count],
@@ -637,8 +638,8 @@ done:
/**
* get the list of share names defined in the configuration.
*/
-WERROR smbconf_get_share_names(TALLOC_CTX *mem_ctx,
- struct smbconf_ctx *ctx,
+WERROR smbconf_get_share_names(struct smbconf_ctx *ctx,
+ TALLOC_CTX *mem_ctx,
uint32_t *num_shares,
char ***share_names)
{
@@ -758,7 +759,8 @@ done:
/**
* get a definition of a share (service) from configuration.
*/
-WERROR smbconf_get_share(TALLOC_CTX *mem_ctx, struct smbconf_ctx *ctx,
+WERROR smbconf_get_share(struct smbconf_ctx *ctx,
+ TALLOC_CTX *mem_ctx,
const char *servicename, uint32_t *num_params,
char ***param_names, char ***param_values)
{
@@ -856,8 +858,8 @@ done:
/**
* get the value of a configuration parameter as a string
*/
-WERROR smbconf_get_parameter(TALLOC_CTX *mem_ctx,
- struct smbconf_ctx *ctx,
+WERROR smbconf_get_parameter(struct smbconf_ctx *ctx,
+ TALLOC_CTX *mem_ctx,
const char *service,
const char *param,
char **valstr)
@@ -909,8 +911,8 @@ done:
*
* Create [global] if it does not exist.
*/
-WERROR smbconf_get_global_parameter(TALLOC_CTX *mem_ctx,
- struct smbconf_ctx *ctx,
+WERROR smbconf_get_global_parameter(struct smbconf_ctx *ctx,
+ TALLOC_CTX *mem_ctx,
const char *param,
char **valstr)
{
@@ -922,7 +924,7 @@ WERROR smbconf_get_global_parameter(TALLOC_CTX *mem_ctx,
goto done;
}
}
- werr = smbconf_get_parameter(mem_ctx, ctx, GLOBAL_NAME, param, valstr);
+ werr = smbconf_get_parameter(ctx, mem_ctx, GLOBAL_NAME, param, valstr);
done:
return werr;
diff --git a/source3/lib/smbconf/smbconf.h b/source3/lib/smbconf/smbconf.h
index 134dc29c09..9679b2777d 100644
--- a/source3/lib/smbconf/smbconf.h
+++ b/source3/lib/smbconf/smbconf.h
@@ -40,17 +40,19 @@ void smbconf_close(struct smbconf_ctx *ctx);
bool smbconf_changed(struct smbconf_ctx *ctx, struct smbconf_csn *csn,
const char *service, const char *param);
WERROR smbconf_drop(struct smbconf_ctx *ctx);
-WERROR smbconf_get_config(TALLOC_CTX *mem_ctx,
- struct smbconf_ctx *ctx, uint32_t *num_shares,
+WERROR smbconf_get_config(struct smbconf_ctx *ctx,
+ TALLOC_CTX *mem_ctx,
+ uint32_t *num_shares,
char ***share_names, uint32_t **num_params,
char ****param_names, char ****param_values);
-WERROR smbconf_get_share_names(TALLOC_CTX *mem_ctx,
- struct smbconf_ctx *ctx,
+WERROR smbconf_get_share_names(struct smbconf_ctx *ctx,
+ TALLOC_CTX *mem_ctx,
uint32_t *num_shares,
char ***share_names);
bool smbconf_share_exists(struct smbconf_ctx *ctx, const char *servicename);
WERROR smbconf_create_share(struct smbconf_ctx *ctx, const char *servicename);
-WERROR smbconf_get_share(TALLOC_CTX *mem_ctx, struct smbconf_ctx *ctx,
+WERROR smbconf_get_share(struct smbconf_ctx *ctx,
+ TALLOC_CTX *mem_ctx,
const char *servicename, uint32_t *num_params,
char ***param_names, char ***param_values);
WERROR smbconf_delete_share(struct smbconf_ctx *ctx,
@@ -61,13 +63,13 @@ WERROR smbconf_set_parameter(struct smbconf_ctx *ctx,
const char *valstr);
WERROR smbconf_set_global_parameter(struct smbconf_ctx *ctx,
const char *param, const char *val);
-WERROR smbconf_get_parameter(TALLOC_CTX *mem_ctx,
- struct smbconf_ctx *ctx,
+WERROR smbconf_get_parameter(struct smbconf_ctx *ctx,
+ TALLOC_CTX *mem_ctx,
const char *service,
const char *param,
char **valstr);
-WERROR smbconf_get_global_parameter(TALLOC_CTX *mem_ctx,
- struct smbconf_ctx *ctx,
+WERROR smbconf_get_global_parameter(struct smbconf_ctx *ctx,
+ TALLOC_CTX *mem_ctx,
const char *param,
char **valstr);
WERROR smbconf_delete_parameter(struct smbconf_ctx *ctx,
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 37d68ba4af..a97f8e9c03 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -6510,7 +6510,7 @@ static bool process_registry_globals(bool (*pfunc)(const char *, const char *))
goto done;
}
- werr = smbconf_get_share(mem_ctx, conf_ctx, GLOBAL_NAME,
+ werr = smbconf_get_share(conf_ctx, mem_ctx, GLOBAL_NAME,
&num_params, &param_names, &param_values);
if (!W_ERROR_IS_OK(werr)) {
goto done;
diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index 21a3b2f7d2..d4437cd122 100644
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -318,7 +318,7 @@ static int net_conf_list(struct smbconf_ctx *conf_ctx,
goto done;
}
- werr = smbconf_get_config(ctx, conf_ctx, &num_shares, &share_names,
+ werr = smbconf_get_config(conf_ctx, ctx, &num_shares, &share_names,
&num_params, &param_names, &param_values);
if (!W_ERROR_IS_OK(werr)) {
d_fprintf(stderr, "Error getting config: %s\n",
@@ -448,7 +448,7 @@ static int net_conf_listshares(struct smbconf_ctx *conf_ctx,
goto done;
}
- werr = smbconf_get_share_names(ctx, conf_ctx, &num_shares,
+ werr = smbconf_get_share_names(conf_ctx, ctx, &num_shares,
&share_names);
if (!W_ERROR_IS_OK(werr)) {
goto done;
@@ -511,7 +511,7 @@ static int net_conf_showshare(struct smbconf_ctx *conf_ctx,
sharename = argv[0];
- werr = smbconf_get_share(ctx, conf_ctx, sharename, &num_params,
+ werr = smbconf_get_share(conf_ctx, ctx, sharename, &num_params,
&param_names, &param_values);
if (!W_ERROR_IS_OK(werr)) {
d_printf("error getting share parameters: %s\n",
@@ -799,7 +799,7 @@ static int net_conf_getparm(struct smbconf_ctx *conf_ctx,
service = strdup_lower(argv[0]);
param = strdup_lower(argv[1]);
- werr = smbconf_get_parameter(ctx, conf_ctx, service, param, &valstr);
+ werr = smbconf_get_parameter(conf_ctx, ctx, service, param, &valstr);
if (W_ERROR_EQUAL(werr, WERR_NO_SUCH_SERVICE)) {
d_fprintf(stderr,
generated by cgit (git 2.34.1) at 2024-11-24 23:42:17 +0000