From: miod@openbsd.org <miod@openbsd.org>
Date: Sun, 5 Apr 2015 15:43:43 +0000 (+0000)
Subject: upstream commit
X-Git-Tag: V_6_9_P1~126
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c265e2e6e932efc6d86f6cc885dea33637a67564;p=thirdparty%2Fopenssh-portable.git

upstream commit

Do not use int for sig_atomic_t; spotted by
 christos@netbsd; ok markus@
---

diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index c5fb3b524..61b4ca568 100644
--- a/ssh-keyscan.c
+++ b/ssh-keyscan.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keyscan.c,v 1.99 2015/01/30 10:44:49 djm Exp $ */
+/* $OpenBSD: ssh-keyscan.c,v 1.100 2015/04/05 15:43:43 miod Exp $ */
 /*
  * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
  *
@@ -94,7 +94,7 @@ typedef struct Connection {
 	int c_len;		/* Total bytes which must be read. */
 	int c_off;		/* Length of data read so far. */
 	int c_keytype;		/* Only one of KT_RSA1, KT_DSA, or KT_RSA */
-	int c_done;		/* SSH2 done */
+	sig_atomic_t c_done;	/* SSH2 done */
 	char *c_namebase;	/* Address to free for c_name and c_namelist */
 	char *c_name;		/* Hostname of connection for errors */
 	char *c_namelist;	/* Pointer to other possible addresses */