diff options
| author | des <des@FreeBSD.org> | 2004-01-07 11:16:27 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2004-01-07 11:16:27 +0000 |
| commit | 7545fb1c7eaf9a0f07cf592ab1b5aa8f59a59866 (patch) | |
| tree | 5fffd9d1fcec3a05be383fc9aa81e1eb5e7935de /crypto/openssh/auth2-chall.c | |
| parent | b5f9e06a6d8d64c8429e25a1bc1ebfad436bf477 (diff) | |
| download | FreeBSD-src-7545fb1c7eaf9a0f07cf592ab1b5aa8f59a59866.zip FreeBSD-src-7545fb1c7eaf9a0f07cf592ab1b5aa8f59a59866.tar.gz | |
Resolve conflicts and remove obsolete files.
Sponsored by: registrar.no
Diffstat (limited to 'crypto/openssh/auth2-chall.c')
| -rw-r--r-- | crypto/openssh/auth2-chall.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/crypto/openssh/auth2-chall.c b/crypto/openssh/auth2-chall.c index 1e48387..4e2a0f9 100644 --- a/crypto/openssh/auth2-chall.c +++ b/crypto/openssh/auth2-chall.c @@ -43,7 +43,7 @@ static void input_userauth_info_response(int, u_int32_t, void *); extern KbdintDevice bsdauth_device; #else #ifdef USE_PAM -extern KbdintDevice pam_device; +extern KbdintDevice sshpam_device; #endif #ifdef SKEY extern KbdintDevice skey_device; @@ -55,7 +55,7 @@ KbdintDevice *devices[] = { &bsdauth_device, #else #ifdef USE_PAM - &pam_device, + &sshpam_device, #endif #ifdef SKEY &skey_device, @@ -327,22 +327,24 @@ input_userauth_info_response(int type, u_int32_t seq, void *ctxt) void privsep_challenge_enable(void) { +#if defined(BSD_AUTH) || defined(USE_PAM) || defined(SKEY) + int n = 0; +#endif #ifdef BSD_AUTH extern KbdintDevice mm_bsdauth_device; #endif #ifdef USE_PAM - extern KbdintDevice mm_pam_device; + extern KbdintDevice mm_sshpam_device; #endif #ifdef SKEY extern KbdintDevice mm_skey_device; #endif - int n = 0; #ifdef BSD_AUTH devices[n++] = &mm_bsdauth_device; #else #ifdef USE_PAM - devices[n++] = &mm_pam_device; + devices[n++] = &mm_sshpam_device; #endif #ifdef SKEY devices[n++] = &mm_skey_device; |
