diff options
| author | Steve Langasek <vorlon@debian.org> | 2009-08-24 03:06:11 -0700 |
|---|---|---|
| committer | Steve Langasek <vorlon@debian.org> | 2019-01-08 21:25:43 -0800 |
| commit | 78915f5a06936cc24cf7776c8b53d08b6ea3616c (patch) | |
| tree | 6325216d4660f2a33d2161d71302b8c3f47c76e5 /modules/pam_mail/pam_mail.c | |
| parent | fdd6439782a15a1abe342044e07e5f7501ae73de (diff) | |
| parent | 212b52cf29c06cc209bc8ac0540dbab1acdf1464 (diff) | |
| download | pam-78915f5a06936cc24cf7776c8b53d08b6ea3616c.tar.gz pam-78915f5a06936cc24cf7776c8b53d08b6ea3616c.tar.bz2 pam-78915f5a06936cc24cf7776c8b53d08b6ea3616c.zip | |
merge upstream version 1.1.0
Diffstat (limited to 'modules/pam_mail/pam_mail.c')
| -rw-r--r-- | modules/pam_mail/pam_mail.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/modules/pam_mail/pam_mail.c b/modules/pam_mail/pam_mail.c index 46395b53..a5473605 100644 --- a/modules/pam_mail/pam_mail.c +++ b/modules/pam_mail/pam_mail.c @@ -303,8 +303,13 @@ report_mail(pam_handle_t *pamh, int ctrl, int type, const char *folder) { int retval; - if (!(ctrl & PAM_MAIL_SILENT) || - ((ctrl & PAM_QUIET_MAIL) && type == HAVE_NEW_MAIL)) + if ((ctrl & PAM_MAIL_SILENT) || + ((ctrl & PAM_QUIET_MAIL) && type != HAVE_NEW_MAIL)) + { + D(("keeping quiet")); + retval = PAM_SUCCESS; + } + else { if (ctrl & PAM_STANDARD_MAIL) switch (type) @@ -345,11 +350,6 @@ report_mail(pam_handle_t *pamh, int ctrl, int type, const char *folder) break; } } - else - { - D(("keeping quiet")); - retval = PAM_SUCCESS; - } D(("returning %s", pam_strerror(pamh, retval))); return retval; |