diff options
author | Andreas Schneider <asn@cryptomilk.org> | 2016-02-02 09:06:00 +0100 |
---|---|---|
committer | Andreas Schneider <asn@cryptomilk.org> | 2018-10-05 12:09:45 +0200 |
commit | 2004617fd0ade3da77741ab24a77326b0fb12ea0 (patch) | |
tree | fe58027c79ba4675290daae92ce31a1bf9d465f4 | |
parent | c5fe7c5a7283b8a6bee0061f5a6ed1a4f76ae274 (diff) | |
download | libssh-2004617fd0ade3da77741ab24a77326b0fb12ea0.tar.gz libssh-2004617fd0ade3da77741ab24a77326b0fb12ea0.tar.xz libssh-2004617fd0ade3da77741ab24a77326b0fb12ea0.zip |
tests: Always start tests as root so we can switch to a user
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
(cherry-picked from commit 1729d4a1)
-rw-r--r-- | tests/CMakeLists.txt | 2 | ||||
-rw-r--r-- | tests/torture.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 36d774e5..116a0bce 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -82,7 +82,7 @@ if (WITH_CLIENT_TESTING) configure_file(etc/pam.d/sshd.in ${CMAKE_CURRENT_BINARY_DIR}/etc/pam.d/sshd @ONLY) set(TORTURE_ENVIRONMENT "LD_PRELOAD=${SOCKET_WRAPPER_LIBRARY}:${NSS_WRAPPER_LIBRARY}:${UID_WRAPPER_LIBRARY}:${PAM_WRAPPER_LIBRARY}") - list(APPEND TORTURE_ENVIRONMENT UID_WRAPPER=1) + list(APPEND TORTURE_ENVIRONMENT UID_WRAPPER=1 UID_WRAPPER_ROOT=1) list(APPEND TORTURE_ENVIRONMENT NSS_WRAPPER_PASSWD=${CMAKE_CURRENT_BINARY_DIR}/etc/passwd) list(APPEND TORTURE_ENVIRONMENT NSS_WRAPPER_SHADOW=${CMAKE_CURRENT_BINARY_DIR}/etc/shadow) list(APPEND TORTURE_ENVIRONMENT NSS_WRAPPER_GROUP=${CMAKE_CURRENT_BINARY_DIR}/etc/group) diff --git a/tests/torture.c b/tests/torture.c index b0ae4ab9..dab68739 100644 --- a/tests/torture.c +++ b/tests/torture.c @@ -879,7 +879,6 @@ void torture_setup_sshd_server(void **state) /* Set the default interface for the server */ setenv("SOCKET_WRAPPER_DEFAULT_IFACE", "10", 1); - setenv("UID_WRAPPER_ROOT", "1", 1); setenv("PAM_WRAPPER", "1", 1); s = *state; @@ -895,7 +894,6 @@ void torture_setup_sshd_server(void **state) usleep(1000); setenv("SOCKET_WRAPPER_DEFAULT_IFACE", "21", 1); - unsetenv("UID_WRAPPER_ROOT"); unsetenv("PAM_WRAPPER"); } |