[Openvas-commits] r2807 - in trunk/openvas-client: . nessus src/util

[scm-commit@wald.intevation.org]

Author: jan
Date: 2009-03-16 22:45:34 +0100 (Mon, 16 Mar 2009)
New Revision: 2807

Modified:
   trunk/openvas-client/ChangeLog
   trunk/openvas-client/nessus/data_mining.c
   trunk/openvas-client/nessus/regex.c
   trunk/openvas-client/src/util/openvas_ssh_key_create.c
Log:
Further patches by Marcus Brinkmann towards a crosscompiling
OpenVAS-Client based on mingw.

* src/util/openvas_ssh_key_create.c (openvas_ssh_privkey_create,
openvas_ssh_pubkey_create): stdout and stderr can be
macros in some build environments. Therefore renaming variables
to something else.

* nessus/data_mining.c (requests2lines): Make this function
conditional to the presence of MMAP.

* nessus/regex.c: Protect typedef of boolean from being done
on WIN32.



Modified: trunk/openvas-client/ChangeLog
===================================================================
--- trunk/openvas-client/ChangeLog	2009-03-16 21:17:50 UTC (rev 2806)
+++ trunk/openvas-client/ChangeLog	2009-03-16 21:45:34 UTC (rev 2807)
@@ -1,5 +1,21 @@
 2009-03-16  Jan-Oliver Wagner <jan-oliver.wagner at intevation.de>
 
+	Further patches by Marcus Brinkmann towards a crosscompiling
+	OpenVAS-Client based on mingw.
+
+	* src/util/openvas_ssh_key_create.c (openvas_ssh_privkey_create,
+	openvas_ssh_pubkey_create): stdout and stderr can be
+	macros in some build environments. Therefore renaming variables
+	to something else.
+
+	* nessus/data_mining.c (requests2lines): Make this function
+	conditional to the presence of MMAP.
+
+	* nessus/regex.c: Protect typedef of boolean from being done
+	on WIN32.
+
+2009-03-16  Jan-Oliver Wagner <jan-oliver.wagner at intevation.de>
+
 	Adding some patches by Marcus Brinkmann towards a crosscompiling
 	OpenVAS-Client based on mingw.
 

Modified: trunk/openvas-client/nessus/data_mining.c
===================================================================
--- trunk/openvas-client/nessus/data_mining.c	2009-03-16 21:17:50 UTC (rev 2806)
+++ trunk/openvas-client/nessus/data_mining.c	2009-03-16 21:45:34 UTC (rev 2807)
@@ -823,6 +823,7 @@
 };
 
 
+#ifdef HAVE_MMAP
 static u_short *
 requests2lines(be, requests)
  int be;
@@ -852,6 +853,7 @@
  }
 return ret;
 }
+#endif
  
 
 static int

Modified: trunk/openvas-client/nessus/regex.c
===================================================================
--- trunk/openvas-client/nessus/regex.c	2009-03-16 21:17:50 UTC (rev 2806)
+++ trunk/openvas-client/nessus/regex.c	2009-03-16 21:45:34 UTC (rev 2807)
@@ -251,7 +251,9 @@
 #define MAX(a, b) ((a) > (b) ? (a) : (b))
 #define MIN(a, b) ((a) < (b) ? (a) : (b))
 
+#ifndef _WIN32
 typedef char boolean;
+#endif
 #define false 0
 #define true 1
 

Modified: trunk/openvas-client/src/util/openvas_ssh_key_create.c
===================================================================
--- trunk/openvas-client/src/util/openvas_ssh_key_create.c	2009-03-16 21:17:50 UTC (rev 2806)
+++ trunk/openvas-client/src/util/openvas_ssh_key_create.c	2009-03-16 21:45:34 UTC (rev 2807)
@@ -124,8 +124,8 @@
 gboolean openvas_ssh_privkey_create(char* pubkey_file, char* privkey_file,
                                     char* passphrase_pub, char* passphrase_priv)
 {
-  gchar* stdout = NULL;
-  gchar* stderr = NULL;
+  gchar* astdout = NULL;
+  gchar* astderr = NULL;
   GError* err = NULL;
   gint exit_status;
   char* dir = NULL;
@@ -174,14 +174,14 @@
                                     passphrase_priv, NULL);
   efree (&pubkey_stripped);
 
-  if(g_spawn_command_line_sync(command, &stdout, &stderr, &exit_status, &err) == FALSE
+  if(g_spawn_command_line_sync(command, &astdout, &astderr, &exit_status, &err) == FALSE
           || exit_status != 0 )
   {
     show_error(_("Error creating private key file.\nFor further information consult your shell."));
     printf("Error creating private key file.");
     printf("\tSpawned openssl process returned with %d.\n", exit_status);
-    printf("\t\t stdout: %s", stdout);
-    printf("\t\t stderr: %s", stderr);
+    printf("\t\t stdout: %s", astdout);
+    printf("\t\t stderr: %s", astderr);
     return FALSE;
   }
 
@@ -204,8 +204,8 @@
 gboolean openvas_ssh_pubkey_create(char* comment, char* passphrase,
                                    char* filepath)
 {
-  gchar* stdout = NULL;
-  gchar* stderr = NULL;
+  gchar* astdout = NULL;
+  gchar* astderr = NULL;
   GError* err = NULL;
   gint exit_status;
   char* dir;
@@ -251,14 +251,14 @@
                                     comment, " -P ", passphrase, NULL);
   efree(&file_pubstripped);
 
-  if(g_spawn_command_line_sync(command, &stdout, &stderr, &exit_status, &err) == FALSE
+  if(g_spawn_command_line_sync(command, &astdout, &astderr, &exit_status, &err) == FALSE
      || exit_status != 0 )
   {
     show_error(_("Error creating public key file.\nFor further information consult your shell."));
     printf("Error creating public key file.\n");
     printf("\tSpawned key-gen process returned with %d.\n", exit_status);
-    printf("\t\t stdout: %s", stdout);
-    printf("\t\t stderr: %s", stderr);
+    printf("\t\t stdout: %s", astdout);
+    printf("\t\t stderr: %s", astderr);
     return FALSE;
   }
   return TRUE;