diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | acconfig.h | 5 | ||||
-rw-r--r-- | configure.ac | 7 | ||||
-rw-r--r-- | includes.h | 5 | ||||
-rw-r--r-- | servconf.c | 4 | ||||
-rw-r--r-- | session.c | 2 |
6 files changed, 23 insertions, 4 deletions
@@ -1,6 +1,8 @@ | |||
1 | 20040105 | 1 | 20040105 |
2 | - (dtucker) [contrib/ssh-copy-id] Bug #781: exit if ssh fails. Patch from | 2 | - (dtucker) [contrib/ssh-copy-id] Bug #781: exit if ssh fails. Patch from |
3 | cjwatson at debian.org. | 3 | cjwatson at debian.org. |
4 | - (dtucker) [acconfig.h configure.ac includes.h servconf.c session.c] | ||
5 | Only enable KerberosGetAFSToken if Heimdal's libkafs is found. with jakob@ | ||
4 | 6 | ||
5 | 20040102 | 7 | 20040102 |
6 | - (djm) OSX/Darwin needs BIND_8_COMPAT to build getrrsetbyname. Report from | 8 | - (djm) OSX/Darwin needs BIND_8_COMPAT to build getrrsetbyname. Report from |
@@ -1648,4 +1650,4 @@ | |||
1648 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 1650 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
1649 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 1651 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
1650 | 1652 | ||
1651 | $Id: ChangeLog,v 1.3162 2004/01/04 21:16:34 dtucker Exp $ | 1653 | $Id: ChangeLog,v 1.3163 2004/01/05 11:36:51 dtucker Exp $ |
diff --git a/acconfig.h b/acconfig.h index 2a5c4334c..40162b731 100644 --- a/acconfig.h +++ b/acconfig.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: acconfig.h,v 1.170 2004/01/02 07:02:44 djm Exp $ */ | 1 | /* $Id: acconfig.h,v 1.171 2004/01/05 11:36:52 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,6 +256,9 @@ | |||
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 */ | ||
260 | #undef AFS | ||
261 | |||
259 | /* Define if you want S/Key support */ | 262 | /* Define if you want S/Key support */ |
260 | #undef SKEY | 263 | #undef SKEY |
261 | 264 | ||
diff --git a/configure.ac b/configure.ac index 9127489de..afc4ae9b4 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.182 2004/01/02 07:01:31 djm Exp $ | 1 | # $Id: configure.ac,v 1.183 2004/01/05 11:36:52 dtucker Exp $ |
2 | 2 | ||
3 | AC_INIT | 3 | AC_INIT |
4 | AC_CONFIG_SRCDIR([ssh.c]) | 4 | AC_CONFIG_SRCDIR([ssh.c]) |
@@ -2037,6 +2037,11 @@ AC_ARG_WITH(kerberos5, | |||
2037 | [ AC_MSG_RESULT(yes) | 2037 | [ AC_MSG_RESULT(yes) |
2038 | AC_DEFINE(HEIMDAL) | 2038 | AC_DEFINE(HEIMDAL) |
2039 | K5LIBS="-lkrb5 -ldes -lcom_err -lasn1 -lroken" | 2039 | K5LIBS="-lkrb5 -ldes -lcom_err -lasn1 -lroken" |
2040 | AC_SEARCH_LIBS(k_hasafs, kafs, | ||
2041 | [ AC_DEFINE(AFS) | ||
2042 | K5LIBS="-lkafs $K5LIBS" | ||
2043 | ] | ||
2044 | ) | ||
2040 | ], | 2045 | ], |
2041 | [ AC_MSG_RESULT(no) | 2046 | [ AC_MSG_RESULT(no) |
2042 | K5LIBS="-lkrb5 -lk5crypto -lcom_err" | 2047 | K5LIBS="-lkrb5 -lk5crypto -lcom_err" |
diff --git a/includes.h b/includes.h index ac9a950e0..02364bbd7 100644 --- a/includes.h +++ b/includes.h | |||
@@ -169,6 +169,11 @@ 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) | ||
173 | # include <krb5.h> | ||
174 | # include <kafs.h> | ||
175 | #endif | ||
176 | |||
172 | #include <openssl/opensslv.h> /* For OPENSSL_VERSION_NUMBER */ | 177 | #include <openssl/opensslv.h> /* For OPENSSL_VERSION_NUMBER */ |
173 | 178 | ||
174 | #include "defines.h" | 179 | #include "defines.h" |
diff --git a/servconf.c b/servconf.c index b832c75b3..04a10fadf 100644 --- a/servconf.c +++ b/servconf.c | |||
@@ -305,8 +305,12 @@ static struct { | |||
305 | { "kerberosauthentication", sKerberosAuthentication }, | 305 | { "kerberosauthentication", sKerberosAuthentication }, |
306 | { "kerberosorlocalpasswd", sKerberosOrLocalPasswd }, | 306 | { "kerberosorlocalpasswd", sKerberosOrLocalPasswd }, |
307 | { "kerberosticketcleanup", sKerberosTicketCleanup }, | 307 | { "kerberosticketcleanup", sKerberosTicketCleanup }, |
308 | #ifdef AFS | ||
308 | { "kerberosgetafstoken", sKerberosGetAFSToken }, | 309 | { "kerberosgetafstoken", sKerberosGetAFSToken }, |
309 | #else | 310 | #else |
311 | { "kerberosgetafstoken", sUnsupported }, | ||
312 | #endif | ||
313 | #else | ||
310 | { "kerberosauthentication", sUnsupported }, | 314 | { "kerberosauthentication", sUnsupported }, |
311 | { "kerberosorlocalpasswd", sUnsupported }, | 315 | { "kerberosorlocalpasswd", sUnsupported }, |
312 | { "kerberosticketcleanup", sUnsupported }, | 316 | { "kerberosticketcleanup", sUnsupported }, |
@@ -1415,7 +1415,7 @@ do_child(Session *s, const char *command) | |||
1415 | */ | 1415 | */ |
1416 | environ = env; | 1416 | environ = env; |
1417 | 1417 | ||
1418 | #ifdef KRB5 | 1418 | #if defined(HEIMDAL) && defined(AFS) |
1419 | /* | 1419 | /* |
1420 | * At this point, we check to see if AFS is active and if we have | 1420 | * At this point, we check to see if AFS is active and if we have |
1421 | * a valid Kerberos 5 TGT. If so, it seems like a good idea to see | 1421 | * a valid Kerberos 5 TGT. If so, it seems like a good idea to see |