diff options
| author | Adam <Adam@anope.org> | 2010-08-31 17:53:39 -0400 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2010-08-31 17:53:39 -0400 |
| commit | 7dfc8e8ee8f5355429763eac70fe694bf947eca3 (patch) | |
| tree | e1974b6e250981820e6cd0e678ced990167a3bf4 | |
| parent | 3a9a0ef1355d5b8363354fb12bff20bd3cbbf129 (diff) | |
Fixed do_sjoin to properly find the server source on TS6 IRCds
| -rw-r--r-- | src/channels.c | 7 | ||||
| -rw-r--r-- | version.log | 3 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/channels.c b/src/channels.c index 041468d9e..55079b2a3 100644 --- a/src/channels.c +++ b/src/channels.c @@ -794,7 +794,7 @@ void do_sjoin(const char *source, int ac, char **av) { Channel *c; User *user; - Server *serv; + Server *serv = NULL; struct c_userlist *cu; char *s = NULL; char *end, cubuf[7], *end2, *cumodes[6], *buf; @@ -803,7 +803,10 @@ void do_sjoin(const char *source, int ac, char **av) int is_created = 0; int keep_their_modes = 1; - serv = findserver(servlist, source); + if (UseTS6 && ircd->ts6) + serv = findserver_uid(servlist, source); + if (!serv) + serv = findserver(servlist, source); if (ircd->sjb64) { ts = base64dects(av[0]); diff --git a/version.log b/version.log index 63ee2eada..d231aa7ab 100644 --- a/version.log +++ b/version.log @@ -8,9 +8,10 @@ VERSION_MAJOR="1" VERSION_MINOR="8" VERSION_PATCH="4" VERSION_EXTRA="-git" -VERSION_BUILD="3029" +VERSION_BUILD="3030" # $Log$ # Changes since the 1.8.4 Release +#Revision 3030 - Fixed do_sjoin to properly find the server source on TS6 IRCds #Revision 3029 - Fixed InspIRCd1.2 protocol module passing invalid users in the SJOIN string which made internal debug messages confusing/wrong #Revision 3028 - We tell everyone to use 127.0.0.1 instead of localhost, so we should too. #Revision 3027 - Kill users using our nicks when on InspIRCd 1.2 |