*
* Kern Sibbald, January MM, September MM
*/
-
/*
- Copyright (C) 2000, 2001 Kern Sibbald and John Walker
+ 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
- as published by the Free Software Foundation; either version 2
- of the License, or (at your option) any later version.
+ 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
- GNU General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ the file LICENSE for additional details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+/* _("...") macro returns a wxChar*, so if we need a char*, we need to convert it with:
+ * wxString(_("...")).mb_str(*wxConvCurrent) */
+
+#include <wx/intl.h>
+
#include "bacula.h"
#include "console_conf.h"
*/
int r_first = R_FIRST;
int r_last = R_LAST;
+static RES *sres_head[R_LAST - R_FIRST + 1];
+RES **res_head = sres_head;
/* Forward referenced subroutines */
{"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},
- {"requiressl", store_yesno, ITEM(res_cons.require_ssl), 1, ITEM_DEFAULT, 0},
{"password", store_password, ITEM(res_cons.password), 0, ITEM_REQUIRED, 0},
+ {"tlsenable", store_yesno, ITEM(res_cons.tls_enable), 1, 0, 0},
+ {"tlsrequire", store_yesno, ITEM(res_cons.tls_require), 1, 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},
{NULL, NULL, NULL, 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},
- {"enablessl", store_yesno, ITEM(res_dir.enable_ssl), 1, ITEM_DEFAULT, 0},
+ {"tlsenable", store_yesno, ITEM(res_dir.tls_enable), 1, 0, 0},
+ {"tlsrequire", store_yesno, ITEM(res_dir.tls_require), 1, 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},
{NULL, NULL, NULL, 0, 0, 0}
};
* It must have one item for each of the resources.
*/
RES_TABLE resources[] = {
- {"console", cons_items, R_CONSOLE, NULL},
- {"director", dir_items, R_DIRECTOR, NULL},
- {NULL, NULL, 0, NULL}
+ {"console", cons_items, R_CONSOLE},
+ {"director", dir_items, R_DIRECTOR},
+ {NULL, NULL, 0}
};
int recurse = 1;
if (res == NULL) {
- printf("No record for %d %s\n", type, res_to_str(type));
+ printf(wxString(_("No record for %d %s\n")).mb_str(*wxConvCurrent), type, res_to_str(type));
return;
}
- if (type < 0) { /* no recursion */
+ if (type < 0) { /* no recursion */
type = - type;
recurse = 0;
}
switch (type) {
case R_CONSOLE:
- printf("Console: name=%s rcfile=%s histfile=%s\n", reshdr->name,
+ printf(wxString(_("Console: name=%s rcfile=%s histfile=%s\n")).mb_str(*wxConvCurrent), 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(wxString(_("Director: name=%s address=%s DIRport=%d\n")).mb_str(*wxConvCurrent), reshdr->name,
res->res_dir.address, res->res_dir.DIRport);
break;
default:
- printf("Unknown resource type %d\n", type);
+ printf(wxString(_("Unknown resource type %d\n")).mb_str(*wxConvCurrent), type);
}
if (recurse && res->res_dir.hdr.next) {
dump_resource(type, res->res_dir.hdr.next, sendit, sock);
}
switch (type) {
- case R_CONSOLE:
- if (res->res_cons.rc_file) {
- free(res->res_cons.rc_file);
- }
- if (res->res_cons.hist_file) {
- free(res->res_cons.hist_file);
- }
- case R_DIRECTOR:
- if (res->res_dir.address)
- free(res->res_dir.address);
- break;
- default:
- printf("Unknown resource type %d\n", type);
- }
+ case R_CONSOLE:
+ if (res->res_cons.rc_file) {
+ free(res->res_cons.rc_file);
+ }
+ if (res->res_cons.hist_file) {
+ free(res->res_cons.hist_file);
+ }
+ 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);
+ }
+ case R_DIRECTOR:
+ if (res->res_dir.address) {
+ free(res->res_dir.address);
+ }
+ if (res->res_dir.tls_ctx) {
+ free_tls_context(res->res_dir.tls_ctx);
+ }
+ if (res->res_dir.tls_ca_certfile) {
+ free(res->res_dir.tls_ca_certfile);
+ }
+ if (res->res_dir.tls_ca_certdir) {
+ free(res->res_dir.tls_ca_certdir);
+ }
+ if (res->res_dir.tls_certfile) {
+ free(res->res_dir.tls_certfile);
+ }
+ if (res->res_dir.tls_keyfile) {
+ free(res->res_dir.tls_keyfile);
+ }
+ break;
+ default:
+ printf(wxString(_("Unknown resource type %d\n")).mb_str(*wxConvCurrent), type);
+ }
/* Common stuff again -- free the resource, recurse to next one */
free(res);
if (nres) {
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_ABORT, 0, wxString(_("%s item is required in %s resource, but not found.\n")).mb_str(*wxConvCurrent),
items[i].name, resources[rindex]);
- }
+ }
}
}
break;
default:
- Emsg1(M_ERROR, 0, "Unknown resource type %d\n", type);
+ Emsg1(M_ERROR, 0, wxString(_("Unknown resource type %d\n")).mb_str(*wxConvCurrent), type);
error = 1;
break;
}
size = sizeof(DIRRES);
break;
default:
- printf("Unknown resource type %d\n", type);
+ printf(wxString(_("Unknown resource type %d\n")).mb_str(*wxConvCurrent), type);
error = 1;
size = 1;
break;
if (!error) {
res = (URES *)malloc(size);
memcpy(res, &res_all, size);
- if (!resources[rindex].res_head) {
- resources[rindex].res_head = (RES *)res; /* store first entry */
+ if (!res_head[rindex]) {
+ res_head[rindex] = (RES *)res; /* store first entry */
} else {
RES *next;
- for (next=resources[rindex].res_head; next->next; next=next->next) {
+ 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);
+ Emsg2(M_ERROR_TERM, 0,
+ wxString(_("Attempt to define second %s resource named \"%s\" is not permitted.\n")).mb_str(*wxConvCurrent),
+ 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);
+ res->res_dir.hdr.name);
}
}
}
projects / bacula / bacula / blobdiff