summaryrefslogtreecommitdiff
path: root/auth2-hostbased.c
diff options
context:
space:
mode:
Diffstat (limited to 'auth2-hostbased.c')
-rw-r--r--auth2-hostbased.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/auth2-hostbased.c b/auth2-hostbased.c
index 2bde7bb79..505d3eff4 100644
--- a/auth2-hostbased.c
+++ b/auth2-hostbased.c
@@ -23,7 +23,7 @@
23 */ 23 */
24 24
25#include "includes.h" 25#include "includes.h"
26RCSID("$OpenBSD: auth2-hostbased.c,v 1.2 2002/05/31 11:35:15 markus Exp $"); 26RCSID("$OpenBSD: auth2-hostbased.c,v 1.5 2003/06/24 08:23:46 markus Exp $");
27 27
28#include "ssh2.h" 28#include "ssh2.h"
29#include "xmalloc.h" 29#include "xmalloc.h"
@@ -42,7 +42,7 @@ RCSID("$OpenBSD: auth2-hostbased.c,v 1.2 2002/05/31 11:35:15 markus Exp $");
42/* import */ 42/* import */
43extern ServerOptions options; 43extern ServerOptions options;
44extern u_char *session_id2; 44extern u_char *session_id2;
45extern int session_id2_len; 45extern u_int session_id2_len;
46 46
47static int 47static int
48userauth_hostbased(Authctxt *authctxt) 48userauth_hostbased(Authctxt *authctxt)
@@ -77,7 +77,7 @@ userauth_hostbased(Authctxt *authctxt)
77 pktype = key_type_from_name(pkalg); 77 pktype = key_type_from_name(pkalg);
78 if (pktype == KEY_UNSPEC) { 78 if (pktype == KEY_UNSPEC) {
79 /* this is perfectly legal */ 79 /* this is perfectly legal */
80 log("userauth_hostbased: unsupported " 80 logit("userauth_hostbased: unsupported "
81 "public key algorithm: %s", pkalg); 81 "public key algorithm: %s", pkalg);
82 goto done; 82 goto done;
83 } 83 }
@@ -136,7 +136,7 @@ hostbased_key_allowed(struct passwd *pw, const char *cuser, char *chost,
136 HostStatus host_status; 136 HostStatus host_status;
137 int len; 137 int len;
138 138
139 resolvedname = get_canonical_hostname(options.verify_reverse_mapping); 139 resolvedname = get_canonical_hostname(options.use_dns);
140 ipaddr = get_remote_ipaddr(); 140 ipaddr = get_remote_ipaddr();
141 141
142 debug2("userauth_hostbased: chost %s resolvedname %s ipaddr %s", 142 debug2("userauth_hostbased: chost %s resolvedname %s ipaddr %s",
@@ -152,7 +152,7 @@ hostbased_key_allowed(struct passwd *pw, const char *cuser, char *chost,
152 chost[len - 1] = '\0'; 152 chost[len - 1] = '\0';
153 } 153 }
154 if (strcasecmp(resolvedname, chost) != 0) 154 if (strcasecmp(resolvedname, chost) != 0)
155 log("userauth_hostbased mismatch: " 155 logit("userauth_hostbased mismatch: "
156 "client sends %s, but we resolve %s to %s", 156 "client sends %s, but we resolve %s to %s",
157 chost, ipaddr, resolvedname); 157 chost, ipaddr, resolvedname);
158 if (auth_rhosts2(pw, cuser, resolvedname, ipaddr) == 0) 158 if (auth_rhosts2(pw, cuser, resolvedname, ipaddr) == 0)