From 982cbbd84d6ae0614426fc623d532d5a3087d456 Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Thu, 13 Mar 2008 12:29:32 +0000
Subject: [PATCH] kes  Don't zap dcr values during release_volume() as they
 might      have the next Volume to be mounted. kes  Fix AIX prototype.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@6595 91ce42f0-d328-0410-95d8-f526ca767f89
---
 bacula/src/lib/bsys.c      | 2 +-
 bacula/src/stored/append.c | 2 ++
 bacula/src/stored/mount.c  | 6 +++---
 bacula/src/version.h       | 4 ++--
 bacula/technotes-2.3       | 4 ++++
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/bacula/src/lib/bsys.c b/bacula/src/lib/bsys.c
index f83a3b9d87..f37f4cf151 100644
--- a/bacula/src/lib/bsys.c
+++ b/bacula/src/lib/bsys.c
@@ -44,7 +44,7 @@
 #endif
 
 #ifdef HAVE_AIX_OS
-extern "C" int initgroups(char *,int);
+extern "C" int initgroups(const char *,int);
 #endif
 
 
diff --git a/bacula/src/stored/append.c b/bacula/src/stored/append.c
index 60278ee3dc..a6ff753814 100644
--- a/bacula/src/stored/append.c
+++ b/bacula/src/stored/append.c
@@ -296,6 +296,7 @@ bool do_append_data(JCR *jcr)
       }
       if (dev->VolCatInfo.VolCatName[0] == 0) {
          Pmsg0(000, _("NULL Volume name. This shouldn't happen!!!\n"));
+         Dmsg0(000, _("NULL Volume name. This shouldn't happen!!!\n"));
       }
       Dmsg0(90, "back from write_end_session_label()\n");
       /* Flush out final partial block of this session */
@@ -307,6 +308,7 @@ bool do_append_data(JCR *jcr)
       }
       if (dev->VolCatInfo.VolCatName[0] == 0) {
          Pmsg0(000, _("NULL Volume name. This shouldn't happen!!!\n"));
+         Dmsg0(000, _("NULL Volume name. This shouldn't happen!!!\n"));
       }
    }
 
diff --git a/bacula/src/stored/mount.c b/bacula/src/stored/mount.c
index 10f7a117f4..0feccef489 100644
--- a/bacula/src/stored/mount.c
+++ b/bacula/src/stored/mount.c
@@ -169,7 +169,7 @@ mount_next_vol:
    if (job_canceled(jcr)) {
       return false;
    }
-   Dmsg1(150, "want vol=%s\n", dcr->VolumeName);
+   Dmsg2(150, "want vol=%s dev=%s\n", dcr->VolumeName, dev->VolHdr.VolumeName);
 
    if (dev->poll && dev->has_cap(CAP_CLOSEONPOLL)) {
       dev->close();
@@ -596,14 +596,14 @@ void release_volume(DCR *dcr)
    dev->block_num = dev->file = 0;
    dev->EndBlock = dev->EndFile = 0;
    memset(&dev->VolCatInfo, 0, sizeof(dev->VolCatInfo));
-   memset(&dcr->VolCatInfo, 0, sizeof(dcr->VolCatInfo));
+// memset(&dcr->VolCatInfo, 0, sizeof(dcr->VolCatInfo));
    dev->clear_volhdr();
    /* Force re-read of label */
    dev->clear_labeled();
    dev->clear_read();
    dev->clear_append();
    dev->label_type = B_BACULA_LABEL;
-   dcr->VolumeName[0] = 0;
+// dcr->VolumeName[0] = 0;
 
    if (dev->is_open() && (!dev->is_tape() || !dev->has_cap(CAP_ALWAYSOPEN))) {
       dev->close();
diff --git a/bacula/src/version.h b/bacula/src/version.h
index 0999616fac..06b1344af7 100644
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -4,8 +4,8 @@
 
 #undef  VERSION
 #define VERSION "2.3.12"
-#define BDATE   "11 March 2008"
-#define LSMDATE "11Mar08"
+#define BDATE   "13 March 2008"
+#define LSMDATE "13Mar08"
 
 #define PROG_COPYRIGHT "Copyright (C) %d-2008 Free Software Foundation Europe e.V.\n"
 #define BYEAR "2008"       /* year for copyright messages in progs */
diff --git a/bacula/technotes-2.3 b/bacula/technotes-2.3
index 4b186e36b5..fa346df8f0 100644
--- a/bacula/technotes-2.3
+++ b/bacula/technotes-2.3
@@ -1,6 +1,10 @@
               Technical notes on version 2.3
 
 General:
+13Mar08
+kes  Don't zap dcr values during release_volume() as they might
+     have the next Volume to be mounted.
+kes  Fix AIX prototype.
 12Mar08
 kes  Second cut of drive switching during backup.
 11Mar08
-- 
2.39.5