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/fe-common | |
| 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/fe-common')
| -rw-r--r-- | src/fe-common/core/fe-server.c | 6 | ||||
| -rw-r--r-- | src/fe-common/irc/fe-irc-server.c | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/fe-common/core/fe-server.c b/src/fe-common/core/fe-server.c index e4b32bdb..f13829db 100644 --- a/src/fe-common/core/fe-server.c +++ b/src/fe-common/core/fe-server.c @@ -158,6 +158,10 @@ static void cmd_server_add(const char *data) if (value != NULL && *value != '\0') rec->ssl_pkey = g_strdup(value); + value = g_hash_table_lookup(optlist, "ssl_pass"); + if (value != NULL && *value != '\0') + rec->ssl_pass = g_strdup(value); + if (g_hash_table_lookup(optlist, "ssl_verify")) rec->ssl_verify = TRUE; @@ -383,7 +387,7 @@ void fe_server_init(void) command_bind("server remove", NULL, (SIGNAL_FUNC) cmd_server_remove); command_bind_first("server", NULL, (SIGNAL_FUNC) server_command); command_bind_first("disconnect", NULL, (SIGNAL_FUNC) server_command); - command_set_options("server add", "4 6 ssl +ssl_cert +ssl_pkey ssl_verify +ssl_cafile +ssl_capath auto noauto proxy noproxy -host -port"); + command_set_options("server add", "4 6 ssl +ssl_cert +ssl_pkey +ssl_pass ssl_verify +ssl_cafile +ssl_capath auto noauto proxy noproxy -host -port"); signal_add("server looking", (SIGNAL_FUNC) sig_server_looking); signal_add("server connecting", (SIGNAL_FUNC) sig_server_connecting); diff --git a/src/fe-common/irc/fe-irc-server.c b/src/fe-common/irc/fe-irc-server.c index 9bc68762..fbfe4d9d 100644 --- a/src/fe-common/irc/fe-irc-server.c +++ b/src/fe-common/irc/fe-irc-server.c @@ -50,7 +50,7 @@ const char *get_visible_target(IRC_SERVER_REC *server, const char *target) return target; } -/* SYNTAX: SERVER ADD [-4 | -6] [-ssl] [-ssl_cert <cert>] [-ssl_pkey <pkey>] +/* SYNTAX: SERVER ADD [-4 | -6] [-ssl] [-ssl_cert <cert>] [-ssl_pkey <pkey>] [-ssl_pass <password>] [-ssl_verify] [-ssl_cafile <cafile>] [-ssl_capath <capath>] [-auto | -noauto] [-network <network>] [-host <hostname>] [-cmdspeed <ms>] [-cmdmax <count>] [-port <port>] @@ -112,6 +112,8 @@ static void cmd_server_list(const char *data) g_string_append_printf(str, "ssl_cert: %s, ", rec->ssl_cert); if (rec->ssl_pkey) g_string_append_printf(str, "ssl_pkey: %s, ", rec->ssl_pkey); + if (rec->ssl_pass) + g_string_append_printf(str, "(pass), "); } if (rec->ssl_verify) g_string_append(str, "ssl_verify, "); |