From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Wed, 3 Nov 2021 10:48:39 +0000 (+0100)
Subject: mlmmj_list: cleanup error handling
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=061f2f25cb7a13e33ec5017cef5a20a82bf8809c;p=thirdparty%2Fmlmmj.git

mlmmj_list: cleanup error handling
---

diff --git a/src/mlmmj.c b/src/mlmmj.c
index d1c350e9..a3575e35 100644
--- a/src/mlmmj.c
+++ b/src/mlmmj.c
@@ -67,17 +67,22 @@ mlmmj_list_open(struct mlmmj_list *list)
 
 	list->fd = open(list->dir, O_DIRECTORY|O_CLOEXEC);
 	if (list->fd == -1) {
-		warnx("Unabel to open '%s'\n", list->dir);
+		warnx("Unable to open '%s'", list->dir);
 		return (false);
 	}
 
 	list->addr = ctrlvalue(list, "listaddress");
-	if (list->addr == NULL || strchr(list->addr, '@') == NULL)
-		errx(EXIT_FAILURE, "Invalid list address");
+	if (list->addr == NULL) {
+		warnx("Missing list address");
+		mlmmj_list_close(list);
+		return (false);
+	}
 	list->delim = getlistdelim(list->dir);
 	if (!splitlistaddr(list->addr, &list->name, &list->fqdn)) {
-		errx(EXIT_FAILURE, "%s: is not a valid mailing list address,"
+		warnx("%s: is not a valid mailing list address, "
 		    "missing '@'", list->addr);
+		mlmmj_list_close(list);
+		return (false);
 	}
 	return (true);
 }