diff options
| author | des <des@FreeBSD.org> | 2004-04-20 09:46:41 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2004-04-20 09:46:41 +0000 |
| commit | e5d801b2d6aab34943ecb74550a852aa69c82f38 (patch) | |
| tree | 052572b83faf3cab81bed572534efc6912debcbf /crypto/openssh/monitor_wrap.h | |
| parent | efa35724649769e9a081ef6970590dd0b0a97370 (diff) | |
| download | FreeBSD-src-e5d801b2d6aab34943ecb74550a852aa69c82f38.zip FreeBSD-src-e5d801b2d6aab34943ecb74550a852aa69c82f38.tar.gz | |
Resolve conflicts.
Diffstat (limited to 'crypto/openssh/monitor_wrap.h')
| -rw-r--r-- | crypto/openssh/monitor_wrap.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/openssh/monitor_wrap.h b/crypto/openssh/monitor_wrap.h index c31bd2e..a7c9edd 100644 --- a/crypto/openssh/monitor_wrap.h +++ b/crypto/openssh/monitor_wrap.h @@ -67,7 +67,7 @@ OM_uint32 mm_ssh_gssapi_checkmic(Gssctxt *, gss_buffer_t, gss_buffer_t); #endif #ifdef USE_PAM -void mm_start_pam(char *); +void mm_start_pam(struct Authctxt *); u_int mm_do_pam_account(void); void *mm_sshpam_init_ctx(struct Authctxt *); int mm_sshpam_query(void *, char **, char **, u_int *, char ***, u_int **); |
