From: Aaron Jones <redacted>
Date: Mon, 19 Dec 2016 04:56:54 +0000 (+0000)
Subject: authd: don't exit() on OPM duplicate scanner errors, just ignore it
X-Git-Url: https://jfr.im/git/solanum.git/commitdiff_plain/d1f8acb0da1a84465c959d93abf0424c0b652c1a?ds=inline

authd: don't exit() on OPM duplicate scanner errors, just ignore it

I run into this code even with a single kind of scanner with a single
port, so I'm not even sure how it thinks it already exists.

Perhaps it's being parsed twice, or something similar.

c.f. issue #229
---

diff --git a/authd/providers/opm.c b/authd/providers/opm.c
index 8087bc97..40985b30 100644
--- a/authd/providers/opm.c
+++ b/authd/providers/opm.c
@@ -812,7 +812,8 @@ create_opm_scanner(const char *key __unused, int parc __unused, const char **par
 	if(find_proxy_scanner(proxy->proto, proxy->port) != NULL)
 	{
 		warn_opers(L_CRIT, "OPM: got a duplicate scanner: %s (port %hu)", parv[0], proxy->port);
-		exit(EX_PROVIDER_ERROR);
+		rb_free(proxy);
+		return;
 	}
 
 	rb_dlinkAdd(proxy, &proxy->node, &proxy_scanners);