diff options
author | Darren Tucker <dtucker@zip.com.au> | 2003-08-02 22:24:49 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2003-08-02 22:24:49 +1000 |
commit | 6aaa58c4709c43ffb9f3f2be299cd5c4044f24a3 (patch) | |
tree | ecaaf1b076e187ff9e338c844547dec1be09e006 /monitor_wrap.h | |
parent | 4c29dd9f4438d2ab6ac8d2df361fd48360b208ab (diff) |
- (dtucker) OpenBSD CVS Sync
- markus@cvs.openbsd.org 2003/07/22 13:35:22
[auth1.c auth.h auth-passwd.c monitor.c monitor.h monitor_wrap.c
monitor_wrap.h readconf.c readconf.h servconf.c servconf.h session.c ssh.1
ssh.c ssh_config.5 sshconnect1.c sshd.c sshd_config.5 ssh.h]
remove (already disabled) KRB4/AFS support, re-enable -k in ssh(1);
test+ok henning@
- (dtucker) [Makefile.in acconfig.h configure.ac] Remove KRB4/AFS support.
- (dtucker) [auth-krb4.c radix.c radix.h] Remove KRB4/AFS specific files.
I hope I got this right....
Diffstat (limited to 'monitor_wrap.h')
-rw-r--r-- | monitor_wrap.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/monitor_wrap.h b/monitor_wrap.h index d551c9d41..e0dd73bd0 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.9 2003/07/22 13:35:22 markus Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> | 4 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> |
@@ -88,9 +88,6 @@ int mm_skey_query(void *, char **, char **, u_int *, char ***, u_int **); | |||
88 | int mm_skey_respond(void *, u_int, char **); | 88 | int mm_skey_respond(void *, u_int, char **); |
89 | 89 | ||
90 | /* auth_krb */ | 90 | /* auth_krb */ |
91 | #ifdef KRB4 | ||
92 | int mm_auth_krb4(struct Authctxt *, void *, char **, void *); | ||
93 | #endif | ||
94 | #ifdef KRB5 | 91 | #ifdef KRB5 |
95 | /* auth and reply are really krb5_data objects, but we don't want to | 92 | /* auth and reply are really krb5_data objects, but we don't want to |
96 | * include all of the krb5 headers here */ | 93 | * include all of the krb5 headers here */ |