diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/modules/cs_tban.c | 6 | ||||
-rw-r--r-- | src/protocol/bahamut.c | 3 | ||||
-rw-r--r-- | src/protocol/dreamforge.c | 3 | ||||
-rw-r--r-- | src/protocol/inspircd.c | 3 | ||||
-rw-r--r-- | src/protocol/ptlink.c | 59 | ||||
-rw-r--r-- | src/protocol/rageircd.c | 3 | ||||
-rw-r--r-- | src/protocol/shadowircd.c | 3 | ||||
-rw-r--r-- | src/protocol/solidircd.c | 3 | ||||
-rw-r--r-- | src/protocol/ultimate2.c | 3 | ||||
-rw-r--r-- | src/protocol/ultimate3.c | 3 | ||||
-rw-r--r-- | src/protocol/unreal31.c | 3 | ||||
-rw-r--r-- | src/protocol/unreal32.c | 3 |
12 files changed, 45 insertions, 50 deletions
diff --git a/src/modules/cs_tban.c b/src/modules/cs_tban.c index a790256f0..567fc4729 100644 --- a/src/modules/cs_tban.c +++ b/src/modules/cs_tban.c @@ -1,7 +1,7 @@ #include "module.h" #define AUTHOR "Rob" -#define VERSION "1" +#define VERSION "$Id$" void myHelp(User * u); void myFullHelpSyntax(User * u); @@ -33,6 +33,10 @@ int AnopeInit(int argc, char **argv) mAddLanguages(); + moduleAddAuthor(AUTHOR); + moduleAddVersion(VERSION); + moduleSetType(SUPPORTED); + if (status != MOD_ERR_OK) { return MOD_STOP; } diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c index ff76c6df0..68a9272ed 100644 --- a/src/protocol/bahamut.c +++ b/src/protocol/bahamut.c @@ -1628,8 +1628,7 @@ int AnopeInit(int argc, char **argv) { moduleAddAuthor("Anope"); - moduleAddVersion - ("$Id$"); + moduleAddVersion("$Id$"); moduleSetType(PROTOCOL); pmodule_ircd_version("BahamutIRCd 1.4.*/1.8.*"); diff --git a/src/protocol/dreamforge.c b/src/protocol/dreamforge.c index 00cf2a844..685eef45e 100644 --- a/src/protocol/dreamforge.c +++ b/src/protocol/dreamforge.c @@ -1332,8 +1332,7 @@ int AnopeInit(int argc, char **argv) { moduleAddAuthor("Anope"); - moduleAddVersion - ("$Id$"); + moduleAddVersion("$Id$"); moduleSetType(PROTOCOL); pmodule_ircd_version("DreamForge 4.6.7"); diff --git a/src/protocol/inspircd.c b/src/protocol/inspircd.c index 1f6899200..3f23332e5 100644 --- a/src/protocol/inspircd.c +++ b/src/protocol/inspircd.c @@ -1473,8 +1473,7 @@ int AnopeInit(int argc, char **argv) { moduleAddAuthor("Brain"); - moduleAddVersion - ("$Id$"); + moduleAddVersion("$Id$"); moduleSetType(PROTOCOL); pmodule_ircd_version("InspIRCd 1.0 Beta3"); diff --git a/src/protocol/ptlink.c b/src/protocol/ptlink.c index 8a0b55b19..d16d37ba9 100644 --- a/src/protocol/ptlink.c +++ b/src/protocol/ptlink.c @@ -429,18 +429,18 @@ int anope_event_newmask(char *source, int ac, char **av) } return MOD_CONT; } - - if ((u->mode & (UMODE_NM | UMODE_VH)) == (UMODE_NM | UMODE_VH)) { - /* This NEWMASK should be discarded because it's sent due to a +r by - * someone with a ptlink-masked host. PTlink has our correct host, so - * we can just ignore this :) Or we'll get ptlink's old host which is - * not what we want. -GD - */ - u->mode &= ~UMODE_NM; - if (debug) - alog("debug: Ignoring NEWMASK because it's send because of SVSMODE +r"); - return MOD_CONT; - } + + if ((u->mode & (UMODE_NM | UMODE_VH)) == (UMODE_NM | UMODE_VH)) { + /* This NEWMASK should be discarded because it's sent due to a +r by + * someone with a ptlink-masked host. PTlink has our correct host, so + * we can just ignore this :) Or we'll get ptlink's old host which is + * not what we want. -GD + */ + u->mode &= ~UMODE_NM; + if (debug) + alog("debug: Ignoring NEWMASK because it's send because of SVSMODE +r"); + return MOD_CONT; + } newuser = myStrGetOnlyToken(av[0], '@', 0); if (newuser) { @@ -452,9 +452,9 @@ int anope_event_newmask(char *source, int ac, char **av) if (*newhost == '@') newhost++; - - u->mode |= UMODE_VH; - + + u->mode |= UMODE_VH; + if (newhost) { change_user_host(u, newhost); } @@ -713,15 +713,16 @@ void ptlink_cmd_svsmode(User * u, int ac, char **av) { send_cmd(ServerName, "SVSMODE %s %s%s%s", u->nick, av[0], (ac == 2 ? " " : ""), (ac == 2 ? av[1] : "")); - - /* If we set +r on someone +NRah (1 or more of those modes), PTlink will - * send us a NEWMASK with their ptlink-masked-host. If we want HostServ - * to work for them, we will need to send our NEWMASK after we receive - * theirs. Thus we make a hack and store in moduleData that we need to - * look out for that. - */ - if (strchr(av[0], 'r') && (u->mode & UMODE_N) || (u->mode & UMODE_R) || (u->mode & UMODE_a) || (u->mode & UMODE_h)) - u->mode |= UMODE_NM; + + /* If we set +r on someone +NRah (1 or more of those modes), PTlink will + * send us a NEWMASK with their ptlink-masked-host. If we want HostServ + * to work for them, we will need to send our NEWMASK after we receive + * theirs. Thus we make a hack and store in moduleData that we need to + * look out for that. + */ + if (strchr(av[0], 'r') && (u->mode & UMODE_N) || (u->mode & UMODE_R) + || (u->mode & UMODE_a) || (u->mode & UMODE_h)) + u->mode |= UMODE_NM; } int anope_event_error(char *source, int ac, char **av) @@ -1203,16 +1204,16 @@ void ptlink_cmd_vhost_off(User * u) void ptlink_cmd_vhost_on(char *nick, char *vIdent, char *vhost) { - User *u; - + User *u; + if (vIdent) { send_cmd(s_HostServ, "NEWMASK %s@%s %s", vIdent, vhost, nick); } else { send_cmd(s_HostServ, "NEWMASK %s %s", vhost, nick); } - - if ((u = finduser(nick))) - u->mode |= UMODE_VH; + + if ((u = finduser(nick))) + u->mode |= UMODE_VH; } /* INVITE */ diff --git a/src/protocol/rageircd.c b/src/protocol/rageircd.c index 6612175d5..f7ae3c890 100644 --- a/src/protocol/rageircd.c +++ b/src/protocol/rageircd.c @@ -1624,8 +1624,7 @@ int AnopeInit(int argc, char **argv) { moduleAddAuthor("Anope"); - moduleAddVersion - ("$Id$"); + moduleAddVersion("$Id$"); moduleSetType(PROTOCOL); pmodule_ircd_version("RageIRCd 2.0.x"); diff --git a/src/protocol/shadowircd.c b/src/protocol/shadowircd.c index 5cb670449..e3cf55059 100644 --- a/src/protocol/shadowircd.c +++ b/src/protocol/shadowircd.c @@ -1768,8 +1768,7 @@ int AnopeInit(int argc, char **argv) { moduleAddAuthor("Anope"); - moduleAddVersion - ("$Id$"); + moduleAddVersion("$Id$"); moduleSetType(PROTOCOL); pmodule_ircd_version("ShadowIRCd 4.0+"); diff --git a/src/protocol/solidircd.c b/src/protocol/solidircd.c index 55fd83f61..4cd05427e 100644 --- a/src/protocol/solidircd.c +++ b/src/protocol/solidircd.c @@ -1656,8 +1656,7 @@ int AnopeInit(int argc, char **argv) { moduleAddAuthor("Anope"); - moduleAddVersion - ("$Id$"); + moduleAddVersion("$Id$"); moduleSetType(PROTOCOL); pmodule_ircd_version("Solid-IRCd 3.4.*"); diff --git a/src/protocol/ultimate2.c b/src/protocol/ultimate2.c index 5aa0f2be8..70485ca18 100644 --- a/src/protocol/ultimate2.c +++ b/src/protocol/ultimate2.c @@ -1683,8 +1683,7 @@ int AnopeInit(int argc, char **argv) { moduleAddAuthor("Anope"); - moduleAddVersion - ("$Id$"); + moduleAddVersion("$Id$"); moduleSetType(PROTOCOL); pmodule_ircd_version("UltimateIRCd 2.8.2+"); diff --git a/src/protocol/ultimate3.c b/src/protocol/ultimate3.c index 30ea9ba4e..c64500381 100644 --- a/src/protocol/ultimate3.c +++ b/src/protocol/ultimate3.c @@ -1766,8 +1766,7 @@ int AnopeInit(int argc, char **argv) { moduleAddAuthor("Anope"); - moduleAddVersion - ("$Id$"); + moduleAddVersion("$Id$"); moduleSetType(PROTOCOL); pmodule_ircd_version("UltimateIRCd 3.0.0.a26+"); diff --git a/src/protocol/unreal31.c b/src/protocol/unreal31.c index 4dcf7da84..a032e4b21 100644 --- a/src/protocol/unreal31.c +++ b/src/protocol/unreal31.c @@ -1540,8 +1540,7 @@ int AnopeInit(int argc, char **argv) { moduleAddAuthor("Anope"); - moduleAddVersion - ("$Id$"); + moduleAddVersion("$Id$"); moduleSetType(PROTOCOL); pmodule_ircd_version("UnrealIRCd 3.1.1+"); diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c index 8ef4d419f..01781e415 100644 --- a/src/protocol/unreal32.c +++ b/src/protocol/unreal32.c @@ -2171,8 +2171,7 @@ int AnopeInit(int argc, char **argv) { moduleAddAuthor("Anope"); - moduleAddVersion - ("$Id$"); + moduleAddVersion("$Id$"); moduleSetType(PROTOCOL); pmodule_ircd_version("UnrealIRCd 3.2+"); |