From 0aa466ac446bf8cf1617896b1d3321965dd74ad3 Mon Sep 17 00:00:00 2001
From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Fri, 19 Nov 2021 16:15:05 +0000
Subject: Fix early use of $sender_host_name

Broken-by: 90341c71c1
---
 src/src/acl.c    | 2 +-
 src/src/daemon.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/src/acl.c b/src/src/acl.c
index 5252292ff..c55a42b6f 100644
--- a/src/src/acl.c
+++ b/src/src/acl.c
@@ -1211,7 +1211,7 @@ int rc;
 
 /* Previous success */
 
-if (sender_host_name != NULL) return OK;
+if (sender_host_name) return OK;
 
 /* Previous failure */
 
diff --git a/src/src/daemon.c b/src/src/daemon.c
index a248a4f40..b10974a7a 100644
--- a/src/src/daemon.c
+++ b/src/src/daemon.c
@@ -793,10 +793,8 @@ else (void)close(dup_accept_socket);
 the incoming host address and an expanded active_hostname. */
 
 log_close_all();
-interface_address =
-sender_host_address = NULL;
+interface_address = sender_host_name = sender_host_address = NULL;
 store_reset(reset_point);
-sender_host_address = NULL;
 }
 
 
-- 
cgit v1.2.3