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 /auth-skey.c | |
| parent | eabf3417bc73ca9546a3ed489cd809ffdf303853 (diff) | |
| download | openssh-git-037a0dc0835bb5a442bdcbeecdd5baed723f0b45.tar.gz | |
- 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 'auth-skey.c')
| -rw-r--r-- | auth-skey.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/auth-skey.c b/auth-skey.c index cc5f4510..88291599 100644 --- a/auth-skey.c +++ b/auth-skey.c @@ -1,7 +1,7 @@ #include "includes.h" #ifdef SKEY -RCSID("$Id: auth-skey.c,v 1.4 1999/12/01 16:54:35 markus Exp $"); +RCSID("$Id: auth-skey.c,v 1.5 1999/12/06 19:04:57 deraadt Exp $"); #include "ssh.h" #include "packet.h" @@ -114,6 +114,7 @@ skey_fake_keyinfo(char *username) SEEK_SET) != -1 && read(fd, hseed, SKEY_MAX_SEED_LEN) == SKEY_MAX_SEED_LEN) { close(fd); + fd = -1; secret = hseed; secretlen = SKEY_MAX_SEED_LEN; flg = 0; @@ -123,6 +124,8 @@ skey_fake_keyinfo(char *username) secretlen = strlen(secret); flg = 0; } + if (fd != -1) + close(fd); } /* Put that in your pipe and smoke it */ |