- (dtucker) [acconfig.h configure.ac includes.h servconf.c session.c]

   Change AFS symbol to USE_AFS to prevent namespace collisions, do not
   include kafs.h unless necessary.  From deengert at anl.gov.

For consistency, all of the libkafs bits are now inside "#if defined(KRB5)
&& defined(USE_AFS)".

1 files changed, 2 insertions, 2 deletions

diff --git a/session.c b/session.c
index 947ba5eff..3a6d1a028 100644
--- a/session.c
+++ b/session.c
@@ -58,7 +58,7 @@ RCSID("$OpenBSD: session.c,v 1.171 2004/01/13 19:23:15 markus Exp $");
 #include "session.h"
 #include "monitor_wrap.h"
 
-#ifdef KRB5
+#if defined(KRB5) && defined(USE_AFS)
 #include <kafs.h>
 #endif
 
@@ -1425,7 +1425,7 @@ do_child(Session *s, const char *command)
          */
         environ = env;
 
-#if defined(KRB5) && defined(AFS)
+#if defined(KRB5) && defined(USE_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