+/*
+ Bacula(R) - The Network Backup Solution
+
+ Copyright (C) 2000-2015 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 User Agent
* some parts may be split into separate files such as
*
* Kern Sibbald, January MM, September MM
*/
-/*
- 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 ammended 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"
#include "console_conf.h"
* types. Note, these should be unique for each
* daemon though not a requirement.
*/
-int r_first = R_FIRST;
-int r_last = R_LAST;
+int32_t r_first = R_FIRST;
+int32_t r_last = R_LAST;
static RES *sres_head[R_LAST - R_FIRST + 1];
RES **res_head = sres_head;
* then move it to allocated memory when the resource
* scan is complete.
*/
-#if defined(HAVE_WIN32) && !defined(HAVE_CYGWIN) && !defined(HAVE_MINGW)
+#if defined(_MSC_VER)
extern "C" { // work around visual compiler mangling variables
URES res_all;
- int res_all_size = sizeof(res_all);
}
#else
URES res_all;
-int res_all_size = sizeof(res_all);
#endif
+int32_t res_all_size = sizeof(res_all);
/* Definition of records permitted within each
* resource with the routine to process the record
/* Console "globals" */
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},
- {"rcfile", store_dir, ITEM(res_cons.rc_file), 0, 0, 0},
- {"historyfile", store_dir, ITEM(res_cons.hist_file), 0, 0, 0},
- {"password", store_password, ITEM(res_cons.password), 0, ITEM_REQUIRED, 0},
- {"tlsenable", store_yesno, ITEM(res_cons.tls_enable), 1, ITEM_DEFAULT, 0},
- {"tlsrequire", store_yesno, ITEM(res_cons.tls_require), 1, ITEM_DEFAULT, 0},
- {"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},
- {NULL, NULL, NULL, 0, 0, 0}
+ {"Name", store_name, ITEM(res_cons.hdr.name), 0, ITEM_REQUIRED, 0},
+ {"Description", store_str, ITEM(res_cons.hdr.desc), 0, 0, 0},
+ {"RCFile", store_dir, ITEM(res_cons.rc_file), 0, 0, 0},
+ {"HistoryFile", store_dir, ITEM(res_cons.hist_file), 0, 0, 0},
+ {"Password", store_password, ITEM(res_cons.password), 0, ITEM_REQUIRED, 0},
+ {"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},
+ {"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},
+ {"Director", store_str, ITEM(res_cons.director), 0, 0, 0},
+ {"HeartbeatInterval", store_time, ITEM(res_cons.heartbeat_interval), 0, ITEM_DEFAULT, 5 * 60},
+ {NULL, NULL, {0}, 0, 0, 0}
};
/* Director's that we can contact */
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},
- {"dirport", store_int, ITEM(res_dir.DIRport), 0, ITEM_DEFAULT, 9101},
- {"address", store_str, ITEM(res_dir.address), 0, 0, 0},
- {"password", store_password, ITEM(res_dir.password), 0, ITEM_REQUIRED, 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},
- {"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},
- {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},
+ {"DirPort", store_pint32, ITEM(res_dir.DIRport), 0, ITEM_DEFAULT, 9101},
+ {"Address", store_str, ITEM(res_dir.address), 0, 0, 0},
+ {"Password", store_password, ITEM(res_dir.password), 0, ITEM_REQUIRED, 0},
+ {"TlsAuthenticate",store_bool, ITEM(res_dir.tls_enable), 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},
+ {"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},
+ {"HeartbeatInterval", store_time, ITEM(res_dir.heartbeat_interval), 0, ITEM_DEFAULT, 5 * 60},
+ {NULL, NULL, {0}, 0, 0, 0}
};
/*
* This is the master resource definition.
* It must have one item for each of the resources.
+ *
+ * name item rcode
*/
RES_TABLE resources[] = {
- {"console", cons_items, R_CONSOLE},
- {"director", dir_items, R_DIRECTOR},
+ {"Console", cons_items, R_CONSOLE},
+ {"Director", dir_items, R_DIRECTOR},
{NULL, NULL, 0}
};
-
/* Dump contents of resource */
void dump_resource(int type, RES *reshdr, void sendit(void *sock, const char *fmt, ...), void *sock)
{
bool recurse = true;
if (res == NULL) {
- printf("No record for %d %s\n", type, res_to_str(type));
+ printf(_("No record for %d %s\n"), type, res_to_str(type));
return;
}
if (type < 0) { /* no recursion */
}
switch (type) {
case R_CONSOLE:
- printf("Console: name=%s rcfile=%s histfile=%s\n", reshdr->name,
+ printf(_("Console: name=%s rcfile=%s histfile=%s\n"), reshdr->name,
res->res_cons.rc_file, res->res_cons.hist_file);
break;
case R_DIRECTOR:
- printf("Director: name=%s address=%s DIRport=%d\n", reshdr->name,
+ printf(_("Director: name=%s address=%s DIRport=%d\n"), reshdr->name,
res->res_dir.address, res->res_dir.DIRport);
break;
default:
- printf("Unknown resource type %d\n", type);
+ printf(_("Unknown resource type %d\n"), type);
}
if (recurse && res->res_dir.hdr.next) {
dump_resource(type, res->res_dir.hdr.next, sendit, sock);
RES *nres;
URES *res = (URES *)sres;
- if (res == NULL)
+ if (res == NULL) {
return;
+ }
/* common stuff -- free the resource name */
nres = (RES *)res->res_dir.hdr.next;
if (res->res_cons.hist_file) {
free(res->res_cons.hist_file);
}
- if (res->res_cons.tls_ctx) {
+ if (res->res_cons.tls_ctx) {
free_tls_context(res->res_cons.tls_ctx);
}
if (res->res_cons.tls_ca_certfile) {
if (res->res_cons.tls_keyfile) {
free(res->res_cons.tls_keyfile);
}
+ if (res->res_cons.director) {
+ free(res->res_cons.director);
+ }
break;
case R_DIRECTOR:
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) {
}
break;
default:
- printf("Unknown resource type %d\n", type);
+ printf(_("Unknown resource type %d\n"), type);
}
/* Common stuff again -- free the resource, recurse to next one */
free(res);
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",
+ Emsg2(M_ERROR_TERM, 0, _("%s item is required in %s resource, but not found.\n"),
items[i].name, resources[rindex]);
}
}
break;
default:
- Emsg1(M_ERROR, 0, "Unknown resource type %d\n", type);
+ Emsg1(M_ERROR, 0, _("Unknown resource type %d\n"), type);
error = 1;
break;
}
size = sizeof(DIRRES);
break;
default:
- printf("Unknown resource type %d\n", type);
+ printf(_("Unknown resource type %d\n"), type);
error = 1;
size = 1;
break;
if (!res_head[rindex]) {
res_head[rindex] = (RES *)res; /* store first entry */
} else {
- RES *next;
- for (next=res_head[rindex]; next->next; next=next->next) {
+ RES *next, *last;
+ for (last=next=res_head[rindex]; next; next=next->next) {
+ last = 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;
+ last->next = (RES *)res;
Dmsg2(90, "Inserting %s res: %s\n", res_to_str(type),
res->res_dir.hdr.name);
}
}
}
+
+bool parse_cons_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