then
with_libcurl="yes"
else
- if test -x "$withval"
+ if test -f "$withval" && test -x "$withval"
then
with_curl_config="$withval"
with_libcurl="yes"
with_curl_config="$withval/bin/curl-config"
with_libcurl="yes"
fi; fi
+ with_libcurl="yes"
fi; fi
],
[
then
with_libmysql="yes"
else
- if test -x "$withval";
+ if test -f "$withval" && test -x "$withval";
then
with_mysql_config="$withval"
else if test -x "$withval/bin/mysql_config"
then
with_mysql_config="$withval/bin/mysql_config"
fi; fi
+ with_libmysql="yes"
fi; fi
],
[
then
with_libupsclient="no"
else
- with_libupsclient="yes"
if test "x$withval" != "xyes"
then
- if test -x "$withval"
+ if test -f "$withval" && test -x "$withval";
then
with_upsclient_config="$withval"
else
with_upsclient_config="$withval/bin/libupsclient-config"
fi
fi
+ with_libupsclient="yes"
fi
],
[
[
if test "x$withval" != "xno" -a "x$withval" != "xyes"
then
- if test -x "$withval/bin/xmms-config"
+ if test -f "$withval" && test -x "$withval";
+ then
+ with_xmms_config="$withval"
+ else if test -x "$withval/bin/xmms-config"
then
with_xmms_config="$withval/bin/xmms-config"
- fi
- fi
- if test "x$withval" = "xno"
+ fi; fi
+ with_libxmms="yes"
+ else if test "x$withval" = "xno"
then
with_libxmms="no"
else
with_libxmms="yes"
- fi
+ fi; fi
],
[
with_libxmms="yes"
snmp_sess_error (host->sess_handle, NULL, NULL, &errstr);
- ERROR ("snmp plugin: snmp_sess_close failed: %s",
- (errstr == NULL) ? "Unknown problem" : errstr);
+ ERROR ("snmp plugin: host %s: snmp_sess_close failed: %s",
+ host->name, (errstr == NULL) ? "Unknown problem" : errstr);
sfree (errstr);
}
snmp_error (&sess, NULL, NULL, &errstr);
- ERROR ("snmp plugin: snmp_sess_open failed: %s",
- (errstr == NULL) ? "Unknown problem" : errstr);
+ ERROR ("snmp plugin: host %s: snmp_sess_open failed: %s",
+ host->name, (errstr == NULL) ? "Unknown problem" : errstr);
sfree (errstr);
}
} /* void csnmp_host_open_session */
if ((vl->type == ASN_INTEGER)
|| (vl->type == ASN_UINTEGER)
|| (vl->type == ASN_COUNTER)
+#ifdef ASN_TIMETICKS
+ || (vl->type == ASN_TIMETICKS)
+#endif
|| (vl->type == ASN_GAUGE))
{
temp = (uint32_t) *vl->val.integer;
DEBUG ("snmp plugin: csnmp_read_table (host = %s, data = %s)",
host->name, data->name);
+ if (host->sess_handle == NULL)
+ {
+ DEBUG ("snmp plugin: csnmp_read_table: host->sess_handle == NULL");
+ return (-1);
+ }
+
ds = plugin_get_ds (data->type);
if (!ds)
{
char *errstr = NULL;
snmp_sess_error (host->sess_handle, NULL, NULL, &errstr);
- ERROR ("snmp plugin: snmp_sess_synch_response failed: %s",
- (errstr == NULL) ? "Unknown problem" : errstr);
+ ERROR ("snmp plugin: host %s: snmp_sess_synch_response failed: %s",
+ host->name, (errstr == NULL) ? "Unknown problem" : errstr);
csnmp_host_close_session (host);
status = -1;
DEBUG ("snmp plugin: csnmp_read_value (host = %s, data = %s)",
host->name, data->name);
+ if (host->sess_handle == NULL)
+ {
+ DEBUG ("snmp plugin: csnmp_read_table: host->sess_handle == NULL");
+ return (-1);
+ }
+
ds = plugin_get_ds (data->type);
if (!ds)
{
char *errstr = NULL;
snmp_sess_error (host->sess_handle, NULL, NULL, &errstr);
- ERROR ("snmp plugin: snmp_sess_synch_response failed: %s",
- (errstr == NULL) ? "Unknown problem" : errstr);
+ ERROR ("snmp plugin: host %s: snmp_sess_synch_response failed: %s",
+ host->name, (errstr == NULL) ? "Unknown problem" : errstr);
csnmp_host_close_session (host);
sfree (errstr);
int i;
if (host_head == NULL)
+ {
+ NOTICE ("snmp plugin: No host has been defined.");
return (-1);
+ }
call_snmp_init_once ();
threads = (pthread_t *) malloc (threads_num * sizeof (pthread_t));
if (threads == NULL)
+ {
+ ERROR ("snmp plugin: malloc failed.");
return (-1);
+ }
memset (threads, '\0', threads_num * sizeof (pthread_t));
for (i = 0; i < threads_num; i++)