diff options
| author | cyberbotx <cyberbotx@5417fbe8-f217-4b02-8779-1006273d7864> | 2008-11-16 19:31:31 +0000 |
|---|---|---|
| committer | cyberbotx <cyberbotx@5417fbe8-f217-4b02-8779-1006273d7864> | 2008-11-16 19:31:31 +0000 |
| commit | ffbcff160474cd45fbcbbadaff32f38e1d7fea71 (patch) | |
| tree | 4155ce7bb17b63cc1bdf40a99a89c1b34a66aef2 /src/protocol/inspircd12.cpp | |
| parent | 72a4c7e6c7a4187bfee58bdbf3c235f2b0ae44c7 (diff) | |
Added support for multiple uplink blocks in the new config.
Moved the type and id directives from the uplink block to the serverinfo block.
Small config fixes.
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1746 5417fbe8-f217-4b02-8779-1006273d7864
Diffstat (limited to 'src/protocol/inspircd12.cpp')
| -rw-r--r-- | src/protocol/inspircd12.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/protocol/inspircd12.cpp b/src/protocol/inspircd12.cpp index fd48fb924..51c614a70 100644 --- a/src/protocol/inspircd12.cpp +++ b/src/protocol/inspircd12.cpp @@ -609,9 +609,7 @@ class InspIRCdProto : public IRCDProto void SendConnect() { - if (servernum == 1) inspircd_cmd_pass(RemotePassword); - else if (servernum == 2) inspircd_cmd_pass(RemotePassword2); - else if (servernum == 3) inspircd_cmd_pass(RemotePassword3); + inspircd_cmd_pass(uplink_server->password); SendServer(ServerName, 0, ServerDesc); send_cmd(NULL, "BURST"); send_cmd(TS6SID, "VERSION :Anope-%s %s :%s - %s (%s) -- %s", version_number, ServerName, ircd->name, version_flags, EncModule, version_build); @@ -728,16 +726,16 @@ int anope_event_mode(const char *source, int ac, const char **av) */ User *u = find_byuid(source); User *u2 = find_byuid(av[0]); - + // This can happen with server-origin modes. if (u == NULL) u = u2; - + // drop it like fire. // most likely situation was if (u == NULL || u2 == NULL) return MOD_CONT; - + av[0] = u2->nick; do_umode(u->nick, ac, av); } |