diff options
| -rw-r--r-- | docs/help/in/connect.in | 1 | ||||
| -rw-r--r-- | docs/help/in/server.in | 2 | ||||
| -rw-r--r-- | src/core/servers-reconnect.c | 3 | ||||
| -rw-r--r-- | src/core/servers-setup.c | 3 |
4 files changed, 8 insertions, 1 deletions
diff --git a/docs/help/in/connect.in b/docs/help/in/connect.in index 1c1aa2bb..3330966e 100644 --- a/docs/help/in/connect.in +++ b/docs/help/in/connect.in @@ -11,6 +11,7 @@ -ssl_cert: The SSL client certificate file. -ssl_pkey: The SSL client private key, if not included in the certificate file. + -ssl_pass: The password for the SSL client private key or certificate. -ssl_verify: Verifies the SSL certificate of the server. -ssl_cafile: The file with the list of CA certificates. -ssl_capath: The directory which contains the CA certificates. diff --git a/docs/help/in/server.in b/docs/help/in/server.in index d8bcb9a7..f6706daf 100644 --- a/docs/help/in/server.in +++ b/docs/help/in/server.in @@ -18,7 +18,7 @@ -ssl_cert: The SSL client certificate file. -ssl_pkey: The SSL client private key, if not included in the certificate file. - -ssl_pass: Verifies the SSL certificate of the server. + -ssl_pass: The password for the SSL client private key or certificate. -ssl_verify: Verifies the SSL certificate of the server. -ssl_cafile: The file with the list of CA certificates. -ssl_capath: The directory which contains the CA certificates. diff --git a/src/core/servers-reconnect.c b/src/core/servers-reconnect.c index 0a08b461..d99a5405 100644 --- a/src/core/servers-reconnect.c +++ b/src/core/servers-reconnect.c @@ -253,6 +253,9 @@ static void sig_reconnect(SERVER_REC *server) conn->port = server->connrec->port; conn->password = g_strdup(server->connrec->password); + if (strchr(conn->address, '/') != NULL) + conn->unix_socket = TRUE; + server_reconnect_add(conn, (server->connect_time == 0 ? time(NULL) : server->connect_time) + reconnect_time); server_connect_unref(conn); diff --git a/src/core/servers-setup.c b/src/core/servers-setup.c index 0819ff1a..27d9f1f0 100644 --- a/src/core/servers-setup.c +++ b/src/core/servers-setup.c @@ -122,6 +122,9 @@ static void server_setup_fill(SERVER_CONNECT_REC *conn, conn->address = g_strdup(address); if (port > 0) conn->port = port; + if (strchr(address, '/') != NULL) + conn->unix_socket = TRUE; + if (!conn->nick) conn->nick = g_strdup(settings_get_str("nick")); conn->username = g_strdup(settings_get_str("user_name")); conn->realname = g_strdup(settings_get_str("real_name")); |