From 1345a41ddad0778330a4c6e356318fd30ea81c77 Mon Sep 17 00:00:00 2001
From: Elizabeth Myers <elizabeth@interlinked.me>
Date: Mon, 28 Mar 2016 16:46:52 -0500
Subject: [PATCH] authd: misc fixes

---
 authd/provider.c        |  3 +++
 authd/providers/ident.c | 14 ++++++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/authd/provider.c b/authd/provider.c
index b512b4a0..2bcd7c3c 100644
--- a/authd/provider.c
+++ b/authd/provider.c
@@ -274,6 +274,9 @@ start_auth(const char *cid, const char *l_ip, const char *l_port, const char *c_
 #endif
 		((struct sockaddr_in *)&auth->c_addr)->sin_port = htons(auth->c_port);
 
+	rb_strlcpy(auth->hostname, "*", sizeof(auth->hostname));
+	rb_strlcpy(auth->username, "*", sizeof(auth->username));
+
 	memset(auth->data, 0, sizeof(auth->data));
 
 	auth->providers_starting = true;
diff --git a/authd/providers/ident.c b/authd/providers/ident.c
index 5f7740b5..357bc74d 100644
--- a/authd/providers/ident.c
+++ b/authd/providers/ident.c
@@ -46,6 +46,7 @@ static const char *messages[] =
 	"*** Got Ident response",
 	"*** No Ident response",
 	"*** Cannot verify ident validity, ignoring ident",
+	"*** Ident disabled, not checking ident",
 };
 
 typedef enum
@@ -54,6 +55,7 @@ typedef enum
 	REPORT_FOUND,
 	REPORT_FAIL,
 	REPORT_INVALID,
+	REPORT_DISABLED,
 } ident_message;
 
 static EVH timeout_ident_queries_event;
@@ -321,11 +323,17 @@ static bool ident_start(struct auth_client *auth)
 	struct rb_sockaddr_storage l_addr, c_addr;
 	int family = GET_SS_FAMILY(&auth->c_addr);
 
-	if(!ident_enable || auth->data[PROVIDER_IDENT] != NULL)
+	if(auth->data[PROVIDER_IDENT] != NULL)
 	{
 		set_provider_done(auth, PROVIDER_IDENT); /* for blacklists */
 		return true;
 	}
+	else if(!ident_enable)
+	{
+		notice_client(auth->cid, messages[REPORT_DISABLED]);
+		set_provider_done(auth, PROVIDER_IDENT);
+		return true;
+	}
 
 	notice_client(auth->cid, messages[REPORT_LOOKUP]);
 
@@ -394,9 +402,7 @@ add_conf_ident_timeout(const char *key __unused, int parc __unused, const char *
 static void
 set_ident_enabled(const char *key __unused, int parc __unused, const char **parv)
 {
-	ident_enable = (strcasecmp(parv[0], "true") == 0 ||
-			strcasecmp(parv[0], "1") == 0 ||
-			strcasecmp(parv[0], "enable") == 0);
+	ident_enable = (*parv[0] == '1');
 }
 
 struct auth_opts_handler ident_options[] =