From ff4c943d92bd663e5f4b2057f3282359fbd5e3c4 Mon Sep 17 00:00:00 2001
From: Mark Wooding <mdw@distorted.org.uk>
Date: Fri, 4 Apr 2014 19:32:14 +0100
Subject: [PATCH] base.m4: Check that the ident daemon actually gave us an
 answer.

---
 base.m4 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/base.m4 b/base.m4
index 204be0a..d312eb5 100644
--- 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.
-- 
2.11.0