From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 30 Jul 2008 23:07:57 +0000 (+1000)
Subject: Don't fail if the domain has a trust already.
X-Git-Tag: samba-4.0.0alpha6~801^3~95^2~19
X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=2afd7d6d66c4ee16ffad5f1a9d5ba6ef4530ca99;p=ira%2Fwip.git

Don't fail if the domain has a trust already.

Andrew Bartlett
(This used to be commit c2df7ffa6d67dd9381d10397c679746547cd5e17)
---

diff --git a/source4/torture/rpc/lsa.c b/source4/torture/rpc/lsa.c
index e6102f0a821..4fb459ea256 100644
--- a/source4/torture/rpc/lsa.c
+++ b/source4/torture/rpc/lsa.c
@@ -1830,7 +1830,12 @@ static bool test_EnumTrustDom(struct dcerpc_pipe *p,
 	
 	enum_status = dcerpc_lsa_EnumTrustDom(p, mem_ctx, &r);
 	
-	if (!(NT_STATUS_EQUAL(enum_status, STATUS_MORE_ENTRIES) || NT_STATUS_EQUAL(enum_status, NT_STATUS_NO_MORE_ENTRIES))) {
+	if (NT_STATUS_IS_OK(enum_status)) {
+		if (domains.count == 0) {
+			printf("EnumTrustDom failed - should have returned 'NT_STATUS_NO_MORE_ENTRIES' for 0 trusted domains\n");
+			return false;
+		}
+	} else if (!(NT_STATUS_EQUAL(enum_status, STATUS_MORE_ENTRIES) || NT_STATUS_EQUAL(enum_status, NT_STATUS_NO_MORE_ENTRIES))) {
 		printf("EnumTrustDom of zero size failed - %s\n", nt_errstr(enum_status));
 		return false;
 	}