Changeset edf9657

Timestamp:

2006-01-14T18:25:00Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

b23c5c7

Parents:

c22c210

Message:

Fixed the PASS-command, added error messages for invalid commands to irc_exec().

Files:

• irc.c (modified) (1 diff)
• irc.h (modified) (1 diff)
• irc_commands.c (modified) (5 diffs)

irc.c

@@ -573 +573 @@
         
         irc_reply( irc, 366, "%s :End of /NAMES list", channel );
+}
+
+int irc_check_login( irc_t *irc )
+{
+        if( irc->user && irc->nick )
+        {
+                if( global.conf->authmode == AUTHMODE_CLOSED && irc->status < USTATUS_AUTHORIZED )
+                {
+                        irc_reply( irc, 464, ":This server is password-protected." );
+                        return 0;
+                }
+                else
+                {
+                        irc_login( irc );
+                        return 1;
+                }
+        }
+        else
+        {
+                /* More information needed. */
+                return 0;
+        }
 }
 

irc.h

@@ -118 +118 @@
 
 void irc_login( irc_t *irc );
+int irc_check_login( irc_t *irc );
 void irc_motd( irc_t *irc );
 void irc_names( irc_t *irc, char *channel );

irc_commands.c

@@ -29 +29 @@
 static int irc_cmd_pass( irc_t *irc, char **cmd )
 {
-        if( strcmp( cmd[1], (global.conf)->auth_pass ) == 0 )
+        if( global.conf->auth_pass && strcmp( cmd[1], global.conf->auth_pass ) == 0 )
         {
                 irc->status = USTATUS_AUTHORIZED;
+                irc_check_login();
         }
         else
         {
-                irc_reply( irc, 464, ":Nope, maybe you should try it again..." );
+                irc_reply( irc, 464, ":Incorrect password." );
         }
         
@@ -43 +44 @@
 static int irc_cmd_user( irc_t *irc, char **cmd )
 {
-        if( irc->user )
-        {
-                irc_reply( irc, 462, ":You can't change your nick/userinfo" );
-        }
-        else
-        {
-                irc->user = g_strdup( cmd[1] );
-                irc->realname = g_strdup( cmd[4] );
-                if( irc->nick ) irc_login( irc );
-        }
+        irc->user = g_strdup( cmd[1] );
+        irc->realname = g_strdup( cmd[4] );
+        
+        irc_check_login( irc );
         
         return( 1 );
@@ -76 +71 @@
         {
                 irc->nick = g_strdup( cmd[1] );
-                if( irc->user ) irc_login( irc );
+                
+                irc_check_login( irc );
         }
         
@@ -89 +85 @@
         return( 0 );
 }
-
-/*
-        if( !irc->user || !irc->nick )
-        {
-                irc_reply( irc, 451, ":Register first" );
-                return( 1 );
-        }
-*/
 
 static int irc_cmd_ping( irc_t *irc, char **cmd )
@@ -626 +614 @@
                 if( g_strcasecmp( irc_commands[i].command, cmd[0] ) == 0 )
                 {
-                        if( irc_commands[i].flags & IRC_CMD_PRE_LOGIN && irc->status > USTATUS_AUTHORIZED )
-                                continue;
+                        if( irc_commands[i].flags & IRC_CMD_PRE_LOGIN && irc->status >= USTATUS_LOGGED_IN )
+                        {
+                                irc_reply( irc, 462, ":Only allowed before logging in" );
+                                return( 1 );
+                        }
                         if( irc_commands[i].flags & IRC_CMD_LOGGED_IN && irc->status < USTATUS_LOGGED_IN )
-                                continue;
+                        {
+                                irc_reply( irc, 451, ":Register first" );
+                                return( 1 );
+                        }
                         if( irc_commands[i].flags & IRC_CMD_OPER_ONLY && !strchr( irc->umode, 'o' ) )
-                                continue;
+                        {
+                                irc_reply( irc, 481, ":Permission denied - You're not an IRC operator" );
+                                return( 1 );
+                        }
                         
                         for( j = 1; j <= irc_commands[i].required_parameters; j ++ )