kes Require a messages command acl to be able to receive messages

     in a console.
kes  Add console, system, and scan job types in util.c.

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

diff --git a/bacula/src/console2.gladep b/bacula/src/console2.gladep
index 8e701cb6f4c359c9a00c49e00f08c8d9d0804959..c5760fba98ed59a21f457e4a04cc55be14c26317 100644 (file)
--- a/bacula/src/console2.gladep
+++ b/bacula/src/console2.gladep
@@ -5,4 +5,7 @@
   <name>console</name>
   <program_name>gnome-console</program_name>
   <source_directory>gnome2-console</source_directory>
   <name>console</name>
   <program_name>gnome-console</program_name>
   <source_directory>gnome2-console</source_directory>

+  <output_main_file>FALSE</output_main_file>
+  <output_support_files>FALSE</output_support_files>
+  <output_build_files>FALSE</output_build_files>

 </glade-project>
 </glade-project>

diff --git a/bacula/src/dird/ua_server.c b/bacula/src/dird/ua_server.c
index 689b2056f76c6ae0256074cf65aba1a6ad800802..d2ec8ccdb6b7d29500263f0ad0201bb8660ef249 100644 (file)
--- a/bacula/src/dird/ua_server.c
+++ b/bacula/src/dird/ua_server.c
@@ -132,13 +132,15 @@ static void *handle_UA_client_request(void *arg)
             do_a_command(ua, ua->cmd);
          }
          if (!ua->quit) {
             do_a_command(ua, ua->cmd);
          }
          if (!ua->quit) {

-            if (ua->auto_display_messages) {
-               pm_strcpy(ua->cmd, "messages");
-               qmessagescmd(ua, ua->cmd);
-               ua->user_notified_msg_pending = FALSE;
-            } else if (!ua->gui && !ua->user_notified_msg_pending && console_msg_pending) {
-               bsendmsg(ua, _("You have messages.\n"));
-               ua->user_notified_msg_pending = TRUE;
+            if (acl_access_ok(ua, Command_ACL, "messages", 8)) {
+               if (ua->auto_display_messages) {
+                  pm_strcpy(ua->cmd, "messages");
+                  qmessagescmd(ua, ua->cmd);
+                  ua->user_notified_msg_pending = FALSE;
+               } else if (!ua->gui && !ua->user_notified_msg_pending && console_msg_pending) {
+                  bsendmsg(ua, _("You have messages.\n"));
+                  ua->user_notified_msg_pending = TRUE;
+               }

             }
             bnet_sig(ua->UA_sock, BNET_EOD); /* send end of command */
          }
             }
             bnet_sig(ua->UA_sock, BNET_EOD); /* send end of command */
          }

diff --git a/bacula/src/lib/util.c b/bacula/src/lib/util.c
index f991483202662a0cc2737eaaaadf1e9f2c6dedb5..b6c76a0822570acf2c3c051098212677ee02bbff 100644 (file)
--- a/bacula/src/lib/util.c
+++ b/bacula/src/lib/util.c
@@ -287,6 +287,15 @@ const char *job_type_to_str(int type)
    case JT_COPY:
       str = _("Copy");
       break;
    case JT_COPY:
       str = _("Copy");
       break;

+   case JT_CONSOLE:
+      str = _("Console");
+      break;
+   case JT_SYSTEM:
+      str = _("System or Console");
+      break;
+   case JT_SCAN:
+      str = _("Scan");
+      break;

    default:
       str = _("Unknown Type");
       break;
    default:
       str = _("Unknown Type");
       break;

diff --git a/bacula/src/version.h b/bacula/src/version.h
index 3d184f472f9589042014686c162447029511f774..7f696ad2d046b59576377fe47ba5fe29929f8b13 100644 (file)
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -4,8 +4,8 @@
 
 #undef  VERSION
 #define VERSION "1.39.23"
 
 #undef  VERSION
 #define VERSION "1.39.23"

-#define BDATE   "28 September 2006"
-#define LSMDATE "28Sep06"
+#define BDATE   "o1 October 2006"
+#define LSMDATE "01Oct06"

 #define BYEAR "2006"       /* year for copyright messages in progs */
 
 /* Debug flags */
 #define BYEAR "2006"       /* year for copyright messages in progs */
 
 /* Debug flags */

diff --git a/bacula/technotes-1.39 b/bacula/technotes-1.39
index 7c7228fcc4daeb28aea0b8efe4cff79da2e0a5aa..1886fb467b56b19834c57c8b057c2baac55ccb4d 100644 (file)
--- a/bacula/technotes-1.39
+++ b/bacula/technotes-1.39
@@ -1,6 +1,10 @@
               Technical notes on version 1.39  
 
 General:
               Technical notes on version 1.39  
 
 General:

+01Sep06
+kes  Require a messages command acl to be able to receive messages
+     in a console.
+kes  Add console, system, and scan job types in util.c.

 28Sep06
 kes  Print the Volume purged message only for real jobs to keep
      from cluttering up the daemon messages.
 28Sep06
 kes  Print the Volume purged message only for real jobs to keep
      from cluttering up the daemon messages.