[SCM] Samba Shared Repository - branch v3-2-test updated -
initial-v3-2-unstable-896-gbe985d8
Michael Adam
obnox at samba.org
Tue Dec 25 02:42:31 GMT 2007
The branch, v3-2-test has been updated
via be985d8d0ce80d12aa7f0b447b16b14aa0362826 (commit)
via f8823ae1232022ed3f7f9be6b8959d413e8aed19 (commit)
via 92b8e5ea4ba26d663ea4e6fb65e4225d8259ea60 (commit)
via 4f7375a110a69530d6ef9781573f45a5bf8391a5 (commit)
via 4efac39c363d565c2c7211da73d5e1cf2ac3d0b2 (commit)
via 16f137393881edc78c9322f038ba38e53e3ee07d (commit)
via bf6031287f75a0e17092f60f9885e7e55cd0f93c (commit)
via efaffefc438f8375a083b194ac7a09e563000d3c (commit)
from 5039a70246a475176fa8212ad78b430f2211951f (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit be985d8d0ce80d12aa7f0b447b16b14aa0362826
Author: Michael Adam <obnox at samba.org>
Date: Tue Dec 25 03:41:34 2007 +0100
Remove now unneeded talloc ctx parameter from do_JoinConfig().
Michael
commit f8823ae1232022ed3f7f9be6b8959d413e8aed19
Author: Michael Adam <obnox at samba.org>
Date: Tue Dec 25 03:40:35 2007 +0100
Remove now unneeded talloc ctx parameter from do_join_modify_vals_config().
Michael
commit 92b8e5ea4ba26d663ea4e6fb65e4225d8259ea60
Author: Michael Adam <obnox at samba.org>
Date: Tue Dec 25 03:39:31 2007 +0100
Remove now unneeded talloc ctx parameter from do_UnjoinConfig().
Michael
commit 4f7375a110a69530d6ef9781573f45a5bf8391a5
Author: Michael Adam <obnox at samba.org>
Date: Tue Dec 25 03:38:06 2007 +0100
Remove now unneeded talloc ctx parameter from do_unjoin_modify_vals_config().
Michael
commit 4efac39c363d565c2c7211da73d5e1cf2ac3d0b2
Author: Michael Adam <obnox at samba.org>
Date: Tue Dec 25 03:35:00 2007 +0100
Add two missing free-s.
Michael
commit 16f137393881edc78c9322f038ba38e53e3ee07d
Author: Michael Adam <obnox at samba.org>
Date: Tue Dec 25 03:34:04 2007 +0100
Remove talloc context parameter from libnet_smbconf_delparm().
Make use of talloc stackframe internally.
This removes talloc contxt from net_conf_delparm.
Michael
commit bf6031287f75a0e17092f60f9885e7e55cd0f93c
Author: Michael Adam <obnox at samba.org>
Date: Tue Dec 25 03:29:41 2007 +0100
Add a missing free.
Michael
commit efaffefc438f8375a083b194ac7a09e563000d3c
Author: Michael Adam <obnox at samba.org>
Date: Tue Dec 25 03:29:05 2007 +0100
Remove talloc context parameter from libnet_smbconf_setparm().
Make use of talloc stackframe internally.
This removes talloc contxt from net_conf_setparm.
Michael
-----------------------------------------------------------------------
Summary of changes:
source/libnet/libnet_conf.c | 17 ++++++++---------
source/libnet/libnet_join.c | 39 ++++++++++++++++-----------------------
source/utils/net_conf.c | 14 +++++---------
3 files changed, 29 insertions(+), 41 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/libnet/libnet_conf.c b/source/libnet/libnet_conf.c
index be9edad..bb0e637 100644
--- a/source/libnet/libnet_conf.c
+++ b/source/libnet/libnet_conf.c
@@ -310,13 +310,13 @@ done:
return werr;
}
-WERROR libnet_smbconf_setparm(TALLOC_CTX *mem_ctx,
- const char *service,
+WERROR libnet_smbconf_setparm(const char *service,
const char *param,
const char *valstr)
{
WERROR werr;
struct registry_key *key = NULL;
+ TALLOC_CTX *mem_ctx = talloc_stackframe();
if (!libnet_smbconf_key_exists(service)) {
werr = libnet_smbconf_reg_createkey_internal(mem_ctx, service,
@@ -332,7 +332,7 @@ WERROR libnet_smbconf_setparm(TALLOC_CTX *mem_ctx,
werr = libnet_smbconf_reg_setvalue_internal(key, param, valstr);
done:
- TALLOC_FREE(key);
+ TALLOC_FREE(mem_ctx);
return werr;
}
@@ -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;
}
@@ -401,10 +401,9 @@ done:
*
**********************************************************************/
-WERROR libnet_smbconf_set_global_param(TALLOC_CTX *mem_ctx,
- const char *param,
+WERROR libnet_smbconf_set_global_param(const char *param,
const char *val)
{
- return libnet_smbconf_setparm(mem_ctx, GLOBAL_NAME, param, val);
+ return libnet_smbconf_setparm(GLOBAL_NAME, param, val);
}
diff --git a/source/libnet/libnet_join.c b/source/libnet/libnet_join.c
index 68244e5..6edcdb8 100644
--- a/source/libnet/libnet_join.c
+++ b/source/libnet/libnet_join.c
@@ -331,19 +331,17 @@ done:
return status;
}
-static WERROR do_join_modify_vals_config(TALLOC_CTX *mem_ctx,
- struct libnet_JoinCtx *r)
+static WERROR do_join_modify_vals_config(struct libnet_JoinCtx *r)
{
WERROR werr;
bool is_ad = false;
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 +350,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);
}
@@ -372,26 +369,23 @@ static WERROR do_join_modify_vals_config(TALLOC_CTX *mem_ctx,
return werr;
}
-static WERROR do_unjoin_modify_vals_config(TALLOC_CTX *mem_ctx,
- struct libnet_UnjoinCtx *r)
+static WERROR do_unjoin_modify_vals_config(struct libnet_UnjoinCtx *r)
{
WERROR werr = WERR_OK;
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);
}
- werr = libnet_smbconf_delparm(mem_ctx, "GLOBAL", "realm");
+ werr = libnet_smbconf_delparm("GLOBAL", "realm");
return werr;
}
-static WERROR do_JoinConfig(TALLOC_CTX *mem_ctx,
- struct libnet_JoinCtx *r)
+static WERROR do_JoinConfig(struct libnet_JoinCtx *r)
{
WERROR werr;
@@ -403,7 +397,7 @@ static WERROR do_JoinConfig(TALLOC_CTX *mem_ctx,
return WERR_OK;
}
- werr = do_join_modify_vals_config(mem_ctx, r);
+ werr = do_join_modify_vals_config(r);
if (!W_ERROR_IS_OK(werr)) {
return werr;
}
@@ -414,8 +408,7 @@ static WERROR do_JoinConfig(TALLOC_CTX *mem_ctx,
return werr;
}
-static WERROR do_UnjoinConfig(TALLOC_CTX *mem_ctx,
- struct libnet_UnjoinCtx *r)
+static WERROR do_UnjoinConfig(struct libnet_UnjoinCtx *r)
{
WERROR werr;
@@ -427,7 +420,7 @@ static WERROR do_UnjoinConfig(TALLOC_CTX *mem_ctx,
return WERR_OK;
}
- werr = do_unjoin_modify_vals_config(mem_ctx, r);
+ werr = do_unjoin_modify_vals_config(r);
if (!W_ERROR_IS_OK(werr)) {
return werr;
}
@@ -497,7 +490,7 @@ WERROR libnet_Join(TALLOC_CTX *mem_ctx,
}
}
- werr = do_JoinConfig(mem_ctx, r);
+ werr = do_JoinConfig(r);
if (!W_ERROR_IS_OK(werr)) {
return werr;
}
@@ -526,7 +519,7 @@ WERROR libnet_Unjoin(TALLOC_CTX *mem_ctx,
}
}
- werr = do_UnjoinConfig(mem_ctx, r);
+ werr = do_UnjoinConfig(r);
if (!W_ERROR_IS_OK(werr)) {
return werr;
}
diff --git a/source/utils/net_conf.c b/source/utils/net_conf.c
index 9a6f540..df85d7e 100644
--- a/source/utils/net_conf.c
+++ b/source/utils/net_conf.c
@@ -769,9 +769,6 @@ static int net_conf_setparm(int argc, const char **argv)
char *service = NULL;
char *param = NULL;
const char *value_str = NULL;
- TALLOC_CTX *ctx;
-
- ctx = talloc_init("setparm");
if (argc != 3) {
net_conf_setparm_usage(argc, argv);
@@ -781,7 +778,7 @@ static int net_conf_setparm(int argc, const char **argv)
param = strdup_lower(argv[1]);
value_str = argv[2];
- werr = libnet_smbconf_setparm(ctx, service, param, value_str);
+ werr = libnet_smbconf_setparm(service, param, value_str);
if (!W_ERROR_IS_OK(werr)) {
d_fprintf(stderr, "Error setting value '%s': %s\n",
@@ -793,7 +790,7 @@ static int net_conf_setparm(int argc, const char **argv)
done:
SAFE_FREE(service);
- TALLOC_FREE(ctx);
+ SAFE_FREE(param);
return ret;
}
@@ -849,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);
@@ -860,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,
@@ -881,6 +875,8 @@ static int net_conf_delparm(int argc, const char **argv)
ret = 0;
done:
+ SAFE_FREE(service);
+ SAFE_FREE(param);
return ret;
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list