tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- 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.
This commit is contained in:
Ben Lindstrom 2001-06-09 01:32:29 +00:00
parent a238f6e834
commit df4981bc31
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -49,6 +49,10 @@
- pvalchev@cvs.openbsd.org 2001/06/05 05:05:39 - pvalchev@cvs.openbsd.org 2001/06/05 05:05:39
[ssh-keyscan.1 ssh-keyscan.c] [ssh-keyscan.1 ssh-keyscan.c]
License clarification from David Mazieres, ok deraadt@ 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 20010606
- OpenBSD CVS Sync - OpenBSD CVS Sync
@ -5560,4 +5564,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - 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 $

5
channels.c
View File

@ -40,7 +40,7 @@
*/ */
#include "includes.h" #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 "ssh.h"
#include "ssh1.h" #include "ssh1.h"
@ -352,7 +352,7 @@ channel_stop_listening()
switch (c->type) { switch (c->type) {
case SSH_CHANNEL_AUTH_SOCKET: case SSH_CHANNEL_AUTH_SOCKET:
close(c->sock); close(c->sock);
unlink(c->path); /* auth_sock_cleanup_proc deletes the socket */
channel_free(c); channel_free(c);
break; break;
case SSH_CHANNEL_PORT_LISTENER: case SSH_CHANNEL_PORT_LISTENER:
@ -2861,6 +2861,7 @@ auth_input_request_forwarding(struct passwd * pw)
if (nc == NULL) { if (nc == NULL) {
error("auth_input_request_forwarding: channel_new failed"); error("auth_input_request_forwarding: channel_new failed");
auth_sock_cleanup_proc(pw); auth_sock_cleanup_proc(pw);
fatal_remove_cleanup(auth_sock_cleanup_proc, pw);
close(sock); close(sock);
return 0; return 0;
} }