- (dtucker) [session.c] Bug #927: make .hushlogin silent again. ok djm@

[openssh.git] / auth.h

diff --git a/auth.h b/auth.h
index b6a6a49a5d84393ba0799c093a56daf8874dfc74..760337bea36d7362bfe88bbefe4c39e9d8ce1aaf 100644 (file)
--- a/auth.h
+++ b/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 $       */
 
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
@@ -66,6 +66,7 @@ struct Authctxt {
        krb5_ccache      krb5_fwd_ccache;
        krb5_principal   krb5_user;
        char            *krb5_ticket_file;
+       char            *krb5_ccname;
 #endif
        void            *methoddata;
 };
@@ -122,7 +123,9 @@ int auth_krb5_password(Authctxt *authctxt, const char *password);
 void   krb5_cleanup_proc(Authctxt *authctxt);
 #endif /* KRB5 */
 
-#ifdef USE_SHADOW
+#if defined(USE_SHADOW) && defined(HAS_SHADOW_EXPIRE)
+#include <shadow.h>
+int auth_shadow_acctexpired(struct spwd *);
 int auth_shadow_pwexpired(Authctxt *);
 #endif
 
@@ -134,6 +137,7 @@ void        do_authentication2(Authctxt *);
 
 void   auth_log(Authctxt *, int, char *, char *);
 void   userauth_finish(Authctxt *, int, char *);
+void   userauth_send_banner(const char *);
 int    auth_root_allowed(char *);
 
 char   *auth2_read_banner(void);
@@ -178,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"
 
 #define SKEY_PROMPT "\nS/Key Password: "