diff options
| author | Arthur de Jong <arthur@arthurdejong.org> | 2012-12-30 15:16:09 +0100 |
|---|---|---|
| committer | Arthur de Jong <arthur@arthurdejong.org> | 2012-12-30 15:16:09 +0100 |
| commit | 4ebb0dd099d1d17af59da7c51b9cd29d3fe0b8ae (patch) | |
| tree | baeb8e5c1e535205f3acdaabd11a1c8001621cd4 /nslcd/cfg.c | |
| parent | 29c1800b82980207bde4c4a61d489ace25dcb2d4 (diff) | |
remove deprecated use_sasl, reconnect_tries, reconnect_maxsleeptime and tls_checkpeer options which have been replaced some time ago
git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-pam-ldapd@1890 ef36b2f9-881f-0410-afb5-c4e39611909c
Diffstat (limited to 'nslcd/cfg.c')
| -rw-r--r-- | nslcd/cfg.c | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/nslcd/cfg.c b/nslcd/cfg.c index b32821a..0004092 100644 --- a/nslcd/cfg.c +++ b/nslcd/cfg.c @@ -986,11 +986,6 @@ static void cfg_read(const char *filename, struct ldap_config *cfg) 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 @@ static void cfg_read(const char *filename, struct ldap_config *cfg) 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 @@ static void cfg_read(const char *filename, struct ldap_config *cfg) 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); |