From: Howard Chu <hyc@openldap.org>
Date: Fri, 21 Nov 2008 05:15:20 +0000 (+0000)
Subject: Fix prev commit
X-Git-Tag: ACLCHECK_0~1063
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a6933cae276b6e5632b9bc188b80d1349eb3dd09;p=openldap

Fix prev commit
---

diff --git a/libraries/libldap/cyrus.c b/libraries/libldap/cyrus.c
index 263df1be36..a886d7d1c9 100644
--- a/libraries/libldap/cyrus.c
+++ b/libraries/libldap/cyrus.c
@@ -1024,7 +1024,10 @@ ldap_int_sasl_get_option( LDAP *ld, int option, void *arg )
 int
 ldap_int_sasl_set_option( LDAP *ld, int option, void *arg )
 {
-	if ( ld == NULL || arg == NULL )
+	if ( ld == NULL )
+		return -1;
+
+	if ( arg == NULL && option != LDAP_OPT_X_SASL_NOCANON )
 		return -1;
 
 	switch ( option ) {