X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fopenldap.c;h=8053929015935ca6e2be51a66f09484c05803ef0;hb=532328916d6a3037b67a6c3916079931c3429050;hp=50757db8ac513017c954a690cd227b0e2291ea02;hpb=01761867ced7bc5fe71546baf350be4a3e800600;p=collectd.git diff --git a/src/openldap.c b/src/openldap.c index 50757db8..80539290 100644 --- a/src/openldap.c +++ b/src/openldap.c @@ -85,7 +85,7 @@ static int cldap_init_host(cldap_t *st) /* {{{ */ if (st->state && st->ld) { DEBUG("openldap plugin: Already connected to %s", st->url); - return (0); + return 0; } rc = ldap_initialize(&ld, st->url); @@ -147,7 +147,7 @@ static int cldap_init_host(cldap_t *st) /* {{{ */ } else { DEBUG("openldap plugin: Successfully connected to %s", st->url); st->state = 1; - return (0); + return 0; } } /* }}} static cldap_init_host */ @@ -200,14 +200,14 @@ static int cldap_read_host(user_data_t *ud) /* {{{ */ if ((ud == NULL) || (ud->data == NULL)) { ERROR("openldap plugin: cldap_read_host: Invalid user data."); - return (-1); + return -1; } st = (cldap_t *)ud->data; status = cldap_init_host(st); if (status != 0) - return (-1); + return -1; rc = ldap_search_ext_s(st->ld, "cn=Monitor", LDAP_SCOPE_SUBTREE, "(|(!(cn=* *))(cn=Database*))", attrs, 0, NULL, NULL, @@ -376,7 +376,7 @@ static int cldap_read_host(user_data_t *ud) /* {{{ */ } ldap_msgfree(result); - return (0); + return 0; } /* }}} int cldap_read_host */ /* Configuration handling functions {{{ @@ -397,13 +397,13 @@ static int cldap_config_add(oconfig_item_t *ci) /* {{{ */ st = calloc(1, sizeof(*st)); if (st == NULL) { ERROR("openldap plugin: calloc failed."); - return (-1); + return -1; } status = cf_util_get_string(ci, &st->name); if (status != 0) { sfree(st); - return (status); + return status; } st->starttls = 0; @@ -495,10 +495,10 @@ static int cldap_config_add(oconfig_item_t *ci) /* {{{ */ if (status != 0) { cldap_free(st); - return (-1); + return -1; } - return (0); + return 0; } /* }}} int cldap_config_add */ static int cldap_config(oconfig_item_t *ci) /* {{{ */ @@ -518,7 +518,7 @@ static int cldap_config(oconfig_item_t *ci) /* {{{ */ child->key); } /* for (ci->children) */ - return (status); + return status; } /* }}} int cldap_config */ /* }}} End of configuration handling functions */ @@ -529,7 +529,7 @@ static int cldap_init(void) /* {{{ */ * ldap_initialize(3) */ int debug_level; ldap_get_option(NULL, LDAP_OPT_DEBUG_LEVEL, &debug_level); - return (0); + return 0; } /* }}} int cldap_init */ static int cldap_shutdown(void) /* {{{ */ @@ -540,7 +540,7 @@ static int cldap_shutdown(void) /* {{{ */ sfree(databases); databases_num = 0; - return (0); + return 0; } /* }}} int cldap_shutdown */ void module_register(void) /* {{{ */