summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2004-05-21 18:06:27 +0000
committerJeremy Allison <jra@samba.org>2004-05-21 18:06:27 +0000
commit74307ee187302c1612a3a68ccce58dbf325cc90b (patch)
tree7ba6eae81627161d14c88e302216eea439a2bcb3
parent503011e451844f6747e1090bdd21e5a9beeff942 (diff)
downloadsamba-74307ee187302c1612a3a68ccce58dbf325cc90b.tar.gz
r810: Fix from "Jerome Borsboom" <j.borsboom@erasmusmc.nl> to ensure error status
codes don't get overwritten. Jeremy.
-rw-r--r--source/rpc_server/srv_lsa_nt.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/source/rpc_server/srv_lsa_nt.c b/source/rpc_server/srv_lsa_nt.c
index 1d7fdb0e547..b4e29e67485 100644
--- a/source/rpc_server/srv_lsa_nt.c
+++ b/source/rpc_server/srv_lsa_nt.c
@@ -669,12 +669,12 @@ done:
/* set up the LSA Lookup SIDs response */
init_lsa_trans_names(p->mem_ctx, ref, names, num_entries, sid, &mapped_count);
- 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_sids(r_u, ref, names, mapped_count);
return r_u->status;