[Openvas-commits] r9533 - in trunk/openvas-libraries: . nasl

[scm-commit@wald.intevation.org]

Author: mwiegand
Date: 2010-11-26 12:25:38 +0100 (Fri, 26 Nov 2010)
New Revision: 9533

Modified:
   trunk/openvas-libraries/ChangeLog
   trunk/openvas-libraries/nasl/nasl_smb.c
   trunk/openvas-libraries/nasl/nasl_wmi.c
Log:
Ensure the last commit actually compiles and does not produce warnings.

  * nasl/nasl_wmi.c: Added missing includes.
  (nasl_wmi_connect, nasl_wmi_connect_rsop, nasl_wmi_connect_reg): Call
  inet_ntoa () with a proper in_addr struct instead of trying to cast a
  uint32_t to it.

  * nasl/nasl_smb.c: Added missing includes.
  (nasl_smb_connect): Call inet_ntoa () with a proper in_addr struct
  instead of trying to cast a uint32_t to it.


Modified: trunk/openvas-libraries/ChangeLog
===================================================================
--- trunk/openvas-libraries/ChangeLog	2010-11-26 10:09:09 UTC (rev 9532)
+++ trunk/openvas-libraries/ChangeLog	2010-11-26 11:25:38 UTC (rev 9533)
@@ -1,3 +1,17 @@
+2010-11-26  Michael Wiegand <michael.wiegand at greenbone.net>
+
+	Ensure the last commit actually compiles and does not produce
+	warnings.
+
+	* nasl/nasl_wmi.c: Added missing includes.
+	(nasl_wmi_connect, nasl_wmi_connect_rsop, nasl_wmi_connect_reg): Call
+	inet_ntoa () with a proper in_addr struct instead of trying to cast a
+	uint32_t to it.
+
+	* nasl/nasl_smb.c: Added missing includes.
+	(nasl_smb_connect): Call inet_ntoa () with a proper in_addr struct
+	instead of trying to cast a uint32_t to it.
+
 2010-11-26  Sooraj KS <kssooraj at secpod.com>
 
 	* nasl/nasl_wmi.c (wmi_connect, wmi_connect_rsop, wmi_connect_reg):

Modified: trunk/openvas-libraries/nasl/nasl_smb.c
===================================================================
--- trunk/openvas-libraries/nasl/nasl_smb.c	2010-11-26 10:09:09 UTC (rev 9532)
+++ trunk/openvas-libraries/nasl/nasl_smb.c	2010-11-26 11:25:38 UTC (rev 9533)
@@ -44,9 +44,13 @@
 #include <stdio.h>
 #include <string.h>
 #include <netinet/in.h>
+#include <sys/socket.h>
+#include <arpa/inet.h>
 
 #include "nasl_smb.h"
 #include "openvas_smb_interface.h"
+#include "../misc/plugutils.h"
+#include "../misc/system.h"
 
 /**
  * @brief Get a version string of the SMB implementation.
@@ -112,7 +116,9 @@
     }
   if (IN6_IS_ADDR_V4MAPPED (host))
    {
-      ip = estrdup (inet_ntoa (host->s6_addr32[3]));
+     struct in_addr *v4_addr = NULL;
+     v4_addr->s_addr = host->s6_addr32[3];
+     ip = estrdup (inet_ntoa (*v4_addr));
    }
   else
    {

Modified: trunk/openvas-libraries/nasl/nasl_wmi.c
===================================================================
--- trunk/openvas-libraries/nasl/nasl_wmi.c	2010-11-26 10:09:09 UTC (rev 9532)
+++ trunk/openvas-libraries/nasl/nasl_wmi.c	2010-11-26 11:25:38 UTC (rev 9533)
@@ -46,6 +46,8 @@
 #include <string.h>
 #include <stdio.h>
 #include <netinet/in.h>
+#include <sys/socket.h>
+#include <arpa/inet.h>
 #include "system.h"
 #include "plugutils.h"
 
@@ -131,7 +133,9 @@
 
   if (IN6_IS_ADDR_V4MAPPED (host))
     {
-      ip = estrdup (inet_ntoa (host->s6_addr32[3]));
+      struct in_addr *v4_addr = NULL;
+      v4_addr->s_addr = host->s6_addr32[3];
+      ip = estrdup (inet_ntoa (*v4_addr));
     }
   else
     {
@@ -298,7 +302,9 @@
 
   if (IN6_IS_ADDR_V4MAPPED (host))
     {
-      ip = estrdup (inet_ntoa (host->s6_addr32[3]));
+      struct in_addr *v4_addr = NULL;
+      v4_addr->s_addr = host->s6_addr32[3];
+      ip = estrdup (inet_ntoa (*v4_addr));
     }
   else
     {
@@ -426,7 +432,9 @@
 
   if (IN6_IS_ADDR_V4MAPPED (host))
     {
-      ip = estrdup (inet_ntoa (host->s6_addr32[3]));
+      struct in_addr *v4_addr = NULL;
+      v4_addr->s_addr = host->s6_addr32[3];
+      ip = estrdup (inet_ntoa (*v4_addr));
     }
   else
     {