*
*/
/*
- 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
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);
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");
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) {
foreground = TRUE;
break;
+ case 'g': /* set group id */
+ gid = optarg;
+ break;
+
case 's': /* no signals */
no_signals = TRUE;
break;
test_config = TRUE;
break;
+ case 'u': /* set uid */
+ uid = optarg;
+ break;
+
case '?':
default:
usage();
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
/* 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);
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);