Fix postgresql port again + update win32 version and date

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

diff --git a/bacula/kernstodo b/bacula/kernstodo
index 38ec23c59c8efa61b351c3e2a911c3d02da171ce..24249fc5e64acb714bec1c532b3be4e423bdea8e 100644 (file)
--- a/bacula/kernstodo
+++ b/bacula/kernstodo
@@ -113,6 +113,7 @@ From Chris Hull:
 - Estimate to Tibs never returns.
 
 - Later:
+- Make btape accept Device Names in addition to Archive names.
 - Add Events and Perl scripting.
 - Add John's appended files:
    Appended = {     /files/server/logs/http/*log   }

diff --git a/bacula/src/cats/postgresql.c b/bacula/src/cats/postgresql.c
index f5655946bf694d889f63fd65ac4bae0f2df31fd8..af7b8d312ea71f7440dabccee5f73c5dc3d4385b 100644 (file)
--- a/bacula/src/cats/postgresql.c
+++ b/bacula/src/cats/postgresql.c
@@ -117,7 +117,7 @@ int
 db_open_database(JCR *jcr, B_DB *mdb)
 {
    int errstat;
-   char port[10];
+   char buf[10], *port;
 
    P(mutex);
    if (mdb->connected) {
@@ -133,10 +133,11 @@ db_open_database(JCR *jcr, B_DB *mdb)
       return 0;
    }
 
-   if (mdb->db_port && mdb->db_port[0]) {
-      bsnprintf(port, sizeof(port), "%d", mdb->db_port);
+   if (mdb->db_port) {
+      bsnprintf(buf, sizeof(buf), "%d", mdb->db_port);
+      port = buf;
    } else {
-      port[0] = 0;
+      port = NULL;
    }
    /* connect to the database */
    mdb->db = PQsetdbLogin(

diff --git a/bacula/src/filed/win32/winres.rc b/bacula/src/filed/win32/winres.rc
index 62b6c566280e3e3e08c45046e24353f505268977..1aad255ea51399ee2de66801783e2f4633a78b17 100644 (file)
--- a/bacula/src/filed/win32/winres.rc
+++ b/bacula/src/filed/win32/winres.rc
@@ -135,7 +135,7 @@ BEGIN
     LTEXT           "         www.sibbald.com/bacula",IDC_WWW,115,70,100,10
 //    LTEXT           "                 ",-1,69,81,100,10
 //    LTEXT           "                 ",-1,90,70,100,10
-    LTEXT           "Copyright (C) 1999-2003, Kern Sibbald",IDC_COPYRIGHT,7,120,175,10
+    LTEXT           "Copyright (C) 1999-2004, Kern Sibbald",IDC_COPYRIGHT,7,120,175,10
     LTEXT           "Licensed under GNU GPL 2.0.",IDC_TRADEMARK,7,130,175,10
     RTEXT           "Build Date:",-1,108,24,42,8
     RTEXT           "Bacula Version:",-1,100,9,50,8