summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2007-12-25 03:34:04 +0100
committerMichael Adam <obnox@samba.org>2007-12-25 03:34:04 +0100
commit44631bfd4d418cbf1ca4309057e6161cdce50bd4 (patch)
tree5548e72debfaf3b4b1379a3e22eb6a02b01d83ce
parent726f32b6728a7d2b56ccb2f04827d0e5150ea848 (diff)
downloadsamba-44631bfd4d418cbf1ca4309057e6161cdce50bd4.tar.gz
samba-44631bfd4d418cbf1ca4309057e6161cdce50bd4.tar.bz2
samba-44631bfd4d418cbf1ca4309057e6161cdce50bd4.zip
Remove talloc context parameter from libnet_smbconf_delparm().
Make use of talloc stackframe internally. This removes talloc contxt from net_conf_delparm. Michael (This used to be commit 16f137393881edc78c9322f038ba38e53e3ee07d)
-rw-r--r--source3/libnet/libnet_conf.c6
-rw-r--r--source3/libnet/libnet_join.c2
-rw-r--r--source3/utils/net_conf.c5
3 files changed, 5 insertions, 8 deletions
diff --git a/source3/libnet/libnet_conf.c b/source3/libnet/libnet_conf.c
index 6ea97a82eb..bb0e637b33 100644
--- a/source3/libnet/libnet_conf.c
+++ b/source3/libnet/libnet_conf.c
@@ -366,12 +366,12 @@ done:
return werr;
}
-WERROR libnet_smbconf_delparm(TALLOC_CTX *mem_ctx,
- const char *service,
+WERROR libnet_smbconf_delparm(const char *service,
const char *param)
{
struct registry_key *key = NULL;
WERROR werr = WERR_OK;
+ TALLOC_CTX *mem_ctx = talloc_stackframe();
if (!libnet_smbconf_key_exists(service)) {
return WERR_NO_SUCH_SERVICE;
@@ -390,7 +390,7 @@ WERROR libnet_smbconf_delparm(TALLOC_CTX *mem_ctx,
werr = reg_deletevalue(key, param);
done:
- TALLOC_FREE(key);
+ TALLOC_FREE(mem_ctx);
return werr;
}
diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c
index 4f5c09cf47..e8d114d747 100644
--- a/source3/libnet/libnet_join.c
+++ b/source3/libnet/libnet_join.c
@@ -381,7 +381,7 @@ static WERROR do_unjoin_modify_vals_config(TALLOC_CTX *mem_ctx,
W_ERROR_NOT_OK_RETURN(werr);
}
- werr = libnet_smbconf_delparm(mem_ctx, "GLOBAL", "realm");
+ werr = libnet_smbconf_delparm("GLOBAL", "realm");
return werr;
}
diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index 5d8b6d605b..5dc1eb06f4 100644
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -846,9 +846,6 @@ static int net_conf_delparm(int argc, const char **argv)
WERROR werr = WERR_OK;
char *service = NULL;
char *param = NULL;
- TALLOC_CTX *ctx;
-
- ctx = talloc_init("delparm");
if (argc != 2) {
net_conf_delparm_usage(argc, argv);
@@ -857,7 +854,7 @@ static int net_conf_delparm(int argc, const char **argv)
service = strdup_lower(argv[0]);
param = strdup_lower(argv[1]);
- werr = libnet_smbconf_delparm(ctx, service, param);
+ werr = libnet_smbconf_delparm(service, param);
if (W_ERROR_EQUAL(werr, WERR_NO_SUCH_SERVICE)) {
d_fprintf(stderr,