diff options
author | Darren Tucker <dtucker@zip.com.au> | 2003-10-02 16:12:36 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2003-10-02 16:12:36 +1000 |
commit | 3e33cecf71860f73656a73b754cc7b7b9ec0b0ce (patch) | |
tree | 4c993022225dc70faeb42e23ff3323fd1deb717a /auth.h | |
parent | b210aa2cfa546d8c31f8c725d1de3050c747bd6e (diff) |
- markus@cvs.openbsd.org 2003/09/23 20:17:11
[Makefile.in auth1.c auth2.c auth.c auth.h auth-krb5.c canohost.c
cleanup.c clientloop.c fatal.c gss-serv.c log.c log.h monitor.c monitor.h
monitor_wrap.c monitor_wrap.h packet.c serverloop.c session.c session.h
ssh-agent.c sshd.c]
replace fatal_cleanup() and linked list of fatal callbacks with static
cleanup_exit() function. re-refine cleanup_exit() where appropriate,
allocate sshd's authctxt eary to allow simpler cleanup in sshd.
tested by many, ok deraadt@
Diffstat (limited to 'auth.h')
-rw-r--r-- | auth.h | 11 |
1 files changed, 4 insertions, 7 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth.h,v 1.46 2003/08/28 12:54:34 markus Exp $ */ | 1 | /* $OpenBSD: auth.h,v 1.47 2003/09/23 20:17:11 markus Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
@@ -118,15 +118,14 @@ int user_key_allowed(struct passwd *, Key *); | |||
118 | int auth_krb5(Authctxt *authctxt, krb5_data *auth, char **client, krb5_data *); | 118 | int auth_krb5(Authctxt *authctxt, krb5_data *auth, char **client, krb5_data *); |
119 | int auth_krb5_tgt(Authctxt *authctxt, krb5_data *tgt); | 119 | int auth_krb5_tgt(Authctxt *authctxt, krb5_data *tgt); |
120 | int auth_krb5_password(Authctxt *authctxt, const char *password); | 120 | int auth_krb5_password(Authctxt *authctxt, const char *password); |
121 | void krb5_cleanup_proc(void *authctxt); | 121 | void krb5_cleanup_proc(Authctxt *authctxt); |
122 | #endif /* KRB5 */ | 122 | #endif /* KRB5 */ |
123 | 123 | ||
124 | #include "auth-pam.h" | 124 | #include "auth-pam.h" |
125 | 125 | ||
126 | Authctxt *do_authentication(void); | 126 | void do_authentication(Authctxt *); |
127 | Authctxt *do_authentication2(void); | 127 | void do_authentication2(Authctxt *); |
128 | 128 | ||
129 | Authctxt *authctxt_new(void); | ||
130 | void auth_log(Authctxt *, int, char *, char *); | 129 | void auth_log(Authctxt *, int, char *, char *); |
131 | void userauth_finish(Authctxt *, int, char *); | 130 | void userauth_finish(Authctxt *, int, char *); |
132 | int auth_root_allowed(char *); | 131 | int auth_root_allowed(char *); |
@@ -149,8 +148,6 @@ char *get_challenge(Authctxt *); | |||
149 | int verify_response(Authctxt *, const char *); | 148 | int verify_response(Authctxt *, const char *); |
150 | void abandon_challenge_response(Authctxt *); | 149 | void abandon_challenge_response(Authctxt *); |
151 | 150 | ||
152 | struct passwd * auth_get_user(void); | ||
153 | |||
154 | char *expand_filename(const char *, struct passwd *); | 151 | char *expand_filename(const char *, struct passwd *); |
155 | char *authorized_keys_file(struct passwd *); | 152 | char *authorized_keys_file(struct passwd *); |
156 | char *authorized_keys_file2(struct passwd *); | 153 | char *authorized_keys_file2(struct passwd *); |