]> git.sur5r.net Git - openldap/commitdiff
ITS#8092 fix previous fix.
authorHallvard Furuseth <h.b.furuseth@usit.uio.no>
Mon, 4 May 2015 19:05:57 +0000 (21:05 +0200)
committerHallvard Furuseth <h.b.furuseth@usit.uio.no>
Mon, 4 May 2015 19:05:57 +0000 (21:05 +0200)
slap_auxprop_lookup() returns void with old sasl versions.

servers/slapd/sasl.c

index 32bb691db3ea3c4a45647db96894aa31a66f5dce..137b7244cb8e947bd287ab7779b5d24b904f1991 100644 (file)
@@ -347,8 +347,10 @@ slap_auxprop_lookup(
        }
 
        /* we don't know anything about this, ignore it */
-       if ( !conn )
-               return SASL_OK;
+       if ( !conn ) {
+               rc == LDAP_SUCCESS;
+               goto done;
+       }
 
        /* Now see what else needs to be fetched */
        for( i = 0; sl.list[i].name; i++ ) {
@@ -503,6 +505,7 @@ retry_dontUseCopy:;
                        }
                }
        }
+done:;
 #if SASL_VERSION_FULL >= 0x020118
        return rc != LDAP_SUCCESS ? SASL_FAIL : SASL_OK;
 #endif