From: Kern Sibbald <kern@sibbald.com>
Date: Wed, 18 Apr 2007 16:32:46 +0000 (+0000)
Subject: Update
X-Git-Tag: Release-7.0.0~6562
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d684457744d3adb37b4b5f92d723dbe245cf528a;p=bacula%2Fbacula

Update

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

diff --git a/bacula/kernstodo b/bacula/kernstodo
index df9222511e..389dd221a9 100644
--- a/bacula/kernstodo
+++ b/bacula/kernstodo
@@ -43,6 +43,9 @@ Document:
  
 
 Priority:
+- On restore add Restore Client, Original Client.
+- Change gnome-console to bgnome-console.
+- Change wx-console to bwx-console
 01-Apr 00:42 rufus-dir: Start Backup JobId 55, Job=kernsave.2007-04-01_00.42.48
 01-Apr 00:42 rufus-sd: Python SD JobStart: JobId=55 Client=Rufus
 01-Apr 00:42 rufus-dir: Created new Volume "Full0001" in catalog.
diff --git a/bacula/src/cats/postgresql.c b/bacula/src/cats/postgresql.c
index d1a322e32a..fcaf6f48b0 100644
--- a/bacula/src/cats/postgresql.c
+++ b/bacula/src/cats/postgresql.c
@@ -1,16 +1,7 @@
-/*
- * Bacula Catalog Database routines specific to PostgreSQL
- *   These are PostgreSQL specific routines
- *
- *    Dan Langille, December 2003
- *    based upon work done by Kern Sibbald, March 2000
- *
- *    Version $Id$
- */
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2003-2006 Free Software Foundation Europe e.V.
+   Copyright (C) 2003-2007 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
@@ -34,6 +25,15 @@
    (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
    Switzerland, email:ftf@fsfeurope.org.
 */
+/*
+ * Bacula Catalog Database routines specific to PostgreSQL
+ *   These are PostgreSQL specific routines
+ *
+ *    Dan Langille, December 2003
+ *    based upon work done by Kern Sibbald, March 2000
+ *
+ *    Version $Id$
+ */
 
 
 /* The following is necessary so that we do not include
@@ -545,13 +545,13 @@ int my_postgresql_batch_start(JCR *jcr, B_DB *mdb)
    Dmsg0(500, "my_postgresql_batch_start started\n");
 
    if (my_postgresql_query(mdb,
-			   " CREATE TEMPORARY TABLE batch "
-			   "        (fileindex int,       "
-			   "        jobid int,            "
-			   "        path varchar,         "
-			   "        name varchar,         "
-			   "        lstat varchar,        "
-			   "        md5 varchar)") == 1)
+                           " CREATE TEMPORARY TABLE batch "
+                           "        (fileindex int,       "
+                           "        jobid int,            "
+                           "        path varchar,         "
+                           "        name varchar,         "
+                           "        lstat varchar,        "
+                           "        md5 varchar)") == 1)
    {
       Dmsg0(500, "my_postgresql_batch_start failed\n");
       return 1;
@@ -590,7 +590,7 @@ int my_postgresql_batch_end(JCR *jcr, B_DB *mdb, const char *error)
    int count=30;
    Dmsg0(500, "my_postgresql_batch_end started\n");
 
-   if (!mdb) {			/* no files ? */
+   if (!mdb) {                  /* no files ? */
       return 0;
    }
 
@@ -635,13 +635,13 @@ int my_postgresql_batch_insert(JCR *jcr, B_DB *mdb, ATTR_DBR *ar)
    }
 
    len = Mmsg(mdb->cmd, "%u\t%s\t%s\t%s\t%s\t%s\n", 
-	      ar->FileIndex, edit_int64(ar->JobId, ed1), mdb->esc_path, 
-	      mdb->esc_name, ar->attr, digest);
+              ar->FileIndex, edit_int64(ar->JobId, ed1), mdb->esc_path, 
+              mdb->esc_name, ar->attr, digest);
 
    do { 
       res = PQputCopyData(mdb->db,
-			  mdb->cmd,
-			  len);
+                          mdb->cmd,
+                          len);
    } while (res == 0 && --count > 0);
 
    if (res == 1) {
@@ -676,27 +676,27 @@ char *my_postgresql_copy_escape(char *dest, char *src, size_t len)
    while (len > 0 && *src) {
       switch (*src) {
       case '\n':
-	 c = 'n';
-	 break;
+         c = 'n';
+         break;
       case '\\':
-	 c = '\\';
-	 break;
+         c = '\\';
+         break;
       case '\t':
-	 c = 't';
-	 break;
+         c = 't';
+         break;
       case '\r':
-	 c = 'r';
-	 break;
+         c = 'r';
+         break;
       default:
-	 c = '\0' ;
+         c = '\0' ;
       }
 
       if (c) {
-	 *dest = '\\';
-	 dest++;
-	 *dest = c;
+         *dest = '\\';
+         dest++;
+         *dest = c;
       } else {
-	 *dest = *src;
+         *dest = *src;
       }
 
       len--;
diff --git a/bacula/src/version.h b/bacula/src/version.h
index 474be67b4f..49f70cc07b 100644
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -4,8 +4,8 @@
 
 #undef  VERSION
 #define VERSION "2.1.8"
-#define BDATE   "14 April 2007"
-#define LSMDATE "14Apr07"
+#define BDATE   "18 April 2007"
+#define LSMDATE "18Apr07"
 
 #define PROG_COPYRIGHT "Copyright (C) %d-2007 Free Software Foundation Europe e.V.\n"
 #define BYEAR "2007"       /* year for copyright messages in progs */