Changes in irc_commands.c [c029350:f9756bd]
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
irc_commands.c
rc029350 rf9756bd 30 30 static void irc_cmd_pass( irc_t *irc, char **cmd ) 31 31 { 32 if( global.conf->auth_pass && 32 if( irc->status & USTATUS_LOGGED_IN ) 33 { 34 char *send_cmd[] = { "identify", cmd[1], NULL }; 35 36 /* We're already logged in, this client seems to send the PASS 37 command last. (Possibly it won't send it at all if it turns 38 out we don't require it, which will break this feature.) 39 Try to identify using the given password. */ 40 return root_command( irc, send_cmd ); 41 } 42 /* Handling in pre-logged-in state, first see if this server is 43 password-protected: */ 44 else if( global.conf->auth_pass && 33 45 ( strncmp( global.conf->auth_pass, "md5:", 4 ) == 0 ? 34 46 md5_verify_password( cmd[1], global.conf->auth_pass + 4 ) == 0 : … … 38 50 irc_check_login( irc ); 39 51 } 40 else 52 else if( global.conf->auth_pass ) 41 53 { 42 54 irc_reply( irc, 464, ":Incorrect password" ); 55 } 56 else 57 { 58 /* Remember the password and try to identify after USER/NICK. */ 59 irc_setpass( irc, cmd[1] ); 60 irc_check_login( irc ); 43 61 } 44 62 } … … 260 278 if( cmd[1] != irc->last_target ) 261 279 { 262 if( irc->last_target ) 263 g_free( irc->last_target ); 280 g_free( irc->last_target ); 264 281 irc->last_target = g_strdup( cmd[1] ); 265 282 } … … 581 598 582 599 static const command_t irc_commands[] = { 583 { "pass", 1, irc_cmd_pass, IRC_CMD_PRE_LOGIN},600 { "pass", 1, irc_cmd_pass, 0 }, 584 601 { "user", 4, irc_cmd_user, IRC_CMD_PRE_LOGIN }, 585 602 { "nick", 1, irc_cmd_nick, 0 },
Note: See TracChangeset
for help on using the changeset viewer.