base.m4: Check that the ident daemon actually gave us an answer.

[exim-config] / base.m4

diff --git a/base.m4 b/base.m4
index 204be0a..d312eb5 100644 (file)
--- a/base.m4
+++ b/base.m4
@@ -260,12 +260,12 @@ mail_check_auth:
        warn     set acl_c_user = $authenticated_id
                 hosts = +thishost
                !authenticated = *
+                condition = ${if def:sender_ident}
                 set acl_c_user = $sender_ident
 
-       ## User must be authenticated.
+       ## User must be authenticated by now.
        deny     message = Sender not authenticated
-               !hosts = +thishost
-               !authenticated = *
+                condition = ${if !def:acl_c_user}
 
        ## Make sure that the local part is one that the authenticated sender
        ## is allowed to claim.