Relevant BUGIDs: 124397

Purpose of commit: new feature

Commit summary:
---------------
* pam_mail - use PAM_PATH_MAILDIR as the location of mail spool

diff --git a/CHANGELOG b/CHANGELOG
index f5cd678ee9c1ff4de0b5618ceda2273b6e29ed39..ff2e2cee9deb52c3f4ea0c43e8e42997add5dab0 100644 (file)
--- 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 4f1152b3c16bbebf7be66491e0f60b0e34734778..35a6b9f2d4b744ce19b16df7400809b67bcec03c 100644 (file)
--- a/modules/pam_mail/pam_mail.c
+++ b/modules/pam_mail/pam_mail.c
@@ -8,14 +8,6 @@
  * mailhash additions by Chris Adams <cadams@ro.com> 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 <security/_pam_aconf.h>
 
 #include <ctype.h>
@@ -34,6 +26,14 @@
 #include <pwdb/pwdb_public.h>
 #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