diff options
| author | thorpej <thorpej> | 2000-04-18 19:02:20 +0000 |
|---|---|---|
| committer | thorpej <thorpej> | 2000-04-18 19:02:20 +0000 |
| commit | cd79c6c3ae070fa3cb599a7e3c02e0aaf5798e71 (patch) | |
| tree | 02baebc6b6b8e4fc7a66d62b24cfb189bcb5c31e /security | |
| parent | 3187f1a6e34d8becec71c14de9b8acec7ee423da (diff) | |
| download | pkgsrc-cd79c6c3ae070fa3cb599a7e3c02e0aaf5798e71.tar.gz | |
Fix a bug where if you were logging in from an account which had not
authorized key and for which there was no kerberos principle, sshd
would segfault.
Diffstat (limited to 'security')
| -rw-r--r-- | security/ssh/files/patch-sum | 4 | ||||
| -rw-r--r-- | security/ssh/patches/patch-at | 15 |
2 files changed, 10 insertions, 9 deletions
diff --git a/security/ssh/files/patch-sum b/security/ssh/files/patch-sum index 51769580ea1..20f643aedf6 100644 --- a/security/ssh/files/patch-sum +++ b/security/ssh/files/patch-sum @@ -1,4 +1,4 @@ -# $NetBSD: patch-sum,v 1.20 2000/03/20 02:25:49 itojun Exp $ +# $NetBSD: patch-sum,v 1.21 2000/04/18 19:02:20 thorpej Exp $ MD5 (patch-aa) = 39a4c82d2b89aae61df69a50f7aaa813 MD5 (patch-ab) = 14aab959d372b529a72ef5770aae9b27 @@ -18,7 +18,7 @@ MD5 (patch-ap) = 99049fb6deb9bab8950723b7430a89a4 MD5 (patch-aq) = 0e2a55c248173b5c707518513fa1f028 MD5 (patch-ar) = 87da758dc3aea7ba995295ba026952c2 MD5 (patch-as) = f1f3fc3e5dae2461fffd2e6555f3077c -MD5 (patch-at) = 8f7b4464fb25bf7871191c1aa8de4b30 +MD5 (patch-at) = 1099da438d736d21004c0ed56fe411c2 MD5 (patch-au) = 41bf4866b533d1c8e11045bd6af2f387 MD5 (patch-av) = b3f9909bd6a5cc387e929d16f89884c0 MD5 (patch-ax) = 98084f72d9d51a8635711c5ba2f8b945 diff --git a/security/ssh/patches/patch-at b/security/ssh/patches/patch-at index 12eee1a0a3a..aa9b64f3701 100644 --- a/security/ssh/patches/patch-at +++ b/security/ssh/patches/patch-at @@ -1,7 +1,7 @@ -$NetBSD: patch-at,v 1.1 1999/12/25 05:28:36 kim Exp $ +$NetBSD: patch-at,v 1.2 2000/04/18 19:02:21 thorpej Exp $ ---- auth-passwd.c.orig Wed May 12 07:19:23 1999 -+++ auth-passwd.c Fri Dec 24 21:50:04 1999 +--- auth-passwd.c.orig Wed May 12 04:19:23 1999 ++++ auth-passwd.c Tue Apr 18 11:48:03 2000 @@ -301,29 +301,25 @@ static int securid_initialized = 0; #endif /* HAVE_SECURID */ @@ -84,10 +84,11 @@ $NetBSD: patch-at,v 1.1 1999/12/25 05:28:36 kim Exp $ saved_pw_passwd = xstrdup(pw->pw_passwd); -#if defined(KERBEROS) -+#if defined(KRB5) - if (options.kerberos_authentication) - { --#if defined(KRB5) +- if (options.kerberos_authentication) +- { + #if defined(KRB5) ++ if (options.kerberos_authentication && client != NULL) ++ { snprintf(ccname, sizeof(ccname), "FILE:/tmp/krb5cc_l%d", getpid()); if (problem = krb5_cc_resolve(ssh_context, ccname, &ccache)) |