diff options
| author | des <des@FreeBSD.org> | 2002-06-27 22:42:11 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2002-06-27 22:42:11 +0000 |
| commit | 5ba29faa04960f19c0c3ff005c2b897c3094c1d6 (patch) | |
| tree | 8b0c3ca50a9406d306d417f78b63f73616b80615 /crypto/openssh/auth2-chall.c | |
| parent | 434f33d82438442b1dab7090fab90db4c3d02cdb (diff) | |
| download | FreeBSD-src-5ba29faa04960f19c0c3ff005c2b897c3094c1d6.zip FreeBSD-src-5ba29faa04960f19c0c3ff005c2b897c3094c1d6.tar.gz | |
Forcibly revert to mainline.
Diffstat (limited to 'crypto/openssh/auth2-chall.c')
| -rw-r--r-- | crypto/openssh/auth2-chall.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/crypto/openssh/auth2-chall.c b/crypto/openssh/auth2-chall.c index 1db7a81..f35bfb2 100644 --- a/crypto/openssh/auth2-chall.c +++ b/crypto/openssh/auth2-chall.c @@ -24,7 +24,6 @@ */ #include "includes.h" RCSID("$OpenBSD: auth2-chall.c,v 1.18 2002/06/19 00:27:55 deraadt Exp $"); -RCSID("$FreeBSD$"); #include "ssh2.h" #include "auth.h" @@ -41,20 +40,20 @@ static void input_userauth_info_response(int, u_int32_t, void *); #ifdef BSD_AUTH extern KbdintDevice bsdauth_device; -#elif defined(USE_PAM) -extern KbdintDevice pam_device; -#elif defined(SKEY) +#else +#ifdef SKEY extern KbdintDevice skey_device; #endif +#endif KbdintDevice *devices[] = { #ifdef BSD_AUTH &bsdauth_device, -#elif defined(USE_PAM) - &pam_device, -#elif defined(SKEY) +#else +#ifdef SKEY &skey_device, #endif +#endif NULL }; |
