From: Kern Sibbald <kern@sibbald.com>
Date: Mon, 23 Jun 2003 20:10:53 +0000 (+0000)
Subject: Don't close_db() in free_ua_context() and don't zap jcr pointer to db
X-Git-Tag: Release-7.0.0~10085
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=7f56381ace9fe35e7193bf48f50bdc0eaad64637;p=bacula%2Fbacula

Don't close_db() in free_ua_context() and don't zap jcr pointer to db


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

diff --git a/bacula/src/dird/ua_cmds.c b/bacula/src/dird/ua_cmds.c
index acdf92a3b9..2e05678084 100644
--- a/bacula/src/dird/ua_cmds.c
+++ b/bacula/src/dird/ua_cmds.c
@@ -1563,5 +1563,4 @@ void close_db(UAContext *ua)
       db_close_database(ua->jcr, ua->db);
    }
    ua->db = NULL;
-   ua->jcr->db = NULL;
 }
diff --git a/bacula/src/dird/ua_server.c b/bacula/src/dird/ua_server.c
index 54f4801ed5..eb5470c0f1 100644
--- a/bacula/src/dird/ua_server.c
+++ b/bacula/src/dird/ua_server.c
@@ -176,6 +176,7 @@ static void *handle_UA_client_request(void *arg)
 
 getout:
 
+   close_db(ua);
    free_ua_context(ua);
    free_jcr(jcr);
 
@@ -220,8 +221,6 @@ void free_ua_context(UAContext *ua)
       bnet_close(ua->UA_sock);
    }
 
-   close_db(ua);
-
    free(ua);
 }