From: Mark Wooding <mdw@distorted.org.uk>
Date: Sat, 6 Jun 2020 17:07:17 +0000 (+0100)
Subject: server/*.c: Don't try reading per-user configuration.
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/commitdiff_plain/477b12ff719d3749b8d8f85035bd6384fee9be0d

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

This can't end well.
---

diff --git a/doc/disorderd.8.in b/doc/disorderd.8.in
index f194a0e..6325dd0 100644
--- a/doc/disorderd.8.in
+++ b/doc/disorderd.8.in
@@ -135,9 +135,6 @@ See \fBdisorder_config\fR(5).
 .TP
 .I pkgconfdir/config.private
 Private configuration (now largely obsolete).
-.TP
-.I ~/.disorder/passwd
-Per-user password file.
 .SS "Communication"
 .TP
 .I pkgstatedir/socket
diff --git a/server/choose.c b/server/choose.c
index ab24e2d..d033d7f 100644
--- a/server/choose.c
+++ b/server/choose.c
@@ -281,6 +281,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");
   /* Find out current queue/recent list */
   queue_read();
diff --git a/server/dbupgrade.c b/server/dbupgrade.c
index 220fb76..704142a 100644
--- a/server/dbupgrade.c
+++ b/server/dbupgrade.c
@@ -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);
diff --git a/server/deadlock.c b/server/deadlock.c
index fdc4f50..6855d6a 100644
--- a/server/deadlock.c
+++ b/server/deadlock.c
@@ -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);
diff --git a/server/disorderd.c b/server/disorderd.c
index a2ed421..83d0db0 100644
--- a/server/disorderd.c
+++ b/server/disorderd.c
@@ -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");
diff --git a/server/dump.c b/server/dump.c
index 85f9349..d59eb6a 100644
--- a/server/dump.c
+++ b/server/dump.c
@@ -408,6 +408,7 @@ int main(int argc, char **argv) {
       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) {
diff --git a/server/gstdecode.c b/server/gstdecode.c
index 1f4d7a2..6a288bc 100644
--- a/server/gstdecode.c
+++ b/server/gstdecode.c
@@ -586,6 +586,7 @@ int main(int argc, char *argv[])
   if(optind >= argc) disorder_fatal(0, "missing filename");
   file = argv[optind++];
   if(optind < argc) disorder_fatal(0, "excess arguments");
+  config_per_user = 0;
   if(config_read(1, 0)) disorder_fatal(0, "cannot read configuration");
 
   /* Set up the GStreamer machinery. */
diff --git a/server/normalize.c b/server/normalize.c
index 6875094..2f48628 100644
--- a/server/normalize.c
+++ b/server/normalize.c
@@ -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) {
diff --git a/server/rescan.c b/server/rescan.c
index 3a5a589..b89a0a6 100644
--- a/server/rescan.c
+++ b/server/rescan.c
@@ -402,6 +402,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");
   xnice(config->nice_rescan);
   sa.sa_handler = signal_handler;
diff --git a/server/speaker.c b/server/speaker.c
index 0cc3ac4..719a6d8 100644
--- a/server/speaker.c
+++ b/server/speaker.c
@@ -769,6 +769,7 @@ int main(int argc, char **argv) {
     log_default = &log_syslog;
   }
   config_uaudio_apis = uaudio_apis;
+  config_per_user = 0;
   if(config_read(1, NULL)) disorder_fatal(0, "cannot read configuration");
   /* ignore SIGPIPE */
   signal(SIGPIPE, SIG_IGN);
diff --git a/server/stats.c b/server/stats.c
index ac37374..ba8a223 100644
--- a/server/stats.c
+++ b/server/stats.c
@@ -74,6 +74,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");
   trackdb_init(TRACKDB_NO_RECOVER);