[SCM] Samba Shared Repository - branch master updated

[Matthias Dieter Wallnöfer]

The branch, master has been updated
       via  84c901a... s4:"samdb_server_site_name" uses - proof for out of memory
       via  34ff1c6... s4:samdb_server_site_name - fix indentation
      from  1e08449... s4:fill_netlogon_samlogon_reponse - fix a typo

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


- Log -----------------------------------------------------------------
commit 84c901a619ad4b20c36b84c435fb869e8374bd8a
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date:   Tue Apr 13 15:45:29 2010 +0200

    s4:"samdb_server_site_name" uses - proof for out of memory

commit 34ff1c6944a56365390b252f516b6d3aafc8ac50
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date:   Tue Apr 13 15:40:43 2010 +0200

    s4:samdb_server_site_name - fix indentation

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

Summary of changes:
 source4/cldap_server/netlogon.c               |    4 +++-
 source4/dsdb/common/util.c                    |   10 ++++++----
 source4/rpc_server/netlogon/dcerpc_netlogon.c |    5 ++++-
 3 files changed, 13 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/cldap_server/netlogon.c b/source4/cldap_server/netlogon.c
index fc9cafd..139c1ca 100644
--- a/source4/cldap_server/netlogon.c
+++ b/source4/cldap_server/netlogon.c
@@ -250,7 +250,8 @@ NTSTATUS fill_netlogon_samlogon_response(struct ldb_context *sam_ctx,
 	}
 #endif
 
-	pdc_name         = talloc_asprintf(mem_ctx, "\\\\%s", lp_netbios_name(lp_ctx));
+	pdc_name         = talloc_asprintf(mem_ctx, "\\\\%s",
+					   lp_netbios_name(lp_ctx));
 	NT_STATUS_HAVE_NO_MEMORY(pdc_name);
 	domain_uuid      = samdb_result_guid(dom_res->msgs[0], "objectGUID");
 	dns_domain       = lp_dnsdomain(lp_ctx);
@@ -263,6 +264,7 @@ NTSTATUS fill_netlogon_samlogon_response(struct ldb_context *sam_ctx,
 	NT_STATUS_HAVE_NO_MEMORY(pdc_dns_name);
 	flatname         = lp_sam_name(lp_ctx);
 	server_site      = samdb_server_site_name(sam_ctx, mem_ctx);
+	NT_STATUS_HAVE_NO_MEMORY(server_site);
 	/* FIXME: Hardcoded site name */
 	client_site      = "Default-First-Site-Name";
 	load_interfaces(mem_ctx, lp_interfaces(lp_ctx), &ifaces);
diff --git a/source4/dsdb/common/util.c b/source4/dsdb/common/util.c
index d36e1ec..66a0b0f 100644
--- a/source4/dsdb/common/util.c
+++ b/source4/dsdb/common/util.c
@@ -1545,12 +1545,14 @@ int samdb_rid_set_dn(struct ldb_context *ldb, TALLOC_CTX *mem_ctx, struct ldb_dn
 
 const char *samdb_server_site_name(struct ldb_context *ldb, TALLOC_CTX *mem_ctx)
 {
-	const struct ldb_val *val = ldb_dn_get_rdn_val(samdb_server_site_dn(ldb, mem_ctx));
+	const struct ldb_val *val = ldb_dn_get_rdn_val(samdb_server_site_dn(ldb,
+									    mem_ctx));
 
-	if (val != NULL)
-		return (const char *) val->data;
-	else
+	if (val == NULL) {
 		return NULL;
+	}
+
+	return (const char *) val->data;
 }
 
 /*
diff --git a/source4/rpc_server/netlogon/dcerpc_netlogon.c b/source4/rpc_server/netlogon/dcerpc_netlogon.c
index 5f85353..596a2ee 100644
--- a/source4/rpc_server/netlogon/dcerpc_netlogon.c
+++ b/source4/rpc_server/netlogon/dcerpc_netlogon.c
@@ -1476,6 +1476,7 @@ static WERROR dcesrv_netr_DsRGetDCNameEx2(struct dcesrv_call_state *dce_call,
 	struct netr_DsRGetDCNameInfo *info;
 	struct loadparm_context *lp_ctx = dce_call->conn->dce_ctx->lp_ctx;
 	struct socket_address *addr;
+	const char *server_site_name;
 	char *guid_str;
 	struct netlogon_samlogon_response response;
 	NTSTATUS status;
@@ -1494,8 +1495,10 @@ static WERROR dcesrv_netr_DsRGetDCNameEx2(struct dcesrv_call_state *dce_call,
 	/* "server_unc" is ignored by w2k3 */
 
 	/* Proof server site parameter "site_name" if it was specified */
+	server_site_name = samdb_server_site_name(sam_ctx, mem_ctx);
+	W_ERROR_HAVE_NO_MEMORY(server_site_name);
 	if ((r->in.site_name != NULL) && (strcasecmp(r->in.site_name,
-	    samdb_server_site_name(sam_ctx, mem_ctx)) != 0)) {
+						     server_site_name) != 0)) {
 		return WERR_NO_SUCH_DOMAIN;
 	}
 


-- 
Samba Shared Repository