rename plugin->len to plugin->file_len

[bacula/bacula] / bacula / src / filed / filed.c

diff --git a/bacula/src/filed/filed.c b/bacula/src/filed/filed.c
index 21b7c68fc374e71d40f0cc1a61904290438e2df2..79dd1928aad3b5c31e0018d9ffac80753e2219d9 100644 (file)
--- a/bacula/src/filed/filed.c
+++ b/bacula/src/filed/filed.c
@@ -1,12 +1,12 @@
 /*
    Bacula® - The Network Backup Solution
 
 /*
    Bacula® - The Network Backup Solution
 

-   Copyright (C) 2000-2008 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2010 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
 
    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
+   modify it under the terms of version three of the GNU Affero General Public

    License as published by the Free Software Foundation and included
    in the file LICENSE.
 
    License as published by the Free Software Foundation and included
    in the file LICENSE.
 


@@ -15,7 +15,7 @@
    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 GNU
    General Public License for more details.
 

-   You should have received a copy of the GNU General Public License
+   You should have received a copy of the GNU Affero 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.
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.


@@ -30,8 +30,6 @@
  *
  *    Kern Sibbald, March MM
  *
  *
  *    Kern Sibbald, March MM
  *

- *   Version $Id$
- *

  */
 
 #include "bacula.h"
  */
 
 #include "bacula.h"


@@ -55,7 +53,6 @@ extern void *handle_client_request(void *dir_sock);
 extern bool parse_fd_config(CONFIG *config, const char *configfile, int exit_code);
 
 /* Forward referenced functions */
 extern bool parse_fd_config(CONFIG *config, const char *configfile, int exit_code);
 
 /* Forward referenced functions */

-void terminate_filed(int sig);

 static bool check_resources();
 
 /* Exported variables */
 static bool check_resources();
 
 /* Exported variables */


@@ -73,21 +70,24 @@ static CONFIG *config;
 
 static void usage()
 {
 
 static void usage()
 {

-   Pmsg3(-1, _(
+   fprintf(stderr, _(

 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"
 "        -d <nn>     set debug level to <nn>\n"
 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"
 "        -d <nn>     set debug level to <nn>\n"

-"        -dt         print timestamp in debug output\n"
+"        -dt         print a timestamp in debug output\n"

 "        -f          run in foreground (for debugging)\n"
 "        -g          groupid\n"
 "        -f          run in foreground (for debugging)\n"
 "        -g          groupid\n"

+"        -k          keep readall capabilities\n"
+"        -m          print kaboom output (for debugging)\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"), 2000, VERSION, BDATE);
 "        -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"), 2000, VERSION, BDATE);

+

    exit(1);
 }
 
    exit(1);
 }
 


@@ -105,6 +105,7 @@ int main (int argc, char *argv[])
 {
    int ch;
    bool test_config = false;
 {
    int ch;
    bool test_config = false;

+   bool keep_readall_caps = false;

    char *uid = NULL;
    char *gid = NULL;
 #ifdef HAVE_PYTHON
    char *uid = NULL;
    char *gid = NULL;
 #ifdef HAVE_PYTHON


@@ -121,7 +122,7 @@ int main (int argc, char *argv[])
    init_msg(NULL, NULL);
    daemon_start_time = time(NULL);
 
    init_msg(NULL, NULL);
    daemon_start_time = time(NULL);
 

-   while ((ch = getopt(argc, argv, "c:d:fg:stu:v?")) != -1) {
+   while ((ch = getopt(argc, argv, "c:d:fg:kmstu:v?")) != -1) {

       switch (ch) {
       case 'c':                    /* configuration file */
          if (configfile != NULL) {
       switch (ch) {
       case 'c':                    /* configuration file */
          if (configfile != NULL) {


@@ -149,6 +150,14 @@ int main (int argc, char *argv[])
          gid = optarg;
          break;
 
          gid = optarg;
          break;
 

+      case 'k':
+         keep_readall_caps = true;
+         break;
+
+      case 'm':                    /* print kaboom output */
+         prt_kaboom = true;
+         break;
+

       case 's':
          no_signals = true;
          break;
       case 's':
          no_signals = true;
          break;


@@ -185,6 +194,10 @@ int main (int argc, char *argv[])
       usage();
    }
 
       usage();
    }
 

+   if (!uid && keep_readall_caps) {
+      Emsg0(M_ERROR_TERM, 0, _("-k option has no meaning without -u option.\n"));
+   }
+

    server_tid = pthread_self();
    if (!no_signals) {
       init_signals(terminate_filed);
    server_tid = pthread_self();
    if (!no_signals) {
       init_signals(terminate_filed);


@@ -221,13 +234,18 @@ int main (int argc, char *argv[])
       init_stack_dump();              /* set new pid */
    }
 
       init_stack_dump();              /* set new pid */
    }
 

+   set_thread_concurrency(me->MaxConcurrentJobs + 10);
+   lmgr_init_thread(); /* initialize the lockmanager stack */
+

    /* Maximum 1 daemon at a time */
    /* Maximum 1 daemon at a time */

-   create_pid_file(me->pid_directory, "bacula-fd", get_first_port_host_order(me->FDaddrs));
-   read_state_file(me->working_directory, "bacula-fd", get_first_port_host_order(me->FDaddrs));
+   create_pid_file(me->pid_directory, "bacula-fd",
+                   get_first_port_host_order(me->FDaddrs));
+   read_state_file(me->working_directory, "bacula-fd",
+                   get_first_port_host_order(me->FDaddrs));

 
    load_fd_plugins(me->plugin_directory);
 
 
    load_fd_plugins(me->plugin_directory);
 

-   drop(uid, gid);
+   drop(uid, gid, keep_readall_caps);

 
 #ifdef BOMB
    me += 1000000;
 
 #ifdef BOMB
    me += 1000000;


@@ -245,8 +263,6 @@ int main (int argc, char *argv[])
    init_python_interpreter(&python_args);
 #endif /* HAVE_PYTHON */
 
    init_python_interpreter(&python_args);
 #endif /* HAVE_PYTHON */
 

-   set_thread_concurrency(10);
-

    if (!no_signals) {
       start_watchdog();               /* start watchdog thread */
       init_jcr_subsystem();           /* start JCR watchdogs etc. */
    if (!no_signals) {
       start_watchdog();               /* start watchdog thread */
       init_jcr_subsystem();           /* start JCR watchdogs etc. */