X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fopenldap.c;h=212310b641b7d66abeb1c7420769bae6f4237ae9;hb=6299d39b903cb87a3db5b6d2148a2d717754a30a;hp=08c65033e07f9906c865bc65110e1a24f7ecbb26;hpb=215a29e1d4cbe5904d348ad5622a6579d089b0ec;p=collectd.git diff --git a/src/openldap.c b/src/openldap.c index 08c65033..212310b6 100644 --- a/src/openldap.c +++ b/src/openldap.c @@ -1,22 +1,29 @@ /** * collectd - src/openldap.c * Copyright (C) 2011 Kimo Rosenbaum + * Copyright (C) 2014 Marc Fournier * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; only version 2 of the License is applicable. + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. * * Authors: * Kimo Rosenbaum + * Marc Fournier **/ #include "collectd.h" @@ -34,30 +41,30 @@ struct ldap_s /* {{{ */ char *cacert; char *host; int state; - int starttls; + _Bool starttls; int timeout; char *url; - int verifyhost; + _Bool verifyhost; int version; LDAP *ld; - char *dn; }; typedef struct ldap_s ldap_t; /* }}} */ static void ldap_free (ldap_t *st) /* {{{ */ { - if(st == NULL) + if (st == NULL) return; sfree (st->cacert); sfree (st->host); sfree (st->name); sfree (st->url); - if(st->ld) - ldap_memfree(st->ld); + if (st->ld) + ldap_memfree (st->ld); sfree (st); } /* }}} void ldap_free */ + /* initialize ldap for each host */ static int ldap_init_host (ldap_t *st) /* {{{ */ { @@ -66,10 +73,10 @@ static int ldap_init_host (ldap_t *st) /* {{{ */ rc = ldap_initialize (&ld, st->url); if (rc != LDAP_SUCCESS) { - char errbuf[1024]; - sstrerror (errno, errbuf, sizeof (errbuf)); - ERROR ("ldap_initialize failed: %s", errbuf); + ERROR ("openldap plugin: ldap_initialize failed: %s", + ldap_err2string (rc)); st->state = 0; + ldap_unbind_ext_s (ld, NULL, NULL); return (-1); } @@ -80,24 +87,24 @@ static int ldap_init_host (ldap_t *st) /* {{{ */ ldap_set_option (st->ld, LDAP_OPT_TIMEOUT, &(const struct timeval){st->timeout, 0}); - if(st->cacert != NULL) + if (st->cacert != NULL) ldap_set_option (st->ld, LDAP_OPT_X_TLS_CACERTFILE, st->cacert); - if(st->verifyhost == 0) + if (st->verifyhost == 0) { int never = LDAP_OPT_X_TLS_NEVER; ldap_set_option (st->ld, LDAP_OPT_X_TLS_REQUIRE_CERT, &never); } - if(st->starttls != 0) + if (st->starttls != 0) { - rc = ldap_start_tls_s(ld, NULL, NULL); + rc = ldap_start_tls_s (ld, NULL, NULL); if (rc != LDAP_SUCCESS) { ERROR ("openldap plugin: Failed to start tls on %s: %s", st->url, ldap_err2string (rc)); st->state = 0; - ldap_unbind_ext_s(st->ld, NULL, NULL); + ldap_unbind_ext_s (st->ld, NULL, NULL); return (-1); } } @@ -106,13 +113,13 @@ static int ldap_init_host (ldap_t *st) /* {{{ */ cred.bv_val = ""; cred.bv_len = 0; - rc = ldap_sasl_bind_s(st->ld, NULL, NULL, &cred, NULL, NULL, NULL); + rc = ldap_sasl_bind_s (st->ld, NULL, NULL, &cred, NULL, NULL, NULL); if (rc != LDAP_SUCCESS) { ERROR ("openldap plugin: Failed to bind to %s: %s", st->url, ldap_err2string (rc)); st->state = 0; - ldap_unbind_ext_s(st->ld, NULL, NULL); + ldap_unbind_ext_s (st->ld, NULL, NULL); return (-1); } else @@ -211,6 +218,7 @@ static int ldap_read_host (user_data_t *ud) /* {{{ */ ERROR ("openldap plugin: Failed to execute search: %s", ldap_err2string (rc)); ldap_msgfree (result); + ldap_unbind_ext_s (st->ld, NULL, NULL); return (-1); } @@ -521,98 +529,13 @@ static int ldap_read_host (user_data_t *ud) /* {{{ */ * */ -static int ldap_config_set_string (char **ret_string, /* {{{ */ - oconfig_item_t *ci) -{ - char *string; - - if ((ci->values_num != 1) - || (ci->values[0].type != OCONFIG_TYPE_STRING)) - { - WARNING ("openldap plugin: The `%s' config option " - "needs exactly one string argument.", ci->key); - return (-1); - } - - string = strdup (ci->values[0].value.string); - if (string == NULL) - { - ERROR ("openldap plugin: strdup failed."); - return (-1); - } - - if (*ret_string != NULL) - free (*ret_string); - *ret_string = string; - - return (0); -} /* }}} int ldap_config_set_string */ - -static int ldap_config_set_int (int *ret_int, /* {{{ */ - oconfig_item_t *ci) -{ - if ((ci->values_num != 1) - || (ci->values[0].type != OCONFIG_TYPE_NUMBER)) - { - WARNING ("openldap plugin: The `%s' config option " - "needs exactly one string argument.", ci->key); - return (-1); - } - - *ret_int = ci->values[0].value.number; - - return (0); -} /* }}} int ldap_config_set_int */ - -static int ldap_config_set_bool (int *ret_boolean, /* {{{ */ - oconfig_item_t *ci) -{ - int status = 0; - - if (ci->values_num != 1) - status = -1; - - if (status == 0) - { - if (ci->values[0].type == OCONFIG_TYPE_BOOLEAN) - *ret_boolean = ci->values[0].value.boolean; - else if (ci->values[0].type == OCONFIG_TYPE_STRING) - { - if (IS_TRUE (ci->values[0].value.string)) - *ret_boolean = 1; - else if (IS_FALSE (ci->values[0].value.string)) - *ret_boolean = 0; - else - status = -1; - } - else - status = -1; - } - - if (status != 0) - { - WARNING ("openldap plugin: The `%s' config option " - "needs exactly one boolean argument.", ci->key); - return (-1); - } - return (0); -} /* }}} int ldap_config_set_bool */ - static int ldap_config_add (oconfig_item_t *ci) /* {{{ */ { ldap_t *st; int i; int status; - if ((ci->values_num != 1) - || (ci->values[0].type != OCONFIG_TYPE_STRING)) - { - WARNING ("openldap plugin: The `%s' config option " - "needs exactly one string argument.", ci->key); - return (-1); - } - - st = (ldap_t *) malloc (sizeof (*st)); + st = malloc (sizeof (*st)); if (st == NULL) { ERROR ("openldap plugin: malloc failed."); @@ -620,13 +543,14 @@ static int ldap_config_add (oconfig_item_t *ci) /* {{{ */ } memset (st, 0, sizeof (*st)); - status = ldap_config_set_string (&st->name, ci); + status = cf_util_get_string (ci, &st->name); if (status != 0) { sfree (st); return (status); } + st->starttls = 0; st->timeout = -1; st->verifyhost = 1; st->version = LDAP_VERSION3; @@ -636,17 +560,17 @@ static int ldap_config_add (oconfig_item_t *ci) /* {{{ */ oconfig_item_t *child = ci->children + i; if (strcasecmp ("CACert", child->key) == 0) - status = ldap_config_set_string (&st->cacert, child); + status = cf_util_get_string (child, &st->cacert); else if (strcasecmp ("StartTLS", child->key) == 0) - status = ldap_config_set_bool (&st->starttls, child); + status = cf_util_get_boolean (child, &st->starttls); else if (strcasecmp ("Timeout", child->key) == 0) - status = ldap_config_set_int (&st->timeout, child); + status = cf_util_get_int (child, &st->timeout); else if (strcasecmp ("URL", child->key) == 0) - status = ldap_config_set_string (&st->url, child); + status = cf_util_get_string (child, &st->url); else if (strcasecmp ("VerifyHost", child->key) == 0) - status = ldap_config_set_bool (&st->verifyhost, child); + status = cf_util_get_boolean (child, &st->verifyhost); else if (strcasecmp ("Version", child->key) == 0) - status = ldap_config_set_int (&st->version, child); + status = cf_util_get_int (child, &st->version); else { WARNING ("openldap plugin: Option `%s' not allowed here.", @@ -673,7 +597,7 @@ static int ldap_config_add (oconfig_item_t *ci) /* {{{ */ LDAPURLDesc *ludpp; int rc; - if ((rc = ldap_url_parse( st->url, &ludpp)) != 0) + if ((rc = ldap_url_parse (st->url, &ludpp)) != 0) { ERROR ("openldap plugin: Instance `%s': " "Invalid URL: `%s'", @@ -685,7 +609,7 @@ static int ldap_config_add (oconfig_item_t *ci) /* {{{ */ st->host = strdup (ludpp->lud_host); } - ldap_free_urldesc(ludpp); + ldap_free_urldesc (ludpp); } if (status == 0) @@ -747,9 +671,8 @@ static int ldap_init (void) /* {{{ */ /* Initialize LDAP library while still single-threaded as recommended in * ldap_initialize(3) */ int debug_level; - ldap_get_option(NULL, LDAP_OPT_DEBUG_LEVEL, &debug_level); + ldap_get_option (NULL, LDAP_OPT_DEBUG_LEVEL, &debug_level); return (0); - } /* }}} int ldap_init */ void module_register (void) /* {{{ */