diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | channels.c | 5 |
2 files changed, 8 insertions, 3 deletions
@@ -49,6 +49,10 @@ | |||
49 | - pvalchev@cvs.openbsd.org 2001/06/05 05:05:39 | 49 | - pvalchev@cvs.openbsd.org 2001/06/05 05:05:39 |
50 | [ssh-keyscan.1 ssh-keyscan.c] | 50 | [ssh-keyscan.1 ssh-keyscan.c] |
51 | License clarification from David Mazieres, ok deraadt@ | 51 | License clarification from David Mazieres, ok deraadt@ |
52 | - markus@cvs.openbsd.org 2001/06/05 10:24:32 | ||
53 | [channels.c] | ||
54 | don't delete the auth socket in channel_stop_listening() | ||
55 | auth_sock_cleanup_proc() will take care of this. | ||
52 | 56 | ||
53 | 20010606 | 57 | 20010606 |
54 | - OpenBSD CVS Sync | 58 | - OpenBSD CVS Sync |
@@ -5560,4 +5564,4 @@ | |||
5560 | - Wrote replacements for strlcpy and mkdtemp | 5564 | - Wrote replacements for strlcpy and mkdtemp |
5561 | - Released 1.0pre1 | 5565 | - Released 1.0pre1 |
5562 | 5566 | ||
5563 | $Id: ChangeLog,v 1.1261 2001/06/09 01:30:39 mouring Exp $ | 5567 | $Id: ChangeLog,v 1.1262 2001/06/09 01:32:29 mouring Exp $ |
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 | } |