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 @@ | |||
67 | [auth2.c monitor.c sshconnect2.c auth2-krb5.c] | 67 | [auth2.c monitor.c sshconnect2.c auth2-krb5.c] |
68 | implement kerberos over ssh2 ("kerberos-2@ssh.com"); tested with jakob@ | 68 | implement kerberos over ssh2 ("kerberos-2@ssh.com"); tested with jakob@ |
69 | server interops with commercial client; ok jakob@ djm@ | 69 | server interops with commercial client; ok jakob@ djm@ |
70 | - (djm) Make portable build with MIT krb5 (some issues remain) | ||
70 | 71 | ||
71 | 20030512 | 72 | 20030512 |
72 | - (djm) Redhat spec: Don't install profile.d scripts when not | 73 | - (djm) Redhat spec: Don't install profile.d scripts when not |
@@ -1454,4 +1455,4 @@ | |||
1454 | save auth method before monitor_reset_key_state(); bugzilla bug #284; | 1455 | save auth method before monitor_reset_key_state(); bugzilla bug #284; |
1455 | ok provos@ | 1456 | ok provos@ |
1456 | 1457 | ||
1457 | $Id: ChangeLog,v 1.2692 2003/05/14 03:47:37 djm Exp $ | 1458 | $Id: ChangeLog,v 1.2693 2003/05/14 04:31:11 djm Exp $ |
diff --git a/Makefile.in b/Makefile.in index 670d9b500..ba898db40 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: Makefile.in,v 1.231 2003/05/10 09:28:02 djm Exp $ | 1 | # $Id: Makefile.in,v 1.232 2003/05/14 04:31:11 djm Exp $ |
2 | 2 | ||
3 | # uncomment if you run a non bourne compatable shell. Ie. csh | 3 | # uncomment if you run a non bourne compatable shell. Ie. csh |
4 | #SHELL = @SH@ | 4 | #SHELL = @SH@ |
@@ -80,7 +80,7 @@ SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \ | |||
80 | auth2-none.o auth2-passwd.o auth2-pubkey.o \ | 80 | auth2-none.o auth2-passwd.o auth2-pubkey.o \ |
81 | monitor_mm.o monitor.o monitor_wrap.o monitor_fdpass.o \ | 81 | monitor_mm.o monitor.o monitor_wrap.o monitor_fdpass.o \ |
82 | kexdhs.o kexgexs.o \ | 82 | kexdhs.o kexgexs.o \ |
83 | auth-krb5.o auth-krb4.o \ | 83 | auth-krb5.o auth2-krb5.o auth-krb4.o \ |
84 | loginrec.o auth-pam.o auth-sia.o md5crypt.o | 84 | loginrec.o auth-pam.o auth-sia.o md5crypt.o |
85 | 85 | ||
86 | 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 | 86 | 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 34b9d661a..0a6f826e7 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 $"); | |||
40 | #include "auth.h" | 40 | #include "auth.h" |
41 | 41 | ||
42 | #ifdef KRB5 | 42 | #ifdef KRB5 |
43 | |||
43 | #include <krb5.h> | 44 | #include <krb5.h> |
44 | #ifndef HEIMDAL | 45 | #ifndef HEIMDAL |
45 | #define krb5_get_err_text(context,code) error_message(code) | 46 | #define krb5_get_err_text(context,code) error_message(code) |
diff --git a/auth2-krb5.c b/auth2-krb5.c index ea4d76da0..b4ff16b62 100644 --- a/auth2-krb5.c +++ b/auth2-krb5.c | |||
@@ -25,6 +25,8 @@ | |||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: auth2-krb5.c,v 1.1 2003/05/14 02:15:47 markus Exp $"); | 26 | RCSID("$OpenBSD: auth2-krb5.c,v 1.1 2003/05/14 02:15:47 markus Exp $"); |
27 | 27 | ||
28 | #ifdef KRB5 | ||
29 | |||
28 | #include <krb5.h> | 30 | #include <krb5.h> |
29 | 31 | ||
30 | #include "ssh2.h" | 32 | #include "ssh2.h" |
@@ -64,3 +66,5 @@ Authmethod method_kerberos = { | |||
64 | userauth_kerberos, | 66 | userauth_kerberos, |
65 | &options.kerberos_authentication | 67 | &options.kerberos_authentication |
66 | }; | 68 | }; |
69 | |||
70 | #endif /* KRB5 */ | ||
diff --git a/sshconnect2.c b/sshconnect2.c index 0605e4e5f..f91f5b274 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 $"); | |||
27 | 27 | ||
28 | #ifdef KRB5 | 28 | #ifdef KRB5 |
29 | #include <krb5.h> | 29 | #include <krb5.h> |
30 | #ifndef HEIMDAL | ||
31 | #define krb5_get_err_text(context,code) error_message(code) | ||
32 | #endif /* !HEIMDAL */ | ||
30 | #endif | 33 | #endif |
31 | 34 | ||
35 | #include "openbsd-compat/sys-queue.h" | ||
36 | |||
32 | #include "ssh.h" | 37 | #include "ssh.h" |
33 | #include "ssh2.h" | 38 | #include "ssh2.h" |
34 | #include "xmalloc.h" | 39 | #include "xmalloc.h" |
@@ -1206,7 +1211,12 @@ userauth_kerberos(Authctxt *authctxt) | |||
1206 | packet_put_string(ap.data, ap.length); | 1211 | packet_put_string(ap.data, ap.length); |
1207 | packet_send(); | 1212 | packet_send(); |
1208 | 1213 | ||
1214 | #ifdef HEIMDAL | ||
1209 | krb5_data_free(&ap); | 1215 | krb5_data_free(&ap); |
1216 | #else | ||
1217 | # warning "XXX - leaks ap data on MIT kerberos" | ||
1218 | #endif | ||
1219 | |||
1210 | return (1); | 1220 | return (1); |
1211 | } | 1221 | } |
1212 | #endif | 1222 | #endif |