* Copyright (C) 2007 Florent EppO Monbillard
*
* This program is free software; you can redistribute it and/or modify it
* Copyright (C) 2007 Florent EppO Monbillard
*
* This program is free software; you can redistribute it and/or modify it
static size_t apache_curl_callback (void *buf, size_t size, size_t nmemb, void *stream)
{
static size_t apache_curl_callback (void *buf, size_t size, size_t nmemb, void *stream)
{
- if (snprintf (credentials, 1024, "%s:%s", user, pass == NULL ? "" : pass) >= 1024)
+ int status;
+
+ status = snprintf (credentials, sizeof (credentials), "%s:%s",
+ user, (pass == NULL) ? "" : pass);
+ if (status >= sizeof (credentials))
strcpy (vl.host, hostname_g);
strcpy (vl.plugin, "apache");
strcpy (vl.plugin_instance, "");
strcpy (vl.host, hostname_g);
strcpy (vl.plugin, "apache");
strcpy (vl.plugin_instance, "");
- strncpy (vl.type_instance, type_instance, sizeof (vl.type_instance));
+
+ if (type_instance != NULL)
+ {
+ strncpy (vl.type_instance, type_instance,
+ sizeof (vl.type_instance));
+ vl.type_instance[sizeof (vl.type_instance) - 1] = '\0';
+ }
plugin_dispatch_values (type, &vl);
} /* void submit_counter */
static void submit_gauge (const char *type, const char *type_instance,
plugin_dispatch_values (type, &vl);
} /* void submit_counter */
static void submit_gauge (const char *type, const char *type_instance,
strcpy (vl.plugin_instance, "");
if (type_instance != NULL)
strcpy (vl.plugin_instance, "");
if (type_instance != NULL)
strncpy (vl.type_instance, type_instance,
sizeof (vl.type_instance));
strncpy (vl.type_instance, type_instance,
sizeof (vl.type_instance));
plugin_dispatch_values (type, &vl);
} /* void submit_counter */
plugin_dispatch_values (type, &vl);
} /* void submit_counter */
plugin_register_config ("apache", config,
config_keys, config_keys_num);
plugin_register_init ("apache", init);
plugin_register_read ("apache", apache_read);
plugin_register_config ("apache", config,
config_keys, config_keys_num);
plugin_register_init ("apache", init);
plugin_register_read ("apache", apache_read);