You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
68 lines
2.0 KiB
68 lines
2.0 KiB
Index: base/logging.c |
|
--- base/logging.c.orig 2007-10-29 00:21:29 +0100 |
|
+++ base/logging.c 2008-05-28 08:27:03 +0200 |
|
@@ -204,6 +204,7 @@ |
|
|
|
/* write something to the syslog facility */ |
|
int write_to_syslog(char *buffer, unsigned long data_type){ |
|
+static int logopen = 0; |
|
|
|
if(buffer==NULL) |
|
return ERROR; |
|
@@ -220,6 +221,12 @@ |
|
if(!(data_type & syslog_options)) |
|
return OK; |
|
|
|
+ /* OSSP fsl identification */ |
|
+ if (!logopen) { |
|
+ openlog("nagios", LOG_NDELAY, LOG_USER); |
|
+ logopen = 1; |
|
+ } |
|
+ |
|
/* write the buffer to the syslog facility */ |
|
syslog(LOG_USER|LOG_INFO,"%s",buffer); |
|
|
|
Index: base/utils.c |
|
--- base/utils.c.orig 2008-03-10 21:58:33 +0100 |
|
+++ base/utils.c 2008-05-28 08:27:03 +0200 |
|
@@ -499,7 +499,7 @@ |
|
/* report an error if we couldn't run the command */ |
|
if(fp==NULL){ |
|
|
|
- strncpy(buffer,"(Error: Could not execute command)\n",sizeof(buffer)-1); |
|
+ snprintf(buffer,sizeof(buffer)-1,"(Error: Could not execute command \"%s\")", cmd); |
|
buffer[sizeof(buffer)-1]='\x0'; |
|
|
|
/* write the error back to the parent process */ |
|
Index: nagios-plugins-1.4.14/configure |
|
--- nagios-plugins-1.4.14/configure.orig 2008-05-28 00:05:10 +0200 |
|
+++ nagios-plugins-1.4.14/configure 2008-05-28 08:27:03 +0200 |
|
@@ -22427,8 +22427,8 @@ |
|
fi |
|
|
|
if test "$ac_cv_lib_ldap_main" = "yes"; then |
|
- LDAPLIBS="-lldap -llber"\ |
|
- LDAPINCLUDE="-I/usr/include/ldap" |
|
+ LDAPLIBS="-lldap -llber -lssl -lcrypto" |
|
+ LDAPINCLUDE="-I$prefix/include" |
|
|
|
|
|
|
|
@@ -26074,17 +26074,10 @@ |
|
|
|
{ echo "$as_me:$LINENO: checking for ICMP ping syntax" >&5 |
|
echo $ECHO_N "checking for ICMP ping syntax... $ECHO_C" >&6; } |
|
-ac_cv_ping_packets_first=no |
|
-ac_cv_ping_has_timeout=no |
|
if test -n "$with_ping_command" |
|
then |
|
{ echo "$as_me:$LINENO: result: (command-line) $with_ping_command" >&5 |
|
echo "${ECHO_T}(command-line) $with_ping_command" >&6; } |
|
- if test -n "$ac_cv_ping_packets_first" |
|
- then |
|
- ac_cv_ping_packets_first=yes |
|
- ac_cv_ping_has_timeout=yes |
|
- fi |
|
|
|
elif [ "z$ac_cv_uname_s" = "zUnixWare" ] && \ |
|
$PATH_TO_PING -n -s 127.0.0.1 56 1 2>/dev/null | \
|
|
|