diff options
author | Colin Watson <cjwatson@debian.org> | 2014-10-07 12:13:50 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2014-10-07 12:13:50 +0100 |
commit | 487bdb3a5ef6075887b830ccb8a0b14f6da78e93 (patch) | |
tree | a2cff6fec1e6c4b4153a170a3e172cfe6bfdec46 /auth.h | |
parent | 796ba4fd011b5d0d9d78d592ba2f30fc9d5ed2e7 (diff) | |
parent | 28453d58058a4d60c3ebe7d7f0c31a510cbf6158 (diff) |
Import openssh_6.7p1.orig.tar.gz
Diffstat (limited to 'auth.h')
-rw-r--r-- | auth.h | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth.h,v 1.77 2014/01/29 06:18:35 djm Exp $ */ | 1 | /* $OpenBSD: auth.h,v 1.78 2014/07/03 11:16:55 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
@@ -154,6 +154,7 @@ void auth_info(Authctxt *authctxt, const char *, ...) | |||
154 | __attribute__((__format__ (printf, 2, 3))) | 154 | __attribute__((__format__ (printf, 2, 3))) |
155 | __attribute__((__nonnull__ (2))); | 155 | __attribute__((__nonnull__ (2))); |
156 | void auth_log(Authctxt *, int, int, const char *, const char *); | 156 | void auth_log(Authctxt *, int, int, const char *, const char *); |
157 | void auth_maxtries_exceeded(Authctxt *) __attribute__((noreturn)); | ||
157 | void userauth_finish(Authctxt *, int, const char *, const char *); | 158 | void userauth_finish(Authctxt *, int, const char *, const char *); |
158 | int auth_root_allowed(const char *); | 159 | int auth_root_allowed(const char *); |
159 | 160 | ||
@@ -210,8 +211,6 @@ struct passwd *fakepw(void); | |||
210 | 211 | ||
211 | int sys_auth_passwd(Authctxt *, const char *); | 212 | int sys_auth_passwd(Authctxt *, const char *); |
212 | 213 | ||
213 | #define AUTH_FAIL_MSG "Too many authentication failures for %.100s" | ||
214 | |||
215 | #define SKEY_PROMPT "\nS/Key Password: " | 214 | #define SKEY_PROMPT "\nS/Key Password: " |
216 | 215 | ||
217 | #if defined(KRB5) && !defined(HEIMDAL) | 216 | #if defined(KRB5) && !defined(HEIMDAL) |