From f0e89655effa637d02d40cb1bced846fe1e66f5f Mon Sep 17 00:00:00 2001 From: Marco van Wieringen Date: Tue, 1 Oct 2013 13:50:45 +0200 Subject: [PATCH] When using multiple catalogs always the first is chosen. With the introduction of the autoselection of the right catalog when none is selected we also auto select a catalog in the pool resource. That is of course wrong as that means every pool always has an explicit override of the catalog to use to the first catalog which makes the override in the client useless. Fixes #229: When using multiple catalogs always the first is chosen. --- src/dird/dird_conf.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/dird/dird_conf.c b/src/dird/dird_conf.c index ae9c11f8db6..53143ce028d 100644 --- a/src/dird/dird_conf.c +++ b/src/dird/dird_conf.c @@ -1649,11 +1649,6 @@ void save_resource(int type, RES_ITEM *items, int pass) res->res_pool.storage = res_all.res_pool.storage; if (res_all.res_pool.catalog || !res->res_pool.use_catalog) { res->res_pool.catalog = res_all.res_pool.catalog; - } else { - /* - * No catalog overwrite given use the first catalog definition. - */ - res->res_pool.catalog = (CATRES *)GetNextRes(R_CATALOG, NULL); } break; case R_CONSOLE: