Backport from Bacula Enterprise

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

diff --git a/bacula/src/dird/mac_sql.c b/bacula/src/dird/mac_sql.c
index e81fdbd4b7208c75b6f6f1847ce9b0bd8f3a86fa..a7623a768e645aac7e46522041a52965da02dac1 100644 (file)
--- a/bacula/src/dird/mac_sql.c
+++ b/bacula/src/dird/mac_sql.c
@@ -1,17 +1,21 @@
 /*
-   Bacula® - The Network Backup Solution
+   Bacula(R) - The Network Backup Solution
 
+   Copyright (C) 2000-2015 Kern Sibbald
    Copyright (C) 2004-2014 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.
+   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.
 
-   Bacula® is a registered trademark of Kern Sibbald.
+   This notice must be preserved when any source code is 
+   conveyed and/or propagated.
+
+   Bacula(R) is a registered trademark of Kern Sibbald.
 */
 /*
  *
@@ -566,8 +570,8 @@ static bool regex_find_jobids(JCR *jcr, idpkt *ids, const char *query1,
          }
       }
       if (last_item) {
-         free(last_item->item);
          Dmsg1(dbglevel, "Remove item %s\n", last_item->item);
+         free(last_item->item);
          item_chain->remove(last_item);
       }
       regfree(&preg);