diff options
| author | jlam <jlam> | 2000-02-11 00:06:35 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2000-02-11 00:06:35 +0000 |
| commit | da78e5e109074d1105c0b8aefbd6febbe0999ed5 (patch) | |
| tree | 2b15f25cb921095c0ea437e0e387fa34c9a557f6 /security | |
| parent | 662c4007113c838f075cca4409556950cb8cb3d9 (diff) | |
| download | pkgsrc-da78e5e109074d1105c0b8aefbd6febbe0999ed5.tar.gz | |
Make this compile with KERBEROS=5.
Diffstat (limited to 'security')
| -rw-r--r-- | security/ssh/files/patch-sum | 4 | ||||
| -rw-r--r-- | security/ssh/patches/patch-af | 19 |
2 files changed, 15 insertions, 8 deletions
diff --git a/security/ssh/files/patch-sum b/security/ssh/files/patch-sum index b94e753b83a..bfc7662176c 100644 --- a/security/ssh/files/patch-sum +++ b/security/ssh/files/patch-sum @@ -1,11 +1,11 @@ -# $NetBSD: patch-sum,v 1.16 2000/01/22 23:30:42 tron Exp $ +# $NetBSD: patch-sum,v 1.17 2000/02/11 00:07:50 jlam Exp $ MD5 (patch-aa) = 39a4c82d2b89aae61df69a50f7aaa813 MD5 (patch-ab) = cff63b7a2d4ef2d9611f6518fe17d87c MD5 (patch-ac) = 3b37e0f4ecc7fa49512d02bc7044269f MD5 (patch-ad) = 60483c735ff0e3c47e640002be0cee75 MD5 (patch-ae) = c0f6b7f8e55442cc311ec00a7deea9a1 -MD5 (patch-af) = 1b1833c3e2f67a95647c1a0e6c4de360 +MD5 (patch-af) = a5f8bc6e6eb737d80848778863237e65 MD5 (patch-ag) = 47b5e06663afddebbf2998e72f59dde2 MD5 (patch-ah) = 7b6fe18163413b4f70195cb082ff51f5 MD5 (patch-ai) = ab4a72deaa42a6ae7bf14ec554ed104f diff --git a/security/ssh/patches/patch-af b/security/ssh/patches/patch-af index cfb76c14549..a6d71c56c72 100644 --- a/security/ssh/patches/patch-af +++ b/security/ssh/patches/patch-af @@ -1,7 +1,7 @@ -$NetBSD: patch-af,v 1.7 1999/12/25 05:28:35 kim Exp $ +$NetBSD: patch-af,v 1.8 2000/02/11 00:07:51 jlam Exp $ --- sshd.c.orig Wed May 12 07:19:29 1999 -+++ sshd.c Fri Dec 24 22:00:08 1999 ++++ sshd.c Thu Feb 10 18:29:16 2000 @@ -537,15 +537,26 @@ #define O_NOCTTY 0 #endif @@ -589,7 +589,7 @@ $NetBSD: patch-af,v 1.7 1999/12/25 05:28:35 kim Exp $ authentication_type = SSH_AUTH_PASSWORD; authenticated = 1; /* Success packet will be sent after loop below. */ -@@ -2281,19 +2391,22 @@ +@@ -2281,34 +2391,61 @@ /* Process the packet. */ switch (type) { @@ -615,7 +615,10 @@ $NetBSD: patch-af,v 1.7 1999/12/25 05:28:35 kim Exp $ /* Accept Kerberos tgt. */ krb5data.data = packet_get_string((unsigned int *) &krb5data.length); -@@ -2303,12 +2416,36 @@ +- if (!auth_kerberos_tgt(user, &krb5data, client) || ++ if (!auth_krb5_tgt(user, &krb5data, client) || + !krb5_kuserok(ssh_context, client, user)){ + log_msg("Kerberos tgt REFUSED for %.100s", user); debug("Kerberos tgt REFUSED for %.100s", user); } free(krb5data.data); @@ -657,14 +660,18 @@ $NetBSD: patch-af,v 1.7 1999/12/25 05:28:35 kim Exp $ case SSH_CMSG_AUTH_KERBEROS: if (!options.kerberos_authentication) { -@@ -2316,6 +2453,7 @@ +@@ -2316,9 +2453,10 @@ log_msg("Kerberos authentication disabled."); break; } +#ifdef KRB5 /* Try Kerberos authentication. */ krb5data.data = packet_get_string((unsigned int *) &krb5data.length); - if (auth_kerberos(user, &krb5data, &tkt_client)) +- if (auth_kerberos(user, &krb5data, &tkt_client)) ++ if (auth_krb5(user, &krb5data, &tkt_client)) + { + char *tkt_user; + @@ -2334,6 +2472,11 @@ /* Client has successfully authenticated to us. */ log_msg("Kerberos authentication accepted %.100s for login to account %.100s from %.200s", |