From f213c9dfe7e97e3355c84d60735cf457e60e7c77 Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Fri, 14 Sep 2007 16:56:40 +0000
Subject: [PATCH] kes  Fix bacula_cats.def for new db_escape_string(). kes 
 Increase size of name string when FD making connection to SD.      May fix
 bug #953.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@5556 91ce42f0-d328-0410-95d8-f526ca767f89
---
 bacula/src/stored/dircmd.c            | 4 ++--
 bacula/src/version.h                  | 4 ++--
 bacula/src/win32/cats/bacula_cats.def | 2 +-
 bacula/technotes-2.3                  | 4 ++++
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/bacula/src/stored/dircmd.c b/bacula/src/stored/dircmd.c
index ccc54dc166..cd0153e8f5 100644
--- a/bacula/src/stored/dircmd.c
+++ b/bacula/src/stored/dircmd.c
@@ -148,7 +148,7 @@ void *handle_connection_request(void *arg)
    int i;
    bool found, quit;
    int bnet_stat = 0;
-   char name[MAX_NAME_LENGTH];
+   char name[500];
 
    if (bs->recv() <= 0) {
       Emsg0(M_ERROR, 0, _("Connection request failed.\n"));
@@ -159,7 +159,7 @@ void *handle_connection_request(void *arg)
    /*
     * Do a sanity check on the message received
     */
-   if (bs->msglen < 25 || bs->msglen > (int)sizeof(name)+100) {
+   if (bs->msglen < 25 || bs->msglen > (int)sizeof(name)) {
       Dmsg1(000, "<filed: %s", bs->msg);
       Emsg1(M_ERROR, 0, _("Invalid connection. Len=%d\n"), bs->msglen);
       bs->close();
diff --git a/bacula/src/version.h b/bacula/src/version.h
index 4cf4e1e2aa..55e6c1b621 100644
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -4,8 +4,8 @@
 
 #undef  VERSION
 #define VERSION "2.3.4"
-#define BDATE   "12 September 2007"
-#define LSMDATE "12Sep07"
+#define BDATE   "14 September 2007"
+#define LSMDATE "14Sep07"
 
 #define PROG_COPYRIGHT "Copyright (C) %d-2007 Free Software Foundation Europe e.V.\n"
 #define BYEAR "2007"       /* year for copyright messages in progs */
diff --git a/bacula/src/win32/cats/bacula_cats.def b/bacula/src/win32/cats/bacula_cats.def
index 04f56127a7..671872631f 100644
--- a/bacula/src/win32/cats/bacula_cats.def
+++ b/bacula/src/win32/cats/bacula_cats.def
@@ -93,7 +93,7 @@ _Z28db_add_digest_to_file_recordP3JCRP4B_DBjPci
 _Z11db_get_typev
 _Z12db_sql_queryP4B_DBPKcPFiPviPPcES3_
 _Z13db_next_indexP3JCRP4B_DBPcS3_
-_Z16db_escape_stringPcS_i
+_Z16db_escape_stringP3JCRP4B_DBPcS3_i
 _Z16db_init_databaseP3JCRPKcS2_S2_S2_iS2_i
 _Z16db_open_databaseP3JCRP4B_DB
 _Z17db_close_databaseP3JCRP4B_DB
diff --git a/bacula/technotes-2.3 b/bacula/technotes-2.3
index 658c56473e..3e8c0d755c 100644
--- a/bacula/technotes-2.3
+++ b/bacula/technotes-2.3
@@ -1,6 +1,10 @@
               Technical notes on version 2.3
 
 General:
+14Sep07
+kes  Fix bacula_cats.def for new db_escape_string().
+kes  Increase size of name string when FD making connection to SD.
+     May fix bug #953.
 13Sep07
 kes  Add code to help Dan debug 2drive-incremental-2disk test.
 kes  Add code to try to fix bug #908.
-- 
2.39.5