From f333b020d8320603586f70c82266c08b09c45ba5 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Mon, 14 May 2007 22:58:12 +0000 Subject: [PATCH] Attempt to fix bsmtp editing on OSes without %z editing. git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@4787 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/src/tools/bsmtp.c | 6 +++++- bacula/technotes-2.1 | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/bacula/src/tools/bsmtp.c b/bacula/src/tools/bsmtp.c index 862269c357..3bd13f0fef 100644 --- a/bacula/src/tools/bsmtp.c +++ b/bacula/src/tools/bsmtp.c @@ -475,7 +475,11 @@ __MINGW_IMPORT long _dstbias; size_t length = strftime(buf, sizeof(buf), "%a, %d %b %Y %H:%M:%S", &tm); sprintf(&buf[length], " %+2.2ld%2.2u", -tzoffset / 60, abs(tzoffset) % 60); #else - strftime(buf, sizeof(buf), "%a, %d %b %Y %H:%M:%S %z", &tm); +#ifdef HAVE_SUN_OS + strftime(buf, sizeof(buf), "%a, %d %b %Y %H:%M:%S (%Z)", &tm); +#else + strftime(buf, sizeof(buf), "%a, %d %b %Y %H:%M:%S %z (%Z)", &tm); +#endif #endif fprintf(sfp, "Date: %s\r\n", buf); Dmsg1(10, "Date: %s\r\n", buf); diff --git a/bacula/technotes-2.1 b/bacula/technotes-2.1 index 2757331cea..2daaefb4fe 100644 --- a/bacula/technotes-2.1 +++ b/bacula/technotes-2.1 @@ -2,6 +2,7 @@ General: 14May07 +kes Attempt to fix bsmtp editing on OSes without %z editing. kes Do better checking for the MySQL 64 bit libraries looking for both .a and .so libraries. kes Add a kludge for Ubuntu's non-standard locations for MySQL -- allow -- 2.39.5