r911: Patch from "Jerome Borsboom" <j.borsboom@erasmusmc.nl>, don't

overwrite error code.
Jeremy.
(This used to be commit 735e49ddc3c4485c7b43208345d0e3e2b8960ad4)

diff --git a/source3/rpc_server/srv_lsa_nt.c b/source3/rpc_server/srv_lsa_nt.c
index b4e29e674852fb84f8271e39597ee83855645624..ff73fd4a9516912b912db0e60d26a2ecf3fd0ccb 100644 (file)
--- 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;