diff options
| author | Jeremy Allison <jra@samba.org> | 2004-05-26 18:27:16 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:51:48 -0500 |
| commit | 7ea0be80de25da22abcf1f1c34f646251f7814c0 (patch) | |
| tree | 47b9c9e572b6b2ed038341b7699009a74fa94741 | |
| parent | e8681c225f50ccd070dc93f2eac74d1813aaf735 (diff) | |
| download | samba-7ea0be80de25da22abcf1f1c34f646251f7814c0.tar.gz samba-7ea0be80de25da22abcf1f1c34f646251f7814c0.tar.bz2 samba-7ea0be80de25da22abcf1f1c34f646251f7814c0.zip | |
r911: Patch from "Jerome Borsboom" <j.borsboom@erasmusmc.nl>, don't
overwrite error code.
Jeremy.
(This used to be commit 735e49ddc3c4485c7b43208345d0e3e2b8960ad4)
| -rw-r--r-- | source3/rpc_server/srv_lsa_nt.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/rpc_server/srv_lsa_nt.c b/source3/rpc_server/srv_lsa_nt.c index b4e29e6748..ff73fd4a95 100644 --- a/source3/rpc_server/srv_lsa_nt.c +++ b/source3/rpc_server/srv_lsa_nt.c @@ -719,12 +719,12 @@ done: /* set up the LSA Lookup RIDs response */ init_lsa_rid2s(ref, rids, num_entries, names, &mapped_count, p->endian); - if (mapped_count == 0) - r_u->status = NT_STATUS_NONE_MAPPED; - else if (mapped_count != num_entries) - r_u->status = STATUS_SOME_UNMAPPED; - else - r_u->status = NT_STATUS_OK; + if (NT_STATUS_IS_OK(r_u->status)) { + if (mapped_count == 0) + r_u->status = NT_STATUS_NONE_MAPPED; + else if (mapped_count != num_entries) + r_u->status = STATUS_SOME_UNMAPPED; + } init_reply_lookup_names(r_u, ref, num_entries, rids, mapped_count); return r_u->status; |