diff options
author | Damien Miller <djm@mindrot.org> | 2003-09-02 22:51:17 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2003-09-02 22:51:17 +1000 |
commit | 1a0c0b96219b037865d624079a81ab7d88bbccc1 (patch) | |
tree | ad24303a17d1f49c98b66d5bfe014103019411af /monitor_wrap.h | |
parent | 55c47edc81accd3118fc0fda2c37765631c0aef0 (diff) |
- markus@cvs.openbsd.org 2003/08/28 12:54:34
[auth-krb5.c auth.h auth1.c monitor.c monitor.h monitor_wrap.c]
[monitor_wrap.h readconf.c servconf.c session.c ssh_config.5]
[sshconnect1.c sshd.c sshd_config sshd_config.5]
remove kerberos support from ssh1, since it has been replaced with GSSAPI;
but keep kerberos passwd auth for ssh1 and 2; ok djm, hin, henning, ...
Diffstat (limited to 'monitor_wrap.h')
-rw-r--r-- | monitor_wrap.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/monitor_wrap.h b/monitor_wrap.h index c6251924a..5e0334588 100644 --- a/monitor_wrap.h +++ b/monitor_wrap.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: monitor_wrap.h,v 1.10 2003/08/22 10:56:09 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> |
@@ -96,13 +96,6 @@ int mm_bsdauth_respond(void *, u_int, char **); | |||
96 | 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 **); |
97 | int mm_skey_respond(void *, u_int, char **); | 97 | int mm_skey_respond(void *, u_int, char **); |
98 | 98 | ||
99 | /* auth_krb */ | ||
100 | #ifdef KRB5 | ||
101 | /* auth and reply are really krb5_data objects, but we don't want to | ||
102 | * include all of the krb5 headers here */ | ||
103 | int mm_auth_krb5(void *authctxt, void *auth, char **client, void *reply); | ||
104 | #endif | ||
105 | |||
106 | /* zlib allocation hooks */ | 99 | /* zlib allocation hooks */ |
107 | 100 | ||
108 | void *mm_zalloc(struct mm_master *, u_int, u_int); | 101 | void *mm_zalloc(struct mm_master *, u_int, u_int); |