diff options
| author | Arthur de Jong <arthur@arthurdejong.org> | 2009-06-03 16:19:06 +0200 |
|---|---|---|
| committer | Arthur de Jong <arthur@arthurdejong.org> | 2009-06-03 16:19:06 +0200 |
| commit | b93c56416bf4395657d4d7388ae686167fac006f (patch) | |
| tree | c9fdc93e89146c2eae879b55d4362828dcd32cb8 /nslcd/cfg.c | |
| parent | 1ca8e125849b93866b692d64b948e43f65ff4d63 (diff) | |
remove SSL/TLS warning messages during startup
git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-ldapd@925 ef36b2f9-881f-0410-afb5-c4e39611909c
Diffstat (limited to 'nslcd/cfg.c')
| -rw-r--r-- | nslcd/cfg.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/nslcd/cfg.c b/nslcd/cfg.c index 87a9bed..d7fde81 100644 --- a/nslcd/cfg.c +++ b/nslcd/cfg.c @@ -858,9 +858,7 @@ static void cfg_read(const char *filename,struct ldap_config *cfg) else if ( (strcasecmp(keyword,"tls_reqcert")==0) || (strcasecmp(keyword,"tls_checkpeer")==0) ) { - if (strcasecmp(keyword,"tls_reqcert")==0) - log_log(LOG_WARNING,"%s:%d: option %s is currently untested (please report any successes)",filename,lnr,keyword); - else + 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); @@ -869,7 +867,6 @@ static void cfg_read(const char *filename,struct ldap_config *cfg) } else if (strcasecmp(keyword,"tls_cacertdir")==0) { - log_log(LOG_WARNING,"%s:%d: option %s is currently untested (please report any successes)",filename,lnr,keyword); get_strdup(filename,lnr,keyword,&line,&value); get_eol(filename,lnr,keyword,&line); /* TODO: check that the path is valid */ @@ -879,7 +876,6 @@ static void cfg_read(const char *filename,struct ldap_config *cfg) } else if (strcasecmp(keyword,"tls_cacertfile")==0) { - log_log(LOG_WARNING,"%s:%d: option %s is currently untested (please report any successes)",filename,lnr,keyword); get_strdup(filename,lnr,keyword,&line,&value); get_eol(filename,lnr,keyword,&line); /* TODO: check that the path is valid */ @@ -889,7 +885,6 @@ static void cfg_read(const char *filename,struct ldap_config *cfg) } else if (strcasecmp(keyword,"tls_randfile")==0) { - log_log(LOG_WARNING,"%s:%d: option %s is currently untested (please report any successes)",filename,lnr,keyword); get_strdup(filename,lnr,keyword,&line,&value); get_eol(filename,lnr,keyword,&line); /* TODO: check that the path is valid */ @@ -899,7 +894,6 @@ static void cfg_read(const char *filename,struct ldap_config *cfg) } else if (strcasecmp(keyword,"tls_ciphers")==0) { - log_log(LOG_WARNING,"%s:%d: option %s is currently untested (please report any successes)",filename,lnr,keyword); get_restdup(filename,lnr,keyword,&line,&value); log_log(LOG_DEBUG,"ldap_set_option(LDAP_OPT_X_TLS_CIPHER_SUITE,\"%s\")",value); LDAP_SET_OPTION(NULL,LDAP_OPT_X_TLS_CIPHER_SUITE,value); @@ -907,7 +901,6 @@ static void cfg_read(const char *filename,struct ldap_config *cfg) } else if (strcasecmp(keyword,"tls_cert")==0) { - log_log(LOG_WARNING,"%s:%d: option %s is currently untested (please report any successes)",filename,lnr,keyword); get_strdup(filename,lnr,keyword,&line,&value); get_eol(filename,lnr,keyword,&line); /* TODO: check that the path is valid */ @@ -917,7 +910,6 @@ static void cfg_read(const char *filename,struct ldap_config *cfg) } else if (strcasecmp(keyword,"tls_key")==0) { - log_log(LOG_WARNING,"%s:%d: option %s is currently untested (please report any successes)",filename,lnr,keyword); get_strdup(filename,lnr,keyword,&line,&value); get_eol(filename,lnr,keyword,&line); /* TODO: check that the path is valid */ |