Simplify two messages in acquire.c

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

diff --git a/bacula/src/stored/stored.c b/bacula/src/stored/stored.c
index 6abd69bf5edd0de6b90563336acfd821adb9910f..37d69b540d173d4384b9d41306dce83e4487ff2b 100644 (file)
--- a/bacula/src/stored/stored.c
+++ b/bacula/src/stored/stored.c
@@ -44,31 +44,32 @@ static void *device_allocation(void *arg);
 
 
 /* Global variables exported */
+char OK_msg[]   = "3000 OK\n";
+char TERM_msg[] = "3999 Terminate\n";
+STORES *me;                          /* our Global resource */
 
-
-/* This is our own global resource */
-STORES *me;
-
-static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
 static uint32_t VolSessionId = 0;
 uint32_t VolSessionTime;
-
 char *configfile;
-static int foreground = 0;
 
+/* Global static variables */
+static int foreground = 0;
+static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
 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"
+"        -v          verbose user messages\n"
 "        -?          print this message.\n"
 "\n"));
    exit(1);
@@ -85,9 +86,12 @@ 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");
+   my_name_is(argc, argv, "bacula-sd");
+   textdomain("bacula-sd");
    init_msg(NULL, NULL);
    daemon_start_time = time(NULL);
    memset(&last_job, 0, sizeof(last_job));
@@ -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:v?")) != -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,14 @@ int main (int argc, char *argv[])
            test_config = TRUE;
            break;
 
+         case 'u':                    /* set uid */
+           uid = optarg;
+           break;
+
+         case 'v':                    /* verbose */
+           verbose++;
+           break;
+
          case '?':
         default:
            usage();
@@ -170,6 +186,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
@@ -196,7 +214,7 @@ int main (int argc, char *argv[])
     * Sleep a bit to give device thread a chance to lock the resource
     * chain before we start the server.
     */
-   sleep(1); 
+   bmicrosleep(1, 0);
                                 
    /* Single server used for Director and File daemon */
    bnet_thread_server(me->SDaddr, me->SDport, me->max_concurrent_jobs * 2 + 1,
@@ -291,6 +309,7 @@ static void *device_allocation(void *arg)
       Dmsg1(10, "SD init done %s\n", device->device_name);
       if (!device->dev) {
          Emsg1(M_ERROR, 0, _("Could not initialize %s\n"), device->device_name);
+        continue;
       }
       if (device->cap_bits & CAP_ALWAYSOPEN) {
          Dmsg1(20, "calling open_device %s\n", device->device_name);