[openssh-commits] [openssh] 01/02: 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 e752c6d547036c602b89e9e704851463bd160e32
Author: djm at openbsd.org <djm at openbsd.org>
Date:   Thu Jan 8 13:44:36 2015 +0000

    upstream commit
    
    fix ssh_config FingerprintHash evaluation order; from Petr
     Lautrbach
---
 readconf.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/readconf.c b/readconf.c
index 399b73e..f1601af 100644
--- a/readconf.c
+++ b/readconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.c,v 1.224 2014/12/21 22:27:56 djm Exp $ */
+/* $OpenBSD: readconf.c,v 1.225 2015/01/08 13:44:36 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo at cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo at cs.hut.fi>, Espoo, Finland
@@ -1464,6 +1464,7 @@ parse_int:
 		goto parse_string;
 
 	case oFingerprintHash:
+		intptr = &options->fingerprint_hash;
 		arg = strdelim(&s);
 		if (!arg || *arg == '\0')
 			fatal("%.200s line %d: Missing argument.",
@@ -1471,8 +1472,8 @@ parse_int:
 		if ((value = ssh_digest_alg_by_name(arg)) == -1)
 			fatal("%.200s line %d: Invalid hash algorithm \"%s\".",
 			    filename, linenum, arg);
-		if (*activep)
-			options->fingerprint_hash = value;
+		if (*activep && *intptr == -1)
+			*intptr = value;
 		break;
 
 	case oDeprecated:

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