X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fwx-console%2Fconsole_conf.c;h=bbfca2dafceb8f890232362782f763f16417836e;hb=c87eb430746cb5d98d0f2016ac0165b39aba61e8;hp=440987cbcff334b10fa1344f222666992d40756e;hpb=f4fadeaf83a912e0a19c19eacd0c7113b21f0a67;p=bacula%2Fbacula diff --git a/bacula/src/wx-console/console_conf.c b/bacula/src/wx-console/console_conf.c index 440987cbcf..bbfca2dafc 100644 --- a/bacula/src/wx-console/console_conf.c +++ b/bacula/src/wx-console/console_conf.c @@ -19,25 +19,26 @@ * * 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 + #include "bacula.h" #include "console_conf.h" @@ -79,8 +80,13 @@ static RES_ITEM cons_items[] = { {"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), 0, 0, 0}, + {"tlsrequire", store_yesno, 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}, {NULL, NULL, NULL, 0, 0, 0} }; @@ -92,7 +98,12 @@ static RES_ITEM dir_items[] = { {"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), 0, 0, 0}, + {"tlsrequire", store_yesno, 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}, {NULL, NULL, NULL, 0, 0, 0} }; @@ -103,7 +114,7 @@ static RES_ITEM dir_items[] = { RES_TABLE resources[] = { {"console", cons_items, R_CONSOLE}, {"director", dir_items, R_DIRECTOR}, - {NULL, NULL, 0} + {NULL, NULL, 0} }; @@ -114,24 +125,24 @@ void dump_resource(int type, RES *reshdr, void sendit(void *sock, const char *fm 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); @@ -163,20 +174,51 @@ void free_resource(RES *sres, int type) } 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) { @@ -201,9 +243,9 @@ void save_resource(int type, RES_ITEM *items, int pass) 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]); - } + } } } @@ -220,7 +262,7 @@ void save_resource(int type, RES_ITEM *items, int pass) 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; } @@ -247,7 +289,7 @@ void save_resource(int type, RES_ITEM *items, int pass) 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; @@ -262,14 +304,14 @@ void save_resource(int type, RES_ITEM *items, int pass) RES *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); + Dmsg2(90, "Inserting %s res: %s\n", res_to_str(type), + res->res_dir.hdr.name); } } }