From: Volker Lendecke <vl@samba.org>
Date: Tue, 24 Mar 2009 10:07:16 +0000 (+0100)
Subject: Fix bug 6097
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb76066e8797599e5ca75821a686e32dd0c97a74;p=thirdparty%2Fsamba.git

Fix bug 6097

A client sent a SID with authority 0 and 0 sub-authorities. W2k3 replies with
NT_STATUS_INVALID_SID, even if other SIDs in the list are valid.

Thanks to Pavel <wylda@volny.cz> for the bug report!
---

diff --git a/source/passdb/lookup_sid.c b/source/passdb/lookup_sid.c
index a7175b9647f..d767fa4f50a 100644
--- a/source/passdb/lookup_sid.c
+++ b/source/passdb/lookup_sid.c
@@ -804,7 +804,7 @@ NTSTATUS lookup_sids(TALLOC_CTX *mem_ctx, int num_sids,
 		} else {
 			/* This is a normal SID with rid component */
 			if (!sid_split_rid(&sid, &rid)) {
-				result = NT_STATUS_INVALID_PARAMETER;
+				result = NT_STATUS_INVALID_SID;
 				goto fail;
 			}
 		}
diff --git a/source/rpc_server/srv_lsa_nt.c b/source/rpc_server/srv_lsa_nt.c
index 9ce992ce25d..9d411eccb9d 100644
--- a/source/rpc_server/srv_lsa_nt.c
+++ b/source/rpc_server/srv_lsa_nt.c
@@ -830,6 +830,10 @@ NTSTATUS _lsa_LookupSids(pipes_struct *p,
 					   &names,
 					   &mapped_count);
 
+	if (NT_STATUS_IS_ERR(status)) {
+		return status;
+	}
+
 	/* Convert from lsa_TranslatedName2 to lsa_TranslatedName */
 	names_out = TALLOC_ARRAY(p->mem_ctx, struct lsa_TranslatedName,
 				 num_sids);