From e45f583ce28581ebb9c09dde1af0ee46a78d3582 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Wed, 14 Jan 2015 12:27:28 +0000 Subject: [PATCH] Minor cleanup (coverity) --- servers/slapd/back-meta/config.c | 3 ++- servers/slapd/back-meta/search.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/servers/slapd/back-meta/config.c b/servers/slapd/back-meta/config.c index e3164b01f8..bcf5359743 100644 --- a/servers/slapd/back-meta/config.c +++ b/servers/slapd/back-meta/config.c @@ -1790,7 +1790,7 @@ meta_back_cf_gen( ConfigArgs *c ) case LDAP_BACK_CFG_IDASSERT_AUTHZFROM: { BerVarray *bvp; - bvp = &mt->mt_idassert_authz; break; + bvp = &mt->mt_idassert_authz; if ( c->valx < 0 ) { if ( *bvp != NULL ) { ber_bvarray_free( *bvp ); @@ -2657,6 +2657,7 @@ idassert-authzFrom "dn:" /* re-parse all rewrite rules, up to the one * that needs to be added */ + ca.be = c->be; ca.fname = c->fname; ca.lineno = c->lineno; for ( i = 0; i < ix; i++ ) { diff --git a/servers/slapd/back-meta/search.c b/servers/slapd/back-meta/search.c index eec9d58234..a20e941748 100644 --- a/servers/slapd/back-meta/search.c +++ b/servers/slapd/back-meta/search.c @@ -251,6 +251,7 @@ retry:; Debug( LDAP_DEBUG_ANY, "%s meta_search_dobind_init[%d] mc=%p: " "empty dn with non-empty cred: error\n", op->o_log_prefix, candidate, (void *)mc ); + rc = LDAP_OTHER; goto other; } @@ -335,7 +336,7 @@ down:; if ( *mcp == NULL ) { retcode = META_SEARCH_ERR; - rs->sr_err = LDAP_UNAVAILABLE; + rc = LDAP_UNAVAILABLE; candidates[ candidate ].sr_msgid = META_MSGID_IGNORE; break; } @@ -353,7 +354,6 @@ other:; LDAP_BACK_CONN_TAINTED_SET( mc ); meta_back_release_conn_lock( mi, mc, 0 ); *mcp = NULL; - rs->sr_err = rc; retcode = META_SEARCH_ERR; -- 2.39.5