diff options
author | Darren Tucker <dtucker@zip.com.au> | 2004-01-22 12:48:26 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2004-01-22 12:48:26 +1100 |
commit | 7fe8b72771ec847d824ce845f851338f1be9e6b2 (patch) | |
tree | 9612fd1b70529ac092c502c24f34d1f27723a37d | |
parent | 1d3ca58705157ffd764515021434343aba1e8037 (diff) |
- (dtucker) [session.c] Enable AFS support in conjunction with KRB5 not
just HEIMDAL.
Currently this will make no difference, as only Heimdal (which defines KRB5
anyway) has libkafs, however a libkafs that works with MIT may become
available. In that case it will be used too.
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | session.c | 2 |
2 files changed, 4 insertions, 2 deletions
@@ -1,6 +1,8 @@ | |||
1 | 20040122 | 1 | 20040122 |
2 | - (dtucker) [configure.ac] Use krb5-config where available for Kerberos/ | 2 | - (dtucker) [configure.ac] Use krb5-config where available for Kerberos/ |
3 | GSSAPI detection, libs and includes. ok djm@ | 3 | GSSAPI detection, libs and includes. ok djm@ |
4 | - (dtucker) [session.c] Enable AFS support in conjunction with KRB5 not | ||
5 | just HEIMDAL. | ||
4 | 6 | ||
5 | 20040121 | 7 | 20040121 |
6 | - (djm) OpenBSD CVS Sync | 8 | - (djm) OpenBSD CVS Sync |
@@ -1705,4 +1707,4 @@ | |||
1705 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 1707 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
1706 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 1708 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
1707 | 1709 | ||
1708 | $Id: ChangeLog,v 1.3178 2004/01/22 01:05:34 dtucker Exp $ | 1710 | $Id: ChangeLog,v 1.3179 2004/01/22 01:48:26 dtucker Exp $ |
@@ -1419,7 +1419,7 @@ do_child(Session *s, const char *command) | |||
1419 | */ | 1419 | */ |
1420 | environ = env; | 1420 | environ = env; |
1421 | 1421 | ||
1422 | #if defined(HEIMDAL) && defined(AFS) | 1422 | #if defined(KRB5) && defined(AFS) |
1423 | /* | 1423 | /* |
1424 | * At this point, we check to see if AFS is active and if we have | 1424 | * At this point, we check to see if AFS is active and if we have |
1425 | * a valid Kerberos 5 TGT. If so, it seems like a good idea to see | 1425 | * a valid Kerberos 5 TGT. If so, it seems like a good idea to see |