kes Add < > around %r in from field on mail command of bacula-dir.conf.in

     so that bsmtp will create a correct email address (mailbox only).
kes  Modify 'memory' command so that the buffers are listed as 'In use'
     to avoid confusion with Orphaned buffers.

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

diff --git a/bacula/kernstodo b/bacula/kernstodo
index 9cbb4e5a7014a8bcdd4e9af61047d41cabef58b8..f9b5869ee0b3344df295a6b6faddc6df37bcd354 100644 (file)
--- a/bacula/kernstodo
+++ b/bacula/kernstodo
@@ -50,6 +50,7 @@ Professional Needs:
 - SD to SD
 - Modules for Databases, Exchange, ...
 - Novell NSS backup http://www.novell.com/coolsolutions/tools/18952.html
+- Compliance norms that compare restored code hash code.
 
 
 Priority:

diff --git a/bacula/src/dird/bacula-dir.conf.in b/bacula/src/dird/bacula-dir.conf.in
index e4abd5bee4be45e17512c18e60b8e105c037de49..7190fbd35693bbf88edb27c98430b035d93691ba 100644 (file)
--- a/bacula/src/dird/bacula-dir.conf.in
+++ b/bacula/src/dird/bacula-dir.conf.in
@@ -246,8 +246,8 @@ Messages {
 #  tell (most) people that its coming from an automated source.
 
 #
-  mailcommand = "@sbindir@/bsmtp -h @smtp_host@ -f \"\(Bacula\) %r\" -s \"Bacula: %t %e of %c %l\" %r"
-  operatorcommand = "@sbindir@/bsmtp -h @smtp_host@ -f \"\(Bacula\) %r\" -s \"Bacula: Intervention needed for %j\" %r"
+  mailcommand = "@sbindir@/bsmtp -h @smtp_host@ -f \"\(Bacula\) \<%r\>\" -s \"Bacula: %t %e of %c %l\" %r"
+  operatorcommand = "@sbindir@/bsmtp -h @smtp_host@ -f \"\(Bacula\) \<%r\>\" -s \"Bacula: Intervention needed for %j\" %r"
   mail = @job_email@ = all, !skipped            
   operator = @job_email@ = mount
   console = all, !skipped, !saved
@@ -264,7 +264,7 @@ Messages {
 # Message delivery for daemon messages (no job).
 Messages {
   Name = Daemon
-  mailcommand = "@sbindir@/bsmtp -h @smtp_host@ -f \"\(Bacula\) %r\" -s \"Bacula daemon message\" %r"
+  mailcommand = "@sbindir@/bsmtp -h @smtp_host@ -f \"\(Bacula\) \<%r\>\" -s \"Bacula daemon message\" %r"
   mail = @job_email@ = all, !skipped            
   console = all, !skipped, !saved
   append = "@working_dir@/log" = all, !skipped

diff --git a/bacula/src/dird/dird.c b/bacula/src/dird/dird.c
index 10e8c96f9505b6a36d86e62ee5511b40a90879c4..4f668fc107b1c6ab48790a14093ef66b986b8983 100644 (file)
--- a/bacula/src/dird/dird.c
+++ b/bacula/src/dird/dird.c
@@ -504,7 +504,7 @@ void reload_config(int sig)
    set_working_directory(director->working_directory);
    FDConnectTimeout = director->FDConnectTimeout;
    SDConnectTimeout = director->SDConnectTimeout;
-   Dmsg0(0, "Director's configuration file reread.\n");
+   Dmsg0(10, "Director's configuration file reread.\n");
 
    /* Now release saved resources, if no jobs using the resources */
    if (njobs == 0) {

diff --git a/bacula/src/dird/ua_cmds.c b/bacula/src/dird/ua_cmds.c
index fa983bb370a40422ce4ca6c5502c4e66199318a4..91a96a72e7b0304e9237cf0971ff4f05b5b23c96 100644 (file)
--- a/bacula/src/dird/ua_cmds.c
+++ b/bacula/src/dird/ua_cmds.c
@@ -1405,7 +1405,7 @@ static int delete_pool(UAContext *ua)
 int memory_cmd(UAContext *ua, const char *cmd)
 {
    list_dir_status_header(ua);
-   sm_dump(false);
+   sm_dump(false, true);
    return 1;
 }
 

diff --git a/bacula/src/lib/smartall.c b/bacula/src/lib/smartall.c
index 11ca3dd6564520bdaec4a8963db6510070c3579d..8101067eac631019266b8560716679ec3fbb32cf 100644 (file)
--- a/bacula/src/lib/smartall.c
+++ b/bacula/src/lib/smartall.c
@@ -365,7 +365,7 @@ void actuallyfree(void *cp)
  *  N.B. DO NOT USE any Bacula print routines (Dmsg, Jmsg, Emsg, ...)
  *    as they have all been shut down at this point.
  */
-void sm_dump(bool bufdump)
+void sm_dump(bool bufdump, bool in_use) 
 {
    struct abufhead *ap;
 
@@ -381,7 +381,7 @@ void sm_dump(bool bufdump)
          fprintf(stderr, _(
             "\nOrphaned buffers exist.  Dump terminated following\n"
             "  discovery of bad links in chain of orphaned buffers.\n"
-            "  Buffer address with bad links: %lx\n"), (long) ap);
+            "  Buffer address with bad links: %p\n"), ap);
          break;
       }
 
@@ -391,7 +391,8 @@ void sm_dump(bool bufdump)
          char *cp = ((char *)ap) + HEAD_SIZE;
 
          bsnprintf(errmsg, sizeof(errmsg),
-           _("Orphaned buffer:  %s %6u bytes buf=%p allocated at %s:%d\n"),
+           _("%s buffer:  %s %6u bytes buf=%p allocated at %s:%d\n"),
+            in_use?"In use":"Orphaned",
             my_name, memsize, cp, ap->abfname, ap->ablineno
          );
          fprintf(stderr, "%s", errmsg);
@@ -468,7 +469,7 @@ int sm_check_rtn(const char *fname, int lineno, bool bufdump)
             fprintf(stderr, _("  discovery of data overrun.\n"));
          }
 
-         fprintf(stderr, _("  Buffer address: %lx\n"), (long) ap);
+         fprintf(stderr, _("  Buffer address: %p\n"), ap);
 
          if (ap->abfname != NULL) {
             unsigned memsize = ap->ablen - (HEAD_SIZE + 1);

diff --git a/bacula/src/lib/smartall.h b/bacula/src/lib/smartall.h
index 5875db28c021454fcd3208ef30466a323b55daa6..b178663b05fee2ad7b5f2d76badd72e8db22a4c9 100644 (file)
--- a/bacula/src/lib/smartall.h
+++ b/bacula/src/lib/smartall.h
@@ -52,7 +52,7 @@ extern void *sm_malloc(const char *fname, int lineno, unsigned int nbytes),
             *actuallyrealloc(void *ptr, unsigned int size);
 extern void sm_free(const char *fname, int lineno, void *fp);
 extern void actuallyfree(void *cp),
-            sm_dump(bool bufdump), sm_static(int mode);
+            sm_dump(bool bufdump, bool in_use=false), sm_static(int mode);
 extern void sm_new_owner(const char *fname, int lineno, char *buf);
 
 #ifdef SMCHECK

diff --git a/bacula/technotes-2.1 b/bacula/technotes-2.1
index 0fa1fab0c2596efd48f0a1fed3cb3786e57da260..64f75bbb857992ee04d49d071caaa70781fbe062 100644 (file)
--- a/bacula/technotes-2.1
+++ b/bacula/technotes-2.1
@@ -2,6 +2,10 @@
 
 General:
 27May07
+kes  Add < > around %r in from field on mail command of bacula-dir.conf.in
+     so that bsmtp will create a correct email address (mailbox only).
+kes  Modify 'memory' command so that the buffers are listed as 'In use'
+     to avoid confusion with Orphaned buffers.
 kes  I reworked the OpenSSL include/lib flags to be handled in     
      the standard Bacula way, which should fix bug #863 concerning
      non-standard OpenSSL libraries.