diff options
Diffstat (limited to 'modules/pam_mail')
| -rw-r--r-- | modules/pam_mail/Makefile.am | 4 | ||||
| -rw-r--r-- | modules/pam_mail/pam_mail.c | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/modules/pam_mail/Makefile.am b/modules/pam_mail/Makefile.am index 4151c042..733fa6ae 100644 --- a/modules/pam_mail/Makefile.am +++ b/modules/pam_mail/Makefile.am @@ -9,10 +9,8 @@ EXTRA_DIST = README securelibdir = $(SECUREDIR) secureconfdir = $(SCONFIGDIR) -AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \ - -I$(top_srcdir)/modules/pammodutil/include/ +AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include AM_LDFLAGS = -no-undefined -avoid-version -module \ - $(top_builddir)/modules/pammodutil/libpammodutil.la \ -L$(top_builddir)/libpam -lpam if HAVE_VERSIONING AM_LDFLAGS += -Wl,--version-script=../modules.map diff --git a/modules/pam_mail/pam_mail.c b/modules/pam_mail/pam_mail.c index 1c2c6043..59424ff4 100644 --- a/modules/pam_mail/pam_mail.c +++ b/modules/pam_mail/pam_mail.c @@ -22,6 +22,10 @@ #include <unistd.h> #include <dirent.h> +#ifdef HAVE_PATHS_H +#include <paths.h> +#endif + #define DEFAULT_MAIL_DIRECTORY PAM_PATH_MAILDIR #define MAIL_FILE_FORMAT "%s%s/%s" #define MAIL_ENV_NAME "MAIL" @@ -42,7 +46,7 @@ #include <security/pam_modules.h> #include <security/_pam_macros.h> -#include <security/_pam_modutil.h> +#include <security/pam_modutil.h> #include <security/pam_ext.h> /* argument parsing */ @@ -134,7 +138,7 @@ static int get_folder(pam_handle_t *pamh, int ctrl, if (ctrl & PAM_NEW_MAIL_DIR) { path = *path_mail; if (*path == '~') { /* support for $HOME delivery */ - pwd = _pammodutil_getpwnam(pamh, user); + pwd = pam_modutil_getpwnam(pamh, user); if (pwd == NULL) { pam_syslog(pamh,LOG_ERR, "user [%s] unknown", user); _pam_overwrite(*path_mail); |