Author: mattm
Date: 2016-09-21 15:05:52 +0200 (Wed, 21 Sep 2016)
New Revision: 26250

Modified:
   trunk/openvas-manager/ChangeLog
   trunk/openvas-manager/src/openvasmd.c
Log:
        * src/openvasmd.c (main): Check for conflicts with --unix-socket.

Modified: trunk/openvas-manager/ChangeLog
===================================================================
--- trunk/openvas-manager/ChangeLog     2016-09-21 12:56:36 UTC (rev 26249)
+++ trunk/openvas-manager/ChangeLog     2016-09-21 13:05:52 UTC (rev 26250)
@@ -1,7 +1,11 @@
-2016-09-14  Matthew Mundell <matthew.mund...@greenbone.net>
+2016-09-21  Matthew Mundell <matthew.mund...@greenbone.net>
 
-       Add option to server clients on UNIX socket instead of TLS.
+       * src/openvasmd.c (main): Check for conflicts with --unix-socket.
 
+2016-09-21  Matthew Mundell <matthew.mund...@greenbone.net>
+
+       Add option to serve clients on UNIX socket instead of TLS.
+
        * src/manage.c (manage_schedule): Use connection instead of session.
 
        * src/manage_sql.c (escalate_2, init_manage): Use connection instead of 
session.

Modified: trunk/openvas-manager/src/openvasmd.c
===================================================================
--- trunk/openvas-manager/src/openvasmd.c       2016-09-21 12:56:36 UTC (rev 
26249)
+++ trunk/openvas-manager/src/openvasmd.c       2016-09-21 13:05:52 UTC (rev 
26250)
@@ -1641,12 +1641,23 @@
       exit (EXIT_SUCCESS);
     }
 
+  /* Check which type of socket to use. */
+
   if (manager_address_string_unix == NULL)
     use_tls = 1;
   else
-    use_tls = 0;
+    {
+      use_tls = 0;
+      if (manager_address_string || manager_address_string_2)
+        {
+          g_critical ("%s: --listen or --listen2 given with --unix-socket\n",
+                      __FUNCTION__);
+          return EXIT_FAILURE;
+        }
+    }
 
   /* Set process title. */
+
   proctitle_init (argc, argv);
   proctitle_set ("openvasmd: Initializing.");
 

_______________________________________________
Openvas-commits mailing list
Openvas-commits@wald.intevation.org
https://lists.wald.intevation.org/cgi-bin/mailman/listinfo/openvas-commits

Reply via email to