From 305f2c70434ecc244c4c7bcad285e2cfae8f3215 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Matthias=20Dieter=20Walln=C3=B6fer?= Date: Thu, 10 Jun 2010 12:17:48 +0200 Subject: [PATCH] s4:dcesrv_samr_AddAliasMembership - Merge the two error blocks into one --- source4/rpc_server/samr/dcesrv_samr.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/source4/rpc_server/samr/dcesrv_samr.c b/source4/rpc_server/samr/dcesrv_samr.c index 3ad39409676..3b1211cb003 100644 --- a/source4/rpc_server/samr/dcesrv_samr.c +++ b/source4/rpc_server/samr/dcesrv_samr.c @@ -2420,10 +2420,6 @@ static NTSTATUS dcesrv_samr_AddAliasMember(struct dcesrv_call_state *dce_call, T if (ret == 1) { memberdn = msgs[0]->dn; - } else if (ret > 1) { - DEBUG(0,("Found %d records matching sid %s\n", - ret, dom_sid_string(mem_ctx, r->in.sid))); - return NT_STATUS_INTERNAL_DB_CORRUPTION; } else if (ret == 0) { status = samdb_create_foreign_security_principal( d_state->sam_ctx, mem_ctx, r->in.sid, &memberdn); @@ -2431,8 +2427,9 @@ static NTSTATUS dcesrv_samr_AddAliasMember(struct dcesrv_call_state *dce_call, T return status; } } else { - DEBUG(0, ("samdb_search returned %d: %s\n", ret, - ldb_errstring(d_state->sam_ctx))); + DEBUG(0,("Found %d records matching sid %s\n", + ret, dom_sid_string(mem_ctx, r->in.sid))); + return NT_STATUS_INTERNAL_DB_CORRUPTION; } if (memberdn == NULL) { -- 2.11.4.GIT