[Openvas-commits] r5663 - in branches/openvas-server-2-0: . openvasd

[scm-commit@wald.intevation.org]

Author: jan
Date: 2009-10-21 20:53:03 +0200 (Wed, 21 Oct 2009)
New Revision: 5663

Modified:
   branches/openvas-server-2-0/ChangeLog
   branches/openvas-server-2-0/openvasd/openvasd.c
Log:
Backport from trunk (r5523).

* openvasd/openvasd.c (server_thread): Removed handling
of SSL version being set to "none". This does not make sense
to handle. If none is specified, now the scanner will fall back
to its default as done before for any unknown SSL identifier.



Modified: branches/openvas-server-2-0/ChangeLog
===================================================================
--- branches/openvas-server-2-0/ChangeLog	2009-10-21 12:17:22 UTC (rev 5662)
+++ branches/openvas-server-2-0/ChangeLog	2009-10-21 18:53:03 UTC (rev 5663)
@@ -1,3 +1,12 @@
+2009-10-21  Jan-Oliver Wagner <jan-oliver.wagner at greenbone.net>
+
+	Backport from trunk (r5523).
+
+	* openvasd/openvasd.c (server_thread): Removed handling
+	of SSL version being set to "none". This does not make sense
+	to handle. If none is specified, now the scanner will fall back
+	to its default as done before for any unknown SSL identifier.
+
 2009-09-16  Michael Wiegand <michael.wiegand at intevation.de>
 
 	* openvas-mkcert.in: Replace usage of MD5 as certificate signature

Modified: branches/openvas-server-2-0/openvasd/openvasd.c
===================================================================
--- branches/openvas-server-2-0/openvasd/openvasd.c	2009-10-21 12:17:22 UTC (rev 5662)
+++ branches/openvas-server-2-0/openvasd/openvasd.c	2009-10-21 18:53:03 UTC (rev 5663)
@@ -361,8 +361,6 @@
  /* Close the server thread - it is useless for us now */
  close (global_iana_socket);
 
- if (ovas_server_ctx != NULL) /* ssl_ver !=  "NONE" */
-   {
      soc2 = ovas_server_context_attach(ovas_server_ctx, soc);
      if (soc2 < 0)
        goto shutdown_and_exit;
@@ -370,7 +368,6 @@
      /* FIXME: The pre-gnutls code optionally printed information about
       * the peer's certificate at this point.
       */
-   }
 
  setsockopt(soc, SOL_SOCKET, SO_KEEPALIVE, &opt, sizeof(opt));
  /* arg_set_value *replaces* an existing value, but it shouldn't fail here */
@@ -490,8 +487,6 @@
   if (ssl_ver == NULL || *ssl_ver == '\0')
     ssl_ver = SSL_VER_DEF_NAME;
 
-  if (strcasecmp(ssl_ver, "NONE") != 0)
-    {
       if (nessus_SSL_init(NULL) < 0)
 	{
 	  fprintf(stderr, "Could not initialize openvas SSL!\n");
@@ -558,9 +553,7 @@
 	      exit (1);
 	    }
 	}
-    } /* ssl_ver != "NONE" */
 
-
   log_write("openvasd %s started\n", OPENVAS_FULL_VERSION);
   for(;;)
     {