build: rename SCONFIGDIR config.h macro to SCONFIG_DIR

This way it is visibly different from the configure variable SCONFIGDIR,
which is helpful, because their values are slightly different:
the macro is quoted while the configure variable is not quoted,
and this difference may cause problems with other build systems.

12 files changed, 16 insertions, 16 deletions

diff --git a/modules/pam_access/pam_access.c b/modules/pam_access/pam_access.c
index 0540176e..f54b4b33 100644
--- a/modules/pam_access/pam_access.c
+++ b/modules/pam_access/pam_access.c
@@ -56,8 +56,8 @@
 #include "pam_cc_compat.h"
 #include "pam_inline.h"
 
-#define PAM_ACCESS_CONFIG	(SCONFIGDIR "/access.conf")
-#define ACCESS_CONF_GLOB	(SCONFIGDIR "/access.d/*.conf")
+#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")
diff --git a/modules/pam_env/pam_env.c b/modules/pam_env/pam_env.c
index 1bb7b2c3..8b499e5f 100644
--- a/modules/pam_env/pam_env.c
+++ b/modules/pam_env/pam_env.c
@@ -52,7 +52,7 @@ typedef struct var {
 #define DEFAULT_USER_ENVFILE    ".pam_environment"
 #define DEFAULT_USER_READ_ENVFILE 0
 
-#define DEFAULT_CONF_FILE	(SCONFIGDIR "/pam_env.conf")
+#define DEFAULT_CONF_FILE	(SCONFIG_DIR "/pam_env.conf")
 #ifdef VENDOR_SCONFIGDIR
 #define VENDOR_DEFAULT_CONF_FILE (VENDOR_SCONFIGDIR "/pam_env.conf")
 #endif
diff --git a/modules/pam_faillock/faillock_config.c b/modules/pam_faillock/faillock_config.c
index 91c8001d..42e2b3ec 100644
--- a/modules/pam_faillock/faillock_config.c
+++ b/modules/pam_faillock/faillock_config.c
@@ -48,7 +48,7 @@
 #include "faillock_config.h"
 #include "faillock.h"
 
-#define FAILLOCK_DEFAULT_CONF SCONFIGDIR "/faillock.conf"
+#define FAILLOCK_DEFAULT_CONF SCONFIG_DIR "/faillock.conf"
 #ifdef VENDOR_SCONFIGDIR
 #define VENDOR_FAILLOCK_DEFAULT_CONF VENDOR_SCONFIGDIR "/faillock.conf"
 #endif
diff --git a/modules/pam_group/pam_group.c b/modules/pam_group/pam_group.c
index 2483059a..82829847 100644
--- a/modules/pam_group/pam_group.c
+++ b/modules/pam_group/pam_group.c
@@ -24,7 +24,7 @@
 #include <fcntl.h>
 #include <netdb.h>
 
-#define PAM_GROUP_CONF		SCONFIGDIR "/group.conf"
+#define PAM_GROUP_CONF		SCONFIG_DIR "/group.conf"
 #ifdef VENDOR_SCONFIGDIR
 # define VENDOR_PAM_GROUP_CONF	VENDOR_SCONFIGDIR "/group.conf"
 #endif
diff --git a/modules/pam_limits/pam_limits.c b/modules/pam_limits/pam_limits.c
index 1197e25c..80f581a5 100644
--- a/modules/pam_limits/pam_limits.c
+++ b/modules/pam_limits/pam_limits.c
@@ -126,7 +126,7 @@ struct pam_limit_s {
 /* Limits from globbed files. */
 #define LIMITS_CONF_GLOB	(LIMITS_FILE_DIR "/*.conf")
 
-#define LIMITS_FILE	(SCONFIGDIR "/limits.conf")
+#define LIMITS_FILE	(SCONFIG_DIR "/limits.conf")
 
 #ifdef VENDOR_SCONFIGDIR
 #define VENDOR_LIMITS_FILE (VENDOR_SCONFIGDIR "/limits.conf")
diff --git a/modules/pam_namespace/pam_namespace.h b/modules/pam_namespace/pam_namespace.h
index fd393d17..bff28485 100644
--- a/modules/pam_namespace/pam_namespace.h
+++ b/modules/pam_namespace/pam_namespace.h
@@ -90,10 +90,10 @@
 /*
  * Module defines
  */
-#define PAM_NAMESPACE_CONFIG (SCONFIGDIR "/namespace.conf")
-#define NAMESPACE_INIT_SCRIPT (SCONFIGDIR "/namespace.init")
-#define NAMESPACE_D_DIR (SCONFIGDIR "/namespace.d/")
-#define NAMESPACE_D_GLOB (SCONFIGDIR "/namespace.d/*.conf")
+#define PAM_NAMESPACE_CONFIG (SCONFIG_DIR "/namespace.conf")
+#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")
diff --git a/modules/pam_pwhistory/opasswd.c b/modules/pam_pwhistory/opasswd.c
index 289b4461..d291761b 100644
--- a/modules/pam_pwhistory/opasswd.c
+++ b/modules/pam_pwhistory/opasswd.c
@@ -76,7 +76,7 @@
 #define RANDOM_DEVICE "/dev/urandom"
 #endif
 
-#define DEFAULT_OLD_PASSWORDS_FILE SCONFIGDIR "/opasswd"
+#define DEFAULT_OLD_PASSWORDS_FILE SCONFIG_DIR "/opasswd"
 
 typedef struct {
   char *user;
diff --git a/modules/pam_pwhistory/pwhistory_config.c b/modules/pam_pwhistory/pwhistory_config.c
index 2f299b54..296a7110 100644
--- a/modules/pam_pwhistory/pwhistory_config.c
+++ b/modules/pam_pwhistory/pwhistory_config.c
@@ -46,7 +46,7 @@
 #include "pam_inline.h"
 #include "pwhistory_config.h"
 
-#define PWHISTORY_DEFAULT_CONF SCONFIGDIR "/pwhistory.conf"
+#define PWHISTORY_DEFAULT_CONF SCONFIG_DIR "/pwhistory.conf"
 
 #ifdef VENDOR_SCONFIGDIR
 #define VENDOR_PWHISTORY_DEFAULT_CONF (VENDOR_SCONFIGDIR "/pwhistory.conf")
diff --git a/modules/pam_sepermit/pam_sepermit.c b/modules/pam_sepermit/pam_sepermit.c
index e8e1cf5b..34b6d5eb 100644
--- a/modules/pam_sepermit/pam_sepermit.c
+++ b/modules/pam_sepermit/pam_sepermit.c
@@ -63,7 +63,7 @@
 
 #include "pam_inline.h"
 
-#define SEPERMIT_CONF_FILE	(SCONFIGDIR "/sepermit.conf")
+#define SEPERMIT_CONF_FILE	(SCONFIG_DIR "/sepermit.conf")
 #ifdef VENDOR_SCONFIGDIR
 # define SEPERMIT_VENDOR_CONF_FILE	(VENDOR_SCONFIGDIR "/sepermit.conf");
 #endif
diff --git a/modules/pam_time/pam_time.c b/modules/pam_time/pam_time.c
index 2b9387fb..65a7bd65 100644
--- a/modules/pam_time/pam_time.c
+++ b/modules/pam_time/pam_time.c
@@ -33,7 +33,7 @@
 #include <libaudit.h>
 #endif
 
-#define PAM_TIME_CONF	(SCONFIGDIR "/time.conf")
+#define PAM_TIME_CONF	(SCONFIG_DIR "/time.conf")
 #ifdef VENDOR_SCONFIGDIR
 #define VENDOR_PAM_TIME_CONF (VENDOR_SCONFIGDIR "/time.conf")
 #endif
diff --git a/modules/pam_unix/passverify.c b/modules/pam_unix/passverify.c
index 624ba783..e8d0b91d 100644
--- a/modules/pam_unix/passverify.c
+++ b/modules/pam_unix/passverify.c
@@ -364,7 +364,7 @@ PAMH_ARG_DECL(int check_shadow_expiry,
 
 #define PW_TMPFILE              "/etc/npasswd"
 #define SH_TMPFILE              "/etc/nshadow"
-#define OPW_TMPFILE             SCONFIGDIR "/nopasswd"
+#define OPW_TMPFILE             SCONFIG_DIR "/nopasswd"
 
 /*
  * i64c - convert an integer to a radix 64 character
diff --git a/modules/pam_unix/passverify.h b/modules/pam_unix/passverify.h
index c4c8df5f..1636791c 100644
--- a/modules/pam_unix/passverify.h
+++ b/modules/pam_unix/passverify.h
@@ -9,7 +9,7 @@
 
 #define PAM_UNIX_RUN_HELPER PAM_CRED_INSUFFICIENT
 
-#define OLD_PASSWORDS_FILE      SCONFIGDIR "/opasswd"
+#define OLD_PASSWORDS_FILE      SCONFIG_DIR "/opasswd"
 
 int
 is_pwd_shadowed(const struct passwd *pwd);