diff options
Diffstat (limited to 'channels.c')
-rw-r--r-- | channels.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/channels.c b/channels.c index 32c23be1f..2664726a2 100644 --- a/channels.c +++ b/channels.c | |||
@@ -40,7 +40,7 @@ | |||
40 | */ | 40 | */ |
41 | 41 | ||
42 | #include "includes.h" | 42 | #include "includes.h" |
43 | RCSID("$OpenBSD: channels.c,v 1.123 2001/06/04 21:59:42 markus Exp $"); | 43 | RCSID("$OpenBSD: channels.c,v 1.124 2001/06/05 10:24:32 markus Exp $"); |
44 | 44 | ||
45 | #include "ssh.h" | 45 | #include "ssh.h" |
46 | #include "ssh1.h" | 46 | #include "ssh1.h" |
@@ -352,7 +352,7 @@ channel_stop_listening() | |||
352 | switch (c->type) { | 352 | switch (c->type) { |
353 | case SSH_CHANNEL_AUTH_SOCKET: | 353 | case SSH_CHANNEL_AUTH_SOCKET: |
354 | close(c->sock); | 354 | close(c->sock); |
355 | unlink(c->path); | 355 | /* auth_sock_cleanup_proc deletes the socket */ |
356 | channel_free(c); | 356 | channel_free(c); |
357 | break; | 357 | break; |
358 | case SSH_CHANNEL_PORT_LISTENER: | 358 | case SSH_CHANNEL_PORT_LISTENER: |
@@ -2861,6 +2861,7 @@ auth_input_request_forwarding(struct passwd * pw) | |||
2861 | if (nc == NULL) { | 2861 | if (nc == NULL) { |
2862 | error("auth_input_request_forwarding: channel_new failed"); | 2862 | error("auth_input_request_forwarding: channel_new failed"); |
2863 | auth_sock_cleanup_proc(pw); | 2863 | auth_sock_cleanup_proc(pw); |
2864 | fatal_remove_cleanup(auth_sock_cleanup_proc, pw); | ||
2864 | close(sock); | 2865 | close(sock); |
2865 | return 0; | 2866 | return 0; |
2866 | } | 2867 | } |