diff options
| author | Alexander Færøy <ahf@irssi.org> | 2014-01-11 19:53:17 +0000 |
|---|---|---|
| committer | ahf <ahf@dbcabf3a-b0e7-0310-adc4-f8d773084564> | 2014-01-11 19:53:17 +0000 |
| commit | 68f8229373a5ccc2a8eebb9ffb1b445b11bfecb6 (patch) | |
| tree | c0157d496b507b1d721b3566761c13aa67d1cc02 /src/core/chat-commands.c | |
| parent | 952698dc3a885b80f63aa065a0f00fe1a907c437 (diff) | |
| download | irssi-68f8229373a5ccc2a8eebb9ffb1b445b11bfecb6.zip | |
Add -ssl_pass to /connect and /server
Fixes: Bug #305
git-svn-id: file:///var/www/svn.irssi.org/SVN/irssi/trunk@5231 dbcabf3a-b0e7-0310-adc4-f8d773084564
Diffstat (limited to 'src/core/chat-commands.c')
| -rw-r--r-- | src/core/chat-commands.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/core/chat-commands.c b/src/core/chat-commands.c index f5d0e9f8..c128439d 100644 --- a/src/core/chat-commands.c +++ b/src/core/chat-commands.c @@ -98,6 +98,8 @@ static SERVER_CONNECT_REC *get_server_connect(const char *data, int *plus_addr, conn->ssl_cert = g_strdup(tmp); if ((tmp = g_hash_table_lookup(optlist, "ssl_pkey")) != NULL) conn->ssl_pkey = g_strdup(tmp); + if ((tmp = g_hash_table_lookup(optlist, "ssl_pass")) != NULL) + conn->ssl_pass = g_strdup(tmp); if (g_hash_table_lookup(optlist, "ssl_verify") != NULL) conn->ssl_verify = TRUE; if ((tmp = g_hash_table_lookup(optlist, "ssl_cafile")) != NULL) @@ -134,7 +136,7 @@ static SERVER_CONNECT_REC *get_server_connect(const char *data, int *plus_addr, return conn; } -/* SYNTAX: CONNECT [-4 | -6] [-ssl] [-ssl_cert <cert>] [-ssl_pkey <pkey>] +/* SYNTAX: CONNECT [-4 | -6] [-ssl] [-ssl_cert <cert>] [-ssl_pkey <pkey>] [-ssl_pass <password>] [-ssl_verify] [-ssl_cafile <cafile>] [-ssl_capath <capath>] [-!] [-noautosendcmd] [-noproxy] [-network <network>] [-host <hostname>] @@ -240,7 +242,7 @@ static void sig_default_command_server(const char *data, SERVER_REC *server, signal_emit("command server connect", 3, data, server, item); } -/* SYNTAX: SERVER [-4 | -6] [-ssl] [-ssl_cert <cert>] [-ssl_pkey <pkey>] +/* SYNTAX: SERVER [-4 | -6] [-ssl] [-ssl_cert <cert>] [-ssl_pkey <pkey>] [-ssl_pass <password>] [-ssl_verify] [-ssl_cafile <cafile>] [-ssl_capath <capath>] [-!] [-noautosendcmd] [-noproxy] [-network <network>] [-host <hostname>] @@ -458,7 +460,7 @@ void chat_commands_init(void) signal_add("default command server", (SIGNAL_FUNC) sig_default_command_server); signal_add("server sendmsg", (SIGNAL_FUNC) sig_server_sendmsg); - command_set_options("connect", "4 6 !! -network ssl +ssl_cert +ssl_pkey ssl_verify +ssl_cafile +ssl_capath +host noproxy -rawlog noautosendcmd"); + command_set_options("connect", "4 6 !! -network ssl +ssl_cert +ssl_pkey +ssl_pass ssl_verify +ssl_cafile +ssl_capath +host noproxy -rawlog noautosendcmd"); command_set_options("msg", "channel nick"); } |