- Fixed a couple of typos and other one-line-text fixes at various places: reported by

aegis (#3081), DanPMK (#2818), tabrisnet (#2974, #2970, #2467), penna (#2721),
  Brad (#2488), vonitsanet (#2467).
- Made OpenSSL version dynamic, reported by buildsmart (#0002975).
- Rejecting fake +z modes in conf, reported by rve (#0002532).

Changes

@@ -1375,3 +1375,8 @@
   not understand the message anyway. Anyway, you can still turn it on ;). (#2680).
 - /INVITE's from people on the silence list are now (silently) ignored, suggested by
   White_Magic (#0002478).
+- Fixed a couple of typos and other one-line-text fixes at various places: reported by
+  aegis (#3081), DanPMK (#2818), tabrisnet (#2974, #2970, #2467), penna (#2721),
+  Brad (#2488), vonitsanet (#2467).
+- Made OpenSSL version dynamic, reported by buildsmart (#0002975).
+- Rejecting fake +z modes in conf, reported by rve (#0002532).

help.conf

@@ -207,7 +207,7 @@ help Chmodef {
 	" ==-----Type-----Name--------Default Action---Other Actions-----==";
 	"        c        CTCP        +C               m, M";
 	"        j        Join        +i               R";
-	"        k        Knock       +k";
+	"        k        Knock       +K";
 	"        m        Messages    +m               M";
 	"        n        Nickchange  +N";
 	"        t        Text        kick             b";
@@ -1132,7 +1132,7 @@ help Svskill {
 };
 
 help Svsnoop {
-	" Enables or disables whether Global IRCop functions";
+	" Enables or disables whether IRCop functions";
 	" exist on the server in question or not.";
 	" Must be sent through an U:Lined server.";
 	" -";
@@ -1244,18 +1244,18 @@ help Svslusers {
 
 help Svswatch {
 	" Changes the WATCH list of a user.";
-	" Must be sent trough an U:Lined server.";
+	" Must be sent through an U:Lined server.";
 	" Syntax: SVSWATCH <nick> :<watch parameters>";
 	" Example: SVSWATCH Blah :+Blih!*@* +Bluh!*@* +Bleh!*@*.com";
 };
 
 help Svssilence {
 	" Changes the SILENCE list of a user.";
-	" Must be sent trough an U:Lined server.";
+	" Must be sent through an U:Lined server.";
 	" In contrast to the SILENCE command, you can add/remove";
 	" multiple entries in one line.";
 	" Syntax: SVSSILENCE <nick> :<silence parameters>";
-	" Example: SILENCE Blah :+*!*@*.com +*!*@*.bla.co.uk";
+	" Example: SVSSILENCE Blah :+*!*@*.com +*!*@*.bla.co.uk";
 };
 
 help Svssno {

include/config.h

@@ -429,13 +429,6 @@
  */
 #define FAST_BADWORD_REPLACE
 
-/*
- * Only important for people using IPv6 (default should be ok for now) -Onliner
- * Because ip6.arpa is still not delegated for the 6bone (3ffe::/16)
- * this options allows you to still resolve it using ip6.int.
- */
-#define SIXBONE_HACK
-
 /*
  * Forces Unreal to use compressed IPv6 addresses rather than expanding them
  */

src/ircd.c

@@ -1230,7 +1230,7 @@ int InitwIRCD(int argc, char *argv[])
 	fprintf(stderr, "                           v%s\n", VERSIONONLY);
 	fprintf(stderr, "                     using %s\n", tre_version());
 #ifdef USE_SSL
-	fprintf(stderr, "                     using %s\n", OPENSSL_VERSION_TEXT);
+	fprintf(stderr, "                     using %s\n", SSLeay_version(SSLEAY_VERSION));
 #endif
 #ifdef ZIP_LINKS
 	fprintf(stderr, "                     using zlib %s\n", zlibVersion());

src/s_conf.c

@@ -3326,6 +3326,12 @@ int	_test_oper(ConfigFile *conf, ConfigEntry *ce)
 			/* oper::modes */
 			else if (!strcmp(cep->ce_varname, "modes")) 
 			{
+				if (strchr(cep->ce_vardata, 'z'))
+				{
+					config_error("%s:%i: oper::modes may not have +z",
+						cep->ce_fileptr->cf_filename, cep->ce_varlinenum);
+					errors++;
+				}
 				if (has_modes)
 				{
 					config_warn_duplicate(cep->ce_fileptr->cf_filename,
@@ -7084,6 +7090,12 @@ int	_test_set(ConfigFile *conf, ConfigEntry *ce)
 		else if (!strcmp(cep->ce_varname, "modes-on-connect")) {
 			CheckNull(cep);
 			CheckDuplicate(cep, modes_on_connect, "modes-on-connect");
+			if (strchr(cep->ce_vardata, 'z'))
+			{
+				config_error("%s:%i: set::modes-on-connect may not have +z",
+					cep->ce_fileptr->cf_filename, cep->ce_varlinenum);
+				errors++;
+			}
 			templong = (long) set_usermode(cep->ce_vardata);
 			if (templong & UMODE_OPER)
 			{
@@ -7150,6 +7162,12 @@ int	_test_set(ConfigFile *conf, ConfigEntry *ce)
 		else if (!strcmp(cep->ce_varname, "modes-on-oper")) {
 			CheckNull(cep);
 			CheckDuplicate(cep, modes_on_oper, "modes-on-oper");
+			if (strchr(cep->ce_vardata, 'z'))
+			{
+				config_error("%s:%i: set::modes-on-oper may not have +z",
+					cep->ce_fileptr->cf_filename, cep->ce_varlinenum);
+				errors++;
+			}
 			templong = (long) set_usermode(cep->ce_vardata);
 		}
 		else if (!strcmp(cep->ce_varname, "snomask-on-oper")) {
@@ -8183,7 +8201,7 @@ int	_conf_alias(ConfigFile *conf, ConfigEntry *ce)
 		del_Command(ce->ce_vardata, NULL, cmptr->func);
 	if (find_Command_simple(ce->ce_vardata))
 	{
-		config_warn("%s:%i: Alias '%s' would conflict with command '%s', alias not added.",
+		config_warn("%s:%i: Alias '%s' would conflict with command (or server token) '%s', alias not added.",
 			ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
 			ce->ce_vardata, ce->ce_vardata);
 		return 0;

unreal.in

@@ -10,7 +10,7 @@ if [ "$1" = "start" ] ; then
 	@BINDIR@
 	sleep 1
 	if [ ! -r $PID_FILE ] ; then
-		echo "Possible error encountered (IRCd seemily not started)"	
+		echo "Possible error encountered (IRCd seemingly not started)"	
 		echo "====================================================="
 		echo "Check above for possible errors, and this output of  "
 		echo "ircd.log. If you cannot solve the problem, read"