MySQL 4.0 fixes -- kes22Jul02

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

diff --git a/bacula/kernstodo b/bacula/kernstodo
index 242b5681c6730d25887ebd131ce9444219f61b36..3b283e8f2ef6e49883e750fe6ce5d8ea2595ce24 100644 (file)
--- a/bacula/kernstodo
+++ b/bacula/kernstodo
@@ -11,6 +11,8 @@ To do:
 - Document specifically how to add new File daemon to config files.
 - Document forcing a new tape to be used.
 
+- Eliminate MySQL shared libraries from smtp and daemons not
+  using MySQL.
 - Pass "Catalog Files = no" to storage daemon to eliminate
   network traffic.
 - Implement alter_sqlite_tables

diff --git a/bacula/src/cats/create_mysql_database.in b/bacula/src/cats/create_mysql_database.in
index 4313515899088665150282f0e3618be3f383aed8..f0bae06f484dede67f7b556d4f79e9e7178e5d95 100644 (file)
--- a/bacula/src/cats/create_mysql_database.in
+++ b/bacula/src/cats/create_mysql_database.in
@@ -2,4 +2,15 @@
 #
 # shell script to create Bacula database(s)
 #
-#  Nothing to do 
+
+bindir=@SQL_BINDIR@
+
+if $bindir/mysql -f <<END-OF-DATA
+CREATE DATABASE bacula;
+END-OF-DATA
+then
+   echo "Creation of bacula database succeeded."
+else
+   echo "Creation of bacula database failed."
+fi
+exit 0

diff --git a/bacula/src/cats/create_sqlite_database.in b/bacula/src/cats/create_sqlite_database.in
index 4313515899088665150282f0e3618be3f383aed8..e2bb8ee0ef2dc9d125c2fb603f4c1307702e60c7 100644 (file)
--- a/bacula/src/cats/create_sqlite_database.in
+++ b/bacula/src/cats/create_sqlite_database.in
@@ -1,5 +1,10 @@
 #!/bin/sh
 #
-# shell script to create Bacula database(s)
-#
-#  Nothing to do 
+# shell script to create Bacula SQLite tables
+
+bindir=@SQL_BINDIR@
+cd @working_dir@
+
+$bindir/sqlite bacula.db <<END-OF-DATA
+END-OF-DATA
+exit 0

diff --git a/bacula/src/cats/mysql.c b/bacula/src/cats/mysql.c
index 6ba7279403a90d413284d488a5865d57d22fcd6e..f2e94b81ee50ec71b7e2c2f0d4b694731bb7cd29 100644 (file)
--- a/bacula/src/cats/mysql.c
+++ b/bacula/src/cats/mysql.c
@@ -295,7 +295,7 @@ list_result(B_DB *mdb, DB_LIST_HANDLER *send, void *ctx)
    sql_field_seek(mdb, 0);
    for (i = 0; i < sql_num_fields(mdb); i++) {
       field = sql_fetch_field(mdb);
-      sprintf(buf, " %-*s |", field->max_length, field->name);
+      sprintf(buf, " %-*s |", (int)field->max_length, field->name);
       send(ctx, buf);
    }
    send(ctx, "\n");
@@ -307,12 +307,12 @@ list_result(B_DB *mdb, DB_LIST_HANDLER *send, void *ctx)
       for (i = 0; i < sql_num_fields(mdb); i++) {
         field = sql_fetch_field(mdb);
         if (row[i] == NULL) {
-            sprintf(buf, " %-*s |", field->max_length, "NULL");
+            sprintf(buf, " %-*s |", (int)field->max_length, "NULL");
         } else if (IS_NUM(field->type)) {
-            sprintf(buf, " %*s |", field->max_length,       
+            sprintf(buf, " %*s |", (int)field->max_length,       
               add_commas(row[i], ewc));
         } else {
-            sprintf(buf, " %-*s |", field->max_length, row[i]);
+            sprintf(buf, " %-*s |", (int)field->max_length, row[i]);
         }
         send(ctx, buf);
       }

diff --git a/bacula/src/dird/ua_cmds.c b/bacula/src/dird/ua_cmds.c
index 83228fff2b6e72a99370f858eac660730a83ff2f..841f56405f70bca4e2a03ee50e913249ddeb602a 100644 (file)
--- a/bacula/src/dird/ua_cmds.c
+++ b/bacula/src/dird/ua_cmds.c
@@ -219,6 +219,10 @@ getVolName:
       bsendmsg(ua, _("Volume name too long.\n"));
       goto getVolName;
    }
+   if (strlen(ua->cmd) == 0) {
+      bsendmsg(ua, _("Volume name must be at least one character long.\n"));
+      goto getVolName;
+   }
 
    strcpy(name, ua->cmd);
    if (num > 0) {
@@ -1118,6 +1122,10 @@ gotVol:
       bsendmsg(ua, _("Volume name too long.\n"));
       goto getVol;
    }
+   if (strlen(ua->cmd) == 0) {
+      bsendmsg(ua, _("Volume name must be at least one character long.\n"));
+      goto getVol;
+   }
 
    memset(&mr, 0, sizeof(mr));
    strcpy(mr.VolumeName, ua->cmd);

diff --git a/bacula/src/version.h b/bacula/src/version.h
index df41c22102b2aa5cf3278385641dddcc5eda0dc6..0ffb565361b90ab73c4079cd300b0dc1ae667293 100644 (file)
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -1,8 +1,8 @@
 /* */
 #define VERSION "1.23"
 #define VSTRING "1"
-#define DATE    "20 July 2002"
-#define LSMDATE "20Jul02"
+#define DATE    "22 July 2002"
+#define LSMDATE "22Jul02"
 
 /* Debug flags */
 #define DEBUG 1