diff options
| author | des <des@FreeBSD.org> | 2004-10-28 16:11:31 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2004-10-28 16:11:31 +0000 |
| commit | a744ec13ade7d70128cd82393862d02c1f712f6a (patch) | |
| tree | 2b93d7eeb78a97c2cc9e93d61346f39150ed165f /crypto/openssh/auth.h | |
| parent | ca12ec184bb7b4d1d0ff5dc213f5da06de091b8c (diff) | |
| download | FreeBSD-src-a744ec13ade7d70128cd82393862d02c1f712f6a.zip FreeBSD-src-a744ec13ade7d70128cd82393862d02c1f712f6a.tar.gz | |
Resolve conflicts
Diffstat (limited to 'crypto/openssh/auth.h')
| -rw-r--r-- | crypto/openssh/auth.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/crypto/openssh/auth.h b/crypto/openssh/auth.h index 83841b6..b7639d9 100644 --- a/crypto/openssh/auth.h +++ b/crypto/openssh/auth.h @@ -1,4 +1,4 @@ -/* $OpenBSD: auth.h,v 1.49 2004/01/30 09:48:57 markus Exp $ */ +/* $OpenBSD: auth.h,v 1.50 2004/05/23 23:59:53 dtucker Exp $ */ /* $FreeBSD$ */ /* @@ -182,8 +182,6 @@ void auth_debug_reset(void); struct passwd *fakepw(void); -#define AUTH_FAIL_MAX 6 -#define AUTH_FAIL_LOG (AUTH_FAIL_MAX/2) #define AUTH_FAIL_MSG "Too many authentication failures for %.100s" #ifdef SKEY |
