From c1af078f9bd87f5900e1ee300876ceb8f94b3c2e Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Fri, 12 Jan 2007 09:59:05 +0000 Subject: [PATCH] Update copyrights + Do not release source pointers when restarting a failed job. git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/branches/Branch-2.0@3975 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/src/dird/backup.c | 2 +- bacula/src/dird/job.c | 46 +++++++++++++++++++----------- bacula/src/dird/jobq.c | 2 +- bacula/src/filed/backup.c | 2 +- bacula/src/stored/status.c | 2 +- bacula/src/tools/dbcheck.c | 2 +- bacula/src/win32/compat/compat.cpp | 2 +- bacula/src/win32/compat/winapi.c | 2 +- bacula/src/win32/winapi.h | 2 +- bacula/technotes-2.0 | 6 ++-- 10 files changed, 41 insertions(+), 27 deletions(-) diff --git a/bacula/src/dird/backup.c b/bacula/src/dird/backup.c index 1927103ffe..8b9dfd8db2 100644 --- a/bacula/src/dird/backup.c +++ b/bacula/src/dird/backup.c @@ -16,7 +16,7 @@ /* Bacula® - The Network Backup Solution - Copyright (C) 2000-2006 Free Software Foundation Europe e.V. + 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. diff --git a/bacula/src/dird/job.c b/bacula/src/dird/job.c index ebcd832ba6..f4eceadeb8 100644 --- a/bacula/src/dird/job.c +++ b/bacula/src/dird/job.c @@ -9,7 +9,7 @@ /* Bacula® - The Network Backup Solution - Copyright (C) 2000-2006 Free Software Foundation Europe e.V. + 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. @@ -852,22 +852,6 @@ void dird_free_jcr_pointers(JCR *jcr) free_pool_memory(jcr->fname); jcr->fname = NULL; } - if (jcr->pool_source) { - free_pool_memory(jcr->pool_source); - jcr->pool_source = NULL; - } - if (jcr->rpool_source) { - free_pool_memory(jcr->rpool_source); - jcr->rpool_source = NULL; - } - if (jcr->wstore_source) { - free_pool_memory(jcr->wstore_source); - jcr->wstore_source = NULL; - } - if (jcr->rstore_source) { - free_pool_memory(jcr->rstore_source); - jcr->rstore_source = NULL; - } if (jcr->stime) { Dmsg0(200, "Free JCR stime\n"); free_pool_memory(jcr->stime); @@ -905,6 +889,27 @@ void dird_free_jcr(JCR *jcr) pthread_cond_destroy(&jcr->term_wait); jcr->term_wait_inited = false; } + if (jcr->fname) { + Dmsg0(200, "Free JCR fname\n"); + free_pool_memory(jcr->fname); + jcr->fname = NULL; + } + if (jcr->pool_source) { + free_pool_memory(jcr->pool_source); + jcr->pool_source = NULL; + } + if (jcr->rpool_source) { + free_pool_memory(jcr->rpool_source); + jcr->rpool_source = NULL; + } + if (jcr->wstore_source) { + free_pool_memory(jcr->wstore_source); + jcr->wstore_source = NULL; + } + if (jcr->rstore_source) { + free_pool_memory(jcr->rstore_source); + jcr->rstore_source = NULL; + } /* Delete lists setup to hold storage pointers */ free_rwstorage(jcr); @@ -955,6 +960,12 @@ void set_jcr_defaults(JCR *jcr, JOB *job) case JT_RESTORE: jcr->JobLevel = L_NONE; break; + case JT_MIGRATE: + if (!jcr->rpool_source) { + jcr->rpool_source = get_pool_memory(PM_MESSAGE); + pm_strcpy(jcr->rpool_source, _("unknown source")); + } + /* Fall-through wanted */ default: jcr->JobLevel = job->JobLevel; break; @@ -966,6 +977,7 @@ void set_jcr_defaults(JCR *jcr, JOB *job) jcr->pool_source = get_pool_memory(PM_MESSAGE); pm_strcpy(jcr->pool_source, _("unknown source")); } + jcr->JobPriority = job->Priority; /* Copy storage definitions -- deleted in dir_free_jcr above */ if (job->storage) { diff --git a/bacula/src/dird/jobq.c b/bacula/src/dird/jobq.c index 6246fcdb5c..ca52baba6d 100755 --- a/bacula/src/dird/jobq.c +++ b/bacula/src/dird/jobq.c @@ -20,7 +20,7 @@ /* Bacula® - The Network Backup Solution - Copyright (C) 2003-2006 Free Software Foundation Europe e.V. + Copyright (C) 2003-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. diff --git a/bacula/src/filed/backup.c b/bacula/src/filed/backup.c index c6e5e49b6c..8b63b528a4 100644 --- a/bacula/src/filed/backup.c +++ b/bacula/src/filed/backup.c @@ -10,7 +10,7 @@ /* Bacula® - The Network Backup Solution - Copyright (C) 2000-2006 Free Software Foundation Europe e.V. + 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. diff --git a/bacula/src/stored/status.c b/bacula/src/stored/status.c index aaf4dcb18d..4744840ce6 100644 --- a/bacula/src/stored/status.c +++ b/bacula/src/stored/status.c @@ -9,7 +9,7 @@ /* Bacula® - The Network Backup Solution - Copyright (C) 2003-2006 Free Software Foundation Europe e.V. + Copyright (C) 2003-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. diff --git a/bacula/src/tools/dbcheck.c b/bacula/src/tools/dbcheck.c index 04cadc8251..e51c72c403 100644 --- a/bacula/src/tools/dbcheck.c +++ b/bacula/src/tools/dbcheck.c @@ -11,7 +11,7 @@ /* Bacula® - The Network Backup Solution - Copyright (C) 2002-2006 Free Software Foundation Europe e.V. + Copyright (C) 2002-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. diff --git a/bacula/src/win32/compat/compat.cpp b/bacula/src/win32/compat/compat.cpp index e481b6d21b..ca36b0c56f 100644 --- a/bacula/src/win32/compat/compat.cpp +++ b/bacula/src/win32/compat/compat.cpp @@ -11,7 +11,7 @@ /* Bacula® - The Network Backup Solution - Copyright (C) 2004-2006 Free Software Foundation Europe e.V. + Copyright (C) 2004-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. diff --git a/bacula/src/win32/compat/winapi.c b/bacula/src/win32/compat/winapi.c index 55ea083788..b713bad443 100644 --- a/bacula/src/win32/compat/winapi.c +++ b/bacula/src/win32/compat/winapi.c @@ -8,7 +8,7 @@ /* Bacula® - The Network Backup Solution - Copyright (C) 2003-2006 Free Software Foundation Europe e.V. + Copyright (C) 2003-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. diff --git a/bacula/src/win32/winapi.h b/bacula/src/win32/winapi.h index 94497023a8..50844d6816 100644 --- a/bacula/src/win32/winapi.h +++ b/bacula/src/win32/winapi.h @@ -8,7 +8,7 @@ /* Bacula® - The Network Backup Solution - Copyright (C) 2003-2006 Free Software Foundation Europe e.V. + Copyright (C) 2003-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. diff --git a/bacula/technotes-2.0 b/bacula/technotes-2.0 index 6ac62eda69..79f5f5232e 100644 --- a/bacula/technotes-2.0 +++ b/bacula/technotes-2.0 @@ -2,12 +2,14 @@ General: Version 2.0.1 -11Jan06 +12Jan07 +kes Do not release source pointers when restarting a failed job. +11Jan07 kes Add dynamic dll entry point for SHGetFolderPath to Win32 code. This *should* fix bug #747. kes Modify winbacula.nsi to substitute with g bin_dir_cmd. Should fix bug #742. -09Jan06 +09Jan07 kes Modify USTORE constructor to set an empty store_source string, and don't copy the store_source string in a cancel. Hopefully this will fix Arno's seg fault, bug #744. -- 2.39.2