diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2004-01-23 22:03:10 +1100 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2004-01-23 22:03:10 +1100 |
| commit | 3c78c5ed2fd12785842bbb9e3bd030fab19a9221 (patch) | |
| tree | 5dd057f81dc6f9ea0da07919cac74bf401580696 /session.c | |
| parent | 6369958301f0184c95988f8c87a5494bab0bb0c6 (diff) | |
| download | openssh-git-3c78c5ed2fd12785842bbb9e3bd030fab19a9221.tar.gz | |
- (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)".
Diffstat (limited to 'session.c')
| -rw-r--r-- | session.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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 |