aboutsummaryrefslogtreecommitdiff
path: root/modules/pam_env
diff options
context:
space:
mode:
authorDmitry V. Levin <ldv@strace.io>2024-08-26 08:00:00 +0000
committerDmitry V. Levin <ldv@strace.io>2024-08-26 08:00:00 +0000
commit3f4b8cd77c8ceeb61ddbb82743deed6f111ec0ec (patch)
tree1fe6b38690b13b5c6b61fe43059f19a5de179f73 /modules/pam_env
parentaca37d3400e31ef01f3f79b64dd8660d872aaf8f (diff)
downloadpam-3f4b8cd77c8ceeb61ddbb82743deed6f111ec0ec.tar.gz
pam-3f4b8cd77c8ceeb61ddbb82743deed6f111ec0ec.tar.bz2
pam-3f4b8cd77c8ceeb61ddbb82743deed6f111ec0ec.zip
build: rename VENDOR_SCONFIGDIR config.h macro to VENDOR_SCONFIG_DIR
... for the same reason SCONFIGDIR config.h macro was renamed to SCONFIG_DIR.
Diffstat (limited to 'modules/pam_env')
-rw-r--r--modules/pam_env/pam_env.c4
-rw-r--r--modules/pam_env/tst-pam_env-retval.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/modules/pam_env/pam_env.c b/modules/pam_env/pam_env.c
index 8b499e5f..5947b861 100644
--- a/modules/pam_env/pam_env.c
+++ b/modules/pam_env/pam_env.c
@@ -53,8 +53,8 @@ typedef struct var {
#define DEFAULT_USER_READ_ENVFILE 0
#define DEFAULT_CONF_FILE (SCONFIG_DIR "/pam_env.conf")
-#ifdef VENDOR_SCONFIGDIR
-#define VENDOR_DEFAULT_CONF_FILE (VENDOR_SCONFIGDIR "/pam_env.conf")
+#ifdef VENDOR_SCONFIG_DIR
+#define VENDOR_DEFAULT_CONF_FILE (VENDOR_SCONFIG_DIR "/pam_env.conf")
#endif
#define GOOD_LINE 0
diff --git a/modules/pam_env/tst-pam_env-retval.c b/modules/pam_env/tst-pam_env-retval.c
index 17a045e2..c08f44c3 100644
--- a/modules/pam_env/tst-pam_env-retval.c
+++ b/modules/pam_env/tst-pam_env-retval.c
@@ -26,9 +26,9 @@ static const char missing_file[] = TEST_NAME ".missing";
static const char my_conf[] = TEST_NAME ".conf";
static const char my_env[] = TEST_NAME ".env";
#ifdef VENDORDIR
-static const char dir_usr_etc_security[] = TEST_NAME_DIR VENDOR_SCONFIGDIR;
+static const char dir_usr_etc_security[] = TEST_NAME_DIR VENDOR_SCONFIG_DIR;
static const char usr_env[] = TEST_NAME_DIR VENDORDIR "/environment";
-static const char usr_conf[] = TEST_NAME_DIR VENDOR_SCONFIGDIR "/pam_env.conf";
+static const char usr_conf[] = TEST_NAME_DIR VENDOR_SCONFIG_DIR "/pam_env.conf";
#endif
static struct pam_conv conv;