- markus@cvs.openbsd.org 2002/05/31 11:35:15

     [auth.h auth2.c]
     move Authmethod definitons to per-method file.

NOTE: The rest of this patch is with the import of the auth2-*.c files.

1 files changed, 8 insertions, 8 deletions

diff --git a/auth.h b/auth.h
index 59646ebe..d98547d0 100644
--- a/auth.h
+++ b/auth.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: auth.h,v 1.38 2002/05/25 18:51:07 markus Exp $	*/
+/*	$OpenBSD: auth.h,v 1.39 2002/05/31 11:35:15 markus Exp $	*/
 
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
@@ -43,6 +43,7 @@
 #endif
 
 typedef struct Authctxt Authctxt;
+typedef struct Authmethod Authmethod;
 typedef struct KbdintDevice KbdintDevice;
 
 struct Authctxt {
@@ -71,6 +72,12 @@ struct Authctxt {
 #endif
 };
 
+struct Authmethod {
+	char	*name;
+	int	(*userauth)(Authctxt *authctxt);
+	int	*enabled;
+};
+
 /*
  * Keyboard interactive device:
  * init_ctx	returns: non NULL upon success
@@ -100,13 +107,6 @@ BIGNUM	*auth_rsa_generate_challenge(Key *);
 int	 auth_rsa_verify_response(Key *, BIGNUM *, u_char[]);
 int	 auth_rsa_key_allowed(struct passwd *, BIGNUM *, Key **);
 
-/* ssh2 methods */
-int	 userauth_none(Authctxt *);
-int	 userauth_passwd(Authctxt *);
-int	 userauth_pubkey(Authctxt *);
-int	 userauth_hostbased(Authctxt *);
-int	 userauth_kbdint(Authctxt *);
-
 int	 auth_rhosts_rsa_key_allowed(struct passwd *, char *, char *, Key *);
 int	 hostbased_key_allowed(struct passwd *, const char *, char *, Key *);
 int	 user_key_allowed(struct passwd *, Key *);