summaryrefslogtreecommitdiff
path: root/monitor.c
diff options
context:
space:
mode:
Diffstat (limited to 'monitor.c')
-rw-r--r--monitor.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/monitor.c b/monitor.c
index 6908a0a6b..d0ee4f7a6 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: monitor.c,v 1.147 2015/04/27 01:52:30 djm Exp $ */ 1/* $OpenBSD: monitor.c,v 1.149 2015/05/04 06:10:48 djm 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>
@@ -1215,9 +1215,9 @@ mm_answer_keyallowed(int sock, Buffer *m)
1215 allowed = options.pubkey_authentication && 1215 allowed = options.pubkey_authentication &&
1216 !auth2_userkey_already_used(authctxt, key) && 1216 !auth2_userkey_already_used(authctxt, key) &&
1217 match_pattern_list(sshkey_ssh_name(key), 1217 match_pattern_list(sshkey_ssh_name(key),
1218 options.pubkey_key_types, 1218 options.pubkey_key_types, 0) == 1 &&
1219 strlen(options.pubkey_key_types), 0) == 1 && 1219 user_key_allowed(authctxt->pw, key,
1220 user_key_allowed(authctxt->pw, key); 1220 pubkey_auth_attempt);
1221 pubkey_auth_info(authctxt, key, NULL); 1221 pubkey_auth_info(authctxt, key, NULL);
1222 auth_method = "publickey"; 1222 auth_method = "publickey";
1223 if (options.pubkey_authentication && allowed != 1) 1223 if (options.pubkey_authentication && allowed != 1)
@@ -1226,8 +1226,7 @@ mm_answer_keyallowed(int sock, Buffer *m)
1226 case MM_HOSTKEY: 1226 case MM_HOSTKEY:
1227 allowed = options.hostbased_authentication && 1227 allowed = options.hostbased_authentication &&
1228 match_pattern_list(sshkey_ssh_name(key), 1228 match_pattern_list(sshkey_ssh_name(key),
1229 options.hostbased_key_types, 1229 options.hostbased_key_types, 0) == 1 &&
1230 strlen(options.hostbased_key_types), 0) == 1 &&
1231 hostbased_key_allowed(authctxt->pw, 1230 hostbased_key_allowed(authctxt->pw,
1232 cuser, chost, key); 1231 cuser, chost, key);
1233 pubkey_auth_info(authctxt, key, 1232 pubkey_auth_info(authctxt, key,