=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/auth.h,v retrieving revision 1.35.2.4 retrieving revision 1.36 diff -u -r1.35.2.4 -r1.36 --- src/usr.bin/ssh/auth.h 2002/10/11 14:51:52 1.35.2.4 +++ src/usr.bin/ssh/auth.h 2002/05/12 23:53:45 1.36 @@ -1,4 +1,4 @@ -/* $OpenBSD: auth.h,v 1.35.2.4 2002/10/11 14:51:52 miod Exp $ */ +/* $OpenBSD: auth.h,v 1.36 2002/05/12 23:53:45 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. @@ -43,7 +43,6 @@ #endif typedef struct Authctxt Authctxt; -typedef struct Authmethod Authmethod; typedef struct KbdintDevice KbdintDevice; struct Authctxt { @@ -72,12 +71,6 @@ #endif }; -struct Authmethod { - char *name; - int (*userauth)(Authctxt *authctxt); - int *enabled; -}; - /* * Keyboard interactive device: * init_ctx returns: non NULL upon success @@ -113,7 +106,7 @@ #ifdef KRB4 #include -int auth_krb4(Authctxt *, KTEXT, char **, KTEXT); +int auth_krb4(Authctxt *, KTEXT, char **); int auth_krb4_password(Authctxt *, const char *); void krb4_cleanup_proc(void *); @@ -126,7 +119,7 @@ #endif /* KRB4 */ #ifdef KRB5 -int auth_krb5(Authctxt *authctxt, krb5_data *auth, char **client, krb5_data *); +int auth_krb5(Authctxt *authctxt, krb5_data *auth, char **client); int auth_krb5_tgt(Authctxt *authctxt, krb5_data *tgt); int auth_krb5_password(Authctxt *authctxt, const char *password); void krb5_cleanup_proc(void *authctxt); @@ -175,11 +168,6 @@ Key *get_hostkey_by_type(int); int get_hostkey_index(Key *); int ssh1_session_key(BIGNUM *); - -/* debug messages during authentication */ -void auth_debug_add(const char *fmt,...) __attribute__((format(printf, 1, 2))); -void auth_debug_send(void); -void auth_debug_reset(void); #define AUTH_FAIL_MAX 6 #define AUTH_FAIL_LOG (AUTH_FAIL_MAX/2)