Import openssh_6.9p1.orig.tar.gz

1 files changed, 3 insertions, 3 deletions

diff --git a/auth.h b/auth.h
index db8603760..8b27575b0 100644
--- a/auth.h
+++ b/auth.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth.h,v 1.82 2015/02/16 22:13:32 djm Exp $ */
+/* $OpenBSD: auth.h,v 1.84 2015/05/08 06:41:56 djm Exp $ */
 
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
@@ -56,7 +56,7 @@ struct Authctxt {
         int              valid;         /* user exists and is allowed to login */
         int              attempt;
         int              failures;
-        int              server_caused_failure; 
+        int              server_caused_failure;
         int              force_pwchange;
         char            *user;          /* username sent by the client */
         char            *service;
@@ -126,7 +126,7 @@ int	 auth_rsa_key_allowed(struct passwd *, BIGNUM *, Key **);
 
 int      auth_rhosts_rsa_key_allowed(struct passwd *, char *, char *, Key *);
 int      hostbased_key_allowed(struct passwd *, const char *, char *, Key *);
-int      user_key_allowed(struct passwd *, Key *);
+int      user_key_allowed(struct passwd *, Key *, int);
 void     pubkey_auth_info(Authctxt *, const Key *, const char *, ...)
             __attribute__((__format__ (printf, 3, 4)));
 void     auth2_record_userkey(Authctxt *, struct sshkey *);