Author: mattm
Date: 2016-09-21 17:18:07 +0200 (Wed, 21 Sep 2016)
New Revision: 26254
Modified:
trunk/gsa/ChangeLog
trunk/gsa/src/gsad_omp.c
Log:
Sort of UNIX socket default.
* src/gsad_omp.c (omp_init): Prefer the UNIX option to connection to
Manager, and use the OPENVAS_RUN_DIR socket if one is not specified.
(openvas_connection_open): Expect address to be set, now that omp_init
has a default.
(authenticate_omp, manager_connect): Remove connect defaults now that
omp_init sets them.
Modified: trunk/gsa/ChangeLog
===================================================================
--- trunk/gsa/ChangeLog 2016-09-21 15:13:08 UTC (rev 26253)
+++ trunk/gsa/ChangeLog 2016-09-21 15:18:07 UTC (rev 26254)
@@ -1,5 +1,16 @@
2016-09-21 Matthew Mundell <matthew.mund...@greenbone.net>
+ Sort of UNIX socket default.
+
+ * src/gsad_omp.c (omp_init): Prefer the UNIX option to connection to
+ Manager, and use the OPENVAS_RUN_DIR socket if one is not specified.
+ (openvas_connection_open): Expect address to be set, now that omp_init
+ has a default.
+ (authenticate_omp, manager_connect): Remove connect defaults now that
+ omp_init sets them.
+
+2016-09-21 Matthew Mundell <matthew.mund...@greenbone.net>
+
* src/gsad_omp.c (filter_exists): Correct grammar.
2016-09-21 Matthew Mundell <matthew.mund...@greenbone.net>
Modified: trunk/gsa/src/gsad_omp.c
===================================================================
--- trunk/gsa/src/gsad_omp.c 2016-09-21 15:13:08 UTC (rev 26253)
+++ trunk/gsa/src/gsad_omp.c 2016-09-21 15:18:07 UTC (rev 26254)
@@ -328,11 +328,18 @@
manager_address = g_strdup (manager_address_unix);
manager_use_tls = 0;
}
- if (manager_address_tls)
+ else if (manager_address_tls)
{
manager_address = g_strdup (manager_address_tls);
manager_use_tls = 1;
}
+ else
+ {
+ manager_address = g_build_filename (OPENVAS_RUN_DIR,
+ "openvasmd.sock",
+ NULL);
+ manager_use_tls = 0;
+ }
manager_port = port_manager;
}
@@ -28478,20 +28485,21 @@
const gchar *address,
int port)
{
+ if (address == NULL)
+ return -1;
+
connection->tls = manager_use_tls;
+
if (manager_use_tls)
connection->socket = openvas_server_open (&connection->session,
- address
- ? address
- : OPENVASMD_ADDRESS,
+ address,
port);
else
- connection->socket = connect_unix (address
- ? address
- // FIX default socket
- : OPENVASMD_ADDRESS);
+ connection->socket = connect_unix (address);
+
if (connection->socket == -1)
return -1;
+
return 0;
}
@@ -28522,9 +28530,7 @@
omp_authenticate_info_opts_t auth_opts;
if (openvas_connection_open (&connection,
- manager_address
- ? manager_address
- : OPENVASMD_ADDRESS,
+ manager_address,
manager_port))
{
g_debug ("%s failed to acquire socket!\n", __FUNCTION__);
@@ -28737,9 +28743,7 @@
*html = NULL; /* Keep compiler quiet. */
if (openvas_connection_open (connection,
- manager_address
- ? manager_address
- : OPENVASMD_ADDRESS,
+ manager_address,
manager_port))
{
response_data->http_status_code = MHD_HTTP_SERVICE_UNAVAILABLE;
_______________________________________________
Openvas-commits mailing list
Openvas-commits@wald.intevation.org
https://lists.wald.intevation.org/cgi-bin/mailman/listinfo/openvas-commits
