From 7fe8b72771ec847d824ce845f851338f1be9e6b2 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Thu, 22 Jan 2004 12:48:26 +1100
Subject: [PATCH]  - (dtucker) [session.c] Enable AFS support in conjunction
 with KRB5 not    just HEIMDAL.

Currently this will make no difference, as only Heimdal (which defines KRB5
anyway) has libkafs, however a libkafs that works with MIT may become
available.  In that case it will be used too.
---
 ChangeLog | 4 +++-
 session.c | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index df415f0ed..7d1c6db14 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 20040122
  - (dtucker) [configure.ac] Use krb5-config where available for Kerberos/
    GSSAPI detection, libs and includes.  ok djm@
+ - (dtucker) [session.c] Enable AFS support in conjunction with KRB5 not
+   just HEIMDAL.
 
 20040121
  - (djm) OpenBSD CVS Sync
@@ -1705,4 +1707,4 @@
  - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
    Report from murple@murple.net, diagnosis from dtucker@zip.com.au
 
-$Id: ChangeLog,v 1.3178 2004/01/22 01:05:34 dtucker Exp $
+$Id: ChangeLog,v 1.3179 2004/01/22 01:48:26 dtucker Exp $
diff --git a/session.c b/session.c
index 82e1996af..6a1cb7841 100644
--- a/session.c
+++ b/session.c
@@ -1419,7 +1419,7 @@ do_child(Session *s, const char *command)
 	 */
 	environ = env;
 
-#if defined(HEIMDAL) && defined(AFS)
+#if defined(KRB5) && defined(AFS)
 	/*
 	 * At this point, we check to see if AFS is active and if we have
 	 * a valid Kerberos 5 TGT. If so, it seems like a good idea to see