1 files changed, 11 insertions, 13 deletions

diff --git a/auth.h b/auth.h
index 90802a5eb..8f13bdf48 100644
--- a/auth.h
+++ b/auth.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth.h,v 1.96 2018/04/10 00:10:49 djm Exp $ */
+/* $OpenBSD: auth.h,v 1.99 2019/01/19 21:43:56 djm Exp $ */
 
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
@@ -133,8 +133,8 @@ auth_rhosts2(struct passwd *, const char *, const char *, const char *);
 
 int      auth_password(struct ssh *, const char *);
 
-int      hostbased_key_allowed(struct passwd *, const char *, char *,
-            struct sshkey *);
+int      hostbased_key_allowed(struct ssh *, struct passwd *,
+            const char *, char *, struct sshkey *);
 int      user_key_allowed(struct ssh *, struct passwd *, struct sshkey *, int,
     struct sshauthopt **);
 int      auth2_key_already_used(Authctxt *, const struct sshkey *);
@@ -167,15 +167,13 @@ int auth_shadow_pwexpired(Authctxt *);
 #include "audit.h"
 void remove_kbdint_device(const char *);
 
-void    do_authentication2(Authctxt *);
+void    do_authentication2(struct ssh *);
 
-void    auth_log(Authctxt *, int, int, const char *, const char *);
-void    auth_maxtries_exceeded(Authctxt *) __attribute__((noreturn));
+void    auth_log(struct ssh *, int, int, const char *, const char *);
+void    auth_maxtries_exceeded(struct ssh *) __attribute__((noreturn));
 void    userauth_finish(struct ssh *, int, const char *, const char *);
 int     auth_root_allowed(struct ssh *, const char *);
 
-void    userauth_send_banner(const char *);
-
 char    *auth2_read_banner(void);
 int      auth2_methods_valid(const char *, int);
 int      auth2_update_methods_lists(Authctxt *, const char *, const char *);
@@ -189,8 +187,8 @@ void	auth2_challenge_stop(struct ssh *);
 int     bsdauth_query(void *, char **, char **, u_int *, char ***, u_int **);
 int     bsdauth_respond(void *, u_int, char **);
 
-int     allowed_user(struct passwd *);
-struct passwd * getpwnamallow(const char *user);
+int     allowed_user(struct ssh *, struct passwd *);
+struct passwd * getpwnamallow(struct ssh *, const char *user);
 
 char    *expand_authorized_keys(const char *, struct passwd *pw);
 char    *authorized_principals_file(struct passwd *);
@@ -211,8 +209,8 @@ struct sshkey	*get_hostkey_public_by_index(int, struct ssh *);
 struct sshkey   *get_hostkey_public_by_type(int, int, struct ssh *);
 struct sshkey   *get_hostkey_private_by_type(int, int, struct ssh *);
 int      get_hostkey_index(struct sshkey *, int, struct ssh *);
-int      sshd_hostkey_sign(struct sshkey *, struct sshkey *, u_char **,
-             size_t *, const u_char *, size_t, const char *, u_int);
+int      sshd_hostkey_sign(struct ssh *, struct sshkey *, struct sshkey *,
+    u_char **, size_t *, const u_char *, size_t, const char *);
 
 /* Key / cert options linkage to auth layer */
 const struct sshauthopt *auth_options(struct ssh *);
@@ -225,7 +223,7 @@ void	 auth_log_authopts(const char *, const struct sshauthopt *, int);
 /* debug messages during authentication */
 void     auth_debug_add(const char *fmt,...)
     __attribute__((format(printf, 1, 2)));
-void     auth_debug_send(void);
+void     auth_debug_send(struct ssh *);
 void     auth_debug_reset(void);
 
 struct passwd *fakepw(void);