| | 1 | --- lib/gssapi.c 2002-12-05 17:12:36.000000000 -0500 |
| | 2 | +++ lib/gssapi.c 2007-11-15 21:59:58.000000000 -0500 |
| | 3 | @@ -34,29 +34,8 @@ |
| | 4 | #include "syshdr.h" |
| | 5 | #include "ftp.h" |
| | 6 | #include "base64.h" |
| | 7 | - |
| | 8 | -#if defined(HAVE_GSSAPI_H) |
| | 9 | -# include <gssapi.h> |
| | 10 | - /* if we have gssapi.h (not gssapi/gssapi.h) we assume we link |
| | 11 | - * against Heimdal, which needs krb5_err.h to define * |
| | 12 | - * KRB5KDC_ERR_S_PRINCIPAL_UNKNOWN |
| | 13 | - */ |
| | 14 | -# include <krb5_err.h> |
| | 15 | -#elif defined(HAVE_GSSAPI_GSSAPI_H) |
| | 16 | -# include <gssapi/gssapi.h> |
| | 17 | - /* if we have gssapi/gssapi.h it might be safe to assume we have the |
| | 18 | - * other two that are part of MIT's krb5 as well, but this will work |
| | 19 | - * even if they one day do away with one of those two header files. |
| | 20 | - */ |
| | 21 | -# if defined(HAVE_GSSAPI_GSSAPI_KRB5_H) |
| | 22 | -# include <gssapi/gssapi_krb5.h> |
| | 23 | -# endif |
| | 24 | -#else |
| | 25 | -# error "Need gssapi.h from either Heimdal or MIT krb5" |
| | 26 | -#endif |
| | 27 | - |
| | 28 | - |
| | 29 | - |
| | 30 | +#include <gssapi/gssapi.h> |
| | 31 | +#include <gssapi/gssapi_krb5.h> |
| | 32 | |
| | 33 | /* |
| | 34 | * The implementation must reserve static storage for a |
| | 35 | @@ -72,7 +51,6 @@ |
| | 36 | static gss_OID_desc gss_c_nt_hostbased_service_oid_desc = |
| | 37 | {10, (void *)"\x2a\x86\x48\x86\xf7\x12" "\x01\x02\x01\x04"}; |
| | 38 | |
| | 39 | -static gss_OID GSS_C_NT_HOSTBASED_SERVICE = &gss_c_nt_hostbased_service_oid_desc; |
| | 40 | |
| | 41 | |
| | 42 | |
