]> granicus.if.org Git - sudo/commitdiff
Fix use_sasl vs. rootuse_sasl logic.
authorTodd C. Miller <Todd.Miller@courtesan.com>
Sun, 15 Jul 2007 16:47:53 +0000 (16:47 +0000)
committerTodd C. Miller <Todd.Miller@courtesan.com>
Sun, 15 Jul 2007 16:47:53 +0000 (16:47 +0000)
ldap.c

diff --git a/ldap.c b/ldap.c
index 500057c16986454532409782dc5602c770cbb737..f965d925ce26ec124c796b8e8f171470f9ff1b2c 100644 (file)
--- a/ldap.c
+++ b/ldap.c
@@ -996,7 +996,8 @@ sudo_ldap_open()
 
 #ifdef HAVE_LDAP_SASL_INTERACTIVE_BIND_S
     /* XXX - should use krb5_ccname from ldap.conf too! */
-    if (ldap_conf.rootuse_sasl != FALSE && ldap_conf.use_sasl == TRUE) {
+    if (ldap_conf.rootuse_sasl == TRUE ||
+       (ldap_conf.rootuse_sasl != FALSE && ldap_conf.use_sasl == TRUE)) {
        void *authid = ldap_conf.rootsasl_authid ?
            ldap_conf.rootsasl_authid : ldap_conf.sasl_authid;