X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fdird%2Fua_server.c;h=bc9c54e9efba4c9c318a39176e5406e7b6e5d577;hb=db05f326a4e98069ab685b3447a3e87037d1b7d8;hp=7f0c6b795cfb0e0ef674bf8a4af5abb388cb177b;hpb=a18896757d81b61a990755940b0f4ce600911192;p=bacula%2Fbacula

diff --git a/bacula/src/dird/ua_server.c b/bacula/src/dird/ua_server.c
index 7f0c6b795c..bc9c54e9ef 100644
--- a/bacula/src/dird/ua_server.c
+++ b/bacula/src/dird/ua_server.c
@@ -1,3 +1,30 @@
+/*
+   Bacula® - The Network Backup Solution
+
+   Copyright (C) 2000-2007 Free Software Foundation Europe e.V.
+
+   The main author of Bacula is Kern Sibbald, with contributions from
+   many others, a complete list can be found in the file AUTHORS.
+   This program is Free Software; you can redistribute it and/or
+   modify it under the terms of version two of the GNU General Public
+   License as published by the Free Software Foundation plus additions
+   that are listed in the file LICENSE.
+
+   This program is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
+
+   Bacula® is a registered trademark of John Walker.
+   The licensor of Bacula is the Free Software Foundation Europe
+   (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
+   Switzerland, email:ftf@fsfeurope.org.
+*/
 /*
  *
  *   Bacula Director -- User Agent Server
@@ -6,20 +33,6 @@
  *
  *    Version $Id$
  */
-/*
-   Copyright (C) 2000-2005 Kern Sibbald
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   version 2 as amended with additional clauses defined in the
-   file LICENSE in the main source directory.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 
-   the file LICENSE for additional details.
-
- */
 
 #include "bacula.h"
 #include "dird.h"
@@ -28,8 +41,6 @@
 extern int r_first;
 extern int r_last;
 extern struct s_res resources[];
-extern int console_msg_pending;
-extern char my_name[];
 
 
 /* Forward referenced functions */
@@ -58,7 +69,7 @@ void start_UA_server(dlist *addrs)
 
    if ((status=pthread_create(&thid, NULL, connect_thread, (void *)myaddrs)) != 0) {
       berrno be;
-      Emsg1(M_ABORT, 0, _("Cannot create UA thread: %s\n"), be.strerror(status));
+      Emsg1(M_ABORT, 0, _("Cannot create UA thread: %s\n"), be.bstrerror(status));
    }
    started = TRUE;
    return;
@@ -69,8 +80,8 @@ void *connect_thread(void *arg)
 {
    pthread_detach(pthread_self());
 
-   /* Permit 10 console connections */
-   bnet_thread_server((dlist*)arg, 10, &ua_workq, handle_UA_client_request);
+   /* Permit 20 console connections */
+   bnet_thread_server((dlist*)arg, 20, &ua_workq, handle_UA_client_request);
    return NULL;
 }
 
@@ -110,21 +121,23 @@ static void *handle_UA_client_request(void *arg)
    int stat;
    UAContext *ua;
    JCR *jcr;
+   BSOCK *user = (BSOCK *)arg;
 
    pthread_detach(pthread_self());
 
-   jcr = new_control_jcr("*Console*", JT_CONSOLE);
+   jcr = new_control_jcr("-Console-", JT_CONSOLE);
 
    ua = new_ua_context(jcr);
-   ua->UA_sock = (BSOCK *)arg;
+   ua->UA_sock = user;
 
-   bnet_recv(ua->UA_sock);          /* Get first message */
+   user->recv();             /* Get first message */
    if (!authenticate_user_agent(ua)) {
       goto getout;
    }
 
    while (!ua->quit) {
-      stat = bnet_recv(ua->UA_sock);
+      if (ua->api) user->signal(BNET_PROMPT);
+      stat = user->recv();
       if (stat >= 0) {
          pm_strcpy(ua->cmd, ua->UA_sock->msg);
          parse_ua_args(ua);
@@ -134,20 +147,26 @@ static void *handle_UA_client_request(void *arg)
             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 (console_msg_pending && 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) {
+                  if (ua->api) {
+                     user->signal(BNET_MSGS_PENDING);
+                  } else {
+                     bsendmsg(ua, _("You have messages.\n"));
+                  }
+                  ua->user_notified_msg_pending = true;
+               }
             }
-            bnet_sig(ua->UA_sock, BNET_EOD); /* send end of command */
+            if (!ua->api) user->signal(BNET_EOD);     /* send end of command */
          }
-      } else if (is_bnet_stop(ua->UA_sock)) {
+      } else if (is_bnet_stop(user)) {
          ua->quit = true;
       } else { /* signal */
-         bnet_sig(ua->UA_sock, BNET_POLL);
+         user->signal(BNET_POLL);
       }
    }