upstream: Remove unneeded unlink of xauthfile o

=?UTF-8?q?n=20error=20path.=20=20From=20Erik=20Sj=C3=B6lund=20via=20githu?=
=?UTF-8?q?b,=20ok=20djm@=20deraadt@?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

OpenBSD-Commit-ID: 62a4893cf83b29a4bbfedc40e7067c25c203e632

diff --git a/clientloop.c b/clientloop.c
index 244de9871af2ffc06a16c10f2426a02f4a7d8e0f..ccf8f4b8c91462cd93dc03d759ea5eb7e7f40f4d 100644 (file)
--- a/clientloop.c
+++ b/clientloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clientloop.c,v 1.324 2019/06/12 11:31:50 jmc Exp $ */
+/* $OpenBSD: clientloop.c,v 1.325 2019/06/26 22:29:43 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -338,7 +338,6 @@ client_x11_get_proto(struct ssh *ssh, const char *display,
                            "%s/xauthfile", xauthdir)) < 0 ||
                            (size_t)r >= sizeof(xauthfile)) {
                                error("%s: xauthfile path too long", __func__);
-                               unlink(xauthfile);
                                rmdir(xauthdir);
                                return -1;
                        }