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

[Günther Deschner]

The branch, v3-3-test has been updated
       via  dc7c2d63b3ce142959aa863f000fa9140de99eb0 (commit)
      from  3e529fb619384e694e01204ca305e2a13724defd (commit)

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


- Log -----------------------------------------------------------------
commit dc7c2d63b3ce142959aa863f000fa9140de99eb0
Author: Günther Deschner <[EMAIL PROTECTED]>
Date:   Tue Nov 25 12:19:35 2008 +0100

    s3-samr: fix _samr_LookupNames return code.
    
    Guenther

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

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 8edccb6..c924af6 100644
--- a/source/rpc_server/srv_samr_nt.c
+++ b/source/rpc_server/srv_samr_nt.c
@@ -1851,6 +1851,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__));
 
@@ -1898,10 +1899,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