summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2003-05-26 21:36:13 +1000
committerDamien Miller <djm@mindrot.org>2003-05-26 21:36:13 +1000
commita6a7c19dcbd96553b63b7524490e3528bd726ed8 (patch)
tree1acaf2b41a7bdcfdf90a536e93b15948fa6c995a
parent9155a681fdbae4c5a90959f0444275a1396b19cf (diff)
- (djm) Avoid auth2-chall.c warning when compiling without
PAM, BSD_AUTH and SKEY
-rw-r--r--ChangeLog6
-rw-r--r--auth2-chall.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 1ee9299a2..4b8381e91 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
120030526
2 - (djm) Avoid auth2-chall.c warning when compiling without
3 PAM, BSD_AUTH and SKEY
4
120030525 520030525
2- (djm) OpenBSD CVS Sync 6- (djm) OpenBSD CVS Sync
3 - djm@cvs.openbsd.org 2003/05/24 09:02:22 7 - djm@cvs.openbsd.org 2003/05/24 09:02:22
@@ -1614,4 +1618,4 @@
1614 save auth method before monitor_reset_key_state(); bugzilla bug #284; 1618 save auth method before monitor_reset_key_state(); bugzilla bug #284;
1615 ok provos@ 1619 ok provos@
1616 1620
1617$Id: ChangeLog,v 1.2751 2003/05/25 04:38:33 djm Exp $ 1621$Id: ChangeLog,v 1.2752 2003/05/26 11:36:13 djm Exp $
diff --git a/auth2-chall.c b/auth2-chall.c
index 12e3cc934..aacbf0bcc 100644
--- a/auth2-chall.c
+++ b/auth2-chall.c
@@ -326,6 +326,9 @@ input_userauth_info_response(int type, u_int32_t seq, void *ctxt)
326void 326void
327privsep_challenge_enable(void) 327privsep_challenge_enable(void)
328{ 328{
329#if defined(BSD_AUTH) || defined(USE_PAM) || defined(SKEY)
330 int n = 0;
331#endif
329#ifdef BSD_AUTH 332#ifdef BSD_AUTH
330 extern KbdintDevice mm_bsdauth_device; 333 extern KbdintDevice mm_bsdauth_device;
331#endif 334#endif
@@ -335,7 +338,6 @@ privsep_challenge_enable(void)
335#ifdef SKEY 338#ifdef SKEY
336 extern KbdintDevice mm_skey_device; 339 extern KbdintDevice mm_skey_device;
337#endif 340#endif
338 int n = 0;
339 341
340#ifdef BSD_AUTH 342#ifdef BSD_AUTH
341 devices[n++] = &mm_bsdauth_device; 343 devices[n++] = &mm_bsdauth_device;