summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordtucker@openbsd.org <dtucker@openbsd.org>2019-06-26 22:29:43 +0000
committerDarren Tucker <dtucker@dtucker.net>2019-06-27 09:43:39 +1000
commit7959330a554051b5587f8af3fec0c2c0d5820f64 (patch)
tree53ff01caee3bf1693476369e0c2fbd560e41d18f
parent8de52eb224143783a49f9bddd9ab7800022a8276 (diff)
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
-rw-r--r--clientloop.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/clientloop.c b/clientloop.c
index 244de987..ccf8f4b8 100644
--- 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;
}