From 859e94eeb6fe1e04850d44a1cde543cb95cb9f89 Mon Sep 17 00:00:00 2001
From: thorpej <thorpej>
Date: Sun, 23 Apr 2000 19:17:29 +0000
Subject: Sync w/ srcurity/ssh: prevent a segv when doing password
 authentication and the client happens to not be in a Kerberos realm.

---
 security/ssh6/files/patch-sum  |  4 ++--
 security/ssh6/patches/patch-at | 15 ++++++++-------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/security/ssh6/files/patch-sum b/security/ssh6/files/patch-sum
index aff928664fd..f3214f94cec 100644
--- a/security/ssh6/files/patch-sum
+++ b/security/ssh6/files/patch-sum
@@ -1,4 +1,4 @@
-# $NetBSD: patch-sum,v 1.1 2000/03/20 02:25:31 itojun Exp $
+# $NetBSD: patch-sum,v 1.2 2000/04/23 19:17:29 thorpej Exp $
 
 MD5 (patch-aa) = 39a4c82d2b89aae61df69a50f7aaa813
 MD5 (patch-ab) = 36dc0eb7feba0554674242b39082a09b
@@ -18,7 +18,7 @@ MD5 (patch-ap) = 99049fb6deb9bab8950723b7430a89a4
 MD5 (patch-aq) = 6af8d097a297182328216440e306effa
 MD5 (patch-ar) = f402ab7533811e42e6df38ee9dfb2e84
 MD5 (patch-as) = f1f3fc3e5dae2461fffd2e6555f3077c
-MD5 (patch-at) = 8f7b4464fb25bf7871191c1aa8de4b30
+MD5 (patch-at) = 1099da438d736d21004c0ed56fe411c2
 MD5 (patch-au) = 5106bb8fd152358b6696491066805df1
 MD5 (patch-av) = b3f9909bd6a5cc387e929d16f89884c0
 MD5 (patch-aw) = 91ad583415323fd97b46415050b0781a
diff --git a/security/ssh6/patches/patch-at b/security/ssh6/patches/patch-at
index b1af8c0962d..34a0799a3bb 100644
--- a/security/ssh6/patches/patch-at
+++ b/security/ssh6/patches/patch-at
@@ -1,7 +1,7 @@
-$NetBSD: patch-at,v 1.1 2000/03/20 02:25:40 itojun Exp $
+$NetBSD: patch-at,v 1.2 2000/04/23 19:17:30 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 2000/03/20 02:25:40 itojun 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))
-- 
cgit v1.2.3