+/*
+ Bacula(R) - The Network Backup Solution
+
+ Copyright (C) 2000-2017 Kern Sibbald
+
+ 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.
+
+ This notice must be preserved when any source code is
+ conveyed and/or propagated.
+
+ Bacula(R) is a registered trademark of Kern Sibbald.
+*/
/*
* Main configuration file parser for Bacula File Daemon (Client)
* some parts may be split into separate files such as
* for the resource records.
*
* Kern Sibbald, September MM
- *
- * Version $Id$
- */
-/*
- Copyright (C) 2000-2005 Kern Sibbald
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- version 2 as amended with additional clauses defined in the
- file LICENSE in the main source directory.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- the file LICENSE for additional details.
-
*/
#include "bacula.h"
* types. Note, these should be unique for each
* daemon though not a requirement.
*/
-int r_first = R_FIRST;
-int r_last = R_LAST;
-static RES *sres_head[R_LAST - R_FIRST + 1];
-RES **res_head = sres_head;
+int32_t r_first = R_FIRST;
+int32_t r_last = R_LAST;
+RES_HEAD **res_head;
/* Forward referenced subroutines */
* then move it to allocated memory when the resource
* scan is complete.
*/
-#if defined(HAVE_WIN32) && !defined(HAVE_CYGWIN)
+#if defined(_MSC_VER)
extern "C" { // work around visual compiler mangling variables
- URES res_all;
- int res_all_size = sizeof(res_all);
+ URES res_all;
}
#else
URES res_all;
-int res_all_size = sizeof(res_all);
#endif
+int32_t res_all_size = sizeof(res_all);
+
+/* Forward definition for encyption cipher/digest type */
+static void store_cipher_type(LEX *lc, RES_ITEM *item, int index, int pass);
+static void store_digest_type(LEX *lc, RES_ITEM *item, int index, int pass);
/* Definition of records permitted within each
* resource with the routine to process the record
/* Client or File daemon "Global" resources */
static RES_ITEM 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},
- {"fdport", store_addresses_port, ITEM(res_client.FDaddrs), 0, ITEM_DEFAULT, 9102},
- {"fdaddress", store_addresses_address, ITEM(res_client.FDaddrs), 0, ITEM_DEFAULT, 9102},
- {"fdaddresses", store_addresses, ITEM(res_client.FDaddrs), 0, ITEM_DEFAULT, 9102},
-
- {"workingdirectory", store_dir, ITEM(res_client.working_directory), 0, ITEM_REQUIRED, 0},
- {"piddirectory", store_dir, ITEM(res_client.pid_directory), 0, ITEM_REQUIRED, 0},
- {"subsysdirectory", store_dir, ITEM(res_client.subsys_directory), 0, 0, 0},
- {"scriptsdirectory", store_dir, ITEM(res_client.scripts_directory), 0, 0, 0},
- {"maximumconcurrentjobs", store_pint, ITEM(res_client.MaxConcurrentJobs), 0, ITEM_DEFAULT, 10},
- {"messages", store_res, ITEM(res_client.messages), R_MSGS, 0, 0},
- {"heartbeatinterval", store_time, ITEM(res_client.heartbeat_interval), 0, ITEM_DEFAULT, 0},
- {"sdconnecttimeout", store_time,ITEM(res_client.SDConnectTimeout), 0, ITEM_DEFAULT, 60 * 30},
- {"maximumnetworkbuffersize", store_pint, ITEM(res_client.max_network_buffer_size), 0, 0, 0},
- {"tlsenable", store_yesno, ITEM(res_client.tls_enable), 1, ITEM_DEFAULT, 0},
- {"tlsrequire", store_yesno, ITEM(res_client.tls_require), 1, ITEM_DEFAULT, 0},
- {"tlscacertificatefile", store_dir, ITEM(res_client.tls_ca_certfile), 0, 0, 0},
- {"tlscacertificatedir", store_dir, ITEM(res_client.tls_ca_certdir), 0, 0, 0},
- {"tlscertificate", store_dir, ITEM(res_client.tls_certfile), 0, 0, 0},
- {"tlskey", store_dir, ITEM(res_client.tls_keyfile), 0, 0, 0},
- {NULL, NULL, NULL, 0, 0, 0}
+ {"Name", store_name, ITEM(res_client.hdr.name), 0, ITEM_REQUIRED, 0},
+ {"Description", store_str, ITEM(res_client.hdr.desc), 0, 0, 0},
+ {"FdPort", store_addresses_port, ITEM(res_client.FDaddrs), 0, ITEM_DEFAULT, 9102},
+ {"FdAddress", store_addresses_address, ITEM(res_client.FDaddrs), 0, ITEM_DEFAULT, 9102},
+ {"FdAddresses", store_addresses, ITEM(res_client.FDaddrs), 0, ITEM_DEFAULT, 9102},
+ {"FdSourceAddress", store_addresses_address, ITEM(res_client.FDsrc_addr), 0, ITEM_DEFAULT, 0},
+
+ {"WorkingDirectory", store_dir, ITEM(res_client.working_directory), 0, ITEM_REQUIRED, 0},
+ {"PidDirectory", store_dir, ITEM(res_client.pid_directory), 0, ITEM_REQUIRED, 0},
+ {"SubsysDirectory", store_dir, ITEM(res_client.subsys_directory), 0, 0, 0},
+ {"PluginDirectory", store_dir, ITEM(res_client.plugin_directory), 0, 0, 0},
+ {"SnapshotCommand", store_str, ITEM(res_client.snapshot_command), 0, 0, 0},
+ {"ScriptsDirectory", store_dir, ITEM(res_client.scripts_directory), 0, 0, 0},
+ {"MaximumConcurrentJobs", store_pint32, ITEM(res_client.MaxConcurrentJobs), 0, ITEM_DEFAULT, 20},
+ {"Messages", store_res, ITEM(res_client.messages), R_MSGS, 0, 0},
+ {"SdConnectTimeout", store_time,ITEM(res_client.SDConnectTimeout), 0, ITEM_DEFAULT, 60 * 30},
+ {"HeartbeatInterval", store_time, ITEM(res_client.heartbeat_interval), 0, ITEM_DEFAULT, 5 * 60},
+ {"MaximumNetworkBufferSize", store_pint32, ITEM(res_client.max_network_buffer_size), 0, 0, 0},
+#ifdef DATA_ENCRYPTION
+ {"PkiSignatures", store_bool, ITEM(res_client.pki_sign), 0, ITEM_DEFAULT, 0},
+ {"PkiEncryption", store_bool, ITEM(res_client.pki_encrypt), 0, ITEM_DEFAULT, 0},
+ {"PkiKeyPair", store_dir, ITEM(res_client.pki_keypair_file), 0, 0, 0},
+ {"PkiSigner", store_alist_str, ITEM(res_client.pki_signing_key_files), 0, 0, 0},
+ {"PkiMasterKey", store_alist_str, ITEM(res_client.pki_master_key_files), 0, 0, 0},
+ {"PkiCipher", store_cipher_type, ITEM(res_client.pki_cipher), 0, 0, 0},
+ {"PkiDigest", store_digest_type, ITEM(res_client.pki_digest), 0, 0, 0},
+#endif
+ {"TlsAuthenticate", store_bool, ITEM(res_client.tls_authenticate), 0, 0, 0},
+ {"TlsEnable", store_bool, ITEM(res_client.tls_enable), 0, 0, 0},
+ {"TlsRequire", store_bool, ITEM(res_client.tls_require), 0, 0, 0},
+ {"TlsCaCertificateFile", store_dir, ITEM(res_client.tls_ca_certfile), 0, 0, 0},
+ {"TlsCaCertificateDir", store_dir, ITEM(res_client.tls_ca_certdir), 0, 0, 0},
+ {"TlsCertificate", store_dir, ITEM(res_client.tls_certfile), 0, 0, 0},
+ {"TlsKey", store_dir, ITEM(res_client.tls_keyfile), 0, 0, 0},
+ {"VerId", store_str, ITEM(res_client.verid), 0, 0, 0},
+ {"MaximumBandwidthPerJob",store_speed, ITEM(res_client.max_bandwidth_per_job), 0, 0, 0},
+ {"CommCompression", store_bool, ITEM(res_client.comm_compression), 0, ITEM_DEFAULT, true},
+ {"DisableCommand", store_alist_str, ITEM(res_client.disable_cmds), 0, 0, 0},
+ {NULL, NULL, {0}, 0, 0, 0}
};
/* Directors that can use our services */
static RES_ITEM dir_items[] = {
- {"name", store_name, ITEM(res_dir.hdr.name), 0, ITEM_REQUIRED, 0},
- {"description", store_str, ITEM(res_dir.hdr.desc), 0, 0, 0},
- {"password", store_password, ITEM(res_dir.password), 0, ITEM_REQUIRED, 0},
- {"address", store_str, ITEM(res_dir.address), 0, 0, 0},
- {"monitor", store_yesno, ITEM(res_dir.monitor), 1, ITEM_DEFAULT, 0},
- {"tlsenable", store_yesno, ITEM(res_dir.tls_enable), 1, ITEM_DEFAULT, 0},
- {"tlsrequire", store_yesno, ITEM(res_dir.tls_require), 1, ITEM_DEFAULT, 0},
- {"tlsverifypeer", store_yesno, ITEM(res_dir.tls_verify_peer), 1, ITEM_DEFAULT, 0},
- {"tlscacertificatefile", store_dir, ITEM(res_dir.tls_ca_certfile), 0, 0, 0},
- {"tlscacertificatedir", store_dir, ITEM(res_dir.tls_ca_certdir), 0, 0, 0},
- {"tlscertificate", store_dir, ITEM(res_dir.tls_certfile), 0, 0, 0},
- {"tlskey", store_dir, ITEM(res_dir.tls_keyfile), 0, 0, 0},
- {"tlsdhfile", store_dir, ITEM(res_dir.tls_dhfile), 0, 0, 0},
- {"tlsallowedcn", store_alist_str, ITEM(res_dir.tls_allowed_cns), 0, 0, 0},
- {NULL, NULL, NULL, 0, 0, 0}
+ {"Name", store_name, ITEM(res_dir.hdr.name), 0, ITEM_REQUIRED, 0},
+ {"Description", store_str, ITEM(res_dir.hdr.desc), 0, 0, 0},
+ {"Password", store_password, ITEM(res_dir.password), 0, ITEM_REQUIRED, 0},
+ {"Address", store_str, ITEM(res_dir.address), 0, 0, 0},
+ {"Monitor", store_bool, ITEM(res_dir.monitor), 0, ITEM_DEFAULT, 0},
+ {"Remote", store_bool, ITEM(res_dir.remote), 0, ITEM_DEFAULT, 0},
+ {"TlsAuthenticate", store_bool, ITEM(res_dir.tls_authenticate), 0, 0, 0},
+ {"TlsEnable", store_bool, ITEM(res_dir.tls_enable), 0, 0, 0},
+ {"TlsRequire", store_bool, ITEM(res_dir.tls_require), 0, 0, 0},
+ {"TlsVerifyPeer", store_bool, ITEM(res_dir.tls_verify_peer), 0, ITEM_DEFAULT, 1},
+ {"TlsCaCertificateFile", store_dir, ITEM(res_dir.tls_ca_certfile), 0, 0, 0},
+ {"TlsCaCertificateDir", store_dir, ITEM(res_dir.tls_ca_certdir), 0, 0, 0},
+ {"TlsCertificate", store_dir, ITEM(res_dir.tls_certfile), 0, 0, 0},
+ {"TlsKey", store_dir, ITEM(res_dir.tls_keyfile), 0, 0, 0},
+ {"TlsDhFile", store_dir, ITEM(res_dir.tls_dhfile), 0, 0, 0},
+ {"TlsAllowedCn", store_alist_str, ITEM(res_dir.tls_allowed_cns), 0, 0, 0},
+ {"MaximumBandwidthPerJob", store_speed, ITEM(res_dir.max_bandwidth_per_job), 0, 0, 0},
+ {"DisableCommand", store_alist_str, ITEM(res_dir.disable_cmds), 0, 0, 0},
+ {"Console", store_res, ITEM(res_dir.console), R_CONSOLE, 0, 0},
+ {NULL, NULL, {0}, 0, 0, 0}
+};
+
+/* Consoles that we can use to connect a Director */
+static RES_ITEM cons_items[] = {
+ {"Name", store_name, ITEM(res_cons.hdr.name), 0, ITEM_REQUIRED, 0},
+ {"Description", store_str, ITEM(res_cons.hdr.desc), 0, 0, 0},
+ {"Password", store_password, ITEM(res_cons.password), 0, ITEM_REQUIRED, 0},
+ {"Address", store_str, ITEM(res_cons.address), 0, 0, 0},
+ {"DirPort", store_pint32, ITEM(res_cons.DIRport), 0, ITEM_DEFAULT, 9101},
+ {"TlsAuthenticate", store_bool, ITEM(res_cons.tls_authenticate), 0, 0, 0},
+ {"TlsEnable", store_bool, ITEM(res_cons.tls_enable), 0, 0, 0},
+ {"TlsRequire", store_bool, ITEM(res_cons.tls_require), 0, 0, 0},
+ {"TlsVerifyPeer", store_bool, ITEM(res_cons.tls_verify_peer), 0, ITEM_DEFAULT, 1},
+ {"TlsCaCertificateFile", store_dir, ITEM(res_cons.tls_ca_certfile), 0, 0, 0},
+ {"TlsCaCertificateDir", store_dir, ITEM(res_cons.tls_ca_certdir), 0, 0, 0},
+ {"TlsCertificate", store_dir, ITEM(res_cons.tls_certfile), 0, 0, 0},
+ {"TlsKey", store_dir, ITEM(res_cons.tls_keyfile), 0, 0, 0},
+ {"TlsDhFile", store_dir, ITEM(res_cons.tls_dhfile), 0, 0, 0},
+ {"TlsAllowedCn", store_alist_str, ITEM(res_cons.tls_allowed_cns), 0, 0, 0},
+ {NULL, NULL, {0}, 0, 0, 0}
};
/* Message resource */
* It must have one item for each of the resources.
*/
RES_TABLE resources[] = {
- {"director", dir_items, R_DIRECTOR},
- {"filedaemon", cli_items, R_CLIENT},
- {"client", cli_items, R_CLIENT}, /* alias for filedaemon */
- {"messages", msgs_items, R_MSGS},
+ {"Director", dir_items, R_DIRECTOR},
+ {"FileDaemon", cli_items, R_CLIENT},
+ {"Messages", msgs_items, R_MSGS},
+ {"Console", cons_items, R_CONSOLE},
+ {"Client", cli_items, R_CLIENT}, /* alias for filedaemon */
{NULL, NULL, 0}
};
+/* Cipher/Digest keyword structure */
+struct s_ct {
+ const char *type_name;
+ int32_t type_value;
+};
+
+struct s_ct ciphertypes[] = {
+ {"aes128", CRYPTO_CIPHER_AES_128_CBC},
+ {"aes192", CRYPTO_CIPHER_AES_192_CBC},
+ {"aes256", CRYPTO_CIPHER_AES_256_CBC},
+ {"blowfish", CRYPTO_CIPHER_BLOWFISH_CBC},
+ {NULL, 0}
+};
+
+struct s_ct digesttypes[] = {
+ {"md5", CRYPTO_DIGEST_MD5},
+ {"sha1", CRYPTO_DIGEST_SHA1},
+ {"sha256", CRYPTO_DIGEST_SHA256},
+// {"sha512", CRYPTO_DIGEST_SHA512}, /* Not working yet */
+ {NULL, 0}
+};
+
+/*
+ * Store cipher type
+ *
+ */
+static void store_cipher_type(LEX *lc, RES_ITEM *item, int index, int pass)
+{
+ int i;
+
+ lex_get_token(lc, T_NAME);
+ /* Store the type both pass 1 and pass 2 */
+ for (i=0; ciphertypes[i].type_name; i++) {
+ if (strcasecmp(lc->str, ciphertypes[i].type_name) == 0) {
+ *(uint32_t *)(item->value) = ciphertypes[i].type_value;
+ i = 0;
+ break;
+ }
+ }
+ if (i != 0) {
+ scan_err1(lc, _("Expected a Cipher Type keyword, got: %s"), lc->str);
+ }
+ scan_to_eol(lc);
+ set_bit(index, res_all.hdr.item_present);
+}
+
+/*
+ * Store digest type
+ *
+ */
+static void store_digest_type(LEX *lc, RES_ITEM *item, int index, int pass)
+{
+ int i;
+
+ lex_get_token(lc, T_NAME);
+ /* Store the type both pass 1 and pass 2 */
+ for (i=0; digesttypes[i].type_name; i++) {
+ if (strcasecmp(lc->str, digesttypes[i].type_name) == 0) {
+ *(uint32_t *)(item->value) = digesttypes[i].type_value;
+ i = 0;
+ break;
+ }
+ }
+ if (i != 0) {
+ scan_err1(lc, _("Expected a Cipher Type keyword, got: %s"), lc->str);
+ }
+ scan_to_eol(lc);
+ set_bit(index, res_all.hdr.item_present);
+}
/* Dump contents of resource */
-void dump_resource(int type, RES *reshdr, void sendit(void *sock, const char *fmt, ...), void *sock)
+void dump_resource(int type, RES *ares, void sendit(void *sock, const char *fmt, ...), void *sock)
{
- URES *res = (URES *)reshdr;
+ URES *res = (URES *)ares;
int recurse = 1;
if (res == NULL) {
recurse = 0;
}
switch (type) {
- case R_DIRECTOR:
- sendit(sock, "Director: name=%s password=%s\n", reshdr->name,
- res->res_dir.password);
- break;
- case R_CLIENT:
- sendit(sock, "Client: name=%s FDport=%d\n", reshdr->name,
- get_first_port_host_order(res->res_client.FDaddrs));
- break;
- case R_MSGS:
- sendit(sock, "Messages: name=%s\n", res->res_msgs.hdr.name);
- if (res->res_msgs.mail_cmd)
- sendit(sock, " mailcmd=%s\n", res->res_msgs.mail_cmd);
- if (res->res_msgs.operator_cmd)
- sendit(sock, " opcmd=%s\n", res->res_msgs.operator_cmd);
- break;
- default:
- sendit(sock, "Unknown resource type %d\n", type);
+ case R_CONSOLE:
+ sendit(sock, "Console: name=%s password=%s\n", ares->name,
+ res->res_cons.password);
+ break;
+ case R_DIRECTOR:
+ sendit(sock, "Director: name=%s password=%s\n", ares->name,
+ res->res_dir.password);
+ break;
+ case R_CLIENT:
+ sendit(sock, "Client: name=%s FDport=%d\n", ares->name,
+ get_first_port_host_order(res->res_client.FDaddrs));
+ break;
+ case R_MSGS:
+ sendit(sock, "Messages: name=%s\n", res->res_msgs.hdr.name);
+ if (res->res_msgs.mail_cmd)
+ sendit(sock, " mailcmd=%s\n", res->res_msgs.mail_cmd);
+ if (res->res_msgs.operator_cmd)
+ sendit(sock, " opcmd=%s\n", res->res_msgs.operator_cmd);
+ break;
+ default:
+ sendit(sock, "Unknown resource type %d\n", type);
+ }
+ ares = GetNextRes(type, ares);
+ if (recurse && ares) {
+ dump_resource(type, ares, sendit, sock);
}
- if (recurse && res->res_dir.hdr.next)
- dump_resource(type, res->res_dir.hdr.next, sendit, sock);
}
+
/*
* Free memory of resource.
* NB, we don't need to worry about freeing any references
*/
void free_resource(RES *sres, int type)
{
- RES *nres;
URES *res = (URES *)sres;
if (res == NULL) {
}
/* common stuff -- free the resource name */
- nres = (RES *)res->res_dir.hdr.next;
if (res->res_dir.hdr.name) {
free(res->res_dir.hdr.name);
}
if (res->res_dir.address) {
free(res->res_dir.address);
}
- if (res->res_dir.tls_ctx) {
+ if (res->res_dir.tls_ctx) {
free_tls_context(res->res_dir.tls_ctx);
}
if (res->res_dir.tls_ca_certfile) {
if (res->res_dir.tls_allowed_cns) {
delete res->res_dir.tls_allowed_cns;
}
+ if (res->res_dir.disable_cmds) {
+ delete res->res_dir.disable_cmds;
+ }
+ if (res->res_dir.disabled_cmds_array) {
+ free(res->res_dir.disabled_cmds_array);
+ }
break;
- case R_CLIENT:
+ case R_CONSOLE:
+ if (res->res_cons.password) {
+ free(res->res_cons.password);
+ }
+ if (res->res_cons.address) {
+ free(res->res_cons.address);
+ }
+ if (res->res_cons.tls_ctx) {
+ free_tls_context(res->res_cons.tls_ctx);
+ }
+ if (res->res_cons.tls_ca_certfile) {
+ free(res->res_cons.tls_ca_certfile);
+ }
+ if (res->res_cons.tls_ca_certdir) {
+ free(res->res_cons.tls_ca_certdir);
+ }
+ if (res->res_cons.tls_certfile) {
+ free(res->res_cons.tls_certfile);
+ }
+ if (res->res_cons.tls_keyfile) {
+ free(res->res_cons.tls_keyfile);
+ }
+ if (res->res_cons.tls_dhfile) {
+ free(res->res_cons.tls_dhfile);
+ }
+ if (res->res_cons.tls_allowed_cns) {
+ delete res->res_cons.tls_allowed_cns;
+ }
+ break;
+ case R_CLIENT:
if (res->res_client.working_directory) {
free(res->res_client.working_directory);
}
if (res->res_client.scripts_directory) {
free(res->res_client.scripts_directory);
}
+ if (res->res_client.plugin_directory) {
+ free(res->res_client.plugin_directory);
+ }
if (res->res_client.FDaddrs) {
free_addresses(res->res_client.FDaddrs);
}
- if (res->res_client.tls_ctx) {
+ if (res->res_client.FDsrc_addr) {
+ free_addresses(res->res_client.FDsrc_addr);
+ }
+ if (res->res_client.snapshot_command) {
+ free(res->res_client.snapshot_command);
+ }
+ if (res->res_client.pki_keypair_file) {
+ free(res->res_client.pki_keypair_file);
+ }
+ if (res->res_client.pki_keypair) {
+ crypto_keypair_free(res->res_client.pki_keypair);
+ }
+
+ if (res->res_client.pki_signing_key_files) {
+ delete res->res_client.pki_signing_key_files;
+ }
+ if (res->res_client.pki_signers) {
+ X509_KEYPAIR *keypair;
+ foreach_alist(keypair, res->res_client.pki_signers) {
+ crypto_keypair_free(keypair);
+ }
+ delete res->res_client.pki_signers;
+ }
+
+ if (res->res_client.pki_master_key_files) {
+ delete res->res_client.pki_master_key_files;
+ }
+
+ if (res->res_client.pki_recipients) {
+ X509_KEYPAIR *keypair;
+ foreach_alist(keypair, res->res_client.pki_recipients) {
+ crypto_keypair_free(keypair);
+ }
+ delete res->res_client.pki_recipients;
+ }
+
+ if (res->res_client.tls_ctx) {
free_tls_context(res->res_client.tls_ctx);
}
if (res->res_client.tls_ca_certfile) {
if (res->res_client.tls_keyfile) {
free(res->res_client.tls_keyfile);
}
+ if (res->res_client.disable_cmds) {
+ delete res->res_client.disable_cmds;
+ }
+ if (res->res_client.disabled_cmds_array) {
+ free(res->res_client.disabled_cmds_array);
+ }
+ if (res->res_client.verid) {
+ free(res->res_client.verid);
+ }
break;
case R_MSGS:
- if (res->res_msgs.mail_cmd)
+ if (res->res_msgs.mail_cmd) {
free(res->res_msgs.mail_cmd);
- if (res->res_msgs.operator_cmd)
+ }
+ if (res->res_msgs.operator_cmd) {
free(res->res_msgs.operator_cmd);
+ }
free_msgs_res((MSGS *)res); /* free message resource */
res = NULL;
break;
if (res) {
free(res);
}
- if (nres) {
- free_resource(nres, type);
- }
}
/* Save the new resource by chaining it into the head list for
* the resource. If this is pass 2, we update any resource
* pointers (currently only in the Job resource).
*/
-void save_resource(int type, RES_ITEM *items, int pass)
+bool save_resource(CONFIG *config, int type, RES_ITEM *items, int pass)
{
URES *res;
+ CONSRES *cons;
int rindex = type - r_first;
int i, size;
int error = 0;
*/
for (i=0; items[i].name; i++) {
if (items[i].flags & ITEM_REQUIRED) {
- if (!bit_is_set(i, res_all.res_dir.hdr.item_present)) {
- Emsg2(M_ABORT, 0, _("%s item is required in %s resource, but not found.\n"),
- items[i].name, resources[rindex]);
- }
+ if (!bit_is_set(i, res_all.res_dir.hdr.item_present)) {
+ Mmsg(config->m_errmsg, _("\"%s\" directive is required in \"%s\" resource, but not found.\n"),
+ items[i].name, resources[rindex].name);
+ return false;
+ }
}
}
/* Resources containing another resource */
case R_DIRECTOR:
if ((res = (URES *)GetResWithName(R_DIRECTOR, res_all.res_dir.hdr.name)) == NULL) {
- Emsg1(M_ABORT, 0, _("Cannot find Director resource %s\n"), res_all.res_dir.hdr.name);
+ Mmsg(config->m_errmsg, _("Cannot find Director resource %s\n"), res_all.res_dir.hdr.name);
+ return false;
}
res->res_dir.tls_allowed_cns = res_all.res_dir.tls_allowed_cns;
+ res->res_dir.disable_cmds = res_all.res_dir.disable_cmds;
+ res->res_dir.console = res_all.res_dir.console;
+ if (res_all.res_dir.remote && !res_all.res_dir.console) {
+ if ((cons = (CONSRES *)GetNextRes(R_CONSOLE, NULL)) == NULL) {
+ Mmsg(config->m_errmsg, _("Cannot find any Console resource for remote access\n"));
+ return false;
+ }
+ res->res_dir.console = cons;
+ }
+ break;
+ /* Resources containing another resource */
+ case R_CONSOLE:
break;
case R_CLIENT:
if ((res = (URES *)GetResWithName(R_CLIENT, res_all.res_dir.hdr.name)) == NULL) {
- Emsg1(M_ABORT, 0, _("Cannot find Client resource %s\n"), res_all.res_dir.hdr.name);
+ Mmsg(config->m_errmsg, _("Cannot find Client resource %s\n"), res_all.res_dir.hdr.name);
+ return false;
}
+ res->res_client.pki_signing_key_files = res_all.res_client.pki_signing_key_files;
+ res->res_client.pki_master_key_files = res_all.res_client.pki_master_key_files;
+
+ res->res_client.pki_signers = res_all.res_client.pki_signers;
+ res->res_client.pki_recipients = res_all.res_client.pki_recipients;
+
res->res_client.messages = res_all.res_client.messages;
+ res->res_client.disable_cmds = res_all.res_client.disable_cmds;
break;
default:
Emsg1(M_ERROR, 0, _("Unknown resource type %d\n"), type);
free(res_all.res_dir.hdr.desc);
res_all.res_dir.hdr.desc = NULL;
}
- return;
+ return true;
}
/* The following code is only executed on pass 1 */
case R_DIRECTOR:
size = sizeof(DIRRES);
break;
+ case R_CONSOLE:
+ size = sizeof(CONSRES);
+ break;
case R_CLIENT:
size = sizeof(CLIENT);
break;
}
/* Common */
if (!error) {
- res = (URES *)malloc(size);
- memcpy(res, &res_all, size);
- if (!res_head[rindex]) {
- res_head[rindex] = (RES *)res; /* store first entry */
- } else {
- RES *next;
- /* Add new res to end of chain */
- for (next=res_head[rindex]; next->next; next=next->next) {
- if (strcmp(next->name, res->res_dir.hdr.name) == 0) {
- Emsg2(M_ERROR_TERM, 0,
- _("Attempt to define second %s resource named \"%s\" is not permitted.\n"),
- resources[rindex].name, res->res_dir.hdr.name);
- }
- }
- next->next = (RES *)res;
- Dmsg2(90, "Inserting %s res: %s\n", res_to_str(type),
- res->res_dir.hdr.name);
+ if (!config->insert_res(rindex, size)) {
+ return false;
}
}
+ return true;
+}
+
+bool parse_fd_config(CONFIG *config, const char *configfile, int exit_code)
+{
+ config->init(configfile, NULL, exit_code, (void *)&res_all, res_all_size,
+ r_first, r_last, resources, &res_head);
+ return config->parse_config();
}
projects / bacula / bacula / blobdiff