diff options
author | des <des@FreeBSD.org> | 2006-11-10 16:52:41 +0000 |
---|---|---|
committer | des <des@FreeBSD.org> | 2006-11-10 16:52:41 +0000 |
commit | f486315183c122f23f1b35b42ac8dd3c2b635caa (patch) | |
tree | 538ffcf6acb6ece62b0734e0707ef5a1e8efbd7a /crypto/openssh/monitor.c | |
parent | 11e3a8c8c1e6142fc51e7fc357907b54bd433aa7 (diff) | |
download | FreeBSD-src-f486315183c122f23f1b35b42ac8dd3c2b635caa.zip FreeBSD-src-f486315183c122f23f1b35b42ac8dd3c2b635caa.tar.gz |
Resolve conflicts.
Diffstat (limited to 'crypto/openssh/monitor.c')
-rw-r--r-- | crypto/openssh/monitor.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crypto/openssh/monitor.c b/crypto/openssh/monitor.c index 0bc172f..8702a91 100644 --- a/crypto/openssh/monitor.c +++ b/crypto/openssh/monitor.c @@ -1,4 +1,4 @@ -/* $OpenBSD: monitor.c,v 1.88 2006/08/12 20:46:46 miod Exp $ */ +/* $OpenBSD: monitor.c,v 1.89 2006/11/07 10:31:31 markus Exp $ */ /* * Copyright 2002 Niels Provos <provos@citi.umich.edu> * Copyright 2002 Markus Friedl <markus@openbsd.org> @@ -359,7 +359,7 @@ monitor_child_preauth(Authctxt *_authctxt, struct monitor *pmonitor) /* The first few requests do not require asynchronous access */ while (!authenticated) { auth_method = "unknown"; - authenticated = monitor_read(pmonitor, mon_dispatch, &ent); + authenticated = (monitor_read(pmonitor, mon_dispatch, &ent) == 1); if (authenticated) { if (!(ent->flags & MON_AUTHDECIDE)) fatal("%s: unexpected authentication from %d", @@ -1226,7 +1226,7 @@ mm_answer_keyverify(int sock, Buffer *m) verified = key_verify(key, signature, signaturelen, data, datalen); debug3("%s: key %p signature %s", - __func__, key, verified ? "verified" : "unverified"); + __func__, key, (verified == 1) ? "verified" : "unverified"); key_free(key); xfree(blob); @@ -1241,7 +1241,7 @@ mm_answer_keyverify(int sock, Buffer *m) buffer_put_int(m, verified); mm_request_send(sock, MONITOR_ANS_KEYVERIFY, m); - return (verified); + return (verified == 1); } static void |