build: rename VENDOR_SCONFIGDIR config.h macro to VENDOR_SCONFIG_DIR

... for the same reason SCONFIGDIR config.h macro was renamed to
SCONFIG_DIR.

10 files changed, 25 insertions, 25 deletions

diff --git a/modules/pam_access/pam_access.c b/modules/pam_access/pam_access.c
index f54b4b33..bfbc6d57 100644
--- a/modules/pam_access/pam_access.c
+++ b/modules/pam_access/pam_access.c
@@ -58,9 +58,9 @@
 
 #define PAM_ACCESS_CONFIG	(SCONFIG_DIR "/access.conf")
 #define ACCESS_CONF_GLOB	(SCONFIG_DIR "/access.d/*.conf")
-#ifdef VENDOR_SCONFIGDIR
-#define VENDOR_PAM_ACCESS_CONFIG (VENDOR_SCONFIGDIR "/access.conf")
-#define VENDOR_ACCESS_CONF_GLOB  (VENDOR_SCONFIGDIR "/access.d/*.conf")
+#ifdef VENDOR_SCONFIG_DIR
+#define VENDOR_PAM_ACCESS_CONFIG (VENDOR_SCONFIG_DIR "/access.conf")
+#define VENDOR_ACCESS_CONF_GLOB  (VENDOR_SCONFIG_DIR "/access.d/*.conf")
 #endif
 
 /* login_access.c from logdaemon-5.6 with several changes by A.Nogin: */
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;
diff --git a/modules/pam_faillock/faillock_config.c b/modules/pam_faillock/faillock_config.c
index 42e2b3ec..d8e7e800 100644
--- a/modules/pam_faillock/faillock_config.c
+++ b/modules/pam_faillock/faillock_config.c
@@ -49,8 +49,8 @@
 #include "faillock.h"
 
 #define FAILLOCK_DEFAULT_CONF SCONFIG_DIR "/faillock.conf"
-#ifdef VENDOR_SCONFIGDIR
-#define VENDOR_FAILLOCK_DEFAULT_CONF VENDOR_SCONFIGDIR "/faillock.conf"
+#ifdef VENDOR_SCONFIG_DIR
+#define VENDOR_FAILLOCK_DEFAULT_CONF VENDOR_SCONFIG_DIR "/faillock.conf"
 #endif
 
 static void PAM_FORMAT((printf, 3, 4)) PAM_NONNULL((3))
diff --git a/modules/pam_group/pam_group.c b/modules/pam_group/pam_group.c
index 82829847..21c04d73 100644
--- a/modules/pam_group/pam_group.c
+++ b/modules/pam_group/pam_group.c
@@ -25,8 +25,8 @@
 #include <netdb.h>
 
 #define PAM_GROUP_CONF		SCONFIG_DIR "/group.conf"
-#ifdef VENDOR_SCONFIGDIR
-# define VENDOR_PAM_GROUP_CONF	VENDOR_SCONFIGDIR "/group.conf"
+#ifdef VENDOR_SCONFIG_DIR
+# define VENDOR_PAM_GROUP_CONF	VENDOR_SCONFIG_DIR "/group.conf"
 #endif
 #define PAM_GROUP_BUFLEN        1000
 #define FIELD_SEPARATOR         ';'   /* this is new as of .02 */
diff --git a/modules/pam_limits/pam_limits.c b/modules/pam_limits/pam_limits.c
index 80f581a5..75c584fc 100644
--- a/modules/pam_limits/pam_limits.c
+++ b/modules/pam_limits/pam_limits.c
@@ -128,9 +128,9 @@ struct pam_limit_s {
 
 #define LIMITS_FILE	(SCONFIG_DIR "/limits.conf")
 
-#ifdef VENDOR_SCONFIGDIR
-#define VENDOR_LIMITS_FILE (VENDOR_SCONFIGDIR "/limits.conf")
-#define VENDOR_LIMITS_CONF_GLOB  (VENDOR_SCONFIGDIR "/limits.d/*.conf")
+#ifdef VENDOR_SCONFIG_DIR
+#define VENDOR_LIMITS_FILE (VENDOR_SCONFIG_DIR "/limits.conf")
+#define VENDOR_LIMITS_CONF_GLOB  (VENDOR_SCONFIG_DIR "/limits.d/*.conf")
 #endif
 
 static int
diff --git a/modules/pam_namespace/pam_namespace.h b/modules/pam_namespace/pam_namespace.h
index bff28485..17999380 100644
--- a/modules/pam_namespace/pam_namespace.h
+++ b/modules/pam_namespace/pam_namespace.h
@@ -94,11 +94,11 @@
 #define NAMESPACE_INIT_SCRIPT (SCONFIG_DIR "/namespace.init")
 #define NAMESPACE_D_DIR (SCONFIG_DIR "/namespace.d/")
 #define NAMESPACE_D_GLOB (SCONFIG_DIR "/namespace.d/*.conf")
-#ifdef VENDOR_SCONFIGDIR
-#define VENDOR_NAMESPACE_INIT_SCRIPT (VENDOR_SCONFIGDIR "/namespace.init")
-#define VENDOR_PAM_NAMESPACE_CONFIG (VENDOR_SCONFIGDIR "/namespace.conf")
-#define VENDOR_NAMESPACE_D_DIR (VENDOR_SCONFIGDIR "/namespace.d/")
-#define VENDOR_NAMESPACE_D_GLOB (VENDOR_SCONFIGDIR "/namespace.d/*.conf")
+#ifdef VENDOR_SCONFIG_DIR
+#define VENDOR_NAMESPACE_INIT_SCRIPT (VENDOR_SCONFIG_DIR "/namespace.init")
+#define VENDOR_PAM_NAMESPACE_CONFIG (VENDOR_SCONFIG_DIR "/namespace.conf")
+#define VENDOR_NAMESPACE_D_DIR (VENDOR_SCONFIG_DIR "/namespace.d/")
+#define VENDOR_NAMESPACE_D_GLOB (VENDOR_SCONFIG_DIR "/namespace.d/*.conf")
 #endif
 
 /* module flags */
diff --git a/modules/pam_pwhistory/pwhistory_config.c b/modules/pam_pwhistory/pwhistory_config.c
index 296a7110..2399bf21 100644
--- a/modules/pam_pwhistory/pwhistory_config.c
+++ b/modules/pam_pwhistory/pwhistory_config.c
@@ -48,8 +48,8 @@
 
 #define PWHISTORY_DEFAULT_CONF SCONFIG_DIR "/pwhistory.conf"
 
-#ifdef VENDOR_SCONFIGDIR
-#define VENDOR_PWHISTORY_DEFAULT_CONF (VENDOR_SCONFIGDIR "/pwhistory.conf")
+#ifdef VENDOR_SCONFIG_DIR
+#define VENDOR_PWHISTORY_DEFAULT_CONF (VENDOR_SCONFIG_DIR "/pwhistory.conf")
 #endif
 
 void
diff --git a/modules/pam_sepermit/pam_sepermit.c b/modules/pam_sepermit/pam_sepermit.c
index 34b6d5eb..b9ed9458 100644
--- a/modules/pam_sepermit/pam_sepermit.c
+++ b/modules/pam_sepermit/pam_sepermit.c
@@ -64,8 +64,8 @@
 #include "pam_inline.h"
 
 #define SEPERMIT_CONF_FILE	(SCONFIG_DIR "/sepermit.conf")
-#ifdef VENDOR_SCONFIGDIR
-# define SEPERMIT_VENDOR_CONF_FILE	(VENDOR_SCONFIGDIR "/sepermit.conf");
+#ifdef VENDOR_SCONFIG_DIR
+# define SEPERMIT_VENDOR_CONF_FILE	(VENDOR_SCONFIG_DIR "/sepermit.conf");
 #endif
 #define MODULE "pam_sepermit"
 #define OPT_DELIM ":"
diff --git a/modules/pam_time/pam_time.c b/modules/pam_time/pam_time.c
index 65a7bd65..432446aa 100644
--- a/modules/pam_time/pam_time.c
+++ b/modules/pam_time/pam_time.c
@@ -34,8 +34,8 @@
 #endif
 
 #define PAM_TIME_CONF	(SCONFIG_DIR "/time.conf")
-#ifdef VENDOR_SCONFIGDIR
-#define VENDOR_PAM_TIME_CONF (VENDOR_SCONFIGDIR "/time.conf")
+#ifdef VENDOR_SCONFIG_DIR
+#define VENDOR_PAM_TIME_CONF (VENDOR_SCONFIG_DIR "/time.conf")
 #endif
 
 #define PAM_TIME_BUFLEN        1000