nss-pam-ldapd commit: r1735 - in nss-pam-ldapd: man nslcd pynslcd

[Commits of the nss-pam-ldapd project <nss-pam-ldapd-commits [at] lists.arthurdejong.org>]

Author: arthur
Date: Fri Aug 31 10:30:10 2012
New Revision: 1735
URL: http://arthurdejong.org/viewvc/nss-pam-ldapd?revision=1735&view=revision

Log:
change the default value of sasl_canonicalize to yes (thanks Marcus Moeller)

Modified:
   nss-pam-ldapd/man/nslcd.conf.5.xml
   nss-pam-ldapd/nslcd/cfg.c
   nss-pam-ldapd/pynslcd/cfg.py

Modified: nss-pam-ldapd/man/nslcd.conf.5.xml
==============================================================================
--- nss-pam-ldapd/man/nslcd.conf.5.xml  Tue Aug 14 21:45:58 2012        (r1734)
+++ nss-pam-ldapd/man/nslcd.conf.5.xml  Fri Aug 31 10:30:10 2012        (r1735)
@@ -289,7 +289,7 @@
        Determines whether the <acronym>LDAP</acronym> server host name should
        be canonicalised. If this is set to yes the <acronym>LDAP</acronym>
        library will do a reverse host name lookup.
-       By default <command>nslcd</command> disables this extra lookup.
+       By default this extra lookup is performed.
       </para>
      </listitem>
     </varlistentry>

Modified: nss-pam-ldapd/nslcd/cfg.c
==============================================================================
--- nss-pam-ldapd/nslcd/cfg.c   Tue Aug 14 21:45:58 2012        (r1734)
+++ nss-pam-ldapd/nslcd/cfg.c   Fri Aug 31 10:30:10 2012        (r1735)
@@ -111,7 +111,9 @@
   cfg->ldc_sasl_authcid=NULL;
   cfg->ldc_sasl_authzid=NULL;
   cfg->ldc_sasl_secprops=NULL;
-  cfg->ldc_sasl_canonicalize=0;
+#ifdef LDAP_OPT_X_SASL_NOCANON
+  cfg->ldc_sasl_canonicalize=1;
+#endif /* LDAP_OPT_X_SASL_NOCANON */
   for (i=0;i<NSS_LDAP_CONFIG_MAX_BASES;i++)
     cfg->ldc_bases[i]=NULL;
   cfg->ldc_scope=LDAP_SCOPE_SUBTREE;

Modified: nss-pam-ldapd/pynslcd/cfg.py
==============================================================================
--- nss-pam-ldapd/pynslcd/cfg.py        Tue Aug 14 21:45:58 2012        (r1734)
+++ nss-pam-ldapd/pynslcd/cfg.py        Fri Aug 31 10:30:10 2012        (r1735)
@@ -52,7 +52,7 @@
 sasl_authcid = None
 sasl_authzid = None
 sasl_secprops = None
-sasl_canonicalize = False
+sasl_canonicalize = True
 
 # LDAP bases to search
 bases = []
-- 
To unsubscribe send an email to
nss-pam-ldapd-commits-unsubscribe@lists.arthurdejong.org or see
http://lists.arthurdejong.org/nss-pam-ldapd-commits/