diff options
| author | Matthias Dieter Wallnöfer <mdw@samba.org> | 2010-06-10 12:17:48 +0200 |
|---|---|---|
| committer | Matthias Dieter Wallnöfer <mdw@samba.org> | 2010-06-10 16:22:07 +0200 |
| commit | 305f2c70434ecc244c4c7bcad285e2cfae8f3215 (patch) | |
| tree | d6e70855d598b9e53926c779cf02de2baa9bdd45 | |
| parent | 13b1f7a2b33b299208abfbb50fbf1e2b982ca326 (diff) | |
| download | samba-305f2c70434ecc244c4c7bcad285e2cfae8f3215.tar.gz samba-305f2c70434ecc244c4c7bcad285e2cfae8f3215.tar.bz2 samba-305f2c70434ecc244c4c7bcad285e2cfae8f3215.zip | |
s4:dcesrv_samr_AddAliasMembership - Merge the two error blocks into one
| -rw-r--r-- | source4/rpc_server/samr/dcesrv_samr.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/source4/rpc_server/samr/dcesrv_samr.c b/source4/rpc_server/samr/dcesrv_samr.c index 3ad3940967..3b1211cb00 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) { |