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

[disorder] / server / normalize.c

diff --git a/server/normalize.c b/server/normalize.c
index 0f97a2f..2f48628 100644 (file)
--- a/server/normalize.c
+++ b/server/normalize.c
@@ -40,7 +40,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-normalize [OPTIONS]\n"
          "Options:\n"
@@ -163,6 +163,7 @@ int main(int argc, char attribute((unused)) **argv) {
     default: disorder_fatal(0, "invalid option");
     }
   }
+  config_per_user = 0;
   if(config_read(1, NULL))
     disorder_fatal(0, "cannot read configuration");
   if(logsyslog) {