diff options
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | Makefile.in | 6 |
2 files changed, 5 insertions, 4 deletions
@@ -67,6 +67,7 @@ | |||
67 | specific tests on platforms that don't do IPv6. | 67 | specific tests on platforms that don't do IPv6. |
68 | - (dtucker) [Makefile.in] Define TEST_SSH_IPV6 in make's arguments as well | 68 | - (dtucker) [Makefile.in] Define TEST_SSH_IPV6 in make's arguments as well |
69 | as environment. | 69 | as environment. |
70 | - (dtucker) [Makefile.in] Move addrmatch.o to libssh.a where it's needed now. | ||
70 | 71 | ||
71 | 20080609 | 72 | 20080609 |
72 | - (dtucker) OpenBSD CVS Sync | 73 | - (dtucker) OpenBSD CVS Sync |
@@ -4153,4 +4154,4 @@ | |||
4153 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 4154 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
4154 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 4155 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
4155 | 4156 | ||
4156 | $Id: ChangeLog,v 1.4965 2008/06/10 23:38:12 dtucker Exp $ | 4157 | $Id: ChangeLog,v 1.4966 2008/06/10 23:47:59 dtucker Exp $ |
diff --git a/Makefile.in b/Makefile.in index 66d394af6..1a43f01b1 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: Makefile.in,v 1.293 2008/06/10 19:15:51 dtucker Exp $ | 1 | # $Id: Makefile.in,v 1.294 2008/06/10 23:47:59 dtucker Exp $ |
2 | 2 | ||
3 | # uncomment if you run a non bourne compatable shell. Ie. csh | 3 | # uncomment if you run a non bourne compatable shell. Ie. csh |
4 | #SHELL = @SH@ | 4 | #SHELL = @SH@ |
@@ -67,7 +67,7 @@ LIBSSH_OBJS=acss.o authfd.o authfile.o bufaux.o bufbn.o buffer.o \ | |||
67 | cipher-bf1.o cipher-ctr.o cipher-3des1.o cleanup.o \ | 67 | cipher-bf1.o cipher-ctr.o cipher-3des1.o cleanup.o \ |
68 | compat.o compress.o crc32.o deattack.o fatal.o hostfile.o \ | 68 | compat.o compress.o crc32.o deattack.o fatal.o hostfile.o \ |
69 | log.o match.o md-sha256.o moduli.o nchan.o packet.o \ | 69 | log.o match.o md-sha256.o moduli.o nchan.o packet.o \ |
70 | readpass.o rsa.o ttymodes.o xmalloc.o \ | 70 | readpass.o rsa.o ttymodes.o xmalloc.o addrmatch.o \ |
71 | atomicio.o key.o dispatch.o kex.o mac.o uidswap.o uuencode.o misc.o \ | 71 | atomicio.o key.o dispatch.o kex.o mac.o uidswap.o uuencode.o misc.o \ |
72 | monitor_fdpass.o rijndael.o ssh-dss.o ssh-rsa.o dh.o kexdh.o \ | 72 | monitor_fdpass.o rijndael.o ssh-dss.o ssh-rsa.o dh.o kexdh.o \ |
73 | kexgex.o kexdhc.o kexgexc.o scard.o msg.o progressmeter.o dns.o \ | 73 | kexgex.o kexdhc.o kexgexc.o scard.o msg.o progressmeter.o dns.o \ |
@@ -83,7 +83,7 @@ SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \ | |||
83 | auth-skey.o auth-bsdauth.o auth2-hostbased.o auth2-kbdint.o \ | 83 | auth-skey.o auth-bsdauth.o auth2-hostbased.o auth2-kbdint.o \ |
84 | auth2-none.o auth2-passwd.o auth2-pubkey.o \ | 84 | auth2-none.o auth2-passwd.o auth2-pubkey.o \ |
85 | monitor_mm.o monitor.o monitor_wrap.o kexdhs.o kexgexs.o \ | 85 | monitor_mm.o monitor.o monitor_wrap.o kexdhs.o kexgexs.o \ |
86 | auth-krb5.o addrmatch.o \ | 86 | auth-krb5.o \ |
87 | auth2-gss.o gss-serv.o gss-serv-krb5.o \ | 87 | auth2-gss.o gss-serv.o gss-serv-krb5.o \ |
88 | loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \ | 88 | loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \ |
89 | audit.o audit-bsm.o platform.o sftp-server.o sftp-common.o | 89 | audit.o audit-bsm.o platform.o sftp-server.o sftp-common.o |