From: Kern Sibbald <kern@sibbald.com>
Date: Thu, 11 Mar 2004 23:00:38 +0000 (+0000)
Subject: Fix postgresql port again + update win32 version and date
X-Git-Tag: Release-1.34.0~58
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=b7c2d548770bffb83990bf4f53d6b69947ac28ac;p=bacula%2Fbacula

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 38ec23c59c..24249fc5e6 100644
--- 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 f5655946bf..af7b8d312e 100644
--- 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 62b6c56628..1aad255ea5 100644
--- 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