Remove fast block rejection. Fix label overwrite on multiple concurrent jobs

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

diff --git a/bacula/src/dird/ua_input.c b/bacula/src/dird/ua_input.c
index 3321fddf0ceb7d167acf07fc4eadababa2f2be5e..39c4e33ebff8582d8e82da27b91d9ab737cb3900 100644 (file)
--- a/bacula/src/dird/ua_input.c
+++ b/bacula/src/dird/ua_input.c
@@ -55,7 +55,6 @@ int get_cmd(UAContext *ua, char *prompt)
       if (is_bnet_stop(sock)) {
         return 0;                    /* error or terminate */
       }
-      Dmsg1(000, "sock->msglen=%d\n", sock->msglen);
       pm_strcpy(&ua->cmd, sock->msg);
       strip_trailing_junk(ua->cmd);
       if (strcmp(ua->cmd, ".messages") == 0) {

diff --git a/bacula/src/stored/read_record.c b/bacula/src/stored/read_record.c
index 4b0d3a4eba78e24d67dc725f420aed4ca9d0ebb7..277e5778a8e9cd8c05ba6204c00044e507b5c90b 100644 (file)
--- a/bacula/src/stored/read_record.c
+++ b/bacula/src/stored/read_record.c
@@ -115,8 +115,7 @@ int read_records(JCR *jcr,  DEVICE *dev,
         }
       }
       Dmsg2(100, "New block at position=(file:block) %d:%d\n", dev->file, dev->block_num);
-#define FAST_BLOCK_REJECTION
-#ifdef FAST_BLOCK_REJECTION
+#ifdef if_and_when_FAST_BLOCK_REJECTION_is_working
       /* this does not stop when file/block are too big */
       if (!match_bsr_block(jcr->bsr, block)) {
         if (try_repositioning(jcr, rec, dev)) {

diff --git a/bacula/src/version.h b/bacula/src/version.h
index 4add2c20e9b35749b34f263deca6310abba88dea..1179048aa39cca24dd73912661f96b4aef987372 100644 (file)
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -2,8 +2,8 @@
 #undef  VERSION
 #define VERSION "1.33"
 #define VSTRING "1"
-#define BDATE   "06 Dec 2003"
-#define LSMDATE "06Dec03"
+#define BDATE   "07 Dec 2003"
+#define LSMDATE "07Dec03"
 
 /* Debug flags */
 #undef  DEBUG