From: Darren Tucker <dtucker@dtucker.net>
Date: Fri, 18 Jun 2021 10:41:45 +0000 (+1000)
Subject: Put second -lssh in link line for sftp-server.
X-Git-Tag: V_8_7_P1~139
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7ebfe4e439853b88997c9cfc2ff703408a1cca92;p=thirdparty%2Fopenssh-portable.git

Put second -lssh in link line for sftp-server.

When building --without-openssl the recent port-prngd.c change adds
a dependency on atomicio, but since nothing else in sftp-server uses
it, the linker may not find it.  Add a second -lssh similar to other
binaries.
---

diff --git a/Makefile.in b/Makefile.in
index 18cb4d46d..fc15a2ee2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -235,7 +235,7 @@ ssh-keyscan$(EXEEXT): $(LIBCOMPAT) libssh.a $(SSHKEYSCAN_OBJS)
 	$(LD) -o $@ $(SSHKEYSCAN_OBJS) $(LDFLAGS) -lssh -lopenbsd-compat -lssh $(LIBS)
 
 sftp-server$(EXEEXT): $(LIBCOMPAT) libssh.a $(SFTPSERVER_OBJS)
-	$(LD) -o $@ $(SFTPSERVER_OBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
+	$(LD) -o $@ $(SFTPSERVER_OBJS) $(LDFLAGS) -lssh -lopenbsd-compat -lssh $(LIBS)
 
 sftp$(EXEEXT): $(LIBCOMPAT) libssh.a $(SFTP_OBJS)
 	$(LD) -o $@ $(SFTP_OBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) $(LIBEDIT)