From 22e6ce5f33d486d0df8213e9f94254afd5ea19e0 Mon Sep 17 00:00:00 2001 From: Jan Rekorajski Date: Mon, 4 Dec 2000 20:59:12 +0000 Subject: [PATCH] Relevant BUGIDs: 124397 Purpose of commit: new feature Commit summary: --------------- * pam_mail - use PAM_PATH_MAILDIR as the location of mail spool --- CHANGELOG | 2 ++ modules/pam_mail/pam_mail.c | 16 ++++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index f5cd678e..ff2e2cee 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -35,6 +35,8 @@ Where you should replace XXXXX with a bug-id. 0.74: please submit patches for this section with actual code/doc patches! +* pam_mail - use PAM_PATH_MAILDIR as the location of mail spool + (Bug 124397 - baggins) * _pam_aconf.h.in, configure.in - added PAM_PATH_MAILDIR set via --with-mailspool=dir option (default is _PAM_MAILDIR if defined in paths.h otherwise /var/spool/mail (Bug 124397 - baggins) diff --git a/modules/pam_mail/pam_mail.c b/modules/pam_mail/pam_mail.c index 4f1152b3..35a6b9f2 100644 --- a/modules/pam_mail/pam_mail.c +++ b/modules/pam_mail/pam_mail.c @@ -8,14 +8,6 @@ * mailhash additions by Chris Adams 1998/7/11 */ -#define DEFAULT_MAIL_DIRECTORY "/var/spool/mail" -#define MAIL_FILE_FORMAT "%s%s/%s" -#define MAIL_ENV_NAME "MAIL" -#define MAIL_ENV_FORMAT MAIL_ENV_NAME "=%s" -#define YOUR_MAIL_VERBOSE_FORMAT "You have %s mail in %s." -#define YOUR_MAIL_STANDARD_FORMAT "You have %smail." -#define NO_MAIL_STANDARD_FORMAT "No mail." - #include #include @@ -34,6 +26,14 @@ #include #endif +#define DEFAULT_MAIL_DIRECTORY PAM_PATH_MAILDIR +#define MAIL_FILE_FORMAT "%s%s/%s" +#define MAIL_ENV_NAME "MAIL" +#define MAIL_ENV_FORMAT MAIL_ENV_NAME "=%s" +#define YOUR_MAIL_VERBOSE_FORMAT "You have %s mail in %s." +#define YOUR_MAIL_STANDARD_FORMAT "You have %smail." +#define NO_MAIL_STANDARD_FORMAT "No mail." + /* * here, we make a definition for the externally accessible function * in this file (this definition is required for static a module -- 2.40.0