Attachment 8063 Details for Bug 9262 – Proposed patch to fix the problem

[patch] Proposed patch to fix the problem

0014-drsuapi-check-more-carefully-the-validity-of-the-NC.patch (text/plain), 1.93 KB, created by Matthieu Patou on 2012-10-13 07:41:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthieu Patou

Created: 2012-10-13 07:41:59 UTC

Size: 1.93 KB

patch

obsolete

>From 8be6a106ab3a701e593b43e4d5b589b8a1e9013d Mon Sep 17 00:00:00 2001
>From: Matthieu Patou <mat@matws.net>
>Date: Thu, 27 Sep 2012 15:02:06 -0700
>Subject: [PATCH 14/20] drsuapi: check more carefully the validity of the NC
>
>Check that both the GUID and DN are the GUID/DN of a NC if not return
>WERR_DS_DRA_BAD_NC
>---
> source4/rpc_server/drsuapi/updaterefs.c |   15 +++++++++++----
> 1 file changed, 11 insertions(+), 4 deletions(-)
>
>diff --git a/source4/rpc_server/drsuapi/updaterefs.c b/source4/rpc_server/drsuapi/updaterefs.c
>index 2d62718..e82ae48 100644
>--- a/source4/rpc_server/drsuapi/updaterefs.c
>+++ b/source4/rpc_server/drsuapi/updaterefs.c
>@@ -127,7 +127,9 @@ WERROR drsuapi_UpdateRefs(struct drsuapi_bind_state *b_state, TALLOC_CTX *mem_ct
> 			  struct drsuapi_DsReplicaUpdateRefsRequest1 *req)
> {
> 	WERROR werr;
>+	int ret;
> 	struct ldb_dn *dn;
>+	struct ldb_dn *nc_root;
> 	struct ldb_context *sam_ctx = b_state->sam_ctx_system?b_state->sam_ctx_system:b_state->sam_ctx;
> 
> 	DEBUG(4,("DsReplicaUpdateRefs for host '%s' with GUID %s options 0x%08x nc=%s\n",
>@@ -135,15 +137,20 @@ WERROR drsuapi_UpdateRefs(struct drsuapi_bind_state *b_state, TALLOC_CTX *mem_ct
> 		 req->options,
> 		 drs_ObjectIdentifier_to_string(mem_ctx, req->naming_context)));
> 
>-	dn = ldb_dn_new(mem_ctx, sam_ctx, req->naming_context->dn);
>-	if (dn == NULL) {
>-		return WERR_DS_INVALID_DN_SYNTAX;
>+	dn = drs_ObjectIdentifier_to_dn(mem_ctx, sam_ctx, req->naming_context);
>+	W_ERROR_HAVE_NO_MEMORY(dn);
>+	ret = dsdb_find_nc_root(sam_ctx, dn, dn, &nc_root);
>+	if (ret != LDB_SUCCESS) {
>+		return WERR_DS_DRA_BAD_NC;
>+	}
>+	if (ldb_dn_compare(dn, nc_root) != 0) {
>+		return WERR_DS_DRA_BAD_NC;
> 	}
> 
> 	if (ldb_transaction_start(sam_ctx) != LDB_SUCCESS) {
> 		DEBUG(0,(__location__ ": Failed to start transaction on samdb: %s\n",
> 			 ldb_errstring(sam_ctx)));
>-		return WERR_DS_DRA_INTERNAL_ERROR;		
>+		return WERR_DS_DRA_INTERNAL_ERROR;
> 	}
> 
> 	if (req->options & DRSUAPI_DRS_DEL_REF) {
>-- 
>1.7.9.5
>

Flags:

abartlet: review+

Actions: View

Attachments on bug 9262: 8063