diff options
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | Makefile.in | 4 | ||||
-rw-r--r-- | auth-krb5.c | 1 | ||||
-rw-r--r-- | auth2-krb5.c | 4 | ||||
-rw-r--r-- | sshconnect2.c | 10 |
5 files changed, 19 insertions, 3 deletions
@@ -67,6 +67,7 @@ [auth2.c monitor.c sshconnect2.c auth2-krb5.c] implement kerberos over ssh2 ("kerberos-2@ssh.com"); tested with jakob@ server interops with commercial client; ok jakob@ djm@ + - (djm) Make portable build with MIT krb5 (some issues remain) 20030512 - (djm) Redhat spec: Don't install profile.d scripts when not @@ -1454,4 +1455,4 @@ save auth method before monitor_reset_key_state(); bugzilla bug #284; ok provos@ -$Id: ChangeLog,v 1.2692 2003/05/14 03:47:37 djm Exp $ +$Id: ChangeLog,v 1.2693 2003/05/14 04:31:11 djm Exp $ diff --git a/Makefile.in b/Makefile.in index 670d9b50..ba898db4 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -# $Id: Makefile.in,v 1.231 2003/05/10 09:28:02 djm Exp $ +# $Id: Makefile.in,v 1.232 2003/05/14 04:31:11 djm Exp $ # uncomment if you run a non bourne compatable shell. Ie. csh #SHELL = @SH@ @@ -80,7 +80,7 @@ SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \ auth2-none.o auth2-passwd.o auth2-pubkey.o \ monitor_mm.o monitor.o monitor_wrap.o monitor_fdpass.o \ kexdhs.o kexgexs.o \ - auth-krb5.o auth-krb4.o \ + auth-krb5.o auth2-krb5.o auth-krb4.o \ loginrec.o auth-pam.o auth-sia.o md5crypt.o MANPAGES = scp.1.out ssh-add.1.out ssh-agent.1.out ssh-keygen.1.out ssh-keyscan.1.out ssh.1.out sshd.8.out sftp-server.8.out sftp.1.out ssh-rand-helper.8.out ssh-keysign.8.out sshd_config.5.out ssh_config.5.out diff --git a/auth-krb5.c b/auth-krb5.c index 34b9d661..0a6f826e 100644 --- a/auth-krb5.c +++ b/auth-krb5.c @@ -40,6 +40,7 @@ RCSID("$OpenBSD: auth-krb5.c,v 1.10 2002/11/21 23:03:51 deraadt Exp $"); #include "auth.h" #ifdef KRB5 + #include <krb5.h> #ifndef HEIMDAL #define krb5_get_err_text(context,code) error_message(code) diff --git a/auth2-krb5.c b/auth2-krb5.c index ea4d76da..b4ff16b6 100644 --- a/auth2-krb5.c +++ b/auth2-krb5.c @@ -25,6 +25,8 @@ #include "includes.h" RCSID("$OpenBSD: auth2-krb5.c,v 1.1 2003/05/14 02:15:47 markus Exp $"); +#ifdef KRB5 + #include <krb5.h> #include "ssh2.h" @@ -64,3 +66,5 @@ Authmethod method_kerberos = { userauth_kerberos, &options.kerberos_authentication }; + +#endif /* KRB5 */ diff --git a/sshconnect2.c b/sshconnect2.c index 0605e4e5..f91f5b27 100644 --- a/sshconnect2.c +++ b/sshconnect2.c @@ -27,8 +27,13 @@ RCSID("$OpenBSD: sshconnect2.c,v 1.118 2003/05/14 02:15:47 markus Exp $"); #ifdef KRB5 #include <krb5.h> +#ifndef HEIMDAL +#define krb5_get_err_text(context,code) error_message(code) +#endif /* !HEIMDAL */ #endif +#include "openbsd-compat/sys-queue.h" + #include "ssh.h" #include "ssh2.h" #include "xmalloc.h" @@ -1206,7 +1211,12 @@ userauth_kerberos(Authctxt *authctxt) packet_put_string(ap.data, ap.length); packet_send(); +#ifdef HEIMDAL krb5_data_free(&ap); +#else +# warning "XXX - leaks ap data on MIT kerberos" +#endif + return (1); } #endif |