summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-11-25 15:42:47 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-11-25 15:42:47 +0100
commitfc0985dbc546eff9d9d8660a30a0bf923782f2d7 (patch)
treee6130f181d66973d327ae314287be310261b49b5
parentf5a87e35d252934cf1c5bc27f4e3290520345d47 (diff)
parent948218643a04e8bf28de5c716cb9e4115d8b2aa0 (diff)
downloadsamba-fc0985dbc546eff9d9d8660a30a0bf923782f2d7.tar.gz
samba-fc0985dbc546eff9d9d8660a30a0bf923782f2d7.tar.bz2
samba-fc0985dbc546eff9d9d8660a30a0bf923782f2d7.zip
Merge branch 'master' of ssh://git.samba.org/data/git/samba
-rw-r--r--source3/rpc_server/srv_samr_nt.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c
index 3cc86edd62..ba9d911c2b 100644
--- a/source3/rpc_server/srv_samr_nt.c
+++ b/source3/rpc_server/srv_samr_nt.c
@@ -1794,6 +1794,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__));
@@ -1841,10 +1842,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;