summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2008-01-03 14:15:05 +0100
committerMichael Adam <obnox@samba.org>2008-01-03 14:17:49 +0100
commit5655ae7a2468e8fc93b1a8d9ac4b2f35abbf3703 (patch)
tree8eb3ff28761cf46931a97eac44285d960bef5e67 /source3
parent2476254ccdf629d7889b9cff458a6e1097fc71ba (diff)
downloadsamba-5655ae7a2468e8fc93b1a8d9ac4b2f35abbf3703.tar.gz
samba-5655ae7a2468e8fc93b1a8d9ac4b2f35abbf3703.tar.bz2
samba-5655ae7a2468e8fc93b1a8d9ac4b2f35abbf3703.zip
Rename libnet_smbconf_set_global_param() to libnet_conf_set_global_parameter().
Now all functions are converted to the consistent naming scheme. Michael (This used to be commit a559533c0c8a80f3f4078bbc2675de395359485f)
Diffstat (limited to 'source3')
-rw-r--r--source3/lib/netapi/serverinfo.c4
-rw-r--r--source3/libnet/libnet_conf.c4
-rw-r--r--source3/libnet/libnet_join.c18
3 files changed, 13 insertions, 13 deletions
diff --git a/source3/lib/netapi/serverinfo.c b/source3/lib/netapi/serverinfo.c
index 27c7c4b2fc..0e356e0ee7 100644
--- a/source3/lib/netapi/serverinfo.c
+++ b/source3/lib/netapi/serverinfo.c
@@ -167,8 +167,8 @@ static WERROR NetServerSetInfoLocal_1005(struct libnetapi_ctx *ctx,
return WERR_NOT_SUPPORTED;
}
- return libnet_smbconf_set_global_param("server string",
- info1005->comment);
+ return libnet_conf_set_global_parameter("server string",
+ info1005->comment);
}
static WERROR NetServerSetInfoLocal(struct libnetapi_ctx *ctx,
diff --git a/source3/libnet/libnet_conf.c b/source3/libnet/libnet_conf.c
index fbe47b212b..ea3f708883 100644
--- a/source3/libnet/libnet_conf.c
+++ b/source3/libnet/libnet_conf.c
@@ -792,8 +792,8 @@ done:
*
**********************************************************************/
-WERROR libnet_smbconf_set_global_param(const char *param,
- const char *val)
+WERROR libnet_conf_set_global_parameter(const char *param,
+ const char *val)
{
return libnet_conf_set_parameter(GLOBAL_NAME, param, val);
}
diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c
index 00ab608274..478cccf725 100644
--- a/source3/libnet/libnet_join.c
+++ b/source3/libnet/libnet_join.c
@@ -338,11 +338,11 @@ static WERROR do_join_modify_vals_config(struct libnet_JoinCtx *r)
if (!(r->in.join_flags & WKSSVC_JOIN_FLAGS_JOIN_TYPE)) {
- werr = libnet_smbconf_set_global_param("security", "user");
+ werr = libnet_conf_set_global_parameter("security", "user");
W_ERROR_NOT_OK_RETURN(werr);
- werr = libnet_smbconf_set_global_param("workgroup",
- r->in.domain_name);
+ werr = libnet_conf_set_global_parameter("workgroup",
+ r->in.domain_name);
return werr;
}
@@ -350,18 +350,18 @@ static WERROR do_join_modify_vals_config(struct libnet_JoinCtx *r)
is_ad = true;
}
- werr = libnet_smbconf_set_global_param("security", "domain");
+ werr = libnet_conf_set_global_parameter("security", "domain");
W_ERROR_NOT_OK_RETURN(werr);
- werr = libnet_smbconf_set_global_param("workgroup",
- r->out.netbios_domain_name);
+ werr = libnet_conf_set_global_parameter("workgroup",
+ r->out.netbios_domain_name);
W_ERROR_NOT_OK_RETURN(werr);
if (is_ad) {
- werr = libnet_smbconf_set_global_param("security", "ads");
+ werr = libnet_conf_set_global_parameter("security", "ads");
W_ERROR_NOT_OK_RETURN(werr);
- werr = libnet_smbconf_set_global_param("realm",
+ werr = libnet_conf_set_global_parameter("realm",
r->out.dns_domain_name);
W_ERROR_NOT_OK_RETURN(werr);
}
@@ -375,7 +375,7 @@ static WERROR do_unjoin_modify_vals_config(struct libnet_UnjoinCtx *r)
if (r->in.unjoin_flags & WKSSVC_JOIN_FLAGS_JOIN_TYPE) {
- werr = libnet_smbconf_set_global_param("security", "user");
+ werr = libnet_conf_set_global_parameter("security", "user");
W_ERROR_NOT_OK_RETURN(werr);
}