Fixes for SGLINE and SSHUN. As well as a fix for bug 2173687 (PRIVS part of it is...

diff --git a/ChangeLog b/ChangeLog
index 690e5ca17e358cf4a7508f95482c655443fe058d..e745f4522ec09f1705aef97b669ffa0a343d241a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 /***********************************************************************
 X3 ChangeLog
 
+2008-11-06  Neil Spierling  <sirvulcan@sirvulcan.co.nz>
+
+       * src/proto-p10.c: Fixes for SGLINE and SSHUN. As well as a fix for
+       bug 2173687 (PRIVS part of it is already fixed on trunk).
+
 2008-10-24  Matthew Beeching  <jobe@mdbnet.co.uk>
 
        * src/chanserv.help: Minor spelling mistake "change" instead of

diff --git a/src/proto-p10.c b/src/proto-p10.c
index 88d35f53f2e58ba4c438e315bcff397e41103c18..9ec7d867269ced46abfd5e78604d091646084c5d 100644 (file)
--- a/src/proto-p10.c
+++ b/src/proto-p10.c
@@ -92,6 +92,7 @@
 #define CMD_SGLINE              "SGLINE"
 #define CMD_SHUN               "SHUN"
 #define CMD_SILENCE             "SILENCE"
+#define CMD_SMO                 "SMO"
 #define CMD_SNO                 "SNO"
 #define CMD_SSHUN              "SSHUN"
 #define CMD_SQUERY              "SQUERY"
@@ -187,6 +188,7 @@
 #define TOK_SGLINE              "SGL"
 #define TOK_SHUN               "SU"
 #define TOK_SILENCE             "U"
+#define TOK_SMO                 "SMO"
 #define TOK_SNO                 "SNO"
 #define TOK_SSHUN              "SSU"
 #define TOK_SQUERY              "SQUERY"
@@ -291,6 +293,7 @@
 #define P10_SGLINE              TYPE(SGLINE)
 #define P10_SHUN               TYPE(SHUN)
 #define P10_SILENCE             TYPE(SILENCE)
+#define P10_SMO                 TYPE(SMO)
 #define P10_SNO                 TYPE(SNO)
 #define P10_SSHUN              TYPE(SSHUN)
 #define P10_SQUERY              TYPE(SQUERY)
@@ -2319,7 +2322,7 @@ static CMD_FUNC(cmd_sgline)
     if (!(sender = GetServerH(origin)))
         return 0;
 
-    gline_add(origin, argv[1], strtoul(argv[2], NULL, 0), argv[argc-1], now, 0, 0);
+    gline_add(origin, argv[1], strtoul(argv[2], NULL, 0), argv[argc-1], now, 1, 0);
     return 1;
 }
 
@@ -2333,7 +2336,7 @@ static CMD_FUNC(cmd_sshun)
     if (!(sender = GetServerH(origin)))
         return 0;
 
-    shun_add(origin, argv[1], strtoul(argv[2], NULL, 0), argv[argc-1], now, 0);
+    shun_add(origin, argv[1], strtoul(argv[2], NULL, 0), argv[argc-1], now, 1);
     return 1;
 }
 
@@ -2524,6 +2527,8 @@ init_parse(void)
     dict_insert(irc_func_dict, TOK_VERSION, cmd_version);
     dict_insert(irc_func_dict, CMD_ADMIN, cmd_admin);
     dict_insert(irc_func_dict, TOK_ADMIN, cmd_admin);
+    dict_insert(irc_func_dict, CMD_SMO, cmd_dummy);
+    dict_insert(irc_func_dict, TOK_SMO, cmd_dummy);
     dict_insert(irc_func_dict, CMD_SNO, cmd_dummy);
     dict_insert(irc_func_dict, TOK_SNO, cmd_dummy);