More graceful handling of test failure; the exception is now reported

[disorder] / lib / configuration.c

diff --git a/lib/configuration.c b/lib/configuration.c
index 98f5fbfd8f582cb1d1ee521cf0b66c942ff6fc7f..dc3d0092b6c8216081b4e794a848cf6f15362826 100644 (file)
--- a/lib/configuration.c
+++ b/lib/configuration.c
@@ -1393,6 +1393,10 @@ int config_read(int server,
       error(0, "'nice_speaker' cannot be changed without a restart");
       /* ...but we accept the new config anyway */
     }
+    if(c->nice_server != oldconfig->nice_server) {
+      error(0, "'nice_server' cannot be changed without a restart");
+      /* ...but we accept the new config anyway */
+    }
     if(namepartlist_compare(&c->namepart, &oldconfig->namepart)) {
       error(0, "'namepart' settings cannot be changed without a restart");
       failed = 1;
@@ -1462,7 +1466,7 @@ char *config_get_file(const char *name) {
 
 static int stringlist_compare(const struct stringlist *a,
                               const struct stringlist *b) {
-  int n, c;
+  int n = 0, c;
 
   while(n < a->n && n < b->n) {
     if((c = strcmp(a->s[n], b->s[n])))
@@ -1498,7 +1502,7 @@ static int namepart_compare(const struct namepart *a,
 
 static int namepartlist_compare(const struct namepartlist *a,
                                 const struct namepartlist *b) {
-  int n, c;
+  int n = 0, c;
 
   while(n < a->n && n < b->n) {
     if((c = namepart_compare(&a->s[n], &b->s[n])))