[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3197-ge03d5d4

Günther Deschner gd at samba.org
Tue Nov 25 14:43:10 GMT 2008


The branch, v3-2-test has been updated
       via  e03d5d41184374f89d780725468227d546288be3 (commit)
      from  6017b3095b0eb0e5b855d5bf693c99645ff229b1 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit e03d5d41184374f89d780725468227d546288be3
Author: Günther Deschner <gd at samba.org>
Date:   Tue Nov 25 12:19:35 2008 +0100

    s3-samr: fix _samr_LookupNames return code.
    
    Guenther
    (cherry picked from commit dc7c2d63b3ce142959aa863f000fa9140de99eb0)

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

Summary of changes:
 source/rpc_server/srv_samr_nt.c |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/rpc_server/srv_samr_nt.c b/source/rpc_server/srv_samr_nt.c
index a24fb32..e2cf8cd 100644
--- a/source/rpc_server/srv_samr_nt.c
+++ b/source/rpc_server/srv_samr_nt.c
@@ -1850,6 +1850,7 @@ NTSTATUS _samr_LookupNames(pipes_struct *p,
 	DOM_SID pol_sid;
 	uint32  acc_granted;
 	struct samr_Ids rids, types;
+	uint32_t num_mapped = 0;
 
 	DEBUG(5,("_samr_LookupNames: %d\n", __LINE__));
 
@@ -1897,10 +1898,18 @@ NTSTATUS _samr_LookupNames(pipes_struct *p,
 		}
 
 		if (type[i] != SID_NAME_UNKNOWN) {
-			status = NT_STATUS_OK;
+			num_mapped++;
 		}
 	}
 
+	if (num_mapped == num_rids) {
+		status = NT_STATUS_OK;
+	} else if (num_mapped == 0) {
+		status = NT_STATUS_NONE_MAPPED;
+	} else {
+		status = STATUS_SOME_UNMAPPED;
+	}
+
 	rids.count = num_rids;
 	rids.ids = rid;
 


-- 
Samba Shared Repository


More information about the samba-cvs mailing list