diff options
author | Damien Miller <djm@mindrot.org> | 1999-12-07 15:38:31 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 1999-12-07 15:38:31 +1100 |
commit | 037a0dc0835bb5a442bdcbeecdd5baed723f0b45 (patch) | |
tree | d02954d57ac437fd036e3e9544f24559ca8f0f0f /Makefile.in | |
parent | eabf3417bc73ca9546a3ed489cd809ffdf303853 (diff) |
- Merged more OpenBSD changes:
- [atomicio.c authfd.c scp.c serverloop.c ssh.h sshconnect.c sshd.c]
move atomicio into it's own file. wrap all socket write()s which
were doing write(sock, buf, len) != len, with atomicio() calls.
- [auth-skey.c]
fd leak
- [authfile.c]
properly name fd variable
- [channels.c]
display great hatred towards strcpy
- [pty.c pty.h sshd.c]
use openpty() if it exists (it does on BSD4_4)
- [tildexpand.c]
check for ~ expansion past MAXPATHLEN
- Modified helper.c to use new atomicio function.
- Reformat Makefile a little
- Moved RC4 routines from rc4.[ch] into helper.c
- Added autoconf code to detect /dev/ptmx (Solaris) and /dev/ptc (AIX)
Diffstat (limited to 'Makefile.in')
-rw-r--r-- | Makefile.in | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/Makefile.in b/Makefile.in index c2c3261b..80b0a6d4 100644 --- a/Makefile.in +++ b/Makefile.in @@ -23,25 +23,31 @@ LFLAGS=@LDFLAGS@ GNOME_CFLAGS=`gnome-config --cflags gnome gnomeui` GNOME_LIBS=`gnome-config --libs gnome gnomeui` -OBJS= authfd.o authfile.o auth-passwd.o auth-rhosts.o auth-rh-rsa.o \ - auth-rsa.o auth-skey.o bufaux.o buffer.o canohost.o channels.o \ - cipher.o clientloop.o compress.o crc32.o deattack.o helper.o \ - hostfile.o log-client.o login.o log-server.o match.o mpaux.o \ - packet.o pty.o readconf.o readpass.o rsa.o servconf.o serverloop.o \ - sshconnect.o tildexpand.o ttymodes.o uidswap.o xmalloc.o \ - helper.o bsd-mktemp.o bsd-strlcpy.o bsd-strlcat.o bsd-daemon.o \ - bsd-login.o bsd-snprintf.o rc4.o md5crypt.o - +OBJS= atomicio.o authfd.o authfile.o auth-passwd.o auth-rhosts.o \ + auth-rh-rsa.o auth-rsa.o auth-skey.o bsd-daemon.o bsd-login.o \ + bsd-mktemp.o bsd-snprintf.o bsd-strlcat.o bsd-strlcpy.o bufaux.o \ + buffer.o canohost.o channels.o cipher.o clientloop.o compress.o \ + crc32.o deattack.o helper.o helper.o hostfile.o log-client.o \ + login.o log-server.o match.o md5crypt.o mpaux.o packet.o pty.o \ + readconf.o readpass.o rsa.o servconf.o serverloop.o \ + sshconnect.o tildexpand.o ttymodes.o uidswap.o xmalloc.o all: $(OBJS) $(TARGETS) -libssh.a: authfd.o authfile.o bufaux.o buffer.o canohost.o channels.o cipher.o compat.o compress.o crc32.o deattack.o hostfile.o match.o mpaux.o nchan.o packet.o readpass.o rsa.o tildexpand.o ttymodes.o uidswap.o xmalloc.o helper.o rc4.o bsd-mktemp.o bsd-strlcpy.o bsd-strlcat.o bsd-snprintf.o bsd-daemon.o log.o fingerprint.o +libssh.a: atomicio.o authfd.o authfile.o bsd-daemon.o bsd-mktemp.o \ + bsd-snprintf.o bsd-strlcat.o bsd-strlcpy.o bufaux.o \ + buffer.o canohost.o channels.o cipher.o compat.o \ + compress.o crc32.o deattack.o fingerprint.o helper.o \ + hostfile.o log.o match.o mpaux.o nchan.o packet.o \ + readpass.o rsa.o tildexpand.o ttymodes.o uidswap.o xmalloc.o $(AR) rv $@ $^ $(RANLIB) $@ ssh: ssh.o sshconnect.o log-client.o readconf.o clientloop.o libssh.a $(CC) -o $@ $^ $(LFLAGS) $(LIBS) -sshd: sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o pty.o log-server.o login.o servconf.o serverloop.o bsd-login.o md5crypt.o libssh.a +sshd: sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \ + pty.o log-server.o login.o servconf.o serverloop.o bsd-login.o \ + md5crypt.o libssh.a $(CC) -o $@ $^ $(LFLAGS) $(LIBS) scp: scp.o libssh.a |