[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-1101-g4c69c15

[Günther Deschner]

The branch, master has been updated
       via  4c69c151dbcab30d53ece70f5e23c5971320a5c8 (commit)
       via  68ea2876172a76761a678bcfbb17ab64a7db706d (commit)
      from  f3c94f4b40399aea12a3608e930d20eb93a77efa (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 4c69c151dbcab30d53ece70f5e23c5971320a5c8
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Aug 19 14:22:09 2009 +0200

    s3:dsgetdcname: Fix a crash in dsgetdcname
    
    When returning NT_STATUS_OK we can't leave *info == NULL, this crashes
    in is_closest_site called from dsgetdcname().
    
    Signed-off-by: Günther Deschner <gd at samba.org>

commit 68ea2876172a76761a678bcfbb17ab64a7db706d
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Aug 19 14:19:22 2009 +0200

    s3:dsgetdcname: Inline dsgetdcname_cache_refresh
    
    Signed-off-by: Günther Deschner <gd at samba.org>

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

Summary of changes:
 source3/libsmb/dsgetdcname.c |   35 +++++++++--------------------------
 1 files changed, 9 insertions(+), 26 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/libsmb/dsgetdcname.c b/source3/libsmb/dsgetdcname.c
index de020d4..5279b8f 100644
--- a/source3/libsmb/dsgetdcname.c
+++ b/source3/libsmb/dsgetdcname.c
@@ -225,28 +225,6 @@ static NTSTATUS store_cldap_reply(TALLOC_CTX *mem_ctx,
 /****************************************************************
 ****************************************************************/
 
-static NTSTATUS dsgetdcname_cache_refresh(TALLOC_CTX *mem_ctx,
-					  struct messaging_context *msg_ctx,
-					  const char *domain_name,
-					  struct GUID *domain_guid,
-					  uint32_t flags,
-					  const char *site_name,
-					  struct netr_DsRGetDCNameInfo *info)
-{
-	struct netr_DsRGetDCNameInfo *dc_info;
-
-	return dsgetdcname(mem_ctx,
-			   msg_ctx,
-			   domain_name,
-			   domain_guid,
-			   site_name,
-			   flags | DS_FORCE_REDISCOVERY,
-			   &dc_info);
-}
-
-/****************************************************************
-****************************************************************/
-
 static uint32_t get_cldap_reply_server_flags(struct netlogon_samlogon_response *r,
 					     uint32_t nt_version)
 {
@@ -424,13 +402,18 @@ static NTSTATUS dsgetdcname_cached(TALLOC_CTX *mem_ctx,
 	}
 
 	if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_FOUND)) {
-		status = dsgetdcname_cache_refresh(mem_ctx, msg_ctx,
-						   domain_name,
-						   domain_guid, flags,
-						   site_name, *info);
+		struct netr_DsRGetDCNameInfo *dc_info;
+
+		status = dsgetdcname(mem_ctx, msg_ctx, domain_name,
+				     domain_guid, site_name,
+				     flags | DS_FORCE_REDISCOVERY,
+				     &dc_info);
+
 		if (!NT_STATUS_IS_OK(status)) {
 			return status;
 		}
+
+		*info = dc_info;
 	}
 
 	return status;


-- 
Samba Shared Repository