[SCM] Samba Shared Repository - branch v3-2-test updated -
release-3-2-0pre2-2518-g9bb18b3
Jeremy Allison
jra at samba.org
Thu Jun 5 21:29:02 GMT 2008
The branch, v3-2-test has been updated
via 9bb18b330164584905c383cf3eff2d077b250e86 (commit)
from 80c7fbb4edb29b3c670c21baa5f613b942e68e1e (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit 9bb18b330164584905c383cf3eff2d077b250e86
Author: Jeremy Allison <jra at samba.org>
Date: Thu Jun 5 14:28:28 2008 -0700
More correct fix (hopefully :-) for any memory leaks.
Jerry promised to check :-). Vl also please review.
Jeremy.
-----------------------------------------------------------------------
Summary of changes:
source/libsmb/namequery.c | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/libsmb/namequery.c b/source/libsmb/namequery.c
index c987890..24d7ee1 100644
--- a/source/libsmb/namequery.c
+++ b/source/libsmb/namequery.c
@@ -1835,6 +1835,9 @@ static NTSTATUS get_dc_list(const char *domain,
NTSTATUS status;
TALLOC_CTX *ctx = talloc_init("get_dc_list");
+ *ip_list = NULL;
+ *count = 0;
+
if (!ctx) {
return NT_STATUS_NO_MEMORY;
}
@@ -1914,7 +1917,7 @@ static NTSTATUS get_dc_list(const char *domain,
p = pserver;
while (next_token_talloc(ctx, &p, &name, LIST_SEP)) {
- if (strequal(name, "*")) {
+ if (!done_auto_lookup && strequal(name, "*")) {
status = internal_resolve_name(domain, 0x1C, sitename,
&auto_ip_list,
&auto_count,
@@ -2055,6 +2058,12 @@ static NTSTATUS get_dc_list(const char *domain,
out:
+ if (!NT_STATUS_IS_OK(status)) {
+ SAFE_FREE(return_iplist);
+ *ip_list = NULL;
+ *count = 0;
+ }
+
SAFE_FREE(auto_ip_list);
TALLOC_FREE(ctx);
return status;
@@ -2074,6 +2083,9 @@ NTSTATUS get_sorted_dc_list( const char *domain,
NTSTATUS status;
enum dc_lookup_type lookup_type = DC_NORMAL_LOOKUP;
+ *ip_list = NULL;
+ *count = 0;
+
DEBUG(8,("get_sorted_dc_list: attempting lookup "
"for name %s (sitename %s) using [%s]\n",
domain,
@@ -2087,6 +2099,8 @@ NTSTATUS get_sorted_dc_list( const char *domain,
status = get_dc_list(domain, sitename, ip_list,
count, lookup_type, &ordered);
if (!NT_STATUS_IS_OK(status)) {
+ SAFE_FREE(*ip_list);
+ *count = 0;
return status;
}
@@ -2117,6 +2131,8 @@ NTSTATUS get_kdc_list( const char *realm,
count, DC_KDC_ONLY, &ordered);
if (!NT_STATUS_IS_OK(status)) {
+ SAFE_FREE(*ip_list);
+ *count = 0;
return status;
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list