BUILD : 1.7.21 (1411) BUGS : 887 NOTES : SGLINE and SQLINE support added for Hybrid

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


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

3 files changed, 33 insertions, 10 deletions

diff --git a/Changes b/Changes
index 404becc62..c51685f30 100644
--- a/Changes
+++ b/Changes
@@ -46,7 +46,6 @@ Anope Version  S V N
 05/12 F moduleNoticeLang() now calls notice_user instead of notice().     [ #00]
 08/11 F Updated os_raw.c to show up as a 3rd party module.                [ #00]
 08/15 F CS OP now correctly works if there is only 1 user in the channel. [#922]
-08/16 F Forbidden channels no longer appear in /list when inhabited.      [#924]
 
 Provided by Robin Burchell <w00t@inspircd.org> - 2008
 08/08 F Strict warnings in send.c from comparing address of non-ptr       [ #00]
@@ -57,6 +56,7 @@ Provided by Christian Schroer <Christian.Schroer@coderschlampe.com> - 2008
 
 Provided by Scott Seufert <katsklaw@ircmojo.net> - 2008
 05/12 F install.js now works properly on x64 machines                     [#897]
+08/16 F Forbidden channels no longer appear in /list when inhabited.      [#924]
 
 Provided by Trystan <trystan@nomadirc.net> - 2008
 02/11 F Last part of memory leak in cs_akick()                            [#870]
@@ -74,6 +74,9 @@ Provided by Jan Milants <jan_renee@msn.com> - 2008
 01/16 F Server traversion with next_server() failed to list all servers.  [#831]
 02/08 F Removed excessive free in ChanServ AKICK code.                    [#849]
 
+Provided by Martin J. Green <mail@martinjgreen.me.uk> - 2008
+08/17 A SQLINE and SGLINE support for Hybrid.                             [#887]
+
 Provided by Hal9000 <hal9000@pimpmylinux.org> - 2005
 04/29 F Potential crash in channels.c.                                    [ #00]
 04/29 F TS handling on incoming FMODE with InspIRCd 1.1.                  [ #00]
diff --git a/src/protocol/hybrid.c b/src/protocol/hybrid.c
index 94c4cd475..5ee3cc890 100644
--- a/src/protocol/hybrid.c
+++ b/src/protocol/hybrid.c
@@ -21,7 +21,7 @@ IRCDVar myIrcd[] = {
      "+o",                      /* chanserv mode */
      "+o",                      /* memoserv mode */
      NULL,                      /* hostserv mode */
-     "+io",                     /* operserv mode */
+     "+aio",                    /* operserv mode */
      "+o",                      /* botserv mode  */
      "+h",                      /* helpserv mode */
      "+i",                      /* Dev/Null mode */
@@ -30,7 +30,7 @@ IRCDVar myIrcd[] = {
      "+o",                      /* chanserv alias mode */
      "+o",                      /* memoserv alias mode */
      NULL,                      /* hostserv alias mode */
-     "+io",                     /* operserv alias mode */
+     "+aio",                    /* operserv alias mode */
      "+o",                      /* botserv alias mode  */
      "+h",                      /* helpserv alias mode */
      "+i",                      /* Dev/Null alias mode */
@@ -52,8 +52,8 @@ IRCDVar myIrcd[] = {
      NULL,                      /* Mode on ID for Opers */
      NULL,                      /* Mode on UnReg        */
      NULL,                      /* Mode on Nick Change  */
-     0,                         /* Supports SGlines     */
-     0,                         /* Supports SQlines     */
+     1,                         /* Supports SGlines     */
+     1,                         /* Supports SQlines     */
      0,                         /* Supports SZlines     */
      1,                         /* Supports Halfop +h   */
      3,                         /* Number of server args */
@@ -654,11 +654,19 @@ void moduleAddIRCDMsgs(void) {
 
 void hybrid_cmd_sqline(char *mask, char *reason)
 {
-
+    if (!mask || !reason) {
+        return;
+    }
+    
+    send_cmd(ServerName, "RESV * %s :%s", mask, reason);
 }
 void hybrid_cmd_unsgline(char *mask)
 {
-/* Does not support */
+    if (!mask) {
+        return;
+    }
+    
+    send_cmd(ServerName, "UNXLINE * %s", mask);
 }
 
 void hybrid_cmd_unszline(char *mask)
@@ -682,7 +690,11 @@ void hybrid_cmd_svsadmin(char *server, int set)
 
 void hybrid_cmd_sgline(char *mask, char *reason)
 {
-    /* does not support */
+    if (!mask || !reason) {
+        return;
+    }
+    
+    send_cmd(ServerName, "XLINE * %s 0 :%s", mask, reason);
 }
 
 void hybrid_cmd_remove_akill(char *user, char *host)
@@ -709,7 +721,11 @@ void hybrid_cmd_vhost_on(char *nick, char *vIdent, char *vhost)
 
 void hybrid_cmd_unsqline(char *user)
 {
-    /* Hybrid does not support SQLINEs */
+    if (!user) {
+        return;
+    }
+    
+    send_cmd(ServerName, "UNRESV * %s", user);
 }
 
 void hybrid_cmd_join(char *user, char *channel, time_t chantime)
diff --git a/version.log b/version.log
index 23492475a..ff1cffa94 100644
--- a/version.log
+++ b/version.log
@@ -9,10 +9,14 @@ VERSION_MAJOR="1"
 VERSION_MINOR="7"
 VERSION_PATCH="21"
 VERSION_EXTRA="-svn"
-VERSION_BUILD="1410"
+VERSION_BUILD="1411"
 
 # $Log$
 #
+# BUILD : 1.7.21 (1411)
+# BUGS  : 887 
+# NOTES : SGLINE and SQLINE support added for Hybrid
+#
 # BUILD : 1.7.21 (1410)
 # BUGS  : 924
 # NOTES : Bug fixed where forbidden channels will appear in /list when inhabited by ChanServ