From 1a63e6306ab3f44613f0c849f85eb46bd219679f Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Sat, 13 Sep 2003 15:32:01 +0000 Subject: [PATCH] Fix some incorrect changes to dird_conf git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@701 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/src/dird/dird_conf.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/bacula/src/dird/dird_conf.c b/bacula/src/dird/dird_conf.c index cc69362807..526504166f 100644 --- a/bacula/src/dird/dird_conf.c +++ b/bacula/src/dird/dird_conf.c @@ -129,10 +129,10 @@ static struct res_items cli_items[] = { {"name", store_name, ITEM(res_client.hdr.name), 0, ITEM_REQUIRED, 0}, {"description", store_str, ITEM(res_client.hdr.desc), 0, 0, 0}, {"address", store_str, ITEM(res_client.address), 0, ITEM_REQUIRED, 0}, - {"fdaddress", store_str, ITEM(res_client.address), 0, ITEM_REQUIRED, 0}, + {"fdaddress", store_str, ITEM(res_client.address), 0, 0, 0}, {"fdport", store_pint, ITEM(res_client.FDport), 0, ITEM_DEFAULT, 9102}, {"password", store_password, ITEM(res_client.password), 0, ITEM_REQUIRED, 0}, - {"fdpassword", store_password, ITEM(res_client.password), 0, ITEM_REQUIRED, 0}, + {"fdpassword", store_password, ITEM(res_client.password), 0, 0, 0}, {"catalog", store_res, ITEM(res_client.catalog), R_CATALOG, 0, 0}, {"fileretention", store_time, ITEM(res_client.FileRetention), 0, ITEM_DEFAULT, 60*60*24*60}, {"jobretention", store_time, ITEM(res_client.JobRetention), 0, ITEM_DEFAULT, 60*60*24*180}, @@ -151,10 +151,11 @@ static struct res_items store_items[] = { {"description", store_str, ITEM(res_store.hdr.desc), 0, 0, 0}, {"sdport", store_pint, ITEM(res_store.SDport), 0, ITEM_DEFAULT, 9103}, {"address", store_str, ITEM(res_store.address), 0, ITEM_REQUIRED, 0}, - {"sdaddress", store_str, ITEM(res_store.address), 0, ITEM_REQUIRED, 0}, - {"sdpassword", store_password, ITEM(res_store.password), 0, ITEM_REQUIRED, 0}, + {"sdaddress", store_str, ITEM(res_store.address), 0, 0, 0}, + {"password", store_password, ITEM(res_store.password), 0, ITEM_REQUIRED, 0}, + {"sdpassword", store_password, ITEM(res_store.password), 0, 0, 0}, {"device", store_strname, ITEM(res_store.dev_name), 0, ITEM_REQUIRED, 0}, - {"sddevicename", store_strname, ITEM(res_store.dev_name), 0, ITEM_REQUIRED, 0}, + {"sddevicename", store_strname, ITEM(res_store.dev_name), 0, 0, 0}, {"mediatype", store_strname, ITEM(res_store.media_type), 0, ITEM_REQUIRED, 0}, {"autochanger", store_yesno, ITEM(res_store.autochanger), 1, ITEM_DEFAULT, 0}, {"enablessl", store_yesno, ITEM(res_store.enable_ssl), 1, ITEM_DEFAULT, 0}, @@ -176,7 +177,7 @@ static struct res_items cat_items[] = { {"dbport", store_pint, ITEM(res_cat.db_port), 0, 0, 0}, /* keep this password as store_str for the moment */ {"password", store_str, ITEM(res_cat.db_password), 0, 0, 0}, - {"dbpassword", store_str, ITEM(res_cat.db_password), 0, 0, 0}, + {"dbpassword", store_str, ITEM(res_cat.db_password), 0, 0, 0}, {"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}, -- 2.39.5