Couple of srvx updates.

[irc/evilnet/x3.git] / src / mod-qserver.c

diff --git a/src/mod-qserver.c b/src/mod-qserver.c
index 451e1969e79a96a2c6b7edc07ae2fdd1d2999bdc..ec90cbbb6e102709e00dc3d13cbee63186a1642c 100644 (file)
--- a/src/mod-qserver.c
+++ b/src/mod-qserver.c
@@ -5,7 +5,7 @@
  *
  * srvx is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -183,7 +183,9 @@ qserver_conf_read(void)
     node = conf_get_data("modules/qserver", RECDB_OBJECT);
     if (!node)
         return;
-    str1 = database_get_data(node, "address", RECDB_QSTRING);
+    str1 = database_get_data(node, "bind_address", RECDB_QSTRING);
+    if (!str1)
+        str1 = database_get_data(node, "address", RECDB_QSTRING);
     str2 = database_get_data(node, "port", RECDB_QSTRING);
     if (!str2)
         return;
@@ -201,7 +203,7 @@ qserver_conf_read(void)
 }
 
 void
-qserver_cleanup(void)
+qserver_cleanup(UNUSED_ARG(void *extra))
 {
     unsigned int ii;
 
@@ -218,7 +220,7 @@ qserver_init(void)
     qserver_log = log_register_type("QServer", "file:qserver.log");
     conf_register_reload(qserver_conf_read);
     qserver_dict = dict_new();
-    reg_exit_func(qserver_cleanup);
+    reg_exit_func(qserver_cleanup, NULL);
     return 1;
 }