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 f194a0eee3854ee455023bbb6f40b364e419bf66..6325dd068002781f8a6659b85ffeeca371b40459 100644 (file)
--- 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 ab24e2d5e797c083548b0ebde672aecab2ce6f48..d033d7f28a217126c2f6064146e7646af6964148 100644 (file)
--- 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 220fb767d51cef374ee75a092699ea23eaaeb83a..704142ac85059b6d1951b3fc65cb0c46e7bc4cca 100644 (file)
--- 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 fdc4f50fb17b8bed3e364824acdbb10408789c3f..6855d6a802adbae8e1a5df6440e5763080779d18 100644 (file)
--- 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 a2ed42188cabe01253b9ef3e28c44ab74cd65068..83d0db0ace0d51749a3fe85400f8f2973b048a5e 100644 (file)
--- 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 85f93497ab6318b2805c0e34fd09e981771f15cd..d59eb6a5cc8b47687486eaa328a17b7736060cb6 100644 (file)
--- 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 1f4d7a2272df4eefbb30a589b6a18eccee78c8c4..6a288bc2ce79e3875da9a3b3981a84b998c5b43e 100644 (file)
--- 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 687509427ad8336dd26e7c705a4ff120b88c59a7..2f4862891e7fed07884bb384f8b1ad175207db27 100644 (file)
--- 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 3a5a5894fcf48f7165ea5f428c2f097d5a07c0e6..b89a0a6350a4aef85997414662195ee1c388f382 100644 (file)
--- 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 0cc3ac4ff589ed71319911dd455aeb46c8d9d536..719a6d86d791b1ab9145f1e83b4ac93c45fb9bff 100644 (file)
--- 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 ac3737451875f396f3d1711c453fbe2fe9d21198..ba8a223e05e7e49ee5ad5e52c856c17cd33515da 100644 (file)
--- 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);