X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fopenldap.c;h=227c8e1149161a6a9ba8a7e62e45e604745949c8;hb=ff0d8b0879c81f4743f38637063c0e26194f3e00;hp=8053929015935ca6e2be51a66f09484c05803ef0;hpb=867ad628dc6fcd05bd584b605d7093cfc00c3d07;p=collectd.git

diff --git a/src/openldap.c b/src/openldap.c
index 80539290..227c8e11 100644
--- a/src/openldap.c
+++ b/src/openldap.c
@@ -314,8 +314,8 @@ static int cldap_read_host(user_data_t *ud) /* {{{ */
         if ((olmbdb_list =
                  ldap_get_values_len(st->ld, e, "olmBDBEntryCache")) != NULL) {
           olmbdb_data = *olmbdb_list[0];
-          ssnprintf(typeinst, sizeof(typeinst), "bdbentrycache-%s",
-                    nc_data.bv_val);
+          snprintf(typeinst, sizeof(typeinst), "bdbentrycache-%s",
+                   nc_data.bv_val);
           cldap_submit_gauge("cache_size", typeinst, atoll(olmbdb_data.bv_val),
                              st);
           ldap_value_free_len(olmbdb_list);
@@ -324,8 +324,7 @@ static int cldap_read_host(user_data_t *ud) /* {{{ */
         if ((olmbdb_list = ldap_get_values_len(st->ld, e, "olmBDBDNCache")) !=
             NULL) {
           olmbdb_data = *olmbdb_list[0];
-          ssnprintf(typeinst, sizeof(typeinst), "bdbdncache-%s",
-                    nc_data.bv_val);
+          snprintf(typeinst, sizeof(typeinst), "bdbdncache-%s", nc_data.bv_val);
           cldap_submit_gauge("cache_size", typeinst, atoll(olmbdb_data.bv_val),
                              st);
           ldap_value_free_len(olmbdb_list);
@@ -334,8 +333,8 @@ static int cldap_read_host(user_data_t *ud) /* {{{ */
         if ((olmbdb_list = ldap_get_values_len(st->ld, e, "olmBDBIDLCache")) !=
             NULL) {
           olmbdb_data = *olmbdb_list[0];
-          ssnprintf(typeinst, sizeof(typeinst), "bdbidlcache-%s",
-                    nc_data.bv_val);
+          snprintf(typeinst, sizeof(typeinst), "bdbidlcache-%s",
+                   nc_data.bv_val);
           cldap_submit_gauge("cache_size", typeinst, atoll(olmbdb_data.bv_val),
                              st);
           ldap_value_free_len(olmbdb_list);
@@ -480,16 +479,17 @@ static int cldap_config_add(oconfig_item_t *ci) /* {{{ */
       databases[databases_num] = st;
       databases_num++;
 
-      ssnprintf(callback_name, sizeof(callback_name), "openldap/%s/%s",
-                (st->host != NULL) ? st->host : hostname_g,
-                (st->name != NULL) ? st->name : "default");
+      snprintf(callback_name, sizeof(callback_name), "openldap/%s/%s",
+               (st->host != NULL) ? st->host : hostname_g,
+               (st->name != NULL) ? st->name : "default");
 
       status = plugin_register_complex_read(/* group = */ NULL,
                                             /* name      = */ callback_name,
                                             /* callback  = */ cldap_read_host,
-                                            /* interval  = */ 0, &(user_data_t){
-                                                                     .data = st,
-                                                                 });
+                                            /* interval  = */ 0,
+                                            &(user_data_t){
+                                                .data = st,
+                                            });
     }
   }
 
@@ -535,7 +535,7 @@ static int cldap_init(void) /* {{{ */
 static int cldap_shutdown(void) /* {{{ */
 {
   for (size_t i = 0; i < databases_num; i++)
-    if (databases[i]->ld != NULL)
+    if (databases[i] != NULL && databases[i]->ld != NULL)
       ldap_unbind_ext_s(databases[i]->ld, NULL, NULL);
   sfree(databases);
   databases_num = 0;