ebl Update SQLite for Long term statistics

[bacula/bacula] / bacula / src / tools / bsmtp.c

diff --git a/bacula/src/tools/bsmtp.c b/bacula/src/tools/bsmtp.c
index 83b0e552dc9c55bc81b874420342ddc24f9ccef4..0188cedab3e7c14fe45138b9096510c81ddb9478 100644 (file)
--- a/bacula/src/tools/bsmtp.c
+++ b/bacula/src/tools/bsmtp.c
@@ -107,7 +107,7 @@ static char *cleanup_addr(char *addr, char *buf, int buf_len)
 {
    char *p, *q;
 
-   if ((p = strchr(from_addr, '<')) == NULL) {
+   if ((p = strchr(addr, '<')) == NULL) {
       snprintf(buf, buf_len, "<%s>", addr);
    } else {
       /* Copy <addr> */
@@ -187,7 +187,8 @@ _("\n"
 "Usage: %s [-f from] [-h mailhost] [-s subject] [-c copy] [recipient ...]\n"
 "       -8          set charset utf-8\n"
 "       -c          set the Cc: field\n"
-"       -dnn        set debug level to nn\n"
+"       -d <nn>     set debug level to <nn>\n"
+"       -dt         print timestamp in debug output\n"
 "       -f          set the From: field\n"
 "       -h          use mailhost:port as the SMTP server\n"
 "       -s          set the Subject: field\n"
@@ -216,7 +217,9 @@ __MINGW_IMPORT long     _dstbias;
    long offset;
    _tzset();
    offset = _timezone;
-   offset += _dstbias;
+   if (tm.tm_isdst) {
+      offset += _dstbias;
+   }
    return offset /= 60;
 #else
 
@@ -286,9 +289,13 @@ int main (int argc, char *argv[])
          break;
 
       case 'd':                    /* set debug level */
-         debug_level = atoi(optarg);
-         if (debug_level <= 0) {
-            debug_level = 1;
+         if (*optarg == 't') {
+            dbg_timestamp = true;
+         } else {
+            debug_level = atoi(optarg);
+            if (debug_level <= 0) {
+               debug_level = 1;
+            }
          }
          Dmsg1(20, "Debug level = %d\n", debug_level);
          break;