- (djm) Fix Makefile.in for connection sharing changes

2 files changed, 6 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index d1d45db79..4de7f331f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -33,6 +33,7 @@
      [channels.c clientloop.c misc.c misc.h packet.c ssh-agent.c ssh-keyscan.c]
      [sshd.c]
      set_nonblock() instead of fnctl(...,O_NONBLOCK); "looks sane" deraadt@
+ - (djm) Fix Makefile.in for connection sharing changes
 
 20040603
  - (dtucker) [auth-pam.c] Don't use pam_* namespace for sshd's PAM functions.
@@ -1217,4 +1218,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3383 2004/06/15 00:35:30 djm Exp $
+$Id: ChangeLog,v 1.3384 2004/06/15 00:44:40 djm Exp $
diff --git a/Makefile.in b/Makefile.in
index 45bf44823..a813d1747 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.258 2004/05/31 04:38:51 tim Exp $
+# $Id: Makefile.in,v 1.259 2004/06/15 00:44:40 djm Exp $
 
 # uncomment if you run a non bourne compatable shell. Ie. csh
 #SHELL = @SH@
@@ -68,8 +68,8 @@ LIBSSH_OBJS=acss.o authfd.o authfile.o bufaux.o buffer.o \
         log.o match.o moduli.o mpaux.o nchan.o packet.o \
         readpass.o rsa.o tildexpand.o ttymodes.o xmalloc.o \
         atomicio.o key.o dispatch.o kex.o mac.o uuencode.o misc.o \
-        rijndael.o ssh-dss.o ssh-rsa.o dh.o kexdh.o kexgex.o \
-        kexdhc.o kexgexc.o scard.o msg.o progressmeter.o dns.o \
+        monitor_fdpass.o rijndael.o ssh-dss.o ssh-rsa.o dh.o kexdh.o \
+        kexgex.o kexdhc.o kexgexc.o scard.o msg.o progressmeter.o dns.o \
         entropy.o scard-opensc.o gss-genr.o
 
 SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \
@@ -81,8 +81,7 @@ SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \
         auth-chall.o auth2-chall.o groupaccess.o \
         auth-skey.o auth-bsdauth.o auth2-hostbased.o auth2-kbdint.o \
         auth2-none.o auth2-passwd.o auth2-pubkey.o \
-        monitor_mm.o monitor.o monitor_wrap.o monitor_fdpass.o \
-        kexdhs.o kexgexs.o \
+        monitor_mm.o monitor.o monitor_wrap.o kexdhs.o kexgexs.o \
         auth-krb5.o \
         auth2-gss.o gss-serv.o gss-serv-krb5.o \
         loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o