diff options
| author | Greg Hudson <ghudson@mit.edu> | 2010-11-25 20:28:30 +0000 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2010-11-25 20:28:30 +0000 |
| commit | 530043377ee6f39b9ca95c13f6260602e6fe7674 (patch) | |
| tree | 28fd4b42c486d7097c4cd537d90042bb5fda3852 /src/lib/gssapi/spnego | |
| parent | e9dd6e21afc9af2237e9ae5590ad5a67e52fb24e (diff) | |
| download | krb5-530043377ee6f39b9ca95c13f6260602e6fe7674.tar.gz krb5-530043377ee6f39b9ca95c13f6260602e6fe7674.tar.xz krb5-530043377ee6f39b9ca95c13f6260602e6fe7674.zip | |
Fix Windows build
Repair the Windows build. Tested with the prepare-on-Unix method.
Some specific changes include:
* Removed the IPC finalizer (no longer used after r20787) from
ccapi/lib/ccapi_ipc.c, as it was creating a difficult dependency
chain for the pingtest build in ccapi/test. Also updated pingtest
to use the k5_ipc_stream interfaces since cci_stream is gone.
* Reverted the apparently non-functional r20277.
* klist -V prints just "Kerberos for Windows", since it has no access
to PACKAGE_NAME and PACKAGE_VERSION from autoconf. This should be
addressed correctly.
* krb5, telnet, gssftp, and NIM are removed from the build.
* Some files had CRLFs; these were replaced with LFs and the
svn:eol-style property set on the files. Otherwise the CRLFs became
CRCRLFs after the zip transfer.
* Windows does not have opendir/readdir, so added Windows code to
prof_parse.c for includedir. Probable fodder for a libkrb5support
portability shim.
ticket: 6826
target_version: 1.9
tags: pullup
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24533 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/gssapi/spnego')
| -rw-r--r-- | src/lib/gssapi/spnego/gssapiP_spnego.h | 1 | ||||
| -rw-r--r-- | src/lib/gssapi/spnego/spnego_mech.c | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/src/lib/gssapi/spnego/gssapiP_spnego.h b/src/lib/gssapi/spnego/gssapiP_spnego.h index 50f05678d6..3c2edbbdde 100644 --- a/src/lib/gssapi/spnego/gssapiP_spnego.h +++ b/src/lib/gssapi/spnego/gssapiP_spnego.h @@ -13,7 +13,6 @@ extern "C" { #endif #include <gssapi/gssapi.h> -#include <syslog.h> #define SEC_CONTEXT_TOKEN 1 #define SPNEGO_SIZE_OF_INT 4 diff --git a/src/lib/gssapi/spnego/spnego_mech.c b/src/lib/gssapi/spnego/spnego_mech.c index 519050a142..7847146696 100644 --- a/src/lib/gssapi/spnego/spnego_mech.c +++ b/src/lib/gssapi/spnego/spnego_mech.c @@ -61,8 +61,6 @@ */ /* #pragma ident "@(#)spnego_mech.c 1.7 04/09/28 SMI" */ -#include <sys/param.h> -#include <unistd.h> #include <assert.h> #include <stdio.h> #include <stdlib.h> @@ -2417,7 +2415,7 @@ spnego_gss_complete_auth_token( OM_uint32 spnego_gss_acquire_cred_impersonate_name(OM_uint32 *minor_status, const gss_cred_id_t impersonator_cred_handle, - gss_name_t desired_name, + const gss_name_t desired_name, OM_uint32 time_req, gss_OID_set desired_mechs, gss_cred_usage_t cred_usage, |