tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (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)".
This commit is contained in:
Darren Tucker 2004-01-23 22:03:10 +11:00
parent 6369958301
commit 3c78c5ed2f
6 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -8,6 +8,9 @@
zlib >= 1.1.4. Partly from jbasney at ncsa.uiuc.edu. ok djm@ zlib >= 1.1.4. Partly from jbasney at ncsa.uiuc.edu. ok djm@
- (dtucker) [contrib/cygwin/README] Document new ssh-host-config options. - (dtucker) [contrib/cygwin/README] Document new ssh-host-config options.
Patch from vinschen at redhat.com. 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 20040122
- (dtucker) [configure.ac] Use krb5-config where available for Kerberos/ - (dtucker) [configure.ac] Use krb5-config where available for Kerberos/
@ -1720,4 +1723,4 @@
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au Report from murple@murple.net, diagnosis from dtucker@zip.com.au
$Id: ChangeLog,v 1.3184 2004/01/23 10:35:44 dtucker Exp $ $Id: ChangeLog,v 1.3185 2004/01/23 11:03:10 dtucker Exp $

6
acconfig.h
View File

@ -1,4 +1,4 @@
/* $Id: acconfig.h,v 1.171 2004/01/05 11:36:52 dtucker Exp $ */ /* $Id: acconfig.h,v 1.172 2004/01/23 11:03:10 dtucker Exp $ */
/* /*
* Copyright (c) 1999-2003 Damien Miller. All rights reserved. * Copyright (c) 1999-2003 Damien Miller. All rights reserved.
@ -256,8 +256,8 @@
/* Define this if you are using the Heimdal version of Kerberos V5 */ /* Define this if you are using the Heimdal version of Kerberos V5 */
#undef HEIMDAL #undef HEIMDAL
/* Define this if you want to use Heimdal's AFS support */ /* Define this if you want to use libkafs' AFS support */
#undef AFS #undef USE_AFS
/* Define if you want S/Key support */ /* Define if you want S/Key support */
#undef SKEY #undef SKEY

4
configure.ac
View File

@ -1,4 +1,4 @@
# $Id: configure.ac,v 1.186 2004/01/23 06:13:33 dtucker Exp $ # $Id: configure.ac,v 1.187 2004/01/23 11:03:10 dtucker Exp $
AC_INIT AC_INIT
AC_CONFIG_SRCDIR([ssh.c]) AC_CONFIG_SRCDIR([ssh.c])
@ -2128,7 +2128,7 @@ AC_ARG_WITH(kerberos5,
fi fi
fi ] fi ]
AC_SEARCH_LIBS(k_hasafs, kafs, AC_SEARCH_LIBS(k_hasafs, kafs,
[ AC_DEFINE(AFS) [ AC_DEFINE(USE_AFS)
K5LIBS="-lkafs $K5LIBS" K5LIBS="-lkafs $K5LIBS"
] ]
) )

2
includes.h
View File

@ -169,7 +169,7 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
# include <libutil.h> /* Openpty on FreeBSD at least */ # include <libutil.h> /* Openpty on FreeBSD at least */
#endif #endif
#if defined(HEIMDAL) && defined(AFS) #if defined(KRB5) && defined(USE_AFS)
# include <krb5.h> # include <krb5.h>
# include <kafs.h> # include <kafs.h>
#endif #endif

2
servconf.c
View File

@ -305,7 +305,7 @@ static struct {
{ "kerberosauthentication", sKerberosAuthentication }, { "kerberosauthentication", sKerberosAuthentication },
{ "kerberosorlocalpasswd", sKerberosOrLocalPasswd }, { "kerberosorlocalpasswd", sKerberosOrLocalPasswd },
{ "kerberosticketcleanup", sKerberosTicketCleanup }, { "kerberosticketcleanup", sKerberosTicketCleanup },
#ifdef AFS #ifdef USE_AFS
{ "kerberosgetafstoken", sKerberosGetAFSToken }, { "kerberosgetafstoken", sKerberosGetAFSToken },
#else #else
{ "kerberosgetafstoken", sUnsupported }, { "kerberosgetafstoken", sUnsupported },

4
session.c
View File

@ -58,7 +58,7 @@ RCSID("$OpenBSD: session.c,v 1.171 2004/01/13 19:23:15 markus Exp $");
#include "session.h" #include "session.h"
#include "monitor_wrap.h" #include "monitor_wrap.h"
#ifdef KRB5 #if defined(KRB5) && defined(USE_AFS)
#include <kafs.h> #include <kafs.h>
#endif #endif
@ -1425,7 +1425,7 @@ do_child(Session *s, const char *command)
*/ */
environ = env; 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 * 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 * a valid Kerberos 5 TGT. If so, it seems like a good idea to see