summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2004-12-14 22:18:33 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:07:26 -0500
commit113cacf94cda313840ae714c9b8137c0a17cf23c (patch)
treea275a1d06a9c812a269c1868bacded47ab2bf6eb /source4
parentd21a55dda787a65f15eccb6442189ad7d97526f0 (diff)
downloadsamba-113cacf94cda313840ae714c9b8137c0a17cf23c.tar.gz
samba-113cacf94cda313840ae714c9b8137c0a17cf23c.tar.bz2
samba-113cacf94cda313840ae714c9b8137c0a17cf23c.zip
r4206: fixed a status code check in lsa_LookupNames2 that could cause a segv
(This used to be commit 31ab04f790ff4349dbc8a24c07fa35e10b831baf)
Diffstat (limited to 'source4')
-rw-r--r--source4/rpc_server/lsa/dcesrv_lsa.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/source4/rpc_server/lsa/dcesrv_lsa.c b/source4/rpc_server/lsa/dcesrv_lsa.c
index 22e108d538..5b1323dcff 100644
--- a/source4/rpc_server/lsa/dcesrv_lsa.c
+++ b/source4/rpc_server/lsa/dcesrv_lsa.c
@@ -691,8 +691,9 @@ static NTSTATUS lsa_OpenAccount(struct dcesrv_call_state *dce_call, TALLOC_CTX *
/*
lsa_EnumPrivsAccount
*/
-static NTSTATUS lsa_EnumPrivsAccount(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
- struct lsa_EnumPrivsAccount *r)
+static NTSTATUS lsa_EnumPrivsAccount(struct dcesrv_call_state *dce_call,
+ TALLOC_CTX *mem_ctx,
+ struct lsa_EnumPrivsAccount *r)
{
DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
}
@@ -1375,7 +1376,7 @@ static NTSTATUS lsa_LookupNames2(struct dcesrv_call_state *dce_call,
r->out.sids->sids[i].unknown = 0;
status2 = lsa_lookup_name(state, mem_ctx, name, &sid, &atype);
- if (!NT_STATUS_IS_OK(status) || sid->num_auths == 0) {
+ if (!NT_STATUS_IS_OK(status2) || sid->num_auths == 0) {
status = STATUS_SOME_UNMAPPED;
continue;
}