lib/configuration.c, etc.: Replace `config_userconf()' by a variable.

[disorder] / server / dump.c

diff --git a/server/dump.c b/server/dump.c
index 31e08afdb7789a59590970f0185624c4d02b6764..d59eb6a5cc8b47687486eaa328a17b7736060cb6 100644 (file)
--- a/server/dump.c
+++ b/server/dump.c
@@ -40,7 +40,7 @@ static const struct option options[] = {
 };
 
 /* display usage message and terminate */
 };
 
 /* display usage message and terminate */

-static void help(void) {
+static void attribute((noreturn)) help(void) {

   xprintf("Usage:\n"
          "  disorder-dump [OPTIONS] --dump|--undump PATH\n"
          "  disorder-dump [OPTIONS] --recompute-aliases\n"
   xprintf("Usage:\n"
          "  disorder-dump [OPTIONS] --dump|--undump PATH\n"
          "  disorder-dump [OPTIONS] --recompute-aliases\n"


@@ -408,6 +408,7 @@ int main(int argc, char **argv) {
       disorder_fatal(0, "specify only a dump file name");
     path = argv[optind];
   }
       disorder_fatal(0, "specify only a dump file name");
     path = argv[optind];
   }

+  config_per_user = 0;

   if(config_read(0, NULL))
     disorder_fatal(0, "cannot read configuration");
   if(dump) {
   if(config_read(0, NULL))
     disorder_fatal(0, "cannot read configuration");
   if(dump) {