From: Kern Sibbald <kern@sibbald.com>
Date: Fri, 14 Dec 2007 10:43:12 +0000 (+0000)
Subject: Skip leading | when lex input comes from a pipe as suggested
X-Git-Tag: Release-2.2.7~14
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=06f032d96e24b987b7f670397a7d3bae737bdcc9;p=bacula%2Fbacula

Skip leading | when lex input comes from a pipe as suggested
     by Michael Stapelberg <michael@stapelberg.de>.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/branches/Branch-2.2@6060 91ce42f0-d328-0410-95d8-f526ca767f89
---

diff --git a/bacula/src/lib/lex.c b/bacula/src/lib/lex.c
index adbab02198..3a4262ed22 100644
--- a/bacula/src/lib/lex.c
+++ b/bacula/src/lib/lex.c
@@ -174,7 +174,7 @@ LEX *lex_open_file(LEX *lf, const char *filename, LEX_ERROR_HANDLER *scan_error)
 
 
    if (fname[0] == '|') {
-      if ((bpipe = open_bpipe(fname, 0, "rb")) == NULL) {
+      if ((bpipe = open_bpipe(fname+1, 0, "rb")) == NULL) {
          free(fname);
          return NULL;
       }
diff --git a/bacula/src/tools/bsmtp.c b/bacula/src/tools/bsmtp.c
index c1a3e22110..880ef9b289 100644
--- a/bacula/src/tools/bsmtp.c
+++ b/bacula/src/tools/bsmtp.c
@@ -216,7 +216,9 @@ __MINGW_IMPORT long     _dstbias;
    long offset;
    _tzset();
    offset = _timezone;
-   offset += _dstbias;
+   if (tm.tm_isdst) {
+      offset += _dstbias;
+   }
    return offset /= 60;
 #else
 
diff --git a/bacula/technotes-2.1 b/bacula/technotes-2.1
index 0c7e94e952..fbbd28fcee 100644
--- a/bacula/technotes-2.1
+++ b/bacula/technotes-2.1
@@ -1,6 +1,12 @@
               Technical notes on version 2.2
 
 General:
+14Dec07
+kes  Skip leading | when lex input comes from a pipe as suggested
+     by Michael Stapelberg <michael@stapelberg.de>.
+13Dec07
+kes  Apply patch for bsmtp Win32 daylight savings time fix supplied by
+     Nerijus Baliunas <nerijus@users.sourceforge.net>
 10Dec07
 kes  This patch corrects a problem where the maximum concurrent storage
      jobs counter gets out of sync during restore jobs causing jobs to