kes Cleanup incorrect email addresses in bsmtp.

kes  Make bat display initial messages rather than discard them.

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

diff --git a/bacula/kernstodo b/bacula/kernstodo
index 1423e0c4bcb3840a168a4662508646355637ace2..a4d1f74bd927f2d5149279cdc9c9fa000bb570a3 100644 (file)
--- a/bacula/kernstodo
+++ b/bacula/kernstodo
@@ -49,8 +49,10 @@ Professional Needs:
 - Synthetic Full, Diff, Inc (Virtual, Reconstructed)
 - SD to SD
 - Modules for Databases, Exchange, ...
+- Novell NSS backup http://www.novell.com/coolsolutions/tools/18952.html
 
 Priority:
+- Unicode input http://en.wikipedia.org/wiki/Byte_Order_Mark
 - How does restore JobId=nnn work? (Dirk)
 - What does: restore select fileset="TestSet" client="workplay-fd" pool="Default"
 > storage="File2"  before="2007-02-05 23:05:04" do?  (Dirk)

diff --git a/bacula/src/qt-console/console/console.cpp b/bacula/src/qt-console/console/console.cpp
index 04f50c833133c50d24800ab18b7e8f025f458095..d7ebbef4ecde8ec9b1bd6ed1182e4f317274e890 100644 (file)
--- a/bacula/src/qt-console/console/console.cpp
+++ b/bacula/src/qt-console/console/console.cpp
@@ -158,7 +158,7 @@ void Console::connect()
    QObject::connect(m_notifier, SIGNAL(activated(int)), this, SLOT(read_dir(int)));
 
    write(".api 1");
-   discardToPrompt();
+   displayToPrompt();
 
    beginNewCommand();
    dir_cmd(".jobs", job_list);

diff --git a/bacula/src/qt-console/mainwin.cpp b/bacula/src/qt-console/mainwin.cpp
index ec64b6042bf2cb632e570a0a99947441342bad81..561bd75f199b6d048bec53f61a88d9f9ce390d5d 100644 (file)
--- a/bacula/src/qt-console/mainwin.cpp
+++ b/bacula/src/qt-console/mainwin.cpp
@@ -67,7 +67,7 @@ MainWin::MainWin(QWidget *parent) : QMainWindow(parent)
 
    readSettings();
 
-   foreach(Console *console, m_consoleHash){
+   foreach(Console *console, m_consoleHash) {
       console->connect();
    }
    m_currentConsole = (Console*)getFromHash(m_firstItem);

diff --git a/bacula/src/tools/bsmtp.c b/bacula/src/tools/bsmtp.c
index 1397ff4d7f0ad98f03f4aaa343aae8433600884b..d0b6066e686b67261f22ee65e0032938bebf9a0d 100644 (file)
--- a/bacula/src/tools/bsmtp.c
+++ b/bacula/src/tools/bsmtp.c
@@ -70,13 +70,37 @@ static int mailport = 25;
 static char my_hostname[MAXSTRING];
 static bool content_utf8 = false;
 
+/* 
+ * Take input that may have names and other stuff and strip
+ *  it down to the mail box address ... i.e. what is enclosed
+ *  in < >.  Otherwise add < >.
+ */
+static char *cleanup_addr(char *addr, char *buf, int buf_len)
+{
+   char *p, *q;
+
+   if ((p = strchr(from_addr, '<')) == NULL) {
+      snprintf(buf, buf_len, "<%s>", addr);
+   } else {
+      /* Copy <addr> */
+      for (q=buf; *p && *p!='>'; ) {
+         *q++ = *p++;
+      }
+      if (*p) {
+         *q++ = *p;
+      }
+      *q = 0;
+  }
+  Dmsg2(100, "cleanup in=%s out=%s\n", addr, buf);
+  return buf;    
+}
 
 /*
  *  examine message from server
  */
 static void get_response(void)
 {
-    char buf[MAXSTRING];
+    char buf[1000];
 
     Dmsg0(50, "Calling fgets on read socket rfp.\n");
     buf[3] = 0;
@@ -184,7 +208,7 @@ __MINGW_IMPORT long     _dstbias;
  */
 int main (int argc, char *argv[])
 {
-    char buf[MAXSTRING];
+    char buf[1000];
     struct sockaddr_in sin;
     struct hostent *hp;
     int i, ch;
@@ -405,27 +429,15 @@ hp:
     */
    get_response(); /* banner */
    chat("helo %s\r\n", my_hostname);
-   if (strchr(from_addr, '<') == NULL) {
-      chat("mail from:<%s>\r\n", from_addr);
-   } else {
-      chat("mail from:%s\r\n", from_addr);
-   }
-
+   chat("mail from:%s\r\n", cleanup_addr(from_addr, buf, sizeof(buf)));
+   
    for (i = 0; i < argc; i++) {
       Dmsg1(20, "rcpt to: %s\n", argv[i]);
-      if (strchr(argv[i], '<') == NULL) {
-         chat("rcpt to:<%s>\r\n", argv[i]);
-      } else {
-         chat("rcpt to:%s\r\n", argv[i]);
-      }
+      chat("rcpt to:%s\r\n", cleanup_addr(argv[i], buf, sizeof(buf)));
    }
 
    if (cc_addr) {
-      if (strchr(cc_addr, '<') == NULL) {
-         chat("rcpt to:<%s>\r\n", cc_addr);
-      } else {
-         chat("rcpt to:%s\r\n", cc_addr);
-      }
+      chat("rcpt to:%s\r\n", cleanup_addr(cc_addr, buf, sizeof(buf)));
    }
    Dmsg0(20, "Data\n");
    chat("data\r\n");

diff --git a/bacula/src/version.h b/bacula/src/version.h
index 7189096cd9ee7194dc4e859e11df8072e6434037..7dc9356f238ba79fe752da0c505aaedc14154e36 100644 (file)
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -3,9 +3,9 @@
  */
 
 #undef  VERSION
-#define VERSION "2.1.8"
-#define BDATE   "16 May 2007"
-#define LSMDATE "16May07"
+#define VERSION "2.1.10"
+#define BDATE   "18 May 2007"
+#define LSMDATE "18May07"
 
 #define PROG_COPYRIGHT "Copyright (C) %d-2007 Free Software Foundation Europe e.V.\n"
 #define BYEAR "2007"       /* year for copyright messages in progs */

diff --git a/bacula/src/win32/installer/Readme.txt b/bacula/src/win32/installer/Readme.txt
index 34f5036a0d660a51fa36bc5961b3a7b702052f30..5535f9b8cf0ad7da0bdacb4a57dc068bf95d1c1b 100644 (file)
--- a/bacula/src/win32/installer/Readme.txt
+++ b/bacula/src/win32/installer/Readme.txt
@@ -4,9 +4,9 @@ Bacula - Windows Version Disclaimer
 Please note, only the Win32 Client (File daemon) is supported.  All the\r
 other components (Director, Storage daemon, their utilities) are provided\r
 on an "as is" basis.  Unfortunately, they are neither properly tested,   \r
-documented, or supported.  This means that we cannot accept bug reports\r
-against the non-supported components.  For them to be supported, we need\r
-three things from the Open Source community:\r
+documented, or supported.  This means that we cannot ensure that bug reports\r
+against the non-supported components will be fixed.  For them to be supported, \r
+we need three things from the Open Source community:\r
 \r
 1. Full documentation of the Windows particularities of the Director,\r
    the Storage daemon, and their utilities in the Bacula manual.\r
@@ -56,6 +56,10 @@ when it happens the daemon will not start since Bacula cannot find the directory
 The workaround is to manually edit the appropriate conf file and ensure that it\r
 is written out in UTF-8 format.\r
 \r
+The conf files can be edited with any UTF-8 compatible editor, or on most \r
+modern Win32 machines, you can edit them with notepad, then choose UTF-8\r
+output encoding before saving them.\r
+\r
 \r
 Storage and Director Services\r
 -----------------------------\r

diff --git a/bacula/technotes-2.1 b/bacula/technotes-2.1
index 6c921cf06b52c735a875894564e8c70b7bf341a1..53dd863cbb53cdb12ce1e246bcbdc2fedbdecc0a 100644 (file)
--- a/bacula/technotes-2.1
+++ b/bacula/technotes-2.1
@@ -1,6 +1,9 @@
               Technical notes on version 2.1
 
 General:
+18May07
+kes  Cleanup incorrect email addresses in bsmtp.
+kes  Make bat display initial messages rather than discard them.
 16May07
 kes  First cut of adding .mod to the run command.    
 kes  Implement auto display of messages in bat.