summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--Makefile.in3
-rw-r--r--configure.in3
3 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 685b6143e..1352588b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,8 @@
15 listen sock now. 15 listen sock now.
16 - [sshd.c] 16 - [sshd.c]
17 make that a fatal 17 make that a fatal
18 - Applied patch from David Rankin <drankin@bohemians.lexington.ky.us>
19 to fix libwrap support on NetBSD
18 - Released 1.2pre17 20 - Released 1.2pre17
19 21
2019991208 2219991208
diff --git a/Makefile.in b/Makefile.in
index 232f8e024..7148c50cd 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -15,6 +15,7 @@ CFLAGS=@CFLAGS@ $(PATHS) @DEFS@
15EXTRA_TARGETS=@GNOME_ASKPASS@ 15EXTRA_TARGETS=@GNOME_ASKPASS@
16TARGETS=libssh.a ssh sshd ssh-add ssh-keygen ssh-agent scp $(EXTRA_TARGETS) 16TARGETS=libssh.a ssh sshd ssh-add ssh-keygen ssh-agent scp $(EXTRA_TARGETS)
17LIBS=@LIBS@ 17LIBS=@LIBS@
18LIBWRAP=@LIBWRAP@
18AR=@AR@ 19AR=@AR@
19RANLIB=@RANLIB@ 20RANLIB=@RANLIB@
20INSTALL=@INSTALL@ 21INSTALL=@INSTALL@
@@ -48,7 +49,7 @@ ssh: ssh.o sshconnect.o log-client.o readconf.o clientloop.o libssh.a
48sshd: sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \ 49sshd: sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \
49 pty.o log-server.o login.o servconf.o serverloop.o bsd-login.o \ 50 pty.o log-server.o login.o servconf.o serverloop.o bsd-login.o \
50 md5crypt.o libssh.a 51 md5crypt.o libssh.a
51 $(CC) -o $@ $^ $(LFLAGS) $(LIBS) 52 $(CC) -o $@ $^ $(LFLAGS) $(LIBS) $(LIBWRAP)
52 53
53scp: scp.o libssh.a 54scp: scp.o libssh.a
54 $(CC) -o $@ $^ $(LFLAGS) $(LIBS) 55 $(CC) -o $@ $^ $(LFLAGS) $(LIBS)
diff --git a/configure.in b/configure.in
index e0395528d..2e7623bb4 100644
--- a/configure.in
+++ b/configure.in
@@ -276,9 +276,10 @@ AC_ARG_WITH(tcp-wrappers,
276 [ --with-tcp-wrappers Enable tcpwrappers support], 276 [ --with-tcp-wrappers Enable tcpwrappers support],
277 [ 277 [
278 AC_DEFINE(LIBWRAP) 278 AC_DEFINE(LIBWRAP)
279 LIBS="$LIBS -lwrap" 279 LIBWRAP="-lwrap"
280 ] 280 ]
281) 281)
282AC_SUBST(LIBWRAP)
282 283
283dnl Check whether to enable MD5 passwords 284dnl Check whether to enable MD5 passwords
284AC_ARG_WITH(md5-passwords, 285AC_ARG_WITH(md5-passwords,