Play catchup with Apple dscl's API churn

[disorder] / server / disorderd.c

diff --git a/server/disorderd.c b/server/disorderd.c
index 758907cbd0ac4370fe99ad9e6729191ded725f43..913721bdecc87915a24943a755306c9e76004c5d 100644 (file)
--- a/server/disorderd.c
+++ b/server/disorderd.c
@@ -38,11 +38,13 @@
 #include <sys/time.h>
 #include <pcre.h>
 #include <fcntl.h>
 #include <sys/time.h>
 #include <pcre.h>
 #include <fcntl.h>

+#include <gcrypt.h>

 
 #include "daemonize.h"
 #include "event.h"
 #include "log.h"
 #include "configuration.h"
 
 #include "daemonize.h"
 #include "event.h"
 #include "log.h"
 #include "configuration.h"

+#include "rights.h"

 #include "trackdb.h"
 #include "queue.h"
 #include "mem.h"
 #include "trackdb.h"
 #include "queue.h"
 #include "mem.h"


@@ -55,7 +57,7 @@
 #include "mixer.h"
 #include "eventlog.h"
 #include "printf.h"
 #include "mixer.h"
 #include "eventlog.h"
 #include "printf.h"

-#include "setup.h"
+#include "version.h"

 
 static ev_source *ev;
 
 
 static ev_source *ev;
 


@@ -71,7 +73,6 @@ static const struct option options[] = {
   { "foreground", no_argument, 0, 'f' },
   { "log", required_argument, 0, 'l' },
   { "pidfile", required_argument, 0, 'P' },
   { "foreground", no_argument, 0, 'f' },
   { "log", required_argument, 0, 'l' },
   { "pidfile", required_argument, 0, 'P' },

-  { "no-initial-rescan", no_argument, 0, 'N' },

   { "wide-open", no_argument, 0, 'w' },
   { "syslog", no_argument, 0, 's' },
   { 0, 0, 0, 0 }
   { "wide-open", no_argument, 0, 'w' },
   { "syslog", no_argument, 0, 's' },
   { 0, 0, 0, 0 }


@@ -93,13 +94,6 @@ static void help(void) {
   exit(0);
 }
 
   exit(0);
 }
 

-/* display version number and terminate */
-static void version(void) {
-  xprintf("disorderd version %s\n", disorder_version_string);
-  xfclose(stdout);
-  exit(0);
-}
-

 /* SIGHUP callback */
 static int handle_sighup(ev_source attribute((unused)) *ev_,
                         int attribute((unused)) sig,
 /* SIGHUP callback */
 static int handle_sighup(ev_source attribute((unused)) *ev_,
                         int attribute((unused)) sig,


@@ -128,7 +122,7 @@ static int handle_sigterm(ev_source attribute((unused)) *ev_,
 static int rescan_again(ev_source *ev_,
                        const struct timeval attribute((unused)) *now,
                        void attribute((unused)) *u) {
 static int rescan_again(ev_source *ev_,
                        const struct timeval attribute((unused)) *now,
                        void attribute((unused)) *u) {

-  trackdb_rescan(ev_);
+  trackdb_rescan(ev_, 1/*check*/);

   rescan_after(86400);
   return 0;
 }
   rescan_after(86400);
   return 0;
 }


@@ -207,7 +201,6 @@ static void fix_path(void) {
 int main(int argc, char **argv) {
   int n, background = 1, logsyslog = 0;
   const char *pidfile = 0;
 int main(int argc, char **argv) {
   int n, background = 1, logsyslog = 0;
   const char *pidfile = 0;

-  int initial_rescan = 1;

 
   set_progname(argv);
   mem_init();
 
   set_progname(argv);
   mem_init();


@@ -218,12 +211,11 @@ int main(int argc, char **argv) {
   while((n = getopt_long(argc, argv, "hVc:dfP:Ns", options, 0)) >= 0) {
     switch(n) {
     case 'h': help();
   while((n = getopt_long(argc, argv, "hVc:dfP:Ns", options, 0)) >= 0) {
     switch(n) {
     case 'h': help();

-    case 'V': version();
+    case 'V': version("disorderd");

     case 'c': configfile = optarg; break;
     case 'd': debugging = 1; break;
     case 'f': background = 0; break;
     case 'P': pidfile = optarg; break;
     case 'c': configfile = optarg; break;
     case 'd': debugging = 1; break;
     case 'f': background = 0; break;
     case 'P': pidfile = optarg; break;

-    case 'N': initial_rescan = 0; break;

     case 's': logsyslog = 1; break;
     case 'w': wideopen = 1; break;
     default: fatal(0, "invalid option");
     case 's': logsyslog = 1; break;
     case 'w': wideopen = 1; break;
     default: fatal(0, "invalid option");


@@ -241,6 +233,8 @@ int main(int argc, char **argv) {
   info("process ID %lu", (unsigned long)getpid());
   fix_path();
   srand(time(0));                      /* don't start the same every time */
   info("process ID %lu", (unsigned long)getpid());
   fix_path();
   srand(time(0));                      /* don't start the same every time */

+  /* gcrypt initialization */
+  gcry_control(GCRYCTL_INIT_SECMEM, 1);

   /* create event loop */
   ev = ev_new();
   if(ev_child_setup(ev)) fatal(0, "ev_child_setup failed");
   /* create event loop */
   ev = ev_new();
   if(ev_child_setup(ev)) fatal(0, "ev_child_setup failed");


@@ -249,8 +243,6 @@ int main(int argc, char **argv) {
     fatal(0, "cannot read configuration");
   /* make sure the home directory exists and has suitable permissions */
   make_home();
     fatal(0, "cannot read configuration");
   /* make sure the home directory exists and has suitable permissions */
   make_home();

-  /* create the default login */
-  make_root_login();

   /* Start the speaker process (as root! - so it can choose its nice value) */
   speaker_setup(ev);
   /* set server nice value _after_ starting the speaker, so that they
   /* Start the speaker process (as root! - so it can choose its nice value) */
   speaker_setup(ev);
   /* set server nice value _after_ starting the speaker, so that they


@@ -277,10 +269,14 @@ int main(int argc, char **argv) {
       fatal(errno, "error locking %s", lockfile);
   }
   /* initialize database environment */
       fatal(errno, "error locking %s", lockfile);
   }
   /* initialize database environment */

-  trackdb_init(TRACKDB_NORMAL_RECOVER);
+  trackdb_init(TRACKDB_NORMAL_RECOVER|TRACKDB_MAY_CREATE);

   trackdb_master(ev);
   trackdb_master(ev);

-  /* install new config */
+  /* install new config (calls trackdb_open()) */

   reconfigure(ev, 0);
   reconfigure(ev, 0);

+  /* pull in old users */
+  trackdb_old_users();
+  /* create a root login */
+  trackdb_create_root();

   /* re-read config if we receive a SIGHUP */
   if(ev_signal(ev, SIGHUP, handle_sighup, 0)) fatal(0, "ev_signal failed");
   /* exit on SIGINT/SIGTERM */
   /* re-read config if we receive a SIGHUP */
   if(ev_signal(ev, SIGHUP, handle_sighup, 0)) fatal(0, "ev_signal failed");
   /* exit on SIGINT/SIGTERM */


@@ -288,12 +284,9 @@ int main(int argc, char **argv) {
   if(ev_signal(ev, SIGTERM, handle_sigterm, 0)) fatal(0, "ev_signal failed");
   /* ignore SIGPIPE */
   signal(SIGPIPE, SIG_IGN);
   if(ev_signal(ev, SIGTERM, handle_sigterm, 0)) fatal(0, "ev_signal failed");
   /* ignore SIGPIPE */
   signal(SIGPIPE, SIG_IGN);

-  /* start a rescan straight away */
-  if(initial_rescan) {
-    trackdb_rescan(0/*ev*/);
-    /* No ev -> the rescan will block.  Since we called reconfigure() already
-     * any clients will also be forced to block. */
-  }
+  /* Start a rescan straight away */
+  trackdb_rescan(ev, 1/*check*/);
+  /* We'll rescan again after a day */

   rescan_after(86400);
   /* periodically tidy up the database */
   dbgc_after(60);
   rescan_after(86400);
   /* periodically tidy up the database */
   dbgc_after(60);