s/PAM_WRAPPER_CONFDIR/PAM_WRAPPER_SERVICEDIR

diff --git a/doc/pam_wrapper.1.txt b/doc/pam_wrapper.1.txt
index b56593179632dbf59fb153c66d09f56e591cdb2b..0a8ba51783032e3aa8ec924edd098d6101563fcb 100644 (file)
--- a/doc/pam_wrapper.1.txt
+++ b/doc/pam_wrapper.1.txt
@@ -10,7 +10,7 @@ pam_wrapper - A preloadable wrapper to test PAM applications and PAM Modules
 SYNOPSIS
 --------
 
-LD_PRELOAD=libpam_wrapper.so PAM_WRAPPER=1 PAM_WRAPPER_CONFDIR=/path_to_config *./myapplication*
+LD_PRELOAD=libpam_wrapper.so PAM_WRAPPER=1 PAM_WRAPPER_SERVICE_DIR=/path_to_config *./myapplication*
 
 DESCRIPTION
 -----------
@@ -34,7 +34,7 @@ If you load the pam_wrapper and enable it with setting PAM_WRAPPER=1 all PAM
 calls will be wrapped so you are able to specify a directory with the service
 files pam_wrapper should be using.
 
-*PAM_WRAPPER_CONFDIR*::
+*PAM_WRAPPER_SERVICE_DIR*::
 
 The directory to read PAM service files from.
 
@@ -72,7 +72,7 @@ session         required        /usr/lib/pam_wrapper/pam_matrix.so passdb=/path/
 The name of the file should represent the service name used by your PAM
 application.
 
-LD_PRELOAD=./libpam_wrapper.so PAM_WRAPPER=1 PAM_WRAPPER_SERVICE_DIR=pam_services/ ./my_pam_app
+LD_PRELOAD=./libpam_wrapper.so PAM_WRAPPER=1 PAM_WRAPPER_SERVICE_DIR=./pam_services ./my_pam_app
 
 PAM_MATRIX
 ----------

diff --git a/src/pam_wrapper.c b/src/pam_wrapper.c
index 9ad97bdde417b88bd3d5aac14d599347ce12bed9..59455f5a59a02dc79322cb31eb2111cf40dd6419 100644 (file)
--- a/src/pam_wrapper.c
+++ b/src/pam_wrapper.c
@@ -871,7 +871,7 @@ static void pwrap_init(void)
 
        pwrap.initialised = true;
 
-       env = getenv("PAM_WRAPPER_CONFDIR");
+       env = getenv("PAM_WRAPPER_SERVICE_DIR");
        if (env == NULL) {
                PWRAP_LOG(PWRAP_LOG_ERROR, "No config file");
                p_rmdirs(pwrap.config_dir);
@@ -885,7 +885,7 @@ static void pwrap_init(void)
                exit(1);
        }
 
-       setenv("PAM_WRAPPER_SERVICE_DIR", pwrap.config_dir, 1);
+       setenv("PAM_WRAPPER_RUNTIME_DIR", pwrap.config_dir, 1);
 
        PWRAP_LOG(PWRAP_LOG_DEBUG, "Successfully initialized pam_wrapper");
 }
@@ -904,7 +904,7 @@ bool pam_wrapper_enabled(void)
        if (pwrap.enabled) {
                pwrap.enabled = false;
 
-               env = getenv("PAM_WRAPPER_CONFDIR");
+               env = getenv("PAM_WRAPPER_SERVICE_DIR");
                if (env != NULL && env[0] != '\0') {
                        pwrap.enabled = true;
                }
@@ -922,7 +922,7 @@ void pwrap_constructor(void)
         * Here is safe place to call pwrap_init() and initialize data
         * for main process.
         */
-       // pwrap_init();
+       pwrap_init();
 }
 
 

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index e50126713deaeb75b2bc3d6fce18d7f6e30c8700..daa78a083f3e86370f3e62fa4a232e36bfeb1894 100644 (file)
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -18,10 +18,10 @@ configure_file(services/matrix_opt.in ${CMAKE_CURRENT_BINARY_DIR}/services/matri
 configure_file(services/pwrap_get_set.in ${CMAKE_CURRENT_BINARY_DIR}/services/pwrap_get_set @ONLY)
 
 if (OSX)
-       set(TEST_ENVIRONMENT DYLD_FORCE_FLAT_NAMESPACE=1;DYLD_INSERT_LIBRARIES=${PAM_WRAPPER_LOCATION};PAM_WRAPPER=1;PAM_WRAPPER_CONFDIR=${CMAKE_CURRENT_BINARY_DIR}/services})
+       set(TEST_ENVIRONMENT DYLD_FORCE_FLAT_NAMESPACE=1;DYLD_INSERT_LIBRARIES=${PAM_WRAPPER_LOCATION};PAM_WRAPPER=1;PAM_WRAPPER_SERVICE_DIR=${CMAKE_CURRENT_BINARY_DIR}/services})
        add_definitions(-DOSX)
 else ()
-       set(TEST_ENVIRONMENT LD_PRELOAD=${PAM_WRAPPER_LOCATION};PAM_WRAPPER=1;PAM_WRAPPER_CONFDIR=${CMAKE_CURRENT_BINARY_DIR}/services)
+       set(TEST_ENVIRONMENT LD_PRELOAD=${PAM_WRAPPER_LOCATION};PAM_WRAPPER=1;PAM_WRAPPER_SERVICE_DIR=${CMAKE_CURRENT_BINARY_DIR}/services)
 endif ()
 
 set(PAM_LIBRARIES pam)

diff --git a/tests/test_pam_wrapper.c b/tests/test_pam_wrapper.c
index 7f14a913deaf897d412370fff8cf833590384ffb..fc8d74844576b28a6ed546e98a340703e8df28ef 100644 (file)
--- a/tests/test_pam_wrapper.c
+++ b/tests/test_pam_wrapper.c
@@ -203,7 +203,7 @@ static void test_env(void **state)
 
        (void) state; /* unused */
 
-       v = getenv("PAM_WRAPPER_SERVICE_DIR");
+       v = getenv("PAM_WRAPPER_RUNTIME_DIR");
        assert_non_null(v);
 
        ret = stat(v, &sb);