summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordtucker <dtucker@openbsd.org>2019-06-26 22:29:43 +0000
committerdtucker <dtucker@openbsd.org>2019-06-26 22:29:43 +0000
commitd5c09e69dcc7484b14f8c37af8d349e13e6e2453 (patch)
tree6f659d5bb9913475c0baed1ce2e69b5732410572
parentThe POSIX-compatible way of checking for {v,}{f,s,sn,d}printf(3) (diff)
downloadwireguard-openbsd-d5c09e69dcc7484b14f8c37af8d349e13e6e2453.tar.xz
wireguard-openbsd-d5c09e69dcc7484b14f8c37af8d349e13e6e2453.zip
Remove unneeded unlink of xauthfile on error path. From Erik Sjölund via
github, ok djm@ deraadt@
-rw-r--r--usr.bin/ssh/clientloop.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/usr.bin/ssh/clientloop.c b/usr.bin/ssh/clientloop.c
index a0ec264a3f2..4c6d187c53b 100644
--- a/usr.bin/ssh/clientloop.c
+++ b/usr.bin/ssh/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
@@ -330,7 +330,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;
}