Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/disorder

[disorder] / server / deadlock.c

diff --git a/server/deadlock.c b/server/deadlock.c
index 72a82d4..6855d6a 100644 (file)
--- a/server/deadlock.c
+++ b/server/deadlock.c
@@ -1,6 +1,6 @@
 /*
  * This file is part of DisOrder 
- * Copyright (C) 2005, 2007, 2008 Richard Kettlewell
+ * Copyright (C) 2005, 2007-2009 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
@@ -34,7 +34,7 @@ static const struct option options[] = {
 };
 
 /* display usage message and terminate */
-static void help(void) {
+static void attribute((noreturn)) help(void) {
   xprintf("Usage:\n"
          "  disorder-deadlock [OPTIONS]\n"
          "Options:\n"
@@ -71,6 +71,7 @@ int main(int argc, char **argv) {
     openlog(progname, LOG_PID, LOG_DAEMON);
     log_default = &log_syslog;
   }
+  config_per_user = 0;
   if(config_read(0, NULL)) disorder_fatal(0, "cannot read configuration");
   disorder_info("started");
   trackdb_init(TRACKDB_NO_RECOVER);