*shudder*

diff --git a/.RELEASE.NOTES b/.RELEASE.NOTES
index 777a4bf720c55f2a25523222b9d62e22527bea4b..162053efe1a00392dcaefb02cc09de9e9b0930a9 100644 (file)
--- a/.RELEASE.NOTES
+++ b/.RELEASE.NOTES
@@ -1,10 +1,13 @@
 
-Unreal3.1.6-Noon Release Notes
+Unreal3.1.5.1-Valek Release Notes
 ===================================
 
-* Beta1
+* Um, yea, so we found this bug...
 
-* If you are upgrading from an earlier version (before 3.1.4),
+* If you are upgrading from Unreal3.1.4-Meadows, please read
+  doc/RELEASE-NOTES.3.1.5 as well.
+
+* If you are upgrading from an even earlier version (before 3.1.4),
   please read the doc/RELEASE-NOTES.3.1.4 file as well. There
   were numerous important/significant changes between 3.1.4 and
   earlier versions.

diff --git a/Changes b/Changes
index 98f5609da934bc602df92f408e937cf4158ed4e9..8e45a198d6d179652cedd3f8a162bf54ebd3244e 100644 (file)
--- a/Changes
+++ b/Changes
@@ -753,7 +753,7 @@ being bounced, so we're not sure why it happens.
 
 *** Unreal 3.1.5 Released ***
 
-[ Unreal 3.1.6 ]
+[ Unreal 3.1.5.1 ]
 --------------------------------------------------
 Had I only known what I was getting myself into...
 --------------------------------------------------
@@ -773,3 +773,10 @@ Fixed compilation error when NO_OPEROVERRIDE is defined,
 reported by Joe.
 --Luke
 ===================================
+
+Ummm, yea, you want to upgrade. There's a, um, bug that
+probably isn't a good thing
+--Luke
+===================================
+
+*** Unreal 3.1.5.1 Released ***

diff --git a/Config b/Config
index 3eac295a387d22dab5a8bf823507e20acd618832..42059c74427b22588766b5d693ead11f92d9a3e9 100755 (executable)
--- a/Config
+++ b/Config
@@ -11,7 +11,7 @@
 # distribution without the author's prior consent.
 #
 # $Id$
-IRCD_VERSION="Unreal3.1.6 Noon"
+IRCD_VERSION="Unreal3.1.5.1 Valek"
 CONF_DATE=`date`
 LAST_VERSION="very very old"
 #

diff --git a/Unreal.nfo b/Unreal.nfo
index 04f67cb5ea3f201163bc33109a20ee71c9b262a7..3af63274acf45d3ef6b0b591d88601f49d9957f1 100644 (file)
--- a/Unreal.nfo
+++ b/Unreal.nfo
@@ -1,5 +1,5 @@
 ===============================================
-=            UnrealIRCd v3.1.6                =
+=            UnrealIRCd v3.1.5.1              =
 ===============================================
  Was brought to you by:
   * Stskeeps  <stskeeps@unrealircd.com>

diff --git a/include/version.h b/include/version.h
index eb8bd5b6480147bf19fb8ede2901ea343eb1c9ab..2e73df39d0f055e862ebf63f9427c2b296905faa 100644 (file)
--- a/include/version.h
+++ b/include/version.h
@@ -25,14 +25,14 @@
      /**/
 #define COMPILEINFO DEBUGMODESET DEBUGSET
 /*
- * Version Unreal3.1.6-Noon
+ * Version Unreal3.1.5.1-Valek
  */
 #define UnrealProtocol                 2302
 #define PATCH1                 "3"
 #define PATCH2                 ".1"
-#define PATCH3                 ".6"
-#define PATCH4                 "-Noon"
-#define PATCH5                 ""
+#define PATCH3                 ".5"
+#define PATCH4                 ".1"
+#define PATCH5                 "-Valek"
 #define PATCH6                 ""
 #define PATCH7                 ""
 #define PATCH8                 COMPILEINFO

diff --git a/include/win32/settings.h b/include/win32/settings.h
index 425af0443f55bbbff8decc6276ee80ecdeda174f..265fb33c0806ce45caea91ece26d5222584bf3e4 100644 (file)
--- a/include/win32/settings.h
+++ b/include/win32/settings.h
@@ -1,5 +1,5 @@
 /*
- * VERSION: Unreal3.1.6 Noon
+ * VERSION: Unreal3.1.5.1 Valek
  * DATE:    Sat Jun 15 13:43:51 EST 2002
  * OS:      Win-32
  *

diff --git a/src/s_serv.c b/src/s_serv.c
index 609783a4087861ecae6604bd3cb194ee68cf84b8..adc0fc6197cc9d47a68b9b3901ac5c575f43c58b 100644 (file)
--- a/src/s_serv.c
+++ b/src/s_serv.c
@@ -2772,6 +2772,8 @@ int  m_help(cptr, sptr, parc, parv)
                }
                if (message[0] == '!')
                        message++;
+               if (BadPtr(message))
+                       return 0;
                sendto_serv_butone_token(IsServer(cptr) ? cptr : NULL,
                    parv[0], MSG_HELP, TOK_HELP, "%s", message);
                sendto_umode(UMODE_HELPOP, "*** HelpOp -- from %s (HelpOp): %s",
@@ -2796,6 +2798,8 @@ int  m_help(cptr, sptr, parc, parv)
                                return 0;
                }
 
+               if (BadPtr(message))
+                       return 0;
                s = make_nick_user_host(cptr->name, cptr->user->username,
                    cptr->user->realhost);
                for (tmpl = helpign; tmpl; tmpl = tmpl->next)

diff --git a/update b/update
index 097c296b2f280fe5ce783d7927a6c92459621b92..64c43a0c22c134111ca81128ac2a746a5e5c5ce8 100755 (executable)
--- a/update
+++ b/update
@@ -7,7 +7,7 @@
 # or included in any package without permission from the author.
 #
 # NO WARRANTY IS INCLUDED
-CURRENT_VERSION="Unreal3.1.6-Noon"
+CURRENT_VERSION="Unreal3.1.5.1-Valek"
 WHATYAWANT="wget"
 clear
 cat .UPDATE