Permalink
Browse files

'users' was detected as an unknown configuration key entry by both the

LDAP and MySQL validators. Fixes http://bugs.cherokee-project.com/1251
Thanks to David James Breitkreutz for reporting the problem!

git-svn-id: svn://cherokee-project.com/cherokee/trunk@6833 5dc97367-97f1-0310-9951-d761b3857238
  • Loading branch information...
1 parent a85a3a2 commit 02f74bced48e84747a51e85e4931e4d5af783216 @alobbs alobbs committed Sep 5, 2011
Showing with 7 additions and 6 deletions.
  1. +3 −2 cherokee/validator_ldap.c
  2. +4 −4 cherokee/validator_mysql.c
@@ -118,8 +118,9 @@ cherokee_validator_ldap_configure (cherokee_config_node_t *conf, cherokee_server
cherokee_buffer_add_buffer (&props->ca_file, &subconf->val);
} else if (equal_buf_str (&subconf->key, "methods") ||
- equal_buf_str (&subconf->key, "realm")) {
- /* Not handled here
+ equal_buf_str (&subconf->key, "realm") ||
+ equal_buf_str (&subconf->key, "users")) {
+ /* Handled in validator.c
*/
} else {
LOG_WARNING (CHEROKEE_ERROR_VALIDATOR_LDAP_KEY, subconf->key.buf);
@@ -122,10 +122,10 @@ cherokee_validator_mysql_configure (cherokee_config_node_t *conf, cherokee_serve
return ret_error;
}
- } else if ((equal_buf_str (&subconf->key, "methods") ||
- equal_buf_str (&subconf->key, "realm")))
- {
- /* not handled here
+ } else if (equal_buf_str (&subconf->key, "methods") ||
+ equal_buf_str (&subconf->key, "realm") ||
+ equal_buf_str (&subconf->key, "users")) {
+ /* Handled in validator.c
*/
} else {
LOG_CRITICAL (CHEROKEE_ERROR_VALIDATOR_MYSQL_KEY, subconf->key.buf);

0 comments on commit 02f74bc

Please sign in to comment.