diff options
author | Damien Miller <djm@mindrot.org> | 1999-11-17 17:29:08 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 1999-11-17 17:29:08 +1100 |
commit | 10f6f6ba9ee14d306f8780edee8a10640c1643e0 (patch) | |
tree | 859600c705d582b147162d73746cb2f39b59ed58 /authfd.c | |
parent | d743bba481056ba3d1c229c18fd42c6bdc3f8d74 (diff) |
- Merged OpenBSD CVS changes
- [ChangeLog.Ylonen] noone needs this anymore
- [authfd.c] close-on-exec for auth-socket, ok deraadt
- [hostfile.c]
in known_hosts key lookup the entry for the bits does not need
to match, all the information is contained in n and e. This
solves the problem with buggy servers announcing the wrong
modulus length. markus and me.
- [serverloop.c]
bugfix: check for space if child has terminated, from:
iedowse@maths.tcd.ie
- [ssh-add.1 ssh-add.c ssh-keygen.1 ssh-keygen.c sshconnect.c]
[fingerprint.c fingerprint.h]
rsa key fingerprints, idea from Bjoern Groenvall <bg@sics.se>
- [ssh-agent.1] typo
- [ssh.1] add OpenSSH information to AUTHOR section. okay markus@
- [sshd.c]
force logging to stderr while loading private key file
(lost while converting to new log-levels)
Diffstat (limited to 'authfd.c')
-rw-r--r-- | authfd.c | 9 |
1 files changed, 8 insertions, 1 deletions
@@ -14,7 +14,7 @@ Functions for connecting the local authentication agent. | |||
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include "includes.h" | 16 | #include "includes.h" |
17 | RCSID("$Id: authfd.c,v 1.4 1999/11/16 02:37:16 damien Exp $"); | 17 | RCSID("$Id: authfd.c,v 1.5 1999/11/17 06:29:08 damien Exp $"); |
18 | 18 | ||
19 | #include "ssh.h" | 19 | #include "ssh.h" |
20 | #include "rsa.h" | 20 | #include "rsa.h" |
@@ -50,6 +50,13 @@ ssh_get_authentication_socket() | |||
50 | sock = socket(AF_UNIX, SOCK_STREAM, 0); | 50 | sock = socket(AF_UNIX, SOCK_STREAM, 0); |
51 | if (sock < 0) | 51 | if (sock < 0) |
52 | return -1; | 52 | return -1; |
53 | |||
54 | /* close on exec */ | ||
55 | if (fcntl(sock, F_SETFD, 1) == -1) | ||
56 | { | ||
57 | close(sock); | ||
58 | return -1; | ||
59 | } | ||
53 | 60 | ||
54 | if (connect(sock, (struct sockaddr *)&sunaddr, sizeof(sunaddr)) < 0) | 61 | if (connect(sock, (struct sockaddr *)&sunaddr, sizeof(sunaddr)) < 0) |
55 | { | 62 | { |