[PATCH v7 2/2] server: Replace secure_getenv() with getenv().

[Konstantin Demin]

From: Konstantin Demin

Signed-off-by: Konstantin Demin 
---
 configure                |  6 ------
 configure.ac             |  1 -
 dlls/ntdll/unix/server.c | 10 ----------
 include/config.h.in      |  3 ---
 server/request.c         | 10 ----------
 5 files changed, 30 deletions(-)

diff --git a/configure b/configure
index 789100c1558..7e0d8d7621d 100755
--- a/configure
+++ b/configure
@@ -20010,12 +20010,6 @@ if test "x$ac_cv_func_sched_yield" = xyes
 then :
   printf "%s\n" "#define HAVE_SCHED_YIELD 1" >>confdefs.h

-fi
-ac_fn_c_check_func "$LINENO" "secure_getenv" "ac_cv_func_secure_getenv"
-if test "x$ac_cv_func_secure_getenv" = xyes
-then :
-  printf "%s\n" "#define HAVE_SECURE_GETENV 1" >>confdefs.h
-
 fi
 ac_fn_c_check_func "$LINENO" "setproctitle" "ac_cv_func_setproctitle"
 if test "x$ac_cv_func_setproctitle" = xyes
diff --git a/configure.ac b/configure.ac
index bc1c27a6cff..b32d2ba5aa4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2049,7 +2049,6 @@ AC_CHECK_FUNCS(\
    prctl \
    proc_pidinfo \
    sched_yield \
-	secure_getenv \
    setproctitle \
    setprogname \
    sigprocmask \
diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c
index 0858b5494e5..78f480a0494 100644
--- a/dlls/ntdll/unix/server.c
+++ b/dlls/ntdll/unix/server.c
@@ -1291,12 +1291,7 @@ static const char *init_server_dir( dev_t dev, ino_t ino )

/* try "${XDG_RUNTIME_DIR}/wine" */

-#ifdef HAVE_SECURE_GETENV
-    server_root_dir = secure_getenv( "XDG_RUNTIME_DIR" );
-#else
     server_root_dir = getenv( "XDG_RUNTIME_DIR" );
-#endif
-
     if (!server_root_dir)
         goto server_dir_at_run;

@@ -1330,12 +1325,7 @@ server_dir_at_env_tmpdir:

/* try somewhere in ${TMPDIR}/ */

-#ifdef HAVE_SECURE_GETENV
-    server_root_dir = secure_getenv( "TMPDIR" );
-#else
     server_root_dir = getenv( "TMPDIR" );
-#endif
-
     if (!server_root_dir)
         goto server_dir_at_tmp;

diff --git a/include/config.h.in b/include/config.h.in
index 43427e152dc..2e806157ebd 100644
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -366,9 +366,6 @@
 /* Define to 1 if you have the <SDL.h> header file. */
 #undef HAVE_SDL_H

-/* Define to 1 if you have the `secure_getenv' function. */
-#undef HAVE_SECURE_GETENV
-
 /* Define to 1 if you have the `setproctitle' function. */
 #undef HAVE_SETPROCTITLE

diff --git a/server/request.c b/server/request.c
index 31cdc1e18d2..5d07d117836 100644
--- a/server/request.c
+++ b/server/request.c
@@ -700,12 +700,7 @@ static char *create_server_dir( int force )

/* try "${XDG_RUNTIME_DIR}/wine" */

-#ifdef HAVE_SECURE_GETENV
-    server_root_dir = secure_getenv( "XDG_RUNTIME_DIR" );
-#else
     server_root_dir = getenv( "XDG_RUNTIME_DIR" );
-#endif
-
     if (!server_root_dir)
         goto server_dir_at_run;

@@ -741,12 +736,7 @@ server_dir_at_env_tmpdir:

/* try somewhere in ${TMPDIR}/ */

-#ifdef HAVE_SECURE_GETENV
-    server_root_dir = secure_getenv( "TMPDIR" );
-#else
     server_root_dir = getenv( "TMPDIR" );
-#endif
-
     if (!server_root_dir)
         goto server_dir_at_tmp;