diff options
| author | Dmitry V. Levin <ldv@altlinux.org> | 2022-01-23 08:00:00 +0000 |
|---|---|---|
| committer | Dmitry V. Levin <ldv@altlinux.org> | 2022-01-23 08:00:00 +0000 |
| commit | 5b94cc43524ac11b1c2b0370bdaba534358f8fa8 (patch) | |
| tree | 2e4844ae7d37bef0d3b26ee6fd6b562be654230e /modules/pam_sepermit | |
| parent | f9ef347178123befd0bdfc2c101e7b78b04dea03 (diff) | |
| download | pam-5b94cc43524ac11b1c2b0370bdaba534358f8fa8.tar.gz pam-5b94cc43524ac11b1c2b0370bdaba534358f8fa8.tar.bz2 pam-5b94cc43524ac11b1c2b0370bdaba534358f8fa8.zip | |
modules: move SCONFIGDIR-based macro definitions from Makefile.am to the source code
Since SCONFIGDIR macro is available, the is no need to define macros
based on SCONFIGDIR in Makefile.am files.
* modules/pam_access/Makefile.am (AM_CFLAGS): Move definitions of
PAM_ACCESS_CONFIG and ACCESS_CONF_GLOB macros ...
* modules/pam_access/pam_access.c: ... here.
* modules/pam_env/Makefile.am (AM_CFLAGS): Move definition of
DEFAULT_CONF_FILE macro ...
* modules/pam_env/pam_env.c: ... here.
* modules/pam_group/Makefile.am (AM_CFLAGS): Move definition of
PAM_GROUP_CONF macro ...
* modules/pam_group/pam_group.c: ... here.
* modules/pam_limits/Makefile.am (AM_CFLAGS): Move definition of
LIMITS_FILE macro ...
* modules/pam_limits/pam_limits.c: ... here.
* modules/pam_sepermit/Makefile.am (AM_CFLAGS): Move definition of
SEPERMIT_CONF_FILE macro ...
* modules/pam_sepermit/pam_sepermit.c: ... here.
* modules/pam_time/Makefile.am (AM_CFLAGS): Move definition of
PAM_TIME_CONF macro ...
* modules/pam_time/pam_time.c: ... here.
Diffstat (limited to 'modules/pam_sepermit')
| -rw-r--r-- | modules/pam_sepermit/Makefile.am | 1 | ||||
| -rw-r--r-- | modules/pam_sepermit/pam_sepermit.c | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/modules/pam_sepermit/Makefile.am b/modules/pam_sepermit/Makefile.am index 9c9de297..bed3b149 100644 --- a/modules/pam_sepermit/Makefile.am +++ b/modules/pam_sepermit/Makefile.am @@ -21,7 +21,6 @@ sepermitlockdir = ${localstatedir}/run/sepermit AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \ -I$(top_srcdir)/libpam_misc/include \ - -D SEPERMIT_CONF_FILE=\"$(SCONFIGDIR)/sepermit.conf\" \ -D SEPERMIT_LOCKDIR=\"$(sepermitlockdir)\" $(WARN_CFLAGS) pam_sepermit_la_LIBADD = $(top_builddir)/libpam/libpam.la @LIBSELINUX@ diff --git a/modules/pam_sepermit/pam_sepermit.c b/modules/pam_sepermit/pam_sepermit.c index ce6e1453..5a622027 100644 --- a/modules/pam_sepermit/pam_sepermit.c +++ b/modules/pam_sepermit/pam_sepermit.c @@ -63,6 +63,7 @@ #include "pam_inline.h" +#define SEPERMIT_CONF_FILE (SCONFIGDIR "/sepermit.conf") #define MODULE "pam_sepermit" #define OPT_DELIM ":" |