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

[disorder] / server / dbupgrade.c

diff --git a/server/dbupgrade.c b/server/dbupgrade.c
index 18e6aa1049ab114fbeb5ffc9212c22b687d8ef75..704142ac85059b6d1951b3fc65cb0c46e7bc4cca 100644 (file)
--- a/server/dbupgrade.c
+++ b/server/dbupgrade.c
@@ -1,6 +1,6 @@
 /*
  * This file is part of DisOrder
- * Copyright (C) 2007, 2008 Richard Kettlewell
+ * Copyright (C) 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
@@ -48,7 +48,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-dbupgrade [OPTIONS]\n"
          "Options:\n"
@@ -335,6 +335,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");
   /* Open the database */
   trackdb_init(TRACKDB_NO_RECOVER);