upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-16 11:57:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
W. Trevor King 2012-05-30 09:39:54 -07:00 committed by Howard Chu
parent df1d118de8
commit 5cf4fbc74d
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
clients/tools/common.c
View file

@ -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 )