summaryrefslogtreecommitdiff
path: root/source3/libnet/libnet_join.c
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2007-12-25 03:29:05 +0100
committerMichael Adam <obnox@samba.org>2007-12-25 03:29:05 +0100
commitf3b0469b4a623c3ef17e2453bf40eb52778b5c42 (patch)
treed3005611d79c662cf2f39504f324f1bf598c1736 /source3/libnet/libnet_join.c
parenta66a5fd94bfb8a41bdb46aedf7eba28b55fbdaaf (diff)
downloadsamba-f3b0469b4a623c3ef17e2453bf40eb52778b5c42.tar.gz
samba-f3b0469b4a623c3ef17e2453bf40eb52778b5c42.tar.bz2
samba-f3b0469b4a623c3ef17e2453bf40eb52778b5c42.zip
Remove talloc context parameter from libnet_smbconf_setparm().
Make use of talloc stackframe internally. This removes talloc contxt from net_conf_setparm. Michael (This used to be commit efaffefc438f8375a083b194ac7a09e563000d3c)
Diffstat (limited to 'source3/libnet/libnet_join.c')
-rw-r--r--source3/libnet/libnet_join.c17
1 files changed, 7 insertions, 10 deletions
diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c
index 68244e5156..4f5c09cf47 100644
--- a/source3/libnet/libnet_join.c
+++ b/source3/libnet/libnet_join.c
@@ -339,11 +339,10 @@ static WERROR do_join_modify_vals_config(TALLOC_CTX *mem_ctx,
if (!(r->in.join_flags & WKSSVC_JOIN_FLAGS_JOIN_TYPE)) {
- werr = libnet_smbconf_set_global_param(mem_ctx, "security",
- "user");
+ werr = libnet_smbconf_set_global_param("security", "user");
W_ERROR_NOT_OK_RETURN(werr);
- werr = libnet_smbconf_set_global_param(mem_ctx, "workgroup",
+ werr = libnet_smbconf_set_global_param("workgroup",
r->in.domain_name);
return werr;
}
@@ -352,19 +351,18 @@ static WERROR do_join_modify_vals_config(TALLOC_CTX *mem_ctx,
is_ad = true;
}
- werr = libnet_smbconf_set_global_param(mem_ctx, "security", "domain");
+ werr = libnet_smbconf_set_global_param("security", "domain");
W_ERROR_NOT_OK_RETURN(werr);
- werr = libnet_smbconf_set_global_param(mem_ctx, "workgroup",
+ werr = libnet_smbconf_set_global_param("workgroup",
r->out.netbios_domain_name);
W_ERROR_NOT_OK_RETURN(werr);
if (is_ad) {
- werr = libnet_smbconf_set_global_param(mem_ctx, "security",
- "ads");
+ werr = libnet_smbconf_set_global_param("security", "ads");
W_ERROR_NOT_OK_RETURN(werr);
- werr = libnet_smbconf_set_global_param(mem_ctx, "realm",
+ werr = libnet_smbconf_set_global_param("realm",
r->out.dns_domain_name);
W_ERROR_NOT_OK_RETURN(werr);
}
@@ -379,8 +377,7 @@ static WERROR do_unjoin_modify_vals_config(TALLOC_CTX *mem_ctx,
if (r->in.unjoin_flags & WKSSVC_JOIN_FLAGS_JOIN_TYPE) {
- werr = libnet_smbconf_set_global_param(mem_ctx, "security",
- "user");
+ werr = libnet_smbconf_set_global_param("security", "user");
W_ERROR_NOT_OK_RETURN(werr);
}