nss-pam-ldapd commit: r1148 - in nss-pam-ldapd: man nslcd

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

Author: arthur
Date: Fri Jun 18 22:20:12 2010
New Revision: 1148
URL: http://arthurdejong.org/viewvc/nss-pam-ldapd?view=rev&revision=1148

Log:
remove the use_sasl option and instead rely on sasl_mech being specified

Modified:
   nss-pam-ldapd/man/nslcd.conf.5.xml
   nss-pam-ldapd/nslcd/cfg.c
   nss-pam-ldapd/nslcd/cfg.h
   nss-pam-ldapd/nslcd/myldap.c

Modified: nss-pam-ldapd/man/nslcd.conf.5.xml
==============================================================================
--- nss-pam-ldapd/man/nslcd.conf.5.xml  Fri Jun 18 17:56:02 2010        (r1147)
+++ nss-pam-ldapd/man/nslcd.conf.5.xml  Fri Jun 18 22:20:12 2010        (r1148)
@@ -207,15 +207,6 @@
    <variablelist>
 
     <varlistentry>
-     <term><option>use_sasl</option> yes|no</term>
-     <listitem>
-      <para>
-       Specifies whether <acronym>SASL</acronym> authentication should be used.
-      </para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry>
      <term><option>sasl_mech</option> 
<replaceable>MECHANISM</replaceable></term>
      <listitem>
       <para>

Modified: nss-pam-ldapd/nslcd/cfg.c
==============================================================================
--- nss-pam-ldapd/nslcd/cfg.c   Fri Jun 18 17:56:02 2010        (r1147)
+++ nss-pam-ldapd/nslcd/cfg.c   Fri Jun 18 22:20:12 2010        (r1148)
@@ -102,7 +102,6 @@
   cfg->ldc_sasl_secprops=NULL;
   cfg->ldc_sasl_mech=NULL;
   cfg->ldc_sasl_realm=NULL;
-  cfg->ldc_usesasl=0;
   for (i=0;i<NSS_LDAP_CONFIG_MAX_BASES;i++)
     cfg->ldc_bases[i]=NULL;
   cfg->ldc_scope=LDAP_SCOPE_SUBTREE;
@@ -851,9 +850,7 @@
     }
     else if (strcasecmp(keyword,"use_sasl")==0)
     {
-      log_log(LOG_WARNING,"%s:%d: option %s is currently not fully supported 
(please report any successes)",filename,lnr,keyword);
-      get_boolean(filename,lnr,keyword,&line,&cfg->ldc_usesasl);
-      get_eol(filename,lnr,keyword,&line);
+      log_log(LOG_WARNING,"%s:%d: option %s is deprecated (and will be removed 
in an upcoming release), use sasl_mech instead",filename,lnr,keyword);
     }
     /* Kerberos authentication options */
     else if (strcasecmp(keyword,"krb5_ccname")==0)

Modified: nss-pam-ldapd/nslcd/cfg.h
==============================================================================
--- nss-pam-ldapd/nslcd/cfg.h   Fri Jun 18 17:56:02 2010        (r1147)
+++ nss-pam-ldapd/nslcd/cfg.h   Fri Jun 18 22:20:12 2010        (r1148)
@@ -105,8 +105,6 @@
   char *ldc_sasl_mech;
   /* sasl realm */
   char *ldc_sasl_realm;
-  /* do we use sasl when binding? */
-  int ldc_usesasl;
   /* base DN, eg. dc=gnu,dc=org */
   const char *ldc_bases[NSS_LDAP_CONFIG_MAX_BASES];
   /* scope for searches */

Modified: nss-pam-ldapd/nslcd/myldap.c
==============================================================================
--- nss-pam-ldapd/nslcd/myldap.c        Fri Jun 18 17:56:02 2010        (r1147)
+++ nss-pam-ldapd/nslcd/myldap.c        Fri Jun 18 22:20:12 2010        (r1148)
@@ -397,7 +397,7 @@
   }
 #ifdef HAVE_LDAP_SASL_INTERACTIVE_BIND_S
   /* TODO: store this information in the session */
-  if (!nslcd_cfg->ldc_usesasl)
+  if (nslcd_cfg->ldc_sasl_mech==NULL)
   {
 #endif /* HAVE_LDAP_SASL_INTERACTIVE_BIND_S */
     /* do a simple bind */
--
To unsubscribe send an email to
nss-pam-ldapd-commits-unsubscribe@lists.arthurdejong.org or see
http://lists.arthurdejong.org/nss-pam-ldapd-commits