diff options
author | Colin Watson <cjwatson@debian.org> | 2003-09-23 18:08:35 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2003-09-23 18:08:35 +0000 |
commit | d59fd3e421aa81b8e5e118f3f806081df2aca879 (patch) | |
tree | 356a4e607edc979c625bb33db63c656d771478bd /monitor_wrap.h | |
parent | 7505658c58e96b8d270f1928a0e1fa7f3e0c266b (diff) | |
parent | 45431c9b4677608680cd071768cbf156b316a7e8 (diff) |
Merge 3.7.1p2 to the trunk. I have absolutely no idea yet whether this will
work.
Diffstat (limited to 'monitor_wrap.h')
-rw-r--r-- | monitor_wrap.h | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/monitor_wrap.h b/monitor_wrap.h index d960a3d0b..5e0334588 100644 --- a/monitor_wrap.h +++ b/monitor_wrap.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: monitor_wrap.h,v 1.8 2002/09/26 11:38:43 markus Exp $ */ | 1 | /* $OpenBSD: monitor_wrap.h,v 1.11 2003/08/28 12:54:34 markus Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> | 4 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> |
@@ -55,8 +55,21 @@ int mm_auth_rsa_key_allowed(struct passwd *, BIGNUM *, Key **); | |||
55 | int mm_auth_rsa_verify_response(Key *, BIGNUM *, u_char *); | 55 | int mm_auth_rsa_verify_response(Key *, BIGNUM *, u_char *); |
56 | BIGNUM *mm_auth_rsa_generate_challenge(Key *); | 56 | BIGNUM *mm_auth_rsa_generate_challenge(Key *); |
57 | 57 | ||
58 | #ifdef GSSAPI | ||
59 | #include "ssh-gss.h" | ||
60 | OM_uint32 mm_ssh_gssapi_server_ctx(Gssctxt **ctxt, gss_OID oid); | ||
61 | OM_uint32 mm_ssh_gssapi_accept_ctx(Gssctxt *ctxt, | ||
62 | gss_buffer_desc *recv, gss_buffer_desc *send, OM_uint32 *flags); | ||
63 | int mm_ssh_gssapi_userok(char *user); | ||
64 | #endif | ||
65 | |||
58 | #ifdef USE_PAM | 66 | #ifdef USE_PAM |
59 | void mm_start_pam(char *); | 67 | void mm_start_pam(char *); |
68 | u_int mm_do_pam_account(void); | ||
69 | void *mm_sshpam_init_ctx(struct Authctxt *); | ||
70 | int mm_sshpam_query(void *, char **, char **, u_int *, char ***, u_int **); | ||
71 | int mm_sshpam_respond(void *, u_int, char **); | ||
72 | void mm_sshpam_free_ctx(void *); | ||
60 | #endif | 73 | #endif |
61 | 74 | ||
62 | void mm_terminate(void); | 75 | void mm_terminate(void); |
@@ -83,16 +96,6 @@ int mm_bsdauth_respond(void *, u_int, char **); | |||
83 | int mm_skey_query(void *, char **, char **, u_int *, char ***, u_int **); | 96 | int mm_skey_query(void *, char **, char **, u_int *, char ***, u_int **); |
84 | int mm_skey_respond(void *, u_int, char **); | 97 | int mm_skey_respond(void *, u_int, char **); |
85 | 98 | ||
86 | /* auth_krb */ | ||
87 | #ifdef KRB4 | ||
88 | int mm_auth_krb4(struct Authctxt *, void *, char **, void *); | ||
89 | #endif | ||
90 | #ifdef KRB5 | ||
91 | /* auth and reply are really krb5_data objects, but we don't want to | ||
92 | * include all of the krb5 headers here */ | ||
93 | int mm_auth_krb5(void *authctxt, void *auth, char **client, void *reply); | ||
94 | #endif | ||
95 | |||
96 | /* zlib allocation hooks */ | 99 | /* zlib allocation hooks */ |
97 | 100 | ||
98 | void *mm_zalloc(struct mm_master *, u_int, u_int); | 101 | void *mm_zalloc(struct mm_master *, u_int, u_int); |