From 914cc514fa3de0ca6e9bf1f839922d03d01c8b03 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Mon, 6 Dec 2004 11:05:01 +0000 Subject: [PATCH] - Implement Jamie's patch to dird_conf.c that enables Multiple Connections and fixes a typo in show. 05Dec04 - Implement run command in Python git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1748 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/kernstodo | 3 +++ bacula/src/dird/dird_conf.c | 10 ++++++---- bacula/src/version.h | 4 ++-- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/bacula/kernstodo b/bacula/kernstodo index 7b386cc165..4b831f6ff1 100644 --- a/bacula/kernstodo +++ b/bacula/kernstodo @@ -60,6 +60,9 @@ Media: LTO-2 Model: SSL1016 Slots: 16 Cap: 200GB +- Supported drive: + Wangtek 6525ES (SCSI-1 QIC drive, 525MB), under Linux 2.4.something, + bacula 1.36.0/1 works with blocksize 16k INSIDE bacula-sd.conf. - Save mount point for directories not traversed with onefs=yes. - Implement WildFile and WildDir to solve problem of diff --git a/bacula/src/dird/dird_conf.c b/bacula/src/dird/dird_conf.c index cd7b06d5db..ef72bee1ad 100644 --- a/bacula/src/dird/dird_conf.c +++ b/bacula/src/dird/dird_conf.c @@ -191,7 +191,7 @@ static RES_ITEM cat_items[] = { {"user", store_str, ITEM(res_cat.db_user), 0, 0, 0}, {"dbname", store_str, ITEM(res_cat.db_name), 0, ITEM_REQUIRED, 0}, {"dbsocket", store_str, ITEM(res_cat.db_socket), 0, 0, 0}, - {"multipleconnections", store_yesno, ITEM(res_cat.mult_db_connections), 0, 0, 0}, + {"multipleconnections", store_yesno, ITEM(res_cat.mult_db_connections), 1, 0, 0}, {NULL, NULL, NULL, 0, 0, 0} }; @@ -492,9 +492,10 @@ void dump_resource(int type, RES *reshdr, void sendit(void *sock, const char *fm break; case R_CATALOG: sendit(sock, "Catalog: name=%s address=%s DBport=%d db_name=%s\n\ - db_user=%s\n", + db_user=%s MutliDBConn=%d\n", res->res_cat.hdr.name, NPRT(res->res_cat.db_address), - res->res_cat.db_port, res->res_cat.db_name, NPRT(res->res_cat.db_user)); + res->res_cat.db_port, res->res_cat.db_name, NPRT(res->res_cat.db_user), + res->res_cat.mult_db_connections); break; case R_JOB: case R_JOBDEFS: @@ -715,7 +716,8 @@ next_run: NPRT(res->res_pool.label_format)); sendit(sock, " CleaningPrefix=%s\n", NPRT(res->res_pool.cleaning_prefix)); - sendit(sock, " recyleOldest=%d MaxVolJobs=%d MaxVolFiles=%d\n", + sendit(sock, " RecyleOldest=%d PurgeOldest=%d MaxVolJobs=%d MaxVolFiles=%d\n", + res->res_pool.recycle_oldest_volume, res->res_pool.purge_oldest_volume, res->res_pool.MaxVolJobs, res->res_pool.MaxVolFiles); break; diff --git a/bacula/src/version.h b/bacula/src/version.h index 7f7d5ebdf9..63200ca108 100644 --- a/bacula/src/version.h +++ b/bacula/src/version.h @@ -1,8 +1,8 @@ /* */ #undef VERSION #define VERSION "1.37.1" -#define BDATE "05 December 2004" -#define LSMDATE "05Dec04" +#define BDATE "06 December 2004" +#define LSMDATE "06Dec04" /* Debug flags */ #undef DEBUG -- 2.39.5