Don't stop join handling on faulty channel, skip it

[ngircd-alex.git] / src / ngircd / irc-channel.c

diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c
index a41f1d48e15cc9ddf66e959cdbc8a22386921b42..6ddad88b1a9f3817d28a6c3962f03064348eaf3a 100644 (file)
--- a/src/ngircd/irc-channel.c
+++ b/src/ngircd/irc-channel.c
@@ -401,7 +401,7 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req )
 
                /* Join channel (and create channel if it doesn't exist) */
                if (!Channel_Join(target, channame))
-                       break;
+                       goto join_next;
 
                if (!chan) { /* channel is new; it has been created above */
                        chan = Channel_Search(channame);
@@ -420,6 +420,7 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req )
                if (!join_send_topic(Client, target, chan, channame))
                        break; /* write error */
 
+       join_next:
                /* next channel? */
                channame = strtok_r(NULL, ",", &lastchan);
                if (channame && key)