From cec81c797825961d0e89d6f704a13ba90e602636 Mon Sep 17 00:00:00 2001
From: Elizabeth Myers <elizabeth@interlinked.me>
Date: Mon, 27 Jun 2016 19:06:49 -0500
Subject: [PATCH] blacklist: add blacklist_cancel_none

---
 authd/providers/blacklist.c | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/authd/providers/blacklist.c b/authd/providers/blacklist.c
index 6a8b5c17..4b31c78d 100644
--- a/authd/providers/blacklist.c
+++ b/authd/providers/blacklist.c
@@ -100,9 +100,10 @@ struct blacklist_user
 static void blacklists_destroy(void);
 
 static bool blacklists_start(struct auth_client *);
-static void blacklists_generic_cancel(struct auth_client *);
+static inline void blacklists_generic_cancel(struct auth_client *);
 static void blacklists_timeout(struct auth_client *);
 static void blacklists_cancel(struct auth_client *);
+static void blacklists_cancel_none(struct auth_client *);
 
 /* private interfaces */
 static void unref_blacklist(struct blacklist *);
@@ -382,7 +383,7 @@ blacklists_start(struct auth_client *auth)
 		/* Start the lookup if ident and rdns are finished, or not loaded. */
 		if(!lookup_all_blacklists(auth))
 		{
-			blacklists_generic_cancel(auth, "*** Could not do DNS blacklist checks");
+			blacklists_cancel_none(auth);
 			return true;
 		}
 	}
@@ -414,11 +415,11 @@ blacklists_initiate(struct auth_client *auth, uint32_t provider)
 	else
 	{
 		if(!lookup_all_blacklists(auth))
-			blacklists_generic_cancel(auth, "*** Could not do DNS blacklist checks");
+			blacklists_cancel_none(auth);
 	}
 }
 
-static void
+static inline void
 blacklists_generic_cancel(struct auth_client *auth, const char *message)
 {
 	rb_dlink_node *ptr, *nptr;
@@ -451,6 +452,12 @@ blacklists_generic_cancel(struct auth_client *auth, const char *message)
 	auth_client_unref(auth);
 }
 
+static void
+blacklists_timeout(struct auth_client *auth)
+{
+	blacklists_generic_cancel(auth, "*** No response from DNS blacklists");
+}
+
 static void
 blacklists_cancel(struct auth_client *auth)
 {
@@ -458,9 +465,9 @@ blacklists_cancel(struct auth_client *auth)
 }
 
 static void
-blacklists_timeout(struct auth_client *auth)
+blacklists_cancel_none(struct auth_client *auth)
 {
-	blacklists_generic_cancel(auth, "*** No response from DNS blacklists");
+	blacklists_generic_cancel(auth, "*** Could not check DNS blacklists");
 }
 
 static void