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 | f9ef347178123befd0bdfc2c101e7b78b04dea03 (patch) | |
| tree | 9e7c9e38aa92bba3629fa6eb64e3560bbfe370da | |
| parent | a8f47240246fb5a4e7c78dc78a9b6fa7bf240da3 (diff) | |
| download | linux-pam-git-f9ef347178123befd0bdfc2c101e7b78b04dea03.tar.gz | |
pam_limits: make LIMITS_FILE_DIR macro consistent
LIMITS_FILE_DIR used to define a glob pattern instead of a directory
name, fix that inconsistency.
* modules/pam_limits/Makefile.am (AM_CFLAGS): Move "/*.conf" ending of
LIMITS_FILE_DIR macro ...
* modules/pam_limits/pam_limits.c (LIMITS_CONF_GLOB): ... here.
| -rw-r--r-- | modules/pam_limits/Makefile.am | 2 | ||||
| -rw-r--r-- | modules/pam_limits/pam_limits.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/pam_limits/Makefile.am b/modules/pam_limits/Makefile.am index 911b07b3..4411c527 100644 --- a/modules/pam_limits/Makefile.am +++ b/modules/pam_limits/Makefile.am @@ -19,7 +19,7 @@ secureconfdir = $(SCONFIGDIR) limits_conf_dir = $(SCONFIGDIR)/limits.d AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \ - -DLIMITS_FILE_DIR=\"$(limits_conf_dir)/*.conf\" \ + -DLIMITS_FILE_DIR=\"$(limits_conf_dir)\" \ -DLIMITS_FILE=\"$(SCONFIGDIR)/limits.conf\" $(WARN_CFLAGS) AM_LDFLAGS = -no-undefined -avoid-version -module if HAVE_VERSIONING diff --git a/modules/pam_limits/pam_limits.c b/modules/pam_limits/pam_limits.c index 0f91e05b..e3e2c2ce 100644 --- a/modules/pam_limits/pam_limits.c +++ b/modules/pam_limits/pam_limits.c @@ -123,7 +123,7 @@ struct pam_limit_s { #define PAM_SET_ALL 0x0010 /* Limits from globbed files. */ -#define LIMITS_CONF_GLOB LIMITS_FILE_DIR +#define LIMITS_CONF_GLOB (LIMITS_FILE_DIR "/*.conf") #define CONF_FILE (pl->conf_file != NULL)?pl->conf_file:LIMITS_FILE |