- millert@cvs.openbsd.org 2001/03/04 17:42:28

[openssh.git] / auth.h

diff --git a/auth.h b/auth.h
index b604e630492f0ce3039d3bf6be44824f4deeb460..6afce6b3aa55bdbd86ca0d87fda471cb4bafcf93 100644 (file)
--- a/auth.h
+++ b/auth.h
@@ -21,13 +21,20 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $OpenBSD: auth.h,v 1.10 2001/01/21 19:05:43 markus Exp $
+ * $OpenBSD: auth.h,v 1.12 2001/02/22 21:59:43 markus Exp $
  */
 #ifndef AUTH_H
 #define AUTH_H
 
 #include <openssl/rsa.h>
 
+#ifdef HAVE_LOGIN_CAP
+#include <login_cap.h>
+#endif
+#ifdef BSD_AUTH
+#include <bsd_auth.h>
+#endif
+
 typedef struct Authctxt Authctxt;
 struct Authctxt {
        int success;
@@ -39,6 +46,9 @@ struct Authctxt {
        char *service;
        struct passwd *pw;
        char *style;
+#ifdef BSD_AUTH
+       auth_session_t *as;
+#endif
 };
 
 /*
@@ -59,7 +69,7 @@ auth_rhosts_rsa(struct passwd * pw, const char *client_user, RSA* client_host_ke
  * Tries to authenticate the user using password.  Returns true if
  * authentication succeeds.
  */
-int     auth_password(struct passwd * pw, const char *password);
+int     auth_password(Authctxt *authctxt, const char *password);
 
 /*
  * Performs the RSA authentication dialog with the client.  This returns 0 if
@@ -112,7 +122,7 @@ void        do_authentication2(void);
 Authctxt *authctxt_new(void);
 void   auth_log(Authctxt *authctxt, int authenticated, char *method, char *info);
 void   userauth_reply(Authctxt *authctxt, int authenticated);
-int    auth_root_allowed(void);
+int    auth_root_allowed(char *method);
 
 int    auth2_challenge(Authctxt *authctxt, char *devs);
 
@@ -122,7 +132,6 @@ char        *get_challenge(Authctxt *authctxt, char *devs);
 int    verify_response(Authctxt *authctxt, char *response);
 
 struct passwd * auth_get_user(void);
-struct passwd * pwcopy(struct passwd *pw);
 
 #define AUTH_FAIL_MAX 6
 #define AUTH_FAIL_LOG (AUTH_FAIL_MAX/2)