aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-12-04 14:46:39 -05:00
Code

Don't send proxy commands to server if -noproxy option was used.

Browse Source 
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@2341 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2002-01-23 00:23:31 +00:00 committed by cras
parent 4c4f7ec042
commit 46a6cf58f3
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/irc/core/irc-servers.c
View File

@ -106,10 +106,11 @@ static void server_init(IRC_SERVER_REC *server)
conn = server->connrec; conn = server->connrec;
if (conn->proxy_password != NULL && *conn->proxy_password != '\0') if (conn->proxy != NULL && conn->proxy_password != NULL &&
*conn->proxy_password != '\0')
irc_send_cmdv(server, "PASS %s", conn->proxy_password); irc_send_cmdv(server, "PASS %s", conn->proxy_password);
if (conn->proxy_string != NULL) if (conn->proxy != NULL && conn->proxy_string != NULL)
irc_send_cmdv(server, conn->proxy_string, conn->address, conn->port); irc_send_cmdv(server, conn->proxy_string, conn->address, conn->port);
if (conn->password != NULL && *conn->password != '\0') { if (conn->password != NULL && *conn->password != '\0') {
@ -151,7 +152,7 @@ static void server_init(IRC_SERVER_REC *server)
server->cmdcount = 0; server->cmdcount = 0;
if (conn->proxy_string_after != NULL) { if (conn->proxy != NULL && conn->proxy_string_after != NULL) {
irc_send_cmdv(server, conn->proxy_string_after, irc_send_cmdv(server, conn->proxy_string_after,
conn->address, conn->port); conn->address, conn->port);
} }