- Fix for create JobMedia so that VolIndex remains valid even

  during a delete Job or pruning -- bug 402.
- Minor tweak for Win32 build.

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

diff --git a/bacula/kes-1.37 b/bacula/kes-1.37
index 081ede7fd5dd3f7beff8c19e9a17a236ad361b75..06636f4a99efac0e62d1dca06a2edb6a7073dfe5 100644 (file)
--- a/bacula/kes-1.37
+++ b/bacula/kes-1.37
@@ -4,6 +4,10 @@
 General:
 
 Changes to 1.37.36:
+19Aug05
+- Fix for create JobMedia so that VolIndex remains valid even
+  during a delete Job or pruning -- bug 402.
+- Minor tweak for Win32 build.
 18Aug05
 - Win32 fix -- remove debug O_NONBLOCK code.
 - Fix bug 399 -- make_catalog_backup does not work for sqlite3

diff --git a/bacula/src/cats/sql_create.c b/bacula/src/cats/sql_create.c
index 9ca0c3abccee34af9066e0b9c1ea0d62f3cb28ba..df042726ce633455a9820172ebea084694289a3e 100644 (file)
--- a/bacula/src/cats/sql_create.c
+++ b/bacula/src/cats/sql_create.c
@@ -109,7 +109,8 @@ db_create_jobmedia_record(JCR *jcr, B_DB *mdb, JOBMEDIA_DBR *jm)
    db_lock(mdb);
 
    /* Now get count for VolIndex */
-   Mmsg(mdb->cmd, "SELECT count(*) from JobMedia");
+   Mmsg(mdb->cmd, "SELECT count(*) from JobMedia WHERE JobId=%s",
+        edit_int64(jm->JobId, ed1));
    count = get_sql_record_max(jcr, mdb);
    if (count < 0) {
       count = 0;

diff --git a/bacula/src/gnome2-console/test-gnome-console.conf b/bacula/src/gnome2-console/test-gnome-console.conf
index fa5f9bcd4e4d6e1ad02dee60391cf08d0feb94c9..b2725a1f9f6e727978cddccb2aa54f1f76c0d9aa 100644 (file)
--- a/bacula/src/gnome2-console/test-gnome-console.conf
+++ b/bacula/src/gnome2-console/test-gnome-console.conf
@@ -5,6 +5,6 @@
 Director {
   Name = rufus-dir
   DIRport = 8101
-  address = localhost
+  address = rufus
   Password = UA_password
 }

diff --git a/bacula/src/version.h b/bacula/src/version.h
index e8d7728daa3ff8a5234055aeb9320196cb2cc6e7..72b91ac05c30e4dbec55f8cf9a7710051d180eb6 100644 (file)
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -4,8 +4,8 @@
 
 #undef  VERSION
 #define VERSION "1.37.36"
-#define BDATE   "18 August 2005"
-#define LSMDATE "18Aug05"
+#define BDATE   "19 August 2005"
+#define LSMDATE "19Aug05"
 
 /* Debug flags */
 #undef  DEBUG

diff --git a/bacula/src/win32/compat/compat.h b/bacula/src/win32/compat/compat.h
index abf97b796a90109a7c63638927c1f9676881e3bc..ee466c0b96f2b39ed5f464ee60026c5de1758f4f 100644 (file)
--- a/bacula/src/win32/compat/compat.h
+++ b/bacula/src/win32/compat/compat.h
@@ -74,10 +74,11 @@
 #include "getopt.h"
 
 #define HAVE_WIN32 1
+#undef HAVE_NLS
 
 #ifndef HAVE_MINGW
 #ifdef HAVE_CYGWIN
-#error should not be used under cygwin...
+#undef HAVE_CYGWIN
 #else
 #endif //HAVE_CYGWIN
 #endif //HAVE_MINGW
@@ -193,7 +194,7 @@ struct stat
 #undef  S_IFDIR
 #define S_IFDIR        0040000         /* directory */
 #define S_IFCHR        0020000         /* character special */
-#define        S_IFBLK        0060000         /* block special */
+#define S_IFBLK        0060000         /* block special */
 #define S_IFIFO        0010000         /* pipe */
 #undef  S_IFREG
 #define S_IFREG        0100000         /* regular */