From 36d7d271cc69ca408d2dfc80e5750b8e7fe8f0cb Mon Sep 17 00:00:00 2001
From: Bram Matthys <syzop@vulnscan.org>
Date: Sat, 15 Feb 2003 23:41:23 +0000
Subject: [PATCH] - set::services-server is now required to be set (#0000730).

---
 Changes               | 1 +
 doc/unreal32docs.html | 4 ++--
 src/s_conf.c          | 4 ++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Changes b/Changes
index 42820a409..c78821dcb 100644
--- a/Changes
+++ b/Changes
@@ -1911,3 +1911,4 @@ seen. gmtime warning still there
 - Removed some left over +I code
 - Added set::restrict-usermodes to /stats S (reported by AngryWolf)
 - Zip links: Added link::compression-level so you can set the compression level per link.
+- set::services-server is now required to be set (#0000730).
diff --git a/doc/unreal32docs.html b/doc/unreal32docs.html
index a36fe6c3f..16baf5f89 100644
--- a/doc/unreal32docs.html
+++ b/doc/unreal32docs.html
@@ -1387,8 +1387,8 @@ loadmodule "src/modules/scan_http.so";
   Defines the name of the default server to tell users to connect to if this server 
   is full.</p>
 <p><font class="set">set::services-server &lt;server-name&gt;;</font><br>
-  Specifies the name of the server that the services bots are connected to. If 
-  services are not run this value may be left out.</p>
+  Specifies the name of the server that the services bots are connected to. Required, 
+  set it to something like services.yournet.com if you don't have services.</p>
 <p><font class="set">set::stats-server &lt;server-name&gt;;</font><br>
   Sets the name of the server on which the stats bot is located. If stats are 
   not run this value may be left out.</p>
diff --git a/src/s_conf.c b/src/s_conf.c
index bf9dca31a..7f852cef5 100644
--- a/src/s_conf.c
+++ b/src/s_conf.c
@@ -279,6 +279,7 @@ struct {
 		unsigned name_server : 1;
 		unsigned host_timeout : 1;
 		unsigned host_retries : 1;
+		unsigned servicesserv : 1;
 		unsigned defaultserv : 1;
 		unsigned irc_network : 1;
 		unsigned operhost : 1;
@@ -1518,6 +1519,8 @@ int	config_post_test()
 		Error("set::dns::host-timeout missing");
 	if (!requiredstuff.settings.host_retries)
 		Error("set::dns::host-retries missing");
+	if (!requiredstuff.settings.servicesserv)
+		Error("set::services-server missing");
 	if (!requiredstuff.settings.defaultserv)
 		Error("set::default-server missing");
 	if (!requiredstuff.settings.irc_network)
@@ -5035,6 +5038,7 @@ int	_test_set(ConfigFile *conf, ConfigEntry *ce)
 		}
 		else if (!strcmp(cep->ce_varname, "services-server")) {
 			CheckNull(cep);
+			requiredstuff.settings.servicesserv = 1;
 		}
 		else if (!strcmp(cep->ce_varname, "stats-server")) {
 			CheckNull(cep);