From: Howard Chu <hyc@openldap.org>
Date: Wed, 14 Jan 2015 11:14:43 +0000 (+0000)
Subject: Minor cleanup (coverity)
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=82a2b4882e6d104071839a943d82bb350f624b34;p=openldap

Minor cleanup (coverity)
---

diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c
index 2214334192..783a604f41 100644
--- a/servers/slapd/bconfig.c
+++ b/servers/slapd/bconfig.c
@@ -3203,9 +3203,9 @@ config_suffix(ConfigArgs *c)
 	if(tbe == c->be) {
 		Debug( LDAP_DEBUG_ANY, "%s: suffix already served by this backend!.\n",
 			c->log, 0, 0);
-		return 1;
 		free(pdn.bv_val);
 		free(ndn.bv_val);
+		return 1;
 	} else if(tbe) {
 		BackendDB *b2 = tbe;
 
diff --git a/servers/slapd/config.c b/servers/slapd/config.c
index cdc17d9e77..2fcf0e0cac 100644
--- a/servers/slapd/config.c
+++ b/servers/slapd/config.c
@@ -1353,9 +1353,8 @@ slap_keepalive_parse(
 			s = ++next;
 		}
 
-		if ( s == '\0' ) {
+		if ( *s == '\0' ) {
 			sk2.sk_interval = 0;
-			s++;
 
 		} else {
 			sk2.sk_interval = strtol( s, &next, 10 );
diff --git a/servers/slapd/modify.c b/servers/slapd/modify.c
index 8958a581de..08b7da8209 100644
--- a/servers/slapd/modify.c
+++ b/servers/slapd/modify.c
@@ -747,7 +747,6 @@ slap_sort_vals(
 				if ( match == 0 ) goto done;
 			}
 			if ( jstack == 0 ) break;
-			if ( match == 0 ) break;
 			ir = istack[jstack--];
 			l = istack[jstack--];
 		} else {