34 lines
1010 B
Diff
34 lines
1010 B
Diff
|
From 87d6cf1cbc91df6815db8fe0acc7c910bc3d18e4 Mon Sep 17 00:00:00 2001
|
||
|
|
From: "djm@openbsd.org" <djm@openbsd.org>
|
||
|
|
Date: Fri, 30 Nov 2018 02:24:52 +0000
|
||
|
|
Subject: [PATCH 135/294] upstream: don't attempt to connect to empty
|
||
|
|
SSH_AUTH_SOCK; bz#293
|
||
|
|
|
||
|
|
OpenBSD-Commit-ID: 0e8fc8f19f14b21adef7109e0faa583d87c0e929
|
||
|
|
---
|
||
|
|
authfd.c | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/authfd.c b/authfd.c
|
||
|
|
index ecdd869..cc9c650 100644
|
||
|
|
--- a/authfd.c
|
||
|
|
+++ b/authfd.c
|
||
|
|
@@ -1,4 +1,4 @@
|
||
|
|
-/* $OpenBSD: authfd.c,v 1.111 2018/07/09 21:59:10 markus Exp $ */
|
||
|
|
+/* $OpenBSD: authfd.c,v 1.112 2018/11/30 02:24:52 djm Exp $ */
|
||
|
|
/*
|
||
|
|
* Author: Tatu Ylonen <ylo@cs.hut.fi>
|
||
|
|
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
|
||
|
|
@@ -94,7 +94,7 @@ ssh_get_authentication_socket(int *fdp)
|
||
|
|
*fdp = -1;
|
||
|
|
|
||
|
|
authsocket = getenv(SSH_AUTHSOCKET_ENV_NAME);
|
||
|
|
- if (!authsocket)
|
||
|
|
+ if (authsocket == NULL || *authsocket == '\0')
|
||
|
|
return SSH_ERR_AGENT_NOT_PRESENT;
|
||
|
|
|
||
|
|
memset(&sunaddr, 0, sizeof(sunaddr));
|
||
|
|
--
|
||
|
|
1.8.3.1
|
||
|
|
|