diff options
Diffstat (limited to 'monitor.c')
-rw-r--r-- | monitor.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: monitor.c,v 1.88 2006/08/12 20:46:46 miod Exp $ */ | 1 | /* $OpenBSD: monitor.c,v 1.89 2006/11/07 10:31:31 markus Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> | 3 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> |
4 | * Copyright 2002 Markus Friedl <markus@openbsd.org> | 4 | * Copyright 2002 Markus Friedl <markus@openbsd.org> |
@@ -350,7 +350,7 @@ monitor_child_preauth(Authctxt *_authctxt, struct monitor *pmonitor) | |||
350 | /* The first few requests do not require asynchronous access */ | 350 | /* The first few requests do not require asynchronous access */ |
351 | while (!authenticated) { | 351 | while (!authenticated) { |
352 | auth_method = "unknown"; | 352 | auth_method = "unknown"; |
353 | authenticated = monitor_read(pmonitor, mon_dispatch, &ent); | 353 | authenticated = (monitor_read(pmonitor, mon_dispatch, &ent) == 1); |
354 | if (authenticated) { | 354 | if (authenticated) { |
355 | if (!(ent->flags & MON_AUTHDECIDE)) | 355 | if (!(ent->flags & MON_AUTHDECIDE)) |
356 | fatal("%s: unexpected authentication from %d", | 356 | fatal("%s: unexpected authentication from %d", |
@@ -1217,7 +1217,7 @@ mm_answer_keyverify(int sock, Buffer *m) | |||
1217 | 1217 | ||
1218 | verified = key_verify(key, signature, signaturelen, data, datalen); | 1218 | verified = key_verify(key, signature, signaturelen, data, datalen); |
1219 | debug3("%s: key %p signature %s", | 1219 | debug3("%s: key %p signature %s", |
1220 | __func__, key, verified ? "verified" : "unverified"); | 1220 | __func__, key, (verified == 1) ? "verified" : "unverified"); |
1221 | 1221 | ||
1222 | key_free(key); | 1222 | key_free(key); |
1223 | xfree(blob); | 1223 | xfree(blob); |
@@ -1232,7 +1232,7 @@ mm_answer_keyverify(int sock, Buffer *m) | |||
1232 | buffer_put_int(m, verified); | 1232 | buffer_put_int(m, verified); |
1233 | mm_request_send(sock, MONITOR_ANS_KEYVERIFY, m); | 1233 | mm_request_send(sock, MONITOR_ANS_KEYVERIFY, m); |
1234 | 1234 | ||
1235 | return (verified); | 1235 | return (verified == 1); |
1236 | } | 1236 | } |
1237 | 1237 | ||
1238 | static void | 1238 | static void |