server/*.c: Don't try reading per-user configuration.

[disorder] / server / disorderd.c

diff --git a/server/disorderd.c b/server/disorderd.c
index 06651a1c54f47dfaa153cf2aca2b125ae9ff29bf..83d0db0ace0d51749a3fe85400f8f2973b048a5e 100644 (file)
--- a/server/disorderd.c
+++ b/server/disorderd.c
@@ -37,7 +37,7 @@ static const struct option options[] = {
 };
 
 /* display usage message and terminate */
-static void help(void) {
+static void attribute((noreturn)) help(void) {
   xprintf("Usage:\n"
          "  disorderd [OPTIONS]\n"
          "Options:\n"
@@ -223,6 +223,7 @@ int main(int argc, char **argv) {
     default: disorder_fatal(0, "invalid option");
     }
   }
+  config_per_user = 0;
   if(wfr) {
     if(config_read(1,  NULL))
       disorder_fatal(0, "cannot read configuration");