nss-pam-ldapd commit: r1890 - nss-pam-ldapd/nslcd

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

Author: arthur
Date: Sun Dec 30 15:16:09 2012
New Revision: 1890
URL: http://arthurdejong.org/viewvc/nss-pam-ldapd?revision=1890&view=revision

Log:
remove deprecated use_sasl, reconnect_tries, reconnect_maxsleeptime and 
tls_checkpeer options which have been replaced some time ago

Modified:
   nss-pam-ldapd/nslcd/cfg.c

Modified: nss-pam-ldapd/nslcd/cfg.c
==============================================================================
--- nss-pam-ldapd/nslcd/cfg.c   Sun Dec 30 15:14:34 2012        (r1889)
+++ nss-pam-ldapd/nslcd/cfg.c   Sun Dec 30 15:16:09 2012        (r1890)
@@ -986,11 +986,6 @@
       get_restdup(filename, lnr, keyword, &line, &cfg->rootpwmodpw);
     }
     /* SASL authentication options */
-    else if (strcasecmp(keyword, "use_sasl") == 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);
-    }
     else if (strcasecmp(keyword, "sasl_mech") == 0)
     {
       get_strdup(filename, lnr, keyword, &line, &cfg->sasl_mech);
@@ -1094,20 +1089,13 @@
       get_int(filename, lnr, keyword, &line, &cfg->idle_timelimit);
       get_eol(filename, lnr, keyword, &line);
     }
-    else if (strcasecmp(keyword, "reconnect_tries") == 0)
-      log_log(LOG_WARNING, "%s:%d: option %s has been removed and will be 
ignored",
-              filename, lnr, keyword);
     else if (!strcasecmp(keyword, "reconnect_sleeptime"))
     {
       get_int(filename, lnr, keyword, &line, &cfg->reconnect_sleeptime);
       get_eol(filename, lnr, keyword, &line);
     }
-    else if ((strcasecmp(keyword, "reconnect_retrytime") == 0) ||
-             (strcasecmp(keyword, "reconnect_maxsleeptime") == 0))
+    else if (strcasecmp(keyword, "reconnect_retrytime") == 0)
     {
-      if (strcasecmp(keyword, "reconnect_maxsleeptime") == 0)
-        log_log(LOG_WARNING, "%s:%d: option %s has been renamed to 
reconnect_retrytime",
-                filename, lnr, keyword);
       get_int(filename, lnr, keyword, &line, &cfg->reconnect_retrytime);
       get_eol(filename, lnr, keyword, &line);
     }
@@ -1124,12 +1112,8 @@
         cfg->ssl = SSL_LDAPS;
       get_eol(filename, lnr, keyword, &line);
     }
-    else if ((strcasecmp(keyword, "tls_reqcert") == 0) ||
-             (strcasecmp(keyword, "tls_checkpeer") == 0))
+    else if (strcasecmp(keyword, "tls_reqcert") == 0)
     {
-      if (strcasecmp(keyword, "tls_checkpeer") == 0)
-        log_log(LOG_WARNING, "%s:%d: option %s is deprecated (and will be 
removed in an upcoming release), use tls_reqcert instead",
-                filename, lnr, keyword);
       get_reqcert(filename, lnr, keyword, &line, &i);
       get_eol(filename, lnr, keyword, &line);
       log_log(LOG_DEBUG, "ldap_set_option(LDAP_OPT_X_TLS_REQUIRE_CERT,%d)", i);
-- 
To unsubscribe send an email to
nss-pam-ldapd-commits-unsubscribe@lists.arthurdejong.org or see
http://lists.arthurdejong.org/nss-pam-ldapd-commits/