diff options
| -rw-r--r-- | include/services.h | 2 | ||||
| -rw-r--r-- | src/protocol/bahamut.c | 2 | ||||
| -rw-r--r-- | src/protocol/charybdis.c | 2 | ||||
| -rw-r--r-- | src/protocol/inspircd11.c | 2 | ||||
| -rw-r--r-- | src/protocol/inspircd12.cpp | 6 | ||||
| -rw-r--r-- | src/protocol/ratbox.c | 2 | ||||
| -rw-r--r-- | src/protocol/unreal32.c | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/include/services.h b/include/services.h index 499306f10..bfcb014d6 100644 --- a/include/services.h +++ b/include/services.h @@ -1223,7 +1223,7 @@ class IRCDProto { va_end(args); SendModeInternal(bi, dest, buf); } - virtual void SendClientIntroduction(const char *, const char *, const char *, const char *, const char *) = 0; + virtual void SendClientIntroduction(const char *, const char *, const char *, const char *, const char *, const char *uid = ts6_uid_retrieve()) = 0; virtual void SendKick(BotInfo *bi, const char *chan, const char *user, const char *fmt, ...) { va_list args; diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c index ef831be88..e5070b1cd 100644 --- a/src/protocol/bahamut.c +++ b/src/protocol/bahamut.c @@ -694,7 +694,7 @@ class BahamutIRCdProto : public IRCDProto else send_cmd(source->nick, "KICK %s %s", chan, user); } - void SendClientIntroduction(const char *nick, const char *user, const char *host, const char *real, const char *modes) + void SendClientIntroduction(const char *nick, const char *user, const char *host, const char *real, const char *modes, const char *uid) { EnforceQlinedNick(nick, s_BotServ); send_cmd(NULL, "NICK %s 1 %ld %s %s %s %s 0 0 :%s", nick, static_cast<long>(time(NULL)), modes, user, host, ServerName, real); diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c index ba6f5f1eb..400cccbe0 100644 --- a/src/protocol/charybdis.c +++ b/src/protocol/charybdis.c @@ -641,7 +641,7 @@ class CharybdisProto : public IRCDProto charybdis_cmd_svinfo(); } - void SendClientIntroduction(const char *nick, const char *user, const char *host, const char *real, const char *modes) + void SendClientIntroduction(const char *nick, const char *user, const char *host, const char *real, const char *modes, const char *uid) { EnforceQlinedNick(nick, NULL); if (UseTS6) { diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c index c3c3944f3..36083fa13 100644 --- a/src/protocol/inspircd11.c +++ b/src/protocol/inspircd11.c @@ -547,7 +547,7 @@ class InspIRCdProto : public IRCDProto send_cmd(source ? source->nick : s_OperServ, "FMODE %s %u %s", dest, static_cast<unsigned>(c ? c->creation_time : time(NULL)), buf); } - void SendClientIntroduction(const char *nick, const char *user, const char *host, const char *real, const char *modes) + void SendClientIntroduction(const char *nick, const char *user, const char *host, const char *real, const char *modes, const char *uid) { send_cmd(ServerName, "NICK %ld %s %s %s %s +%s 0.0.0.0 :%s", static_cast<long>(time(NULL)), nick, host, host, user, modes, real); send_cmd(nick, "OPERTYPE Service"); diff --git a/src/protocol/inspircd12.cpp b/src/protocol/inspircd12.cpp index 4816ab84a..a4f78791c 100644 --- a/src/protocol/inspircd12.cpp +++ b/src/protocol/inspircd12.cpp @@ -542,7 +542,7 @@ class InspIRCdProto : public IRCDProto void SendGuestNick(const char *nick, const char *user, const char *host, const char *real, const char *modes) { - send_cmd(ServerName, "NICK %ld %s %s %s %s +%s 0.0.0.0 :%s", static_cast<long>(time(NULL)), nick, host, host, user, modes, real); + send_cmd(TS6SID, "UID %ld %s %s %s %s +%s 0.0.0.0 :%s", static_cast<long>(time(NULL)), nick, host, host, user, modes, real); } void SendModeInternal(BotInfo *source, const char *dest, const char *buf) @@ -551,9 +551,9 @@ class InspIRCdProto : public IRCDProto send_cmd(source ? source->uid : TS6SID, "FMODE %s %u %s", dest, static_cast<unsigned>(c ? c->creation_time : time(NULL)), buf); } - void SendClientIntroduction(const char *nick, const char *user, const char *host, const char *real, const char *modes) + void SendClientIntroduction(const char *nick, const char *user, const char *host, const char *real, const char *modes, const char *uid) { - send_cmd(ServerName, "NICK %ld %s %s %s %s +%s 0.0.0.0 :%s", static_cast<long>(time(NULL)), nick, host, host, user, modes, real); + send_cmd(ServerName, "UID %ld %s %s %s %s +%s 0.0.0.0 :%s", static_cast<long>(time(NULL)), nick, host, host, user, modes, real); send_cmd(nick, "OPERTYPE Service"); } diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c index f423a849a..967c2fec0 100644 --- a/src/protocol/ratbox.c +++ b/src/protocol/ratbox.c @@ -617,7 +617,7 @@ class RatboxProto : public IRCDTS6Proto ratbox_cmd_svinfo(); } - void SendClientIntroduction(const char *nick, const char *user, const char *host, const char *real, const char *modes) + void SendClientIntroduction(const char *nick, const char *user, const char *host, const char *real, const char *modes, const char *uid) { EnforceQlinedNick(nick, NULL); if (UseTS6) { diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c index 6a99e4b33..945a95d6f 100644 --- a/src/protocol/unreal32.c +++ b/src/protocol/unreal32.c @@ -673,7 +673,7 @@ class UnrealIRCdProto : public IRCDProto send_cmd(source->nick, "%s %s %s", send_token("MODE", "G"), dest, buf); } - void SendClientIntroduction(const char *nick, const char *user, const char *host, const char *real, const char *modes) + void SendClientIntroduction(const char *nick, const char *user, const char *host, const char *real, const char *modes, const char *uid) { EnforceQlinedNick(nick, s_BotServ); send_cmd(NULL, "%s %s 1 %ld %s %s %s 0 %s %s%s :%s", send_token("NICK", "&"), nick, static_cast<long>(time(NULL)), user, host, ServerName, modes, host, |