Adding with-sce-script-dir flag to configure.ac. Fixes OpenSCAP#1016

Signed-off-by: Conor Nosal <[email protected]>
icy17 · Apr 20, 2018 · a8e8941 · a8e8941
1 parent 8996fe1
commit a8e8941
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/configure.ac b/configure.ac
@@ -1151,8 +1151,16 @@ AC_ARG_ENABLE([sce],
        *) AC_MSG_ERROR([bad value ${enableval} for --enable-sce]) ;;
      esac],[sce=no])
 
+
+AC_ARG_WITH([sce-script-dir],
+     [AS_HELP_STRING([--with-sce-script-dir],
+     [use different temporary directory to execute sce scripts [default=/tmp]])],
+     [],
+     [with_sce_script_dir="/tmp"])
+
 if test "x${sce}" = xyes; then
   AC_DEFINE([ENABLE_SCE], [1], [compilation of script check engine enabled])
+  CFLAGS="$CFLAGS -DSCE_SCRIPT_DIR=\"${with_sce_script_dir}\""
 fi
 
 AC_ARG_ENABLE([util-oscap],

diff --git a/src/common/oscap_acquire.c b/src/common/oscap_acquire.c
@@ -22,7 +22,6 @@
 #include <config.h>
 #endif
 
-#include <stdio.h> // for P_tmpdir macro
 #include <string.h>
 #include <stdlib.h>
 #include <errno.h>
@@ -41,11 +40,11 @@
 #include "common/_error.h"
 #include "oscap_string.h"
 
-#ifndef P_tmpdir
-#define P_tmpdir "/tmp"
+#ifndef SCE_SCRIPT_DIR
+#define SCE_SCRIPT_DIR "/tmp"
 #endif
 
-#define TEMP_DIR_TEMPLATE P_tmpdir "/oscap.XXXXXX"
+#define TEMP_DIR_TEMPLATE SCE_SCRIPT_DIR "/oscap.XXXXXX"
 #define TEMP_URL_TEMPLATE "downloaded.XXXXXX"
 
 char *