Changes in irc_commands.c [eeb85a8:f9756bd]

File:

• irc_commands.c (modified) (4 diffs)

irc_commands.c

@@ -30 +30 @@
 static void irc_cmd_pass( irc_t *irc, char **cmd )
 {
-        if( global.conf->auth_pass && strcmp( cmd[1], global.conf->auth_pass ) == 0 )
+        if( irc->status & USTATUS_LOGGED_IN )
+        {
+                char *send_cmd[] = { "identify", cmd[1], NULL };
+                
+                /* We're already logged in, this client seems to send the PASS
+                   command last. (Possibly it won't send it at all if it turns
+                   out we don't require it, which will break this feature.)
+                   Try to identify using the given password. */
+                return root_command( irc, send_cmd );
+        }
+        /* Handling in pre-logged-in state, first see if this server is
+           password-protected: */
+        else if( global.conf->auth_pass &&
+            ( strncmp( global.conf->auth_pass, "md5:", 4 ) == 0 ?
+                md5_verify_password( cmd[1], global.conf->auth_pass + 4 ) == 0 :
+                strcmp( cmd[1], global.conf->auth_pass ) == 0 ) )
         {
                 irc->status |= USTATUS_AUTHORIZED;
                 irc_check_login( irc );
         }
-        else
+        else if( global.conf->auth_pass )
         {
                 irc_reply( irc, 464, ":Incorrect password" );
+        }
+        else
+        {
+                /* Remember the password and try to identify after USER/NICK. */
+                irc_setpass( irc, cmd[1] );
+                irc_check_login( irc );
         }
 }
@@ -88 +109 @@
 static void irc_cmd_oper( irc_t *irc, char **cmd )
 {
-        if( global.conf->oper_pass && strcmp( cmd[2], global.conf->oper_pass ) == 0 )
+        if( global.conf->oper_pass &&
+            ( strncmp( global.conf->oper_pass, "md5:", 4 ) == 0 ?
+                md5_verify_password( cmd[2], global.conf->oper_pass + 4 ) == 0 :
+                strcmp( cmd[2], global.conf->oper_pass ) == 0 ) )
         {
                 irc_umode_set( irc, "+o", 1 );
@@ -254 +278 @@
                         if( cmd[1] != irc->last_target )
                         {
-                                if( irc->last_target )
-                                        g_free( irc->last_target );
+                                g_free( irc->last_target );
                                 irc->last_target = g_strdup( cmd[1] );
                         }
@@ -575 +598 @@
 
 static const command_t irc_commands[] = {
-        { "pass",        1, irc_cmd_pass,        IRC_CMD_PRE_LOGIN },
+        { "pass",        1, irc_cmd_pass,        0 },
         { "user",        4, irc_cmd_user,        IRC_CMD_PRE_LOGIN },
         { "nick",        1, irc_cmd_nick,        0 },