summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPhilip Hazel <ph10@hermes.cam.ac.uk>2007-08-29 13:58:25 +0000
committerPhilip Hazel <ph10@hermes.cam.ac.uk>2007-08-29 13:58:25 +0000
commit7353285c15cfdcab0567dc8a0d55ff4720a7a01c (patch)
tree9a25a9bb34528ec3f350fde46229ce054ab6c8c4 /src
parent595028e435015508f214f06456874a8882bfd54e (diff)
Allow only accept and warn in the not-QUIT ACL.
Diffstat (limited to 'src')
-rw-r--r--src/src/acl.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/src/acl.c b/src/src/acl.c
index 9c6134422..bc374b461 100644
--- a/src/src/acl.c
+++ b/src/src/acl.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/acl.c,v 1.78 2007/08/22 10:10:23 ph10 Exp $ */
+/* $Cambridge: exim/src/src/acl.c,v 1.79 2007/08/29 13:58:25 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -3456,11 +3456,11 @@ while (acl != NULL)
*log_msgptr = *user_msgptr = NULL;
acl_temp_details = FALSE;
- if (where == ACL_WHERE_QUIT &&
+ if ((where == ACL_WHERE_QUIT || where == ACL_WHERE_NOTQUIT) &&
acl->verb != ACL_ACCEPT &&
acl->verb != ACL_WARN)
{
- *log_msgptr = string_sprintf("\"%s\" is not allowed in a QUIT ACL",
+ *log_msgptr = string_sprintf("\"%s\" is not allowed in a QUIT or not-QUIT ACL",
verbs[acl->verb]);
return ERROR;
}