From df4981bc316d6f9fc9aab8c6198d2396890ba255 Mon Sep 17 00:00:00 2001 From: Ben Lindstrom Date: Sat, 9 Jun 2001 01:32:29 +0000 Subject: - markus@cvs.openbsd.org 2001/06/05 10:24:32 [channels.c] don't delete the auth socket in channel_stop_listening() auth_sock_cleanup_proc() will take care of this. --- ChangeLog | 6 +++++- channels.c | 5 +++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index c87d9f805..510444070 100644 --- a/ChangeLog +++ b/ChangeLog @@ -49,6 +49,10 @@ - pvalchev@cvs.openbsd.org 2001/06/05 05:05:39 [ssh-keyscan.1 ssh-keyscan.c] License clarification from David Mazieres, ok deraadt@ + - markus@cvs.openbsd.org 2001/06/05 10:24:32 + [channels.c] + don't delete the auth socket in channel_stop_listening() + auth_sock_cleanup_proc() will take care of this. 20010606 - OpenBSD CVS Sync @@ -5560,4 +5564,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.1261 2001/06/09 01:30:39 mouring Exp $ +$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 @@ */ #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: @@ -2861,6 +2861,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; } -- cgit v1.2.3