nss-pam-ldapd commit: r1150 - 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:28:56 2010
New Revision: 1150
URL: http://arthurdejong.org/viewvc/nss-pam-ldapd?view=rev&revision=1150

Log:
remove warning messages from parsing the sasl_* options and document them in 
the nslcd.conf(5) manual page (they should be functional)

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

Modified: nss-pam-ldapd/man/nslcd.conf.5.xml
==============================================================================
--- nss-pam-ldapd/man/nslcd.conf.5.xml  Fri Jun 18 22:26:26 2010        (r1149)
+++ nss-pam-ldapd/man/nslcd.conf.5.xml  Fri Jun 18 22:28:56 2010        (r1150)
@@ -201,7 +201,6 @@
    </variablelist>
   </refsect2>
 
-<!-- DO NOT DOCUMENT FOR NOW BECAUSE IT'S NOT SUPPORTED
   <refsect2 id="sasl_authentication_options">
    <title><acronym>SASL</acronym> authentication options</title>
    <variablelist>
@@ -262,7 +261,6 @@
 
    </variablelist>
   </refsect2>
--->
 
   <refsect2 id="kerberos_authentication_options">
    <title>Kerberos authentication options</title>

Modified: nss-pam-ldapd/nslcd/cfg.c
==============================================================================
--- nss-pam-ldapd/nslcd/cfg.c   Fri Jun 18 22:26:26 2010        (r1149)
+++ nss-pam-ldapd/nslcd/cfg.c   Fri Jun 18 22:28:56 2010        (r1150)
@@ -97,11 +97,11 @@
   cfg->ldc_binddn=NULL;
   cfg->ldc_bindpw=NULL;
   cfg->ldc_rootpwmoddn=NULL;
+  cfg->ldc_sasl_mech=NULL;
+  cfg->ldc_sasl_realm=NULL;
   cfg->ldc_sasl_authcid=NULL;
   cfg->ldc_sasl_authzid=NULL;
   cfg->ldc_sasl_secprops=NULL;
-  cfg->ldc_sasl_mech=NULL;
-  cfg->ldc_sasl_realm=NULL;
   for (i=0;i<NSS_LDAP_CONFIG_MAX_BASES;i++)
     cfg->ldc_bases[i]=NULL;
   cfg->ldc_scope=LDAP_SCOPE_SUBTREE;
@@ -818,39 +818,34 @@
       get_restdup(filename,lnr,keyword,&line,&cfg->ldc_rootpwmoddn);
     }
     /* SASL authentication options */
-    else if (strcasecmp(keyword,"sasl_authcid")==0)
-    {
-      log_log(LOG_WARNING,"%s:%d: option %s is currently not fully supported 
(please report any successes)",filename,lnr,keyword);
-      get_strdup(filename,lnr,keyword,&line,&cfg->ldc_sasl_authcid);
-      get_eol(filename,lnr,keyword,&line);
-    }
-    else if (strcasecmp(keyword,"sasl_authzid")==0)
+    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_strdup(filename,lnr,keyword,&line,&cfg->ldc_sasl_authzid);
-      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);
     }
     else if (strcasecmp(keyword,"sasl_mech")==0)
     {
-      log_log(LOG_WARNING,"%s:%d: option %s is currently not fully supported 
(please report any successes)",filename,lnr,keyword);
       get_strdup(filename,lnr,keyword,&line,&cfg->ldc_sasl_mech);
       get_eol(filename,lnr,keyword,&line);
     }
     else if (strcasecmp(keyword,"sasl_realm")==0)
     {
-      log_log(LOG_WARNING,"%s:%d: option %s is currently not fully supported 
(please report any successes)",filename,lnr,keyword);
       get_strdup(filename,lnr,keyword,&line,&cfg->ldc_sasl_realm);
       get_eol(filename,lnr,keyword,&line);
     }
-    else if (strcasecmp(keyword,"sasl_secprops")==0)
+    else if (strcasecmp(keyword,"sasl_authcid")==0)
     {
-      log_log(LOG_WARNING,"%s:%d: option %s is currently not fully supported 
(please report any successes)",filename,lnr,keyword);
-      get_strdup(filename,lnr,keyword,&line,&cfg->ldc_sasl_secprops);
+      get_strdup(filename,lnr,keyword,&line,&cfg->ldc_sasl_authcid);
       get_eol(filename,lnr,keyword,&line);
     }
-    else if (strcasecmp(keyword,"use_sasl")==0)
+    else if (strcasecmp(keyword,"sasl_authzid")==0)
     {
-      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);
+      get_strdup(filename,lnr,keyword,&line,&cfg->ldc_sasl_authzid);
+      get_eol(filename,lnr,keyword,&line);
+    }
+    else if (strcasecmp(keyword,"sasl_secprops")==0)
+    {
+      get_strdup(filename,lnr,keyword,&line,&cfg->ldc_sasl_secprops);
+      get_eol(filename,lnr,keyword,&line);
     }
     /* 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 22:26:26 2010        (r1149)
+++ nss-pam-ldapd/nslcd/cfg.h   Fri Jun 18 22:28:56 2010        (r1150)
@@ -95,16 +95,16 @@
   char *ldc_bindpw;
   /* bind DN for password modification by administrator */
   char *ldc_rootpwmoddn;
+  /* sasl mech */
+  char *ldc_sasl_mech;
+  /* sasl realm */
+  char *ldc_sasl_realm;
   /* sasl authentication id */
   char *ldc_sasl_authcid;
   /* sasl authorization id */
   char *ldc_sasl_authzid;
   /* sasl security */
   char *ldc_sasl_secprops;
-  /* sasl mech */
-  char *ldc_sasl_mech;
-  /* sasl realm */
-  char *ldc_sasl_realm;
   /* base DN, eg. dc=gnu,dc=org */
   const char *ldc_bases[NSS_LDAP_CONFIG_MAX_BASES];
   /* scope for searches */
--
To unsubscribe send an email to
nss-pam-ldapd-commits-unsubscribe@lists.arthurdejong.org or see
http://lists.arthurdejong.org/nss-pam-ldapd-commits