X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/c00fce3ab1dc8b810a439e81e419d7b8ae1d97b9..fbcfb25715ddbb522c8efac3faec1eca4811683d:/server/disorderd.c

diff --git a/server/disorderd.c b/server/disorderd.c
index b41dade..e8e1046 100644
--- a/server/disorderd.c
+++ b/server/disorderd.c
@@ -1,6 +1,6 @@
 /*
  * This file is part of DisOrder.
- * Copyright (C) 2004, 2005, 2006 Richard Kettlewell
+ * Copyright (C) 2004, 2005, 2006, 2007 Richard Kettlewell
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -55,6 +55,7 @@
 #include "mixer.h"
 #include "eventlog.h"
 #include "printf.h"
+#include "setup.h"
 
 static ev_source *ev;
 
@@ -186,7 +187,8 @@ static void volumecheck_after(long offset) {
 /* We fix the path to include the bindir and sbindir we were installed into */
 static void fix_path(void) {
   char *path = getenv("PATH");
-  char *newpath;
+  static char *newpath;
+  /* static or libgc collects it! */
 
   if(!path)
     error(0, "PATH is not set at all!");
@@ -245,6 +247,10 @@ int main(int argc, char **argv) {
   /* read config */
   if(config_read(1))
     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
@@ -258,8 +264,8 @@ int main(int argc, char **argv) {
   if(config->lock) {
     const char *lockfile;
     int lockfd;
-   struct flock lock;
-    
+    struct flock lock;
+
     lockfile = config_get_file("lock");
     if((lockfd = open(lockfile, O_RDWR|O_CREAT, 0600)) < 0)
       fatal(errno, "error opening %s", lockfile);