Fixed minor join bug

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@708 e03df62e-2008-0410-955e-edbf42e46eb7

diff --git a/src/commands.cpp b/src/commands.cpp
index 02c9255985b31ba5737e622802f758fbfcc7897e..3dd1004f1e32190ebe29a8022172b3e3c552d3f5 100644 (file)
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -2274,12 +2274,15 @@ void handle_link_packet(char* udp_msg, char* tcp_host, serverrec *serv)
                }
                if (!strcmp(command,"SVSJOIN"))
                {
-                       snprintf(udp_msg,MAXBUF,"J %s %s",source,data);
+                       snprintf(udp_msg,MAXBUF,"J %s",data);
+                       NetSendToOne(tcp_host,udp_msg);
+                       char* nick = strtok(data," ");
+                       char* chan = strtok(NULL," ");
                        log(DEBUG,"Rewrote SVSJOIN from services to: '%s'",udp_msg);
-                       userrec* u = Find(source);
+                       userrec* u = Find(nick);
                        if (u)
                        {
-                               add_channel(u,data,"",true);
+                               add_channel(u,chan,"",true);
                        }
                        token = udp_msg[0];
                }

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 62eb28e96e5e8891bda21df45366585f04587802..5b9f54fd162146dea3ab41718391be87a99970fc 100644 (file)
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -1437,7 +1437,7 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key, bool overri
                        {
                                // use the stamdard J token with no privilages.
                                char buffer[MAXBUF];
-                               snprintf(buffer,MAXBUF,"J %s :%s",user->nick,Ptr->name);
+                               snprintf(buffer,MAXBUF,"J %s %s",user->nick,Ptr->name);
                                NetSendToAll(buffer);
                        }