From 647d28bf9b8da2ce47a888aad71ab5264eea6c6d Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Wed, 9 Dec 2020 18:28:03 +0100
Subject: lacme: delay webserver socket shutdown.

To after the process has terminated.  This solves a race condition
spewing

    accept: Invalid argument at /usr/libexec/lacme/webserver line 80.

(harmless) errors.

Closes: deb#970458
---
 Changelog | 7 +++++++
 lacme     | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Changelog b/Changelog
index 13db236..a565440 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,10 @@
+lacme (0.7.1) upstream;
+
+ - lacme: delay webserver socket shutdown to after the process has
+   terminated.
+
+ -- Guilhem Moulin <guilhem@fripost.org>  Wed, 09 Dec 2020 18:23:22 +0100
+
 lacme (0.7) upstream;
 
  * Breaking change: the certificate indicated by 'CAfile' is no longer
diff --git a/lacme b/lacme
index 07ebb45..088e393 100755
--- a/lacme
+++ b/lacme
@@ -346,9 +346,9 @@ sub spawn_webserver() {
         set_FD_CLOEXEC($sock, 1);
         push @CLEANUP, sub() {
             print STDERR "[$$] Shutting down ACME webserver bound to $p\n" if $OPTS{debug};
-            shutdown($sock, SHUT_RDWR) or warn "shutdown: $!";
             kill 15 => $pid;
             waitpid $pid => 0;
+            shutdown($sock, SHUT_RDWR) or warn "shutdown: $!";
         };
 
         # on dual-stack ipv4/ipv6, we'll need to open the port for the
-- 
cgit v1.2.3