Escape filenames in restore command

[bacula/bacula] / bacula / src / stored / stored.c

diff --git a/bacula/src/stored/stored.c b/bacula/src/stored/stored.c
index ebe8cf2419cd6708d0762719d2ec2cc485bab67d..3b253ca93c17eb0c0b7675536016e9f4657547d7 100644 (file)
--- a/bacula/src/stored/stored.c
+++ b/bacula/src/stored/stored.c
@@ -10,7 +10,7 @@
  * 
  */
 /*
-   Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker
+   Copyright (C) 2000-2003 Kern Sibbald and John Walker
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -62,13 +62,15 @@ static workq_t dird_workq;        /* queue for processing connections */
 static void usage()
 {
    fprintf(stderr, _(
-"\nVersion: " VERSION " (" DATE ")\n\n"
+"\nVersion: " VERSION " (" BDATE ")\n\n"
 "Usage: stored [-s -f ] [-c config_file] [-d debug_level]  [config_file]\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"
 "        -s          no signals (for debugging)\n"
 "        -t          test - read config and exit\n"
+"        -u          userid\n"
 "        -?          print this message.\n"
 "\n"));
    exit(1);
@@ -85,6 +87,8 @@ int main (int argc, char *argv[])
    int no_signals = FALSE;
    int test_config = FALSE;
    pthread_t thid;
+   char *uid = NULL;
+   char *gid = NULL;
 
    init_stack_dump();
    my_name_is(argc, argv, "stored");
@@ -101,7 +105,7 @@ int main (int argc, char *argv[])
       Emsg1(M_ABORT, 0, "Tape block size (%d) is not a power of 2\n", TAPE_BSIZE);
    }
 
-   while ((ch = getopt(argc, argv, "c:d:fst?")) != -1) {
+   while ((ch = getopt(argc, argv, "c:d:fg:stu:?")) != -1) {
       switch (ch) {
          case 'c':                    /* configuration file */
            if (configfile != NULL) {
@@ -121,6 +125,10 @@ int main (int argc, char *argv[])
            foreground = TRUE;
            break;
 
+         case 'g':                    /* set group id */
+           gid = optarg;
+           break;
+
          case 's':                    /* no signals */
            no_signals = TRUE;
            break;
@@ -129,6 +137,10 @@ int main (int argc, char *argv[])
            test_config = TRUE;
            break;
 
+         case 'u':                    /* set uid */
+           uid = optarg;
+           break;
+
          case '?':
         default:
            usage();
@@ -170,6 +182,8 @@ int main (int argc, char *argv[])
       init_stack_dump();             /* pick up new pid */
    }
 
+   drop(uid, gid);
+
    create_pid_file(me->pid_directory, "bacula-sd", me->SDport);
 
    /* Ensure that Volume Session Time and Id are both
@@ -183,22 +197,21 @@ int main (int argc, char *argv[])
    /* Make sure on Solaris we can run concurrent, watch dog + servers + misc */
    set_thread_concurrency(me->max_concurrent_jobs * 2 + 4);
 
-   /*                           
-    * Here we lock the resources then fire off the device allocation
-    *  thread. That thread will release the resources when all the
-    *  devices are allocated.  This allows use to start the server
-    *  right away, but any jobs will wait until the resources are
-    *  unlocked.       
-    */
-   LockRes();
+    /*
+     * Start the device allocation thread
+     */
    if (pthread_create(&thid, NULL, device_allocation, NULL) != 0) {
       Emsg1(M_ABORT, 0, _("Unable to create thread. ERR=%s\n"), strerror(errno));
    }
 
-
-
    start_watchdog();                 /* start watchdog thread */
 
+   /* 
+    * Sleep a bit to give device thread a chance to lock the resource
+    * chain before we start the server.
+    */
+   sleep(1); 
+                                
    /* Single server used for Director and File daemon */
    bnet_thread_server(me->SDaddr, me->SDport, me->max_concurrent_jobs * 2 + 1,
                      &dird_workq, connection_request);
@@ -226,7 +239,7 @@ static void check_config()
    me = (STORES *)GetNextRes(R_STORAGE, NULL);
    if (!me) {
       UnlockRes();
-      Emsg1(M_ABORT, 0, _("No Storage resource defined in %s. Cannot continue.\n"),
+      Emsg1(M_ERROR_TERM, 0, _("No Storage resource defined in %s. Cannot continue.\n"),
         configfile);
    }
 
@@ -234,23 +247,23 @@ static void check_config()
 
    if (GetNextRes(R_STORAGE, (RES *)me) != NULL) {
       UnlockRes();
-      Emsg1(M_ABORT, 0, _("Only one Storage resource permitted in %s\n"), 
+      Emsg1(M_ERROR_TERM, 0, _("Only one Storage resource permitted in %s\n"), 
         configfile);
    }
    if (GetNextRes(R_DIRECTOR, NULL) == NULL) {
       UnlockRes();
-      Emsg1(M_ABORT, 0, _("No Director resource defined in %s. Cannot continue.\n"),
+      Emsg1(M_ERROR_TERM, 0, _("No Director resource defined in %s. Cannot continue.\n"),
         configfile);
    }
    if (GetNextRes(R_DEVICE, NULL) == NULL){
       UnlockRes();
-      Emsg1(M_ABORT, 0, _("No Device resource defined in %s. Cannot continue.\n"),
+      Emsg1(M_ERROR_TERM, 0, _("No Device resource defined in %s. Cannot continue.\n"),
           configfile);
    }
    if (!me->messages) {
       me->messages = (MSGS *)GetNextRes(R_MSGS, NULL);
       if (!me->messages) {
-         Emsg1(M_ABORT, 0, _("No Messages resource defined in %s. Cannot continue.\n"),
+         Emsg1(M_ERROR_TERM, 0, _("No Messages resource defined in %s. Cannot continue.\n"),
            configfile);
       }
    }
@@ -260,15 +273,15 @@ static void check_config()
    UnlockRes();
 
    if (!me->working_directory) {
-      Emsg1(M_ABORT, 0, _("No Working Directory defined in %s. Cannot continue.\n"),
+      Emsg1(M_ERROR_TERM, 0, _("No Working Directory defined in %s. Cannot continue.\n"),
         configfile);
    }
    if (stat(me->working_directory, &stat_buf) != 0) {
-      Emsg1(M_ABORT, 0, _("Working Directory: %s not found. Cannot continue.\n"),
+      Emsg1(M_ERROR_TERM, 0, _("Working Directory: %s not found. Cannot continue.\n"),
         me->working_directory);
    }
    if (!S_ISDIR(stat_buf.st_mode)) {
-      Emsg1(M_ABORT, 0, _("Working Directory: %s is not a directory. Cannot continue.\n"),
+      Emsg1(M_ERROR_TERM, 0, _("Working Directory: %s is not a directory. Cannot continue.\n"),
         me->working_directory);
    }
    working_directory = me->working_directory;
@@ -283,9 +296,9 @@ static void *device_allocation(void *arg)
    int i;
    DEVRES *device;
 
+   LockRes();
    pthread_detach(pthread_self());
 
-   /* LockRes() alread done */
    for (device=NULL,i=0;  (device=(DEVRES *)GetNextRes(R_DEVICE, (RES *)device)); i++) {
       Dmsg1(90, "calling init_dev %s\n", device->device_name);
       device->dev = init_dev(NULL, device);