From: op <op@openbsd.org>
Date: Thu, 23 May 2024 17:05:45 +0000 (+0000)
Subject: catch EOFs during table_proc handshake
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=613268e5e58c9d39ea81169b5a26333aa9726ce9;p=openbsd

catch EOFs during table_proc handshake

while here also do a s/fatalx/fatal since getline() sets errno on
failure.

ok millert@, gilles@
---

diff --git a/usr.sbin/smtpd/table_proc.c b/usr.sbin/smtpd/table_proc.c
index 07cabf073bc..f21fd2b5095 100644
--- a/usr.sbin/smtpd/table_proc.c
+++ b/usr.sbin/smtpd/table_proc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: table_proc.c,v 1.20 2024/05/22 08:41:02 op Exp $	*/
+/*	$OpenBSD: table_proc.c,v 1.21 2024/05/23 17:05:45 op Exp $	*/
 
 /*
  * Copyright (c) 2024 Omar Polo <op@openbsd.org>
@@ -166,8 +166,9 @@ table_proc_open(struct table *table)
 	}
 
 	if (ferror(priv->in))
-		fatalx("table-proc: getline");
-
+		fatal("table-proc: getline");
+	if (feof(priv->in))
+		fatalx("table-proc: unexpected EOF during handshake");
 	if (services == 0)
 		fatalx("table-proc: no services registered");