[openssh-commits] [openssh] 02/04: upstream commit

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit 1a75d14daf4b60db903e6103cf50e74e0cd0a76b
Author: markus at openbsd.org <markus at openbsd.org>
Date:   Wed May 4 14:29:58 2016 +0000

    upstream commit
    
    allow setting IdentityAgent to SSH_AUTH_SOCK; ok djm@
    
    Upstream-ID: 20c508480d8db3eef18942c0fc39b1fcf25652ac
---
 readconf.c    | 3 ++-
 ssh.c         | 5 +++--
 ssh_config.5  | 7 ++++++-
 sshd_config.5 | 6 +++---
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/readconf.c b/readconf.c
index 26436b3..c706fbf 100644
--- a/readconf.c
+++ b/readconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.c,v 1.253 2016/05/04 12:21:53 markus Exp $ */
+/* $OpenBSD: readconf.c,v 1.254 2016/05/04 14:29:58 markus Exp $ */
 /*
  * Author: Tatu Ylonen <ylo at cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo at cs.hut.fi>, Espoo, Finland
@@ -2034,6 +2034,7 @@ fill_default_options(Options * options)
 	CLEAR_ON_NONE(options->proxy_command);
 	CLEAR_ON_NONE(options->control_path);
 	CLEAR_ON_NONE(options->revoked_host_keys);
+	/* options->identity_agent distinguishes NULL from 'none' */
 	/* options->user will be set in the main program if appropriate */
 	/* options->hostname will be set in the main program if appropriate */
 	/* options->host_key_alias should not be set by default */
diff --git a/ssh.c b/ssh.c
index ea52bbf..7a536a0 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.439 2016/05/04 12:21:53 markus Exp $ */
+/* $OpenBSD: ssh.c,v 1.440 2016/05/04 14:29:58 markus Exp $ */
 /*
  * Author: Tatu Ylonen <ylo at cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo at cs.hut.fi>, Espoo, Finland
@@ -1336,7 +1336,8 @@ main(int ac, char **av)
 	load_public_identity_files();
 
 	/* optionally set the SSH_AUTHSOCKET_ENV_NAME varibale */
-	if (options.identity_agent) {
+	if (options.identity_agent &&
+	    strcmp(options.identity_agent, SSH_AUTHSOCKET_ENV_NAME) != 0) {
 		if (strcmp(options.identity_agent, "none") == 0) {
 			unsetenv(SSH_AUTHSOCKET_ENV_NAME);
 		} else {
diff --git a/ssh_config.5 b/ssh_config.5
index be79011..45fe892 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -33,7 +33,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: ssh_config.5,v 1.231 2016/05/04 12:21:53 markus Exp $
+.\" $OpenBSD: ssh_config.5,v 1.232 2016/05/04 14:29:58 markus Exp $
 .Dd $Mdocdate: May 4 2016 $
 .Dt SSH_CONFIG 5
 .Os
@@ -963,6 +963,11 @@ environment variable and can be used to select a specific agent.
 Setting the socket name to
 .Dq none
 disables the use of an authentication agent.
+If the string
+.Dq SSH_AUTH_SOCK
+is specified, the location of the socket will be read from the
+.Ev SSH_AUTH_SOCK
+environment variable.
 .Pp
 The socket name may use the tilde
 syntax to refer to a user's home directory or one of the following
diff --git a/sshd_config.5 b/sshd_config.5
index 63807c0..479fa38 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -33,8 +33,8 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: sshd_config.5,v 1.222 2016/04/27 13:53:48 jmc Exp $
-.Dd $Mdocdate: April 27 2016 $
+.\" $OpenBSD: sshd_config.5,v 1.223 2016/05/04 14:29:58 markus Exp $
+.Dd $Mdocdate: May 4 2016 $
 .Dt SSHD_CONFIG 5
 .Os
 .Sh NAME
@@ -738,7 +738,7 @@ to an
 .It Cm HostKeyAgent
 Identifies the UNIX-domain socket used to communicate
 with an agent that has access to the private host keys.
-If
+If the string
 .Dq SSH_AUTH_SOCK
 is specified, the location of the socket will be read from the
 .Ev SSH_AUTH_SOCK

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.