diff options
| author | des <des@FreeBSD.org> | 2004-02-26 10:52:33 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2004-02-26 10:52:33 +0000 |
| commit | 124c4a14153799ec55cc535db5222b1780208aa1 (patch) | |
| tree | 91bbaf12f7d9b9158ae725f996c95f18038af40c /crypto/openssh/auth-pam.h | |
| parent | 1754c77e5e8ce4ec5f746dc5ce34e4cb54e3130f (diff) | |
| download | FreeBSD-src-124c4a14153799ec55cc535db5222b1780208aa1.zip FreeBSD-src-124c4a14153799ec55cc535db5222b1780208aa1.tar.gz | |
Resolve conflicts.
Diffstat (limited to 'crypto/openssh/auth-pam.h')
| -rw-r--r-- | crypto/openssh/auth-pam.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/crypto/openssh/auth-pam.h b/crypto/openssh/auth-pam.h index 0e8b4b1..cf74dd5 100644 --- a/crypto/openssh/auth-pam.h +++ b/crypto/openssh/auth-pam.h @@ -1,4 +1,4 @@ -/* $Id: auth-pam.h,v 1.21 2003/09/02 13:18:53 djm Exp $ */ +/* $Id: auth-pam.h,v 1.24 2004/02/10 02:23:29 dtucker Exp $ */ /* $FreeBSD$ */ /* @@ -38,11 +38,12 @@ u_int do_pam_account(void); void do_pam_session(void); void do_pam_set_tty(const char *); void do_pam_setcred(int ); -int is_pam_password_change_required(void); void do_pam_chauthtok(void); int do_pam_putenv(char *, char *); -void print_pam_messages(void); char ** fetch_pam_environment(void); +char ** fetch_pam_child_environment(void); void free_pam_environment(char **); +void sshpam_thread_cleanup(void); +void sshpam_cleanup(void); #endif /* USE_PAM */ |
