BUILD : 1.7.4 (273) BUGS : 121 NOTES : Applied patch provided by Trystan for +A +H support on viagra

git-svn-id: svn://svn.anope.org/anope/trunk@273 31f1291d-b8d6-0310-a050-a5561fc1590b


git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@177 5417fbe8-f217-4b02-8779-1006273d7864

4 files changed, 26 insertions, 4 deletions

diff --git a/Changes b/Changes
index e6ca4fb8e..014cd52c8 100644
--- a/Changes
+++ b/Changes
@@ -4,6 +4,8 @@ Provided by Anope Dev. <dev@anope.org> - 2004
 07/17 A Switched to autoconf for configure script.                        [ #00]
 07/05 A Warning when LocalAddress conflicts with RemoteServer.            [#118]
 06/18 A Added proper Bahamut1.8 support.                                  [ #55]
+07/22 F NOOP bug with wildcards.                                          [#115]
+07/22 F Removed RESTRICTED from incorrectly labeled lang file entry.      [#111]
 07/15 F Fixed the bug where /ns release didn't work with UseSVSHOLD.      [#125]
 07/15 F Fixed a tiny memleak in the db routine                            [ #00]
 07/15 F Updated Dutch language file.                                      [ #00]
@@ -17,6 +19,10 @@ Provided by Anope Dev. <dev@anope.org> - 2004
 06/22 F Changed all strcasecmp's to stricmp's.                            [ #00]
 06/20 F PTLink server support.                                            [ #00]
 
+Provided by Trystan <trystan@nomadirc.net> - 2004
+07/22 A Added VIAGRA support for modes +A and +H.                         [ #99]
+
+
 Anope Version 1.7.4
 -------------------
 Provided by Anope Dev. <dev@anope.org> - 2004
diff --git a/include/services.h b/include/services.h
index 42dc83dfa..fe083ce8f 100644
--- a/include/services.h
+++ b/include/services.h
@@ -1196,6 +1196,8 @@ struct cumode_ {
 #define MODESTOREMOVE "-iklmnpstRKAO"
 #elif defined(IRC_UNREAL)
 #define MODESTOREMOVE "-ckiflmnpstuzACGHKLNOQRSV"
+#elif defined(IRC_VIAGRA)
+#define MODESTOREMOVE "-ciklmnpstORAH"
 #elif defined(IRC_PTLINK)
 #define MODESTOREMOVE "-cdfiklmnpqstRS"
 #else
@@ -1337,6 +1339,11 @@ struct channel_ {
 #define CMODE_N 0x01000000
 #endif
 
+#ifdef IRC_VIAGRA
+#define CMODE_A 0x00001000
+#define CMODE_H 0x00002000
+#endif
+
 /* These modes are for IRC_ULTIMATE3 servers only */
 #ifdef IRC_ULTIMATE3
 #define CMODE_A 0x00000800
diff --git a/src/channels.c b/src/channels.c
index 9fff738b4..0c2a97328 100644
--- a/src/channels.c
+++ b/src/channels.c
@@ -62,7 +62,7 @@ CBMode cbmodes[128] = {
 	{ 0 }, { 0 }, { 0 }, { 0 }, { 0 }, { 0 }, { 0 }, { 0 },
 	{ 0 }, { 0 }, { 0 }, { 0 }, { 0 }, { 0 }, { 0 }, { 0 },
 	{ 0 },
-#if defined(IRC_ULTIMATE) || defined(IRC_UNREAL) || defined(IRC_ULTIMATE3) || defined(IRC_RAGE2)
+#if defined(IRC_ULTIMATE) || defined(IRC_UNREAL) || defined(IRC_ULTIMATE3) || defined(IRC_RAGE2) || defined(IRC_VIAGRA)
 	{ CMODE_A, CBM_NO_USER_MLOCK, NULL, NULL },
 #else
 	{ 0 }, /* A */
@@ -78,9 +78,12 @@ CBMode cbmodes[128] = {
 	{ 0 }, /* F */
 #ifdef IRC_UNREAL
 	{ CMODE_G, 0, NULL, NULL },
-	{ CMODE_H, CBM_NO_USER_MLOCK, NULL, NULL },
 #else
 	{ 0 }, /* G */
+#endif
+#if defined(IRC_UNREAL) || defined(IRC_VIAGRA)
+	{ CMODE_H, CBM_NO_USER_MLOCK, NULL, NULL },
+#else
 	{ 0 }, /* H */
 #endif
 #ifdef IRC_ULTIMATE
@@ -243,7 +246,7 @@ CBModeInfo cbmodeinfos[] = {
 #ifdef IRC_UNREAL
 	{ 'z', CMODE_z, 0, NULL, NULL },
 #endif
-#if defined(IRC_ULTIMATE) || defined(IRC_UNREAL) || defined(IRC_ULTIMATE3) || defined(IRC_PTLINK) || defined(IRC_RAGE2)
+#if defined(IRC_ULTIMATE) || defined(IRC_UNREAL) || defined(IRC_ULTIMATE3) || defined(IRC_PTLINK) || defined(IRC_RAGE2) || defined(IRC_VIAGRA)
 	{ 'A', CMODE_A, 0, NULL, NULL },
 #endif
 #if defined(IRC_UNREAL) || defined(IRC_RAGE2)
@@ -251,6 +254,8 @@ CBModeInfo cbmodeinfos[] = {
 #endif
 #ifdef IRC_UNREAL
 	{ 'G', CMODE_G, 0, NULL, NULL },
+#endif
+#if defined(IRC_UNREAL) || defined(IRC_VIAGRA)
 	{ 'H', CMODE_H, 0, NULL, NULL },
 #endif
 #ifdef IRC_ULTIMATE
diff --git a/version.log b/version.log
index 61d8ad58f..73db10287 100644
--- a/version.log
+++ b/version.log
@@ -8,10 +8,14 @@
 VERSION_MAJOR="1"
 VERSION_MINOR="7"
 VERSION_PATCH="4"
-VERSION_BUILD="272"
+VERSION_BUILD="273"
 
 # $Log$
 #
+# BUILD : 1.7.4 (273)
+# BUGS  : 121
+# NOTES : Applied patch provided by Trystan for +A +H support on viagra
+#
 # BUILD : 1.7.4 (272)
 # BUGS  : 111,115
 # NOTES : Fixed bugs 111 and 115, both need backporting to 1.6.x