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 | |
parent | 6369958301f0184c95988f8c87a5494bab0bb0c6 (diff) |
- (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)".
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | acconfig.h | 6 | ||||
-rw-r--r-- | configure.ac | 4 | ||||
-rw-r--r-- | includes.h | 2 | ||||
-rw-r--r-- | servconf.c | 2 | ||||
-rw-r--r-- | session.c | 4 |
6 files changed, 13 insertions, 10 deletions
@@ -8,6 +8,9 @@ | |||
8 | zlib >= 1.1.4. Partly from jbasney at ncsa.uiuc.edu. ok djm@ | 8 | zlib >= 1.1.4. Partly from jbasney at ncsa.uiuc.edu. ok djm@ |
9 | - (dtucker) [contrib/cygwin/README] Document new ssh-host-config options. | 9 | - (dtucker) [contrib/cygwin/README] Document new ssh-host-config options. |
10 | Patch from vinschen at redhat.com. | 10 | Patch from vinschen at redhat.com. |
11 | - (dtucker) [acconfig.h configure.ac includes.h servconf.c session.c] | ||
12 | Change AFS symbol to USE_AFS to prevent namespace collisions, do not | ||
13 | include kafs.h unless necessary. From deengert at anl.gov. | ||
11 | 14 | ||
12 | 20040122 | 15 | 20040122 |
13 | - (dtucker) [configure.ac] Use krb5-config where available for Kerberos/ | 16 | - (dtucker) [configure.ac] Use krb5-config where available for Kerberos/ |
@@ -1720,4 +1723,4 @@ | |||
1720 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 1723 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
1721 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 1724 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
1722 | 1725 | ||
1723 | $Id: ChangeLog,v 1.3184 2004/01/23 10:35:44 dtucker Exp $ | 1726 | $Id: ChangeLog,v 1.3185 2004/01/23 11:03:10 dtucker Exp $ |
diff --git a/acconfig.h b/acconfig.h index 40162b731..27366ed17 100644 --- a/acconfig.h +++ b/acconfig.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: acconfig.h,v 1.171 2004/01/05 11:36:52 dtucker Exp $ */ | 1 | /* $Id: acconfig.h,v 1.172 2004/01/23 11:03:10 dtucker Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 1999-2003 Damien Miller. All rights reserved. | 4 | * Copyright (c) 1999-2003 Damien Miller. All rights reserved. |
@@ -256,8 +256,8 @@ | |||
256 | /* Define this if you are using the Heimdal version of Kerberos V5 */ | 256 | /* Define this if you are using the Heimdal version of Kerberos V5 */ |
257 | #undef HEIMDAL | 257 | #undef HEIMDAL |
258 | 258 | ||
259 | /* Define this if you want to use Heimdal's AFS support */ | 259 | /* Define this if you want to use libkafs' AFS support */ |
260 | #undef AFS | 260 | #undef USE_AFS |
261 | 261 | ||
262 | /* Define if you want S/Key support */ | 262 | /* Define if you want S/Key support */ |
263 | #undef SKEY | 263 | #undef SKEY |
diff --git a/configure.ac b/configure.ac index c98332ac2..b5fc7ace0 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.186 2004/01/23 06:13:33 dtucker Exp $ | 1 | # $Id: configure.ac,v 1.187 2004/01/23 11:03:10 dtucker Exp $ |
2 | 2 | ||
3 | AC_INIT | 3 | AC_INIT |
4 | AC_CONFIG_SRCDIR([ssh.c]) | 4 | AC_CONFIG_SRCDIR([ssh.c]) |
@@ -2128,7 +2128,7 @@ AC_ARG_WITH(kerberos5, | |||
2128 | fi | 2128 | fi |
2129 | fi ] | 2129 | fi ] |
2130 | AC_SEARCH_LIBS(k_hasafs, kafs, | 2130 | AC_SEARCH_LIBS(k_hasafs, kafs, |
2131 | [ AC_DEFINE(AFS) | 2131 | [ AC_DEFINE(USE_AFS) |
2132 | K5LIBS="-lkafs $K5LIBS" | 2132 | K5LIBS="-lkafs $K5LIBS" |
2133 | ] | 2133 | ] |
2134 | ) | 2134 | ) |
diff --git a/includes.h b/includes.h index 02364bbd7..764bd57fe 100644 --- a/includes.h +++ b/includes.h | |||
@@ -169,7 +169,7 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg } | |||
169 | # include <libutil.h> /* Openpty on FreeBSD at least */ | 169 | # include <libutil.h> /* Openpty on FreeBSD at least */ |
170 | #endif | 170 | #endif |
171 | 171 | ||
172 | #if defined(HEIMDAL) && defined(AFS) | 172 | #if defined(KRB5) && defined(USE_AFS) |
173 | # include <krb5.h> | 173 | # include <krb5.h> |
174 | # include <kafs.h> | 174 | # include <kafs.h> |
175 | #endif | 175 | #endif |
diff --git a/servconf.c b/servconf.c index 04a10fadf..a72246b6c 100644 --- a/servconf.c +++ b/servconf.c | |||
@@ -305,7 +305,7 @@ static struct { | |||
305 | { "kerberosauthentication", sKerberosAuthentication }, | 305 | { "kerberosauthentication", sKerberosAuthentication }, |
306 | { "kerberosorlocalpasswd", sKerberosOrLocalPasswd }, | 306 | { "kerberosorlocalpasswd", sKerberosOrLocalPasswd }, |
307 | { "kerberosticketcleanup", sKerberosTicketCleanup }, | 307 | { "kerberosticketcleanup", sKerberosTicketCleanup }, |
308 | #ifdef AFS | 308 | #ifdef USE_AFS |
309 | { "kerberosgetafstoken", sKerberosGetAFSToken }, | 309 | { "kerberosgetafstoken", sKerberosGetAFSToken }, |
310 | #else | 310 | #else |
311 | { "kerberosgetafstoken", sUnsupported }, | 311 | { "kerberosgetafstoken", sUnsupported }, |
@@ -58,7 +58,7 @@ RCSID("$OpenBSD: session.c,v 1.171 2004/01/13 19:23:15 markus Exp $"); | |||
58 | #include "session.h" | 58 | #include "session.h" |
59 | #include "monitor_wrap.h" | 59 | #include "monitor_wrap.h" |
60 | 60 | ||
61 | #ifdef KRB5 | 61 | #if defined(KRB5) && defined(USE_AFS) |
62 | #include <kafs.h> | 62 | #include <kafs.h> |
63 | #endif | 63 | #endif |
64 | 64 | ||
@@ -1425,7 +1425,7 @@ do_child(Session *s, const char *command) | |||
1425 | */ | 1425 | */ |
1426 | environ = env; | 1426 | environ = env; |
1427 | 1427 | ||
1428 | #if defined(KRB5) && defined(AFS) | 1428 | #if defined(KRB5) && defined(USE_AFS) |
1429 | /* | 1429 | /* |
1430 | * At this point, we check to see if AFS is active and if we have | 1430 | * At this point, we check to see if AFS is active and if we have |
1431 | * a valid Kerberos 5 TGT. If so, it seems like a good idea to see | 1431 | * a valid Kerberos 5 TGT. If so, it seems like a good idea to see |