configure: Test whether compiler can create both 32 and 64-bit binaries

[fips] / execute.c

diff --git a/execute.c b/execute.c
index 3ed645a554a20dcedc4564ecb3e537ca2b4ef1ea..0719e2da23ce1c1b18d4f43a2dc62b5b6abfdb2d 100644 (file)
--- a/execute.c
+++ b/execute.c
@@ -19,12 +19,8 @@
  * THE SOFTWARE.
  */
 
-#include "config.h"
+#include "fips.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <string.h>
 #include <errno.h>
 
 #include <unistd.h>
@@ -81,20 +77,20 @@ get_bin_name (void *ctx)
         * of the filename being linked to). Go figure. */
        int name_len = PATH_MAX + 1;
 
-       name = talloc_size (ctx, name_len - 1);
+       name = talloc_size (ctx, name_len);
        if (name == NULL) {
                fprintf (stderr, "Out of memory.\n");
                exit (1);
        }
 
-       name_len = readlink (link, name, name_len);
+       name_len = readlink (link, name, name_len - 1);
        if (name_len < 0) {
                fprintf (stderr, "Failed to readlink %s: %s\n", link,
                         strerror (errno));
                exit (1);
        }
 
-       name[name_len + 1] = '\0';
+       name[name_len] = '\0';
 
        return name;
 }
@@ -286,52 +282,12 @@ find_libfips_path (void *ctx, const char *program)
        exit (1);
 }
 
-/* After forking, set LD_PRELOAD to preload libfips-{32,64}.so within
- * child environment, then exec given arguments.
- */
-static int
-fork_exec_with_fips_preload_and_wait (char * const argv[])
-{
-       pid_t pid;
-       int i, status;
-
-       pid = fork ();
-
-       /* Child */
-       if (pid == 0) {
-               void *ctx = talloc_new (NULL);
-               char *lib_path;
-
-               lib_path = find_libfips_path (ctx, argv[0]);
-
-               setenv ("LD_PRELOAD", lib_path, 1);
-
-               talloc_free (ctx);
-               
-               execvp (argv[0], argv);
-               fprintf (stderr, "Failed to execute:");
-               for (i = 0; argv[i]; i++) {
-                       fprintf (stderr, " %s", argv[i]);
-               }
-               fprintf (stderr, "\n");
-               exit (1);
-       }
-
-       /* Parent */
-       waitpid (pid, &status, 0);
-       if (WIFEXITED (status)) {
-               return (WEXITSTATUS (status));
-       }
-       if (WIFSIGNALED (status)) {
-               fprintf (stderr, "Child terminated by signal %d\n",
-                        WTERMSIG (status));
-       }
-       return 1;
-}
-
 int
 execute_with_fips_preload (int argc, char * const argv[])
 {
+       void *ctx = talloc_new (NULL);
+       char *lib_path;
+       char *ld_preload_value;
        char **execvp_args;
        int i;
 
@@ -348,5 +304,27 @@ execute_with_fips_preload (int argc, char * const argv[])
        /* execvp needs final NULL */
        execvp_args[i] = NULL;
 
-       return fork_exec_with_fips_preload_and_wait (execvp_args);
+       lib_path = find_libfips_path (ctx, argv[0]);
+
+       ld_preload_value = getenv ("LD_PRELOAD");
+
+       if (ld_preload_value) {
+               ld_preload_value = talloc_asprintf(ctx, "%s:%s",
+                                                  ld_preload_value,
+                                                  lib_path);
+       } else {
+               ld_preload_value = lib_path;
+       }
+
+       setenv ("LD_PRELOAD", ld_preload_value, 1);
+
+       talloc_free (ctx);
+               
+       execvp (argv[0], argv);
+       fprintf (stderr, "Failed to execute:");
+       for (i = 0; argv[i]; i++) {
+               fprintf (stderr, " %s", argv[i]);
+       }
+       fprintf (stderr, "\n");
+       exit (1);
 }