Simone Caronni 457a0b
diff -Naur bacula-7.0.1/examples/nagios/check_bacula/authenticate.c bacula-7.0.1.new/examples/nagios/check_bacula/authenticate.c
Simone Caronni 457a0b
--- bacula-7.0.1/examples/nagios/check_bacula/authenticate.c	2014-03-31 20:51:34.000000000 +0200
Simone Caronni 457a0b
+++ bacula-7.0.1.new/examples/nagios/check_bacula/authenticate.c	2014-04-01 16:45:15.315588066 +0200
Simone Caronni 457a0b
@@ -50,12 +50,14 @@
Simone Caronni 457a0b
 /* Response from Director */
Simone Caronni 457a0b
 static char DIROKhello[]   = "1000 OK:";
Simone Caronni 457a0b
 
Simone Caronni 457a0b
-/* Commands sent to Storage daemon and File daemon and received
Simone Caronni 457a0b
- *  from the User Agent */
Simone Caronni 457a0b
-static char SDFDhello[]    = "Hello Director %s calling\n";
Simone Caronni 457a0b
+/* Commands sent to Storage daemon */
Simone Caronni 457a0b
+static char SDhello[]     = "Hello SD: Bacula Director %s calling\n";
Simone Caronni 457a0b
+
Simone Caronni 457a0b
+/* Commands sent to  File daemon */
Simone Caronni 457a0b
+static char FDhello[]     = "Hello Director %s calling\n";
Simone Caronni 457a0b
 
Simone Caronni 457a0b
 /* Response from SD */
Simone Caronni 457a0b
-static char SDOKhello[]   = "3000 OK Hello\n";
Simone Caronni 457a0b
+static char SDOKhello[]  = "3000 OK Hello";
Simone Caronni 457a0b
 /* Response from FD */
Simone Caronni 457a0b
 static char FDOKhello[] = "2000 OK Hello";
Simone Caronni 457a0b
 
Simone Caronni 457a0b
@@ -114,7 +116,7 @@
Simone Caronni 457a0b
    bash_spaces(dirname);
Simone Caronni 457a0b
    /* Timeout Hello after 5 mins */
Simone Caronni 457a0b
    btimer_t *tid = start_bsock_timer(sd, 60 * 5);
Simone Caronni 457a0b
-   if (!sd->fsend(SDFDhello, dirname)) {
Simone Caronni 457a0b
+   if (!sd->fsend(SDhello, dirname)) {
Simone Caronni 457a0b
       stop_bsock_timer(tid);
Simone Caronni 457a0b
       return 0;
Simone Caronni 457a0b
    }
Simone Caronni 457a0b
@@ -130,7 +132,7 @@
Simone Caronni 457a0b
    }
Simone Caronni 457a0b
    Dmsg1(110, "<stored: %s", sd->msg);
Simone Caronni 457a0b
    stop_bsock_timer(tid);
Simone Caronni 457a0b
-   if (strncmp(sd->msg, SDOKhello, sizeof(SDOKhello)) != 0) {
Simone Caronni 457a0b
+   if (strncmp(sd->msg, SDOKhello, strlen(SDOKhello)) != 0) {
Simone Caronni 457a0b
       return 0;
Simone Caronni 457a0b
    }
Simone Caronni 457a0b
    return 1;
Simone Caronni 457a0b
@@ -153,7 +155,7 @@
Simone Caronni 457a0b
    bash_spaces(dirname);
Simone Caronni 457a0b
    /* Timeout Hello after 5 mins */
Simone Caronni 457a0b
    btimer_t *tid = start_bsock_timer(fd, 60 * 5);
Simone Caronni 457a0b
-   if (!fd->fsend(SDFDhello, dirname)) {
Simone Caronni 457a0b
+   if (!fd->fsend(FDhello, dirname)) {
Simone Caronni 457a0b
       stop_bsock_timer(tid);
Simone Caronni 457a0b
       return 0;
Simone Caronni 457a0b
    }
Simone Caronni 457a0b
diff -Naur bacula-7.0.1/examples/nagios/check_bacula/Makefile.in bacula-7.0.1.new/examples/nagios/check_bacula/Makefile.in
Simone Caronni 457a0b
--- bacula-7.0.1/examples/nagios/check_bacula/Makefile.in	2014-03-31 20:51:34.000000000 +0200
Simone Caronni 457a0b
+++ bacula-7.0.1.new/examples/nagios/check_bacula/Makefile.in	2014-04-01 16:46:12.364115625 +0200
Simone Caronni 457a0b
@@ -70,7 +70,7 @@
Simone Caronni 457a0b
 	(cd $(srcdir); $(RMF) Makefile)
Simone Caronni 457a0b
 
Simone Caronni 457a0b
 install: all
Simone Caronni 457a0b
-	$(INSTALL_PROGRAM) check_bacula $(DESTDIR)$(sbindir)/check_bacula
Simone Caronni 457a0b
+	$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) check_bacula $(DESTDIR)$(sbindir)/check_bacula
Simone Caronni 457a0b
 
Simone Caronni 457a0b
 uninstall:
Simone Caronni 457a0b
 	(cd $(DESTDIR)$(sbindir); $(RMF) check_bacula)
Simone Caronni 457a0b
diff -Naur bacula-7.0.1/examples/nagios/check_bacula/makeit bacula-7.0.1.new/examples/nagios/check_bacula/makeit
Simone Caronni 457a0b
--- bacula-7.0.1/examples/nagios/check_bacula/makeit	2014-03-31 20:51:34.000000000 +0200
Simone Caronni 457a0b
+++ bacula-7.0.1.new/examples/nagios/check_bacula/makeit	1970-01-01 01:00:00.000000000 +0100
Simone Caronni 457a0b
@@ -1,3 +0,0 @@
Simone Caronni 457a0b
-#!/bin/sh
Simone Caronni 457a0b
-
Simone Caronni 457a0b
-make LIBS="-lpthread -ldl -lssl -lcrypto -lz"