Minor cleanup (coverity)

diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c
index 22143341925dad381b728d298e71474eb589955e..783a604f41988713d9cf6329c8d7c995a370a205 100644 (file)
--- 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 cdc17d9e77900dffb4d0237986ab75a6650948dc..2fcf0e0cacceeb360ba6f0e95b8d4f5100eecabe 100644 (file)
--- 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 8958a581dee382a9c235640d650c1cdcfc5e300e..08b7da8209f96fded5c8db9e00e33c8be0d8b28e 100644 (file)
--- 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 {