[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2551-geb99ac3

[Karolin Seeger]

The branch, v3-2-test has been updated
       via  eb99ac3618269103b434afaca13295ab5c2cc478 (commit)
       via  827e525dcaa64a555d75c8a5c8c4ece338b7b3d3 (commit)
      from  2089c692cfe5a4f9bbed1e658c6f73c310dbff57 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit eb99ac3618269103b434afaca13295ab5c2cc478
Author: Karolin Seeger <kseeger at samba.org>
Date:   Tue Jun 10 10:17:14 2008 +0200

    WHATSNEW: Update changes since 3.2.0rc1.
    
    Karolin

commit 827e525dcaa64a555d75c8a5c8c4ece338b7b3d3
Author: Karolin Seeger <kseeger at samba.org>
Date:   Tue Jun 10 09:13:02 2008 +0200

    Revert "More correct fix (hopefully :-) for any memory leaks."
    
    This reverts commit 9bb18b330164584905c383cf3eff2d077b250e86.

-----------------------------------------------------------------------

Summary of changes:
 WHATSNEW.txt              |    5 +++++
 source/libsmb/namequery.c |   18 +-----------------
 2 files changed, 6 insertions(+), 17 deletions(-)


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index c28913a..6085d71 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -248,6 +248,11 @@ o   Volker Lendecke <vl at samba.org>
     * Shrink ldbtools.
 
 
+o   Jim McDonough <jmcd at samba.org>
+    * Fix reset of password last set time just because the expired flag
+      is set to 0.
+
+
 o   Stefan Metzmacher <metze at samba.org>
     * Remove support for symbol versioning in shared libraries.
       For more information, please have a look at the disussion on
diff --git a/source/libsmb/namequery.c b/source/libsmb/namequery.c
index 24d7ee1..c987890 100644
--- a/source/libsmb/namequery.c
+++ b/source/libsmb/namequery.c
@@ -1835,9 +1835,6 @@ 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;
 	}
@@ -1917,7 +1914,7 @@ static NTSTATUS get_dc_list(const char *domain,
 
 	p = pserver;
 	while (next_token_talloc(ctx, &p, &name, LIST_SEP)) {
-		if (!done_auto_lookup && strequal(name, "*")) {
+		if (strequal(name, "*")) {
 			status = internal_resolve_name(domain, 0x1C, sitename,
 						       &auto_ip_list,
 						       &auto_count,
@@ -2058,12 +2055,6 @@ 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;
@@ -2083,9 +2074,6 @@ 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,
@@ -2099,8 +2087,6 @@ 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;
 	}
 
@@ -2131,8 +2117,6 @@ 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