[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-695-gf915655

Volker Lendecke vlendec at samba.org
Tue Mar 24 11:00:01 GMT 2009


The branch, master has been updated
       via  f91565544f96be60cb6464d739008f8241e55d5c (commit)
      from  de2a7c8e4caa4898a3ff5cfd85d21cddec8188f2 (commit)

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


- Log -----------------------------------------------------------------
commit f91565544f96be60cb6464d739008f8241e55d5c
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Mar 24 11:07:16 2009 +0100

    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 at volny.cz> for the bug report!

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

Summary of changes:
 source3/passdb/lookup_sid.c     |    2 +-
 source3/rpc_server/srv_lsa_nt.c |    4 ++++
 2 files changed, 5 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/passdb/lookup_sid.c b/source3/passdb/lookup_sid.c
index 9c20042..a5c2d50 100644
--- a/source3/passdb/lookup_sid.c
+++ b/source3/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/source3/rpc_server/srv_lsa_nt.c b/source3/rpc_server/srv_lsa_nt.c
index ed54c3a..5fdcaf2 100644
--- a/source3/rpc_server/srv_lsa_nt.c
+++ b/source3/rpc_server/srv_lsa_nt.c
@@ -827,6 +827,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);


-- 
Samba Shared Repository


More information about the samba-cvs mailing list