Attachment 8066 Details for Bug 9264 – Fix the return code

[patch] Fix the return code

0016-s4-repl-make-dreplsrv_partition_find_for_nc-return-B.patch (text/plain), 1.37 KB, created by Matthieu Patou on 2012-10-13 07:58:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthieu Patou

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

Size: 1.37 KB

patch

obsolete

>From 193b15efeaf6cfe89770558cddb2110f7cbd54fe Mon Sep 17 00:00:00 2001
>From: Matthieu Patou <mat@matws.net>
>Date: Thu, 27 Sep 2012 18:38:29 -0700
>Subject: [PATCH 16/20] s4-repl: make dreplsrv_partition_find_for_nc return
> BAD_NC only
>
>---
> source4/dsdb/repl/drepl_partitions.c |    9 +++++++--
> 1 file changed, 7 insertions(+), 2 deletions(-)
>
>diff --git a/source4/dsdb/repl/drepl_partitions.c b/source4/dsdb/repl/drepl_partitions.c
>index 5949f42..2a16a45 100644
>--- a/source4/dsdb/repl/drepl_partitions.c
>+++ b/source4/dsdb/repl/drepl_partitions.c
>@@ -413,6 +413,11 @@ static WERROR dreplsrv_partition_add_source_dsa(struct dreplsrv_service *s,
> 	return WERR_OK;
> }
> 
>+/**
>+ * Find a partition when given a NC
>+ * If the NC can't be found it will return BAD_NC
>+ * Initial checks for invalid parameters have to be done beforehand
>+ */
> WERROR dreplsrv_partition_find_for_nc(struct dreplsrv_service *s,
> 				      struct GUID *nc_guid,
> 				      struct dom_sid *nc_sid,
>@@ -429,8 +434,8 @@ WERROR dreplsrv_partition_find_for_nc(struct dreplsrv_service *s,
> 	valid_sid  = nc_sid && !dom_sid_equal(&null_sid, nc_sid);
> 	valid_guid = nc_guid && !GUID_all_zero(nc_guid);
> 
>-	if (!valid_sid && !valid_guid && !nc_dn_str) {
>-		return WERR_DS_DRA_INVALID_PARAMETER;
>+	if (!valid_sid && !valid_guid && (!nc_dn_str)) {
>+		return WERR_DS_DRA_BAD_NC;
> 	}
> 
> 	for (p = s->partitions; p; p = p->next) {
>-- 
>1.7.9.5
>

Flags:

metze: review+
abartlet: review+

Actions: View

Attachments on bug 9264: 8066