openssh: Fix blacklistd sshd-session integration

In version 9.8, the server was split into a listener binary, sshd(8),
and a per-session binary "sshd-session".

Our blacklistd changes also have to be moved from sshd.c to
sshd-session.c.

Reviewed by:	emaste
Approved by:	emaste (mentor)
Fixes:	0fdf8fae8b56 ("openssh: Update to 9.8p1")
MFC after:	3 days
Differential Revision:	https://reviews.freebsd.org/D49116

(cherry picked from commit 61d8af38bf1c5328c27ccfcd8a3b73e9e8604d16)

crypto/openssh/sshd-session.c

@@ -109,6 +109,7 @@
 #include "sk-api.h"
 #include "srclimit.h"
 #include "dh.h"
+#include "blacklist_client.h"
 
 /* Re-exec fds */
 #define REEXEC_DEVCRYPTO_RESERVED_FD	(STDERR_FILENO + 1)
@@ -1316,6 +1317,8 @@ main(int ac, char **av)
 		fatal("sshbuf_new loginmsg failed");
 	auth_debug_reset();
 
+	BLACKLIST_INIT();
+
 	if (privsep_preauth(ssh) == 1)
 		goto authenticated;
 

crypto/openssh/sshd.c

@@ -101,7 +101,6 @@
 #include "sk-api.h"
 #include "addr.h"
 #include "srclimit.h"
-#include "blacklist_client.h"
 
 #ifdef LIBWRAP
 #include <tcpd.h>
@@ -1876,9 +1875,6 @@ main(int ac, char **av)
 	}
 #endif
 #endif
-
-
-	BLACKLIST_INIT();
 }
 
 /* server specific fatal cleanup */