Correct pool source setting

[bacula/bacula] / bacula / src / dird / ua_server.c

diff --git a/bacula/src/dird/ua_server.c b/bacula/src/dird/ua_server.c
index 4b70ba82a8aedba89f211d56636d93156d3c4e27..7f0c6b795cfb0e0ef674bf8a4af5abb388cb177b 100644 (file)
--- a/bacula/src/dird/ua_server.c
+++ b/bacula/src/dird/ua_server.c
@@ -6,24 +6,18 @@
  *
  *    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 as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
+   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 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., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 
+   the file LICENSE for additional details.
 
  */
 
@@ -102,7 +96,7 @@ JCR *new_control_jcr(const char *base_name, int job_type)
    jcr->sched_time = jcr->start_time;
    jcr->JobType = job_type;
    jcr->JobLevel = L_NONE;
-   jcr->JobStatus = JS_Running;
+   set_jcr_job_status(jcr, JS_Running);
    jcr->JobId = 0;
    return jcr;
 }
@@ -124,7 +118,7 @@ static void *handle_UA_client_request(void *arg)
    ua = new_ua_context(jcr);
    ua->UA_sock = (BSOCK *)arg;
 
-   bnet_recv(ua->UA_sock);         /* Get first message */
+   bnet_recv(ua->UA_sock);          /* Get first message */
    if (!authenticate_user_agent(ua)) {
       goto getout;
    }
@@ -132,28 +126,28 @@ static void *handle_UA_client_request(void *arg)
    while (!ua->quit) {
       stat = bnet_recv(ua->UA_sock);
       if (stat >= 0) {
-        pm_strcpy(ua->cmd, ua->UA_sock->msg);
-        parse_ua_args(ua);
+         pm_strcpy(ua->cmd, ua->UA_sock->msg);
+         parse_ua_args(ua);
          if (ua->argc > 0 && ua->argk[0][0] == '.') {
-           do_a_dot_command(ua, ua->cmd);
-        } else {
-           do_a_command(ua, ua->cmd);
-        }
-        if (!ua->quit) {
-           if (ua->auto_display_messages) {
+            do_a_dot_command(ua, ua->cmd);
+         } else {
+            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->user_notified_msg_pending && console_msg_pending) {
+               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 */
-        }
+               ua->user_notified_msg_pending = TRUE;
+            }
+            bnet_sig(ua->UA_sock, BNET_EOD); /* send end of command */
+         }
       } else if (is_bnet_stop(ua->UA_sock)) {
-        ua->quit = true;
+         ua->quit = true;
       } else { /* signal */
-        bnet_sig(ua->UA_sock, BNET_POLL);
+         bnet_sig(ua->UA_sock, BNET_POLL);
       }
    }
 
@@ -182,8 +176,8 @@ UAContext *new_ua_context(JCR *jcr)
    ua->db = jcr->db;
    ua->cmd = get_pool_memory(PM_FNAME);
    ua->args = get_pool_memory(PM_FNAME);
-   ua->verbose = 1;
-   ua->automount = TRUE;
+   ua->verbose = true;
+   ua->automount = true;
    return ua;
 }