diff -Naur bacula-5.0.3.old/examples/nagios/check_bacula/authenticate.c bacula-5.0.3/examples/nagios/check_bacula/authenticate.c
--- bacula-5.0.3.old/examples/nagios/check_bacula/authenticate.c	2011-12-23 14:16:46.510066504 +0100
+++ bacula-5.0.3/examples/nagios/check_bacula/authenticate.c	2011-12-23 14:17:16.562632437 +0100
@@ -57,9 +57,7 @@
 /* Response from SD */
 static char SDOKhello[]   = "3000 OK Hello\n";
 /* Response from FD */
-static char FDOKhello[] = "2000 OK Hello\n";
-static char FD3OKhello[] = "2000 OK Hello 1\n";
-static char FD31OKhello[] = "2000 OK Hello 2\n";
+static char FDOKhello[] = "2000 OK Hello";
 
 /* Forward referenced functions */
 
@@ -171,9 +169,7 @@
    }
    Dmsg1(110, "<stored: %s", fd->msg);
    stop_bsock_timer(tid);
-   if ((strncmp(fd->msg, FDOKhello, sizeof(FDOKhello)) != 0) &&
-       (strncmp(fd->msg, FD3OKhello, sizeof(FD3OKhello)) != 0) &&
-       (strncmp(fd->msg, FD31OKhello, sizeof(FD31OKhello)) != 0) ) {
+   if ((strncmp(fd->msg, FDOKhello, strlen(FDOKhello)) != 0)) {
       return 0;
    }
    return 1;
diff -Naur bacula-5.0.3.old/examples/nagios/check_bacula/check_bacula.c bacula-5.0.3/examples/nagios/check_bacula/check_bacula.c
--- bacula-5.0.3.old/examples/nagios/check_bacula/check_bacula.c	2011-12-23 14:16:46.510066504 +0100
+++ bacula-5.0.3/examples/nagios/check_bacula/check_bacula.c	2011-12-23 14:17:23.122755977 +0100
@@ -268,7 +268,7 @@
 
    int stat;
    char num;
-   char *dname;
+   const char *dname;
    
    dname = "";