zynk/irssi
2
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2026-08-20 00:52:30 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'soperise' into 'security'

Browse source 
Soperise

See merge request irssi/irssi!32
This commit is contained in:
Nei 2018-02-06 06:45:54 +00:00
commit a73659e0ea
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/fe-common/irc/fe-irc-commands.c
View file

@ -345,16 +345,18 @@ static void cmd_ts(const char *data)
} }
typedef struct { typedef struct {
IRC_SERVER_REC *server; char *server_tag;
char *nick; char *nick;
} OPER_PASS_REC; } OPER_PASS_REC;
static void cmd_oper_got_pass(const char *password, OPER_PASS_REC *rec) static void cmd_oper_got_pass(const char *password, OPER_PASS_REC *rec)
{ {
if (*password != '\0') SERVER_REC *server_rec = server_find_tag(rec->server_tag);
irc_send_cmdv(rec->server, "OPER %s %s", rec->nick, password); if (*password != '\0' && IS_IRC_SERVER(server_rec))
irc_send_cmdv((IRC_SERVER_REC *) server_rec, "OPER %s %s", rec->nick, password);
g_free(rec->nick); g_free(rec->nick);
g_free(rec); g_free(rec->server_tag);
g_free(rec);
} }
static void cmd_oper(const char *data, IRC_SERVER_REC *server) static void cmd_oper(const char *data, IRC_SERVER_REC *server)
@ -374,7 +376,7 @@ static void cmd_oper(const char *data, IRC_SERVER_REC *server)
OPER_PASS_REC *rec; OPER_PASS_REC *rec;
rec = g_new(OPER_PASS_REC, 1); rec = g_new(OPER_PASS_REC, 1);
rec->server = server; rec->server_tag = g_strdup(server->tag);
rec->nick = g_strdup(*nick != '\0' ? nick : server->nick); rec->nick = g_strdup(*nick != '\0' ? nick : server->nick);
format = format_get_text(MODULE_NAME, NULL, server, NULL, format = format_get_text(MODULE_NAME, NULL, server, NULL,