sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

Remove talloc context parameter from libnet_smbconf_delparm().

Browse Source 
Make use of talloc stackframe internally.
This removes talloc contxt from net_conf_delparm.

Michael
(This used to be commit 16f1373938)
This commit is contained in:
Michael Adam 2007-12-25 03:34:04 +01:00
parent 726f32b672
commit 44631bfd4d
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source3/libnet/libnet_conf.c
View File

@ -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;
}

2
source3/libnet/libnet_join.c
View File

@ -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;
}

5
source3/utils/net_conf.c
View File

@ -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,