From: Rolf Eike Beer <eike@sf-mail.de>

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

diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c
index 39ef83d383a98ce6430d13631149c7e85c3b513d..139f5061ce6b8afa6777b1760593db2b076d8c40 100644 (file)
--- a/src/ngircd/irc-channel.c
+++ b/src/ngircd/irc-channel.c
@@ -14,7 +14,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: irc-channel.c,v 1.40.2.1 2008/01/07 11:42:14 fw Exp $";
+static char UNUSED id[] = "$Id: irc-channel.c,v 1.40.2.2 2008/02/26 12:07:41 fw Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -79,6 +79,14 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req )
        {
                chan = NULL; flags = NULL;
 
+               if (Client_Type(Client) == CLIENT_SERVER) {
+                       flags = strchr( channame, 0x7 );
+                       if( flags ) {
+                               *flags = '\0';
+                               flags++;
+                       }
+               }
+
                /* wird der Channel neu angelegt? */
                if( Channel_Search( channame )) {
                        is_new_chan = false;
@@ -92,18 +100,6 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req )
                        is_new_chan = true;
                }
 
-               /* Hat ein Server Channel-User-Modes uebergeben? */
-               if( Client_Type( Client ) == CLIENT_SERVER )
-               {
-                       /* Channel-Flags extrahieren */
-                       flags = strchr( channame, 0x7 );
-                       if( flags )
-                       {
-                               *flags = '\0';
-                               flags++;
-                       }
-               }
-
                /* Local client? */
                if( Client_Type( Client ) == CLIENT_USER )
                {