summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/channels.c
diff options
context:
space:
mode:
authormarkus <markus@openbsd.org>2001-06-05 10:24:32 +0000
committermarkus <markus@openbsd.org>2001-06-05 10:24:32 +0000
commita297ee3a0407aa71ab9e91d208cfca01708dfb1c (patch)
tree14f4c948cff0d8a34b704ca0dba617315dd256cc /usr.bin/ssh/channels.c
parentUndo accidentally commited changes. (diff)
downloadwireguard-openbsd-a297ee3a0407aa71ab9e91d208cfca01708dfb1c.tar.xz
wireguard-openbsd-a297ee3a0407aa71ab9e91d208cfca01708dfb1c.zip
don't delete the auth socket in channel_stop_listening()
auth_sock_cleanup_proc() will take care of this.
Diffstat (limited to 'usr.bin/ssh/channels.c')
-rw-r--r--usr.bin/ssh/channels.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/ssh/channels.c b/usr.bin/ssh/channels.c
index a7f83f60459..e2f5178dd96 100644
--- a/usr.bin/ssh/channels.c
+++ b/usr.bin/ssh/channels.c
@@ -40,7 +40,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: channels.c,v 1.123 2001/06/04 21:59:42 markus Exp $");
+RCSID("$OpenBSD: channels.c,v 1.124 2001/06/05 10:24:32 markus Exp $");
#include "ssh.h"
#include "ssh1.h"
@@ -352,7 +352,7 @@ channel_stop_listening()
switch (c->type) {
case SSH_CHANNEL_AUTH_SOCKET:
close(c->sock);
- unlink(c->path);
+ /* auth_sock_cleanup_proc deletes the socket */
channel_free(c);
break;
case SSH_CHANNEL_PORT_LISTENER:
@@ -2804,6 +2804,7 @@ auth_input_request_forwarding(struct passwd * pw)
if (nc == NULL) {
error("auth_input_request_forwarding: channel_new failed");
auth_sock_cleanup_proc(pw);
+ fatal_remove_cleanup(auth_sock_cleanup_proc, pw);
close(sock);
return 0;
}