*
*/
/*
- Copyright (C) 2000-2006 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.
-
- */
+ Bacula® - The Network Backup Solution
+
+ Copyright (C) 2000-2006 Free Software Foundation Europe e.V.
+
+ The main author of Bacula is Kern Sibbald, with contributions from
+ many others, a complete list can be found in the file AUTHORS.
+ This program is Free Software; you can redistribute it and/or
+ modify it under the terms of version two of the GNU General Public
+ License as published by the Free Software Foundation plus additions
+ that are listed in the file LICENSE.
+
+ 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.
+
+ 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., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301, USA.
+
+ Bacula® is a registered trademark of John Walker.
+ The licensor of Bacula is the Free Software Foundation Europe
+ (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
+ Switzerland, email:ftf@fsfeurope.org.
+*/
#include "bacula.h"
#include "filed.h"
bool no_signals = false;
-#define CONFIG_FILE "./bacula-fd.conf" /* default config file */
+#define CONFIG_FILE "bacula-fd.conf" /* default config file */
char *configfile = NULL;
static bool foreground = false;
-static bool inetd_request = false;
static workq_t dir_workq; /* queue of work from Director */
static pthread_t server_tid;
static void usage()
{
- Pmsg2(-1, _(
-"Copyright (C) 2000-2005 Kern Sibbald\n"
+ Pmsg3(-1, _(
+PROG_COPYRIGHT
"\nVersion: %s (%s)\n\n"
"Usage: bacula-fd [-f -s] [-c config_file] [-d debug_level]\n"
" -c <file> use <file> as configuration file\n"
" -dnn set debug level to nn\n"
" -f run in foreground (for debugging)\n"
" -g groupid\n"
-" -i inetd request\n"
" -s no signals (for debugging)\n"
" -t test configuration file and exit\n"
" -u userid\n"
" -v verbose user messages\n"
" -? print this message.\n"
-"\n"), VERSION, BDATE);
+"\n"), 2000, VERSION, BDATE);
exit(1);
}
init_msg(NULL, NULL);
daemon_start_time = time(NULL);
- while ((ch = getopt(argc, argv, "c:d:fg:istu:v?")) != -1) {
+ while ((ch = getopt(argc, argv, "c:d:fg:stu:v?")) != -1) {
switch (ch) {
case 'c': /* configuration file */
if (configfile != NULL) {
gid = optarg;
break;
- case 'i':
- inetd_request = true;
- break;
case 's':
no_signals = true;
break;
terminate_filed(0);
}
- if (!foreground &&!inetd_request) {
+ if (!foreground) {
daemon_start();
init_stack_dump(); /* set new pid */
}
}
server_tid = pthread_self();
- if (inetd_request) {
- /* Socket is on fd 0 */
- struct sockaddr client_addr;
- int port = -1;
- socklen_t client_addr_len = sizeof(client_addr);
- if (getsockname(0, &client_addr, &client_addr_len) == 0) {
- /* MA BUG 6 remove ifdefs */
- port = sockaddr_get_port_net_order(&client_addr);
- }
- BSOCK *bs = init_bsock(NULL, 0, "client", "unknown client", port, &client_addr);
- handle_client_request((void *)bs);
- } else {
- /* Become server, and handle requests */
- IPADDR *p;
- foreach_dlist(p, me->FDaddrs) {
- Dmsg1(10, "filed: listening on port %d\n", p->get_port_host_order());
- }
- bnet_thread_server(me->FDaddrs, me->MaxConcurrentJobs, &dir_workq, handle_client_request);
+ /* Become server, and handle requests */
+ IPADDR *p;
+ foreach_dlist(p, me->FDaddrs) {
+ Dmsg1(10, "filed: listening on port %d\n", p->get_port_host_order());
}
+ bnet_thread_server(me->FDaddrs, me->MaxConcurrentJobs, &dir_workq, handle_client_request);
terminate_filed(0);
exit(0); /* should never get here */
} else {
if (crypto_keypair_load_cert(keypair, filepath)) {
me->pki_recipients->append(keypair);
-
- /* Attempt to load a private key, if available */
- if (crypto_keypair_has_key(filepath)) {
- if (!crypto_keypair_load_key(keypair, filepath, NULL, NULL)) {
- Emsg3(M_FATAL, 0, _("Failed to load private key from file %s for File"
- " daemon \"%s\" in %s.\n"), filepath, me->hdr.name, configfile);
- OK = false;
- }
- }
-
} else {
Emsg3(M_FATAL, 0, _("Failed to load master key certificate"
" from file %s for File daemon \"%s\" in %s.\n"), filepath, me->hdr.name, configfile);
projects / bacula / bacula / blobdiff