Backport from Bacula Enterprise

[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 a7580f244a19438049e9549ff83f70b45b65c796..eb5c586770eb08f03c72b9b3cca4be35acdb4dab 100644 (file)
--- a/bacula/src/dird/ua_server.c
+++ b/bacula/src/dird/ua_server.c
@@ -1,29 +1,21 @@
 /*
-   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 three of the GNU Affero General Public
-   License as published by the Free Software Foundation and included
-   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 Affero 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 Kern Sibbald.
-   The licensor of Bacula is the Free Software Foundation Europe
-   (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
-   Switzerland, email:ftf@fsfeurope.org.
+   Bacula(R) - The Network Backup Solution
+
+   Copyright (C) 2000-2015 Kern Sibbald
+   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+
+   The original author of Bacula is Kern Sibbald, with contributions
+   from many others, a complete list can be found in the file AUTHORS.
+
+   You may use this file and others of this release according to the
+   license defined in the LICENSE file, which includes the Affero General
+   Public License, v3.0 ("AGPLv3") and some additional permissions and
+   terms pursuant to its AGPLv3 Section 7.
+
+   This notice must be preserved when any source code is 
+   conveyed and/or propagated.
+
+   Bacula(R) is a registered trademark of Kern Sibbald.
 */
 /*
  *
@@ -31,7 +23,6 @@
  *
  *     Kern Sibbald, September MM
  *
- *    Version $Id$
  */
 
 #include "bacula.h"
@@ -103,9 +94,9 @@ JCR *new_control_jcr(const char *base_name, int job_type)
    jcr->sd_auth_key = bstrdup("dummy"); /* dummy Storage daemon key */
    create_unique_job_name(jcr, base_name);
    jcr->sched_time = jcr->start_time;
-   jcr->set_JobType(job_type);
-   jcr->set_JobLevel(L_NONE);
-   set_jcr_job_status(jcr, JS_Running);
+   jcr->setJobType(job_type);
+   jcr->setJobLevel(L_NONE);
+   jcr->setJobStatus(JS_Running);
    jcr->JobId = 0;
    return jcr;
 }
@@ -163,11 +154,14 @@ static void *handle_UA_client_request(void *arg)
             }
             if (!ua->api) user->signal(BNET_EOD);     /* send end of command */
          }
-      } else if (is_bnet_stop(user)) {
+      } else if (user->is_stop()) {
          ua->quit = true;
       } else { /* signal */
          user->signal(BNET_POLL);
       }
+
+      /* At the end of each command, revert to the main shared SQL link */
+      ua->db = ua->shared_db;
    }
 
 getout:
@@ -192,9 +186,10 @@ UAContext *new_ua_context(JCR *jcr)
    ua = (UAContext *)malloc(sizeof(UAContext));
    memset(ua, 0, sizeof(UAContext));
    ua->jcr = jcr;
-   ua->db = jcr->db;
+   ua->shared_db = ua->db = jcr->db;
    ua->cmd = get_pool_memory(PM_FNAME);
    ua->args = get_pool_memory(PM_FNAME);
+   ua->errmsg = get_pool_memory(PM_FNAME);
    ua->verbose = true;
    ua->automount = true;
    return ua;
@@ -208,14 +203,16 @@ void free_ua_context(UAContext *ua)
    if (ua->args) {
       free_pool_memory(ua->args);
    }
+   if (ua->errmsg) {
+      free_pool_memory(ua->errmsg);
+   }
    if (ua->prompt) {
       free(ua->prompt);
    }
-
-   if (ua->UA_sock) {
-      bnet_close(ua->UA_sock);
-      ua->UA_sock = NULL;
+   if (ua->unique) {
+      free(ua->unique);
    }
+   free_bsock(ua->UA_sock);
    free(ua);
 }