===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/channels.c,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- src/usr.bin/ssh/channels.c	2001/06/04 21:59:42	1.123
+++ src/usr.bin/ssh/channels.c	2001/06/05 10:24:32	1.124
@@ -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 @@
 			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 @@
 	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;
 	}