From 218f178cb20c276027e972bff0208043fcf533a3 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Mon, 24 Jan 2005 22:50:47 +1100
Subject: [PATCH]    - dtucker@cvs.openbsd.org 2005/01/24 11:47:13     
 [auth-passwd.c]      #if -> #ifdef so builds without HAVE_LOGIN_CAP work too;
 ok djm@ otto@

---
 ChangeLog     | 5 ++++-
 auth-passwd.c | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3fa91cf9c..703d8e670 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,9 @@
    - dtucker@cvs.openbsd.org 2005/01/24 10:29:06
      [moduli]
      Import new moduli; requested by deraadt@ a week ago
+   - dtucker@cvs.openbsd.org 2005/01/24 11:47:13
+     [auth-passwd.c]
+     #if -> #ifdef so builds without HAVE_LOGIN_CAP work too; ok djm@ otto@
 
 20050120
  - (dtucker) OpenBSD CVS Sync
@@ -2040,4 +2043,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3625 2005/01/24 11:00:40 dtucker Exp $
+$Id: ChangeLog,v 1.3626 2005/01/24 11:50:47 dtucker Exp $
diff --git a/auth-passwd.c b/auth-passwd.c
index 2e5fbc73a..fb14f5ce4 100644
--- a/auth-passwd.c
+++ b/auth-passwd.c
@@ -36,7 +36,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: auth-passwd.c,v 1.32 2005/01/21 08:32:02 otto Exp $");
+RCSID("$OpenBSD: auth-passwd.c,v 1.33 2005/01/24 11:47:13 dtucker Exp $");
 
 #include "packet.h"
 #include "buffer.h"
@@ -131,7 +131,7 @@ warn_expiry(Authctxt *authctxt, auth_session_t *as)
 
 	pwtimeleft = auth_check_change(as);
 	actimeleft = auth_check_expire(as);
-#if HAVE_LOGIN_CAP
+#ifdef HAVE_LOGIN_CAP
 	if (authctxt->valid) {
 		pwwarntime = login_getcaptime(lc, "password-warn", TWO_WEEKS,
 		    TWO_WEEKS);