- (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)".

diff --git a/ChangeLog b/ChangeLog
index a0f973a4547138a6a60d37715a0ebd59c077e2ce..0f88fe25a930652cf45e1547c0be967495576f37 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,9 @@
    zlib >= 1.1.4.  Partly from jbasney at ncsa.uiuc.edu.  ok djm@
  - (dtucker) [contrib/cygwin/README] Document new ssh-host-config options.
    Patch from vinschen at redhat.com.
+ - (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.
 
 20040122
  - (dtucker) [configure.ac] Use krb5-config where available for Kerberos/

diff --git a/acconfig.h b/acconfig.h
index a10e1333733979766fc769b93998f88814054bfc..4c95950ca62a1e74497c779bc5c510f8ebee6271 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -256,8 +256,8 @@
 /* Define this if you are using the Heimdal version of Kerberos V5 */
 #undef HEIMDAL
 
-/* Define this if you want to use Heimdal's AFS support */
-#undef AFS
+/* Define this if you want to use libkafs' AFS support */
+#undef USE_AFS
 
 /* Define if you want S/Key support */
 #undef SKEY

diff --git a/configure.ac b/configure.ac
index 606ee87a8c3304639ce92dafb4f57f9df523ea51..96f2c06c1a066426febf7b29bf6d3999f5d70410 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2128,7 +2128,7 @@ AC_ARG_WITH(kerberos5,
                fi
        fi ]
        AC_SEARCH_LIBS(k_hasafs, kafs,
-               [ AC_DEFINE(AFS)
+               [ AC_DEFINE(USE_AFS)
                  K5LIBS="-lkafs $K5LIBS"
                ]
        )

diff --git a/includes.h b/includes.h
index 02364bbd758a502c22be986ae5757307af34e54b..764bd57febe1e3d7f6a2cb294393e3c182cbb8d3 100644 (file)
--- a/includes.h
+++ b/includes.h
@@ -169,7 +169,7 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
 # include <libutil.h> /* Openpty on FreeBSD at least */
 #endif
 
-#if defined(HEIMDAL) && defined(AFS)
+#if defined(KRB5) && defined(USE_AFS)
 # include <krb5.h>
 # include <kafs.h>
 #endif

diff --git a/servconf.c b/servconf.c
index 04a10fadf3023fdafa1f1a56c44b655c1754ab6e..a72246b6cbd8653bde4c670f13199e90529a34df 100644 (file)
--- a/servconf.c
+++ b/servconf.c
@@ -305,7 +305,7 @@ static struct {
        { "kerberosauthentication", sKerberosAuthentication },
        { "kerberosorlocalpasswd", sKerberosOrLocalPasswd },
        { "kerberosticketcleanup", sKerberosTicketCleanup },
-#ifdef AFS
+#ifdef USE_AFS
        { "kerberosgetafstoken", sKerberosGetAFSToken },
 #else
        { "kerberosgetafstoken", sUnsupported },

diff --git a/session.c b/session.c
index 947ba5eff9bfb95ebaaa7916c3300a160d0bf85a..3a6d1a028f3c15c21d133a95fdae9a5d4ce5a400 100644 (file)
--- 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