Print length if Hello to short or long

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@415 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/kernstodo b/bacula/kernstodo
index 247851c8a4e6bd39a714b4c89cfa949d53c2c764..4d6d5afe17d5548ffd5300873f1fb2d051a1efc9 100644 (file)
--- a/bacula/kernstodo
+++ b/bacula/kernstodo
@@ -1,5 +1,5 @@
                  Kern's ToDo List
-                  28 March 2003 
+                  3 April 2003 
 
 Documentation to do: (a little bit at a time)
 - Document running a test version.
@@ -20,6 +20,7 @@ Testing to do: (painful)
 - multiple simultaneous Volumes
 
 For 1.30 release:
+- Make non-zero status from RunJobBefore/After error the job.
 - Remove kern and kelvin from mysql_grant...
 - Install grant_mysql...
 - Look at Python for a Bacula scripting language -- www.python.org

diff --git a/bacula/src/dird/authenticate.c b/bacula/src/dird/authenticate.c
index 8cb06f61657b16863636fa4bedfbb378351a1d14..f6a11fb3256b2c303f36f92780447c841fa58486 100644 (file)
--- a/bacula/src/dird/authenticate.c
+++ b/bacula/src/dird/authenticate.c
@@ -127,10 +127,10 @@ int authenticate_file_daemon(JCR *jcr)
 int authenticate_user_agent(BSOCK *ua)
 {
    char name[MAXSTRING];
-   int ok = 0;
+   int ok;    
 
    if (ua->msglen < 16 || ua->msglen >= MAXSTRING-1) {
-      Emsg0(M_ERROR, 0, _("UA Hello is invalid.\n"));
+      Emsg1(M_ERROR, 0, _("UA Hello is invalid. Len=%d\n"), ua->msglen);
       return 0;
    }
 

diff --git a/bacula/src/filed/authenticate.c b/bacula/src/filed/authenticate.c
index 9c4440c1ca9f0b06fcdc36b7a50dce1ea1c1ca5f..93ea4195e2f4a43d43459471b882f21468766a7b 100644 (file)
--- a/bacula/src/filed/authenticate.c
+++ b/bacula/src/filed/authenticate.c
@@ -46,7 +46,7 @@ static int authenticate(int rcode, BSOCK *bs)
       return 0;
    }
    if (bs->msglen < 25 || bs->msglen > 200) {
-      Emsg0(M_FATAL, 0, _("Bad Hello command from Director.\n"));
+      Emsg1(M_FATAL, 0, _("Bad Hello command from Director. Len=%d.\n"), bs->msglen);
       return 0;
    }
    dirname = get_pool_memory(PM_MESSAGE);

diff --git a/bacula/src/stored/authenticate.c b/bacula/src/stored/authenticate.c
index 5d4d670901f11418cca20975c474108d4e3e1e0b..46cc07818b7a59c4425f6f6b2f5b0f0b04434cd6 100644 (file)
--- a/bacula/src/stored/authenticate.c
+++ b/bacula/src/stored/authenticate.c
@@ -47,7 +47,7 @@ static int authenticate(int rcode, BSOCK *bs)
       return 0;
    }
    if (bs->msglen < 25 || bs->msglen > 200) {
-      Emsg0(M_FATAL, 0, _("Bad Hello command from Director.\n"));
+      Emsg1(M_FATAL, 0, _("Bad Hello command from Director. Len=%d.\n"), bs->msglen);
       return 0;
    }
    dirname = get_pool_memory(PM_MESSAGE);