ITS#7271 Don't clobber SASL_NOCANON in clients/tools/common.c

diff --git a/clients/tools/common.c b/clients/tools/common.c
index 9c98b620a98ac7ce7c4cbd49325e5918faef88e0..e928fb287d7ab7f701d6927177366820491d958c 100644 (file)
--- a/clients/tools/common.c
+++ b/clients/tools/common.c
@@ -1410,12 +1410,13 @@ dnssrv_free:;
 
 #ifdef HAVE_CYRUS_SASL
                /* canon */
-               if( ldap_set_option( ld, LDAP_OPT_X_SASL_NOCANON,
-                       nocanon ? LDAP_OPT_ON : LDAP_OPT_OFF ) != LDAP_OPT_SUCCESS )
-               {
-                       fprintf( stderr, "Could not set LDAP_OPT_X_SASL_NOCANON %s\n",
-                               nocanon ? "on" : "off" );
-                       tool_exit( ld, EXIT_FAILURE );
+               if( nocanon ) {
+                       if( ldap_set_option( ld, LDAP_OPT_X_SASL_NOCANON,
+                               LDAP_OPT_ON ) != LDAP_OPT_SUCCESS )
+                       {
+                               fprintf( stderr, "Could not set LDAP_OPT_X_SASL_NOCANON on\n" );
+                               tool_exit( ld, EXIT_FAILURE );
+                       }
                }
 #endif
                if( ldap_set_option( ld, LDAP_OPT_PROTOCOL_VERSION, &protocol )