From c475eaff9af8c2a4bd7b50db68086b5a04858c31 Mon Sep 17 00:00:00 2001 From: Hallvard Furuseth Date: Mon, 4 May 2015 21:05:57 +0200 Subject: [PATCH] ITS#8092 fix previous fix. slap_auxprop_lookup() returns void with old sasl versions. --- servers/slapd/sasl.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/servers/slapd/sasl.c b/servers/slapd/sasl.c index 32bb691db3..137b7244cb 100644 --- a/servers/slapd/sasl.c +++ b/servers/slapd/sasl.c @@ -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 -- 2.39.5