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

15 files changed, 35 insertions, 44 deletions

diff --git a/src/lib/gssapi/generic/Makefile.in b/src/lib/gssapi/generic/Makefile.in
index e4a0d58d0..65482c915 100644
--- a/src/lib/gssapi/generic/Makefile.in
+++ b/src/lib/gssapi/generic/Makefile.in
@@ -45,7 +45,7 @@ include_xom=@include_xom@
 ##DOS##include_stdint=rem
 ##DOS##include_inttypes=rem
 ##DOS##include_xom=rem
-gssapi.h: gssapi.hin $(BUILDTOP)/include/autoconf.h
+gssapi.h: gssapi.hin
 	@echo "Creating gssapi.h" ; \
 	h=gss$$$$; $(RM) $$h; \
 	(echo "/* This is the gssapi.h prologue. */"; \
diff --git a/src/lib/gssapi/krb5/copy_ccache.c b/src/lib/gssapi/krb5/copy_ccache.c
index efc68073d..fbb7a48a1 100644
--- a/src/lib/gssapi/krb5/copy_ccache.c
+++ b/src/lib/gssapi/krb5/copy_ccache.c
@@ -1,7 +1,7 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 #include "gssapiP_krb5.h"
 
-OM_uint32 KRB5_CALLCONV
+OM_uint32
 gss_krb5int_copy_ccache(OM_uint32 *minor_status,
                         gss_cred_id_t *cred_handle,
                         const gss_OID desired_object,
diff --git a/src/lib/gssapi/krb5/get_tkt_flags.c b/src/lib/gssapi/krb5/get_tkt_flags.c
index 07f0c9727..636fc04db 100644
--- a/src/lib/gssapi/krb5/get_tkt_flags.c
+++ b/src/lib/gssapi/krb5/get_tkt_flags.c
@@ -27,7 +27,7 @@
  * $Id$
  */
 
-OM_uint32 KRB5_CALLCONV
+OM_uint32
 gss_krb5int_get_tkt_flags(OM_uint32 *minor_status,
                           const gss_ctx_id_t context_handle,
                           const gss_OID desired_object,
diff --git a/src/lib/gssapi/krb5/gssapiP_krb5.h b/src/lib/gssapi/krb5/gssapiP_krb5.h
index 1cb1c1062..a0e60be5e 100644
--- a/src/lib/gssapi/krb5/gssapiP_krb5.h
+++ b/src/lib/gssapi/krb5/gssapiP_krb5.h
@@ -1003,7 +1003,7 @@ kg_compose_deleg_cred(OM_uint32 *minor_status,
 #define GSS_KRB5_GET_TKT_FLAGS_OID_LENGTH 11
 #define GSS_KRB5_GET_TKT_FLAGS_OID "\x2a\x86\x48\x86\xf7\x12\x01\x02\x02\x05\x01"
 
-OM_uint32 KRB5_CALLCONV gss_krb5int_get_tkt_flags
+OM_uint32 gss_krb5int_get_tkt_flags
 (OM_uint32 *minor_status,
  const gss_ctx_id_t context_handle,
  const gss_OID desired_object,
@@ -1012,7 +1012,7 @@ OM_uint32 KRB5_CALLCONV gss_krb5int_get_tkt_flags
 #define GSS_KRB5_COPY_CCACHE_OID_LENGTH 11
 #define GSS_KRB5_COPY_CCACHE_OID "\x2a\x86\x48\x86\xf7\x12\x01\x02\x02\x05\x02"
 
-OM_uint32 KRB5_CALLCONV gss_krb5int_copy_ccache
+OM_uint32 gss_krb5int_copy_ccache
 (OM_uint32 *minor_status,
  gss_cred_id_t *cred_handle,
  const gss_OID desired_oid,
@@ -1026,11 +1026,9 @@ struct krb5_gss_ccache_name_req {
     const char **out_name;
 };
 
-OM_uint32 KRB5_CALLCONV gss_krb5int_ccache_name
- (OM_uint32 *minor_status,
-  const gss_OID,
-  const gss_OID,
-  const gss_buffer_t);
+OM_uint32
+gss_krb5int_ccache_name(OM_uint32 *minor_status, const gss_OID, const gss_OID,
+                        const gss_buffer_t);
 
 #define GSS_KRB5_INQ_SSPI_SESSION_KEY_OID_LENGTH 11
 #define GSS_KRB5_INQ_SSPI_SESSION_KEY_OID "\x2a\x86\x48\x86\xf7\x12\x01\x02\x02\x05\x05"
@@ -1046,7 +1044,7 @@ struct krb5_gss_set_allowable_enctypes_req {
     krb5_enctype *ktypes;
 };
 
-OM_uint32 KRB5_CALLCONV
+OM_uint32
 gss_krb5int_set_allowable_enctypes(OM_uint32 *minor_status,
                                    gss_cred_id_t *cred,
                                    const gss_OID desired_oid,
@@ -1118,7 +1116,7 @@ struct krb5_gss_import_cred_req {
     krb5_keytab keytab;
 };
 
-OM_uint32 KRB5_CALLCONV
+OM_uint32
 gss_krb5int_import_cred(OM_uint32 *minor_status,
                         gss_cred_id_t *cred,
                         const gss_OID desired_oid,
diff --git a/src/lib/gssapi/krb5/gssapi_krb5.c b/src/lib/gssapi/krb5/gssapi_krb5.c
index 25534e56b..50d4e36dd 100644
--- a/src/lib/gssapi/krb5/gssapi_krb5.c
+++ b/src/lib/gssapi/krb5/gssapi_krb5.c
@@ -590,10 +590,12 @@ static struct {
         {GSS_KRB5_FREE_LUCID_SEC_CONTEXT_OID_LENGTH, GSS_KRB5_FREE_LUCID_SEC_CONTEXT_OID},
         gss_krb5int_free_lucid_sec_context
     },
+#ifndef _WIN32
     {
         {GSS_KRB5_USE_KDC_CONTEXT_OID_LENGTH, GSS_KRB5_USE_KDC_CONTEXT_OID},
         krb5int_gss_use_kdc_context
     },
+#endif
 };
 
 static OM_uint32
diff --git a/src/lib/gssapi/krb5/krb5_gss_glue.c b/src/lib/gssapi/krb5/krb5_gss_glue.c
index eb9dd83ca..bc3b7c7f9 100644
--- a/src/lib/gssapi/krb5/krb5_gss_glue.c
+++ b/src/lib/gssapi/krb5/krb5_gss_glue.c
@@ -298,6 +298,7 @@ krb5_gss_register_acceptor_identity(const char *keytab)
     return major_status;
 }
 
+#ifndef _WIN32
 krb5_error_code
 krb5_gss_use_kdc_context(void)
 {
@@ -327,6 +328,7 @@ krb5_gss_use_kdc_context(void)
 
     return ret;
 }
+#endif
 
 /*
  * This API should go away and be replaced with an accessor
diff --git a/src/lib/gssapi/krb5/lucid_context.c b/src/lib/gssapi/krb5/lucid_context.c
index b1454cf71..6fe069bda 100644
--- a/src/lib/gssapi/krb5/lucid_context.c
+++ b/src/lib/gssapi/krb5/lucid_context.c
@@ -60,10 +60,10 @@ make_external_lucid_ctx_v1(
  * Exported routines
  */
 
-OM_uint32 KRB5_CALLCONV
+OM_uint32
 gss_krb5int_export_lucid_sec_context(
     OM_uint32           *minor_status,
-    gss_ctx_id_t        context_handle,
+    const gss_ctx_id_t  context_handle,
     const gss_OID       desired_object,
     gss_buffer_set_t    *data_set)
 {
diff --git a/src/lib/gssapi/krb5/set_allowable_enctypes.c b/src/lib/gssapi/krb5/set_allowable_enctypes.c
index de1c5a4db..0daf8b135 100644
--- a/src/lib/gssapi/krb5/set_allowable_enctypes.c
+++ b/src/lib/gssapi/krb5/set_allowable_enctypes.c
@@ -59,7 +59,7 @@
 #endif
 #include "gssapi_krb5.h"
 
-OM_uint32 KRB5_CALLCONV
+OM_uint32
 gss_krb5int_set_allowable_enctypes(OM_uint32 *minor_status,
                                    gss_cred_id_t *cred_handle,
                                    const gss_OID desired_oid,
diff --git a/src/lib/gssapi/krb5/set_ccache.c b/src/lib/gssapi/krb5/set_ccache.c
index 7d52608df..4b6c89065 100644
--- a/src/lib/gssapi/krb5/set_ccache.c
+++ b/src/lib/gssapi/krb5/set_ccache.c
@@ -31,7 +31,7 @@
 #include <string.h>
 #include "gssapiP_krb5.h"
 
-OM_uint32 KRB5_CALLCONV
+OM_uint32
 gss_krb5int_ccache_name(OM_uint32 *minor_status,
                         const gss_OID desired_mech,
                         const gss_OID desired_object,
diff --git a/src/lib/gssapi/mechglue/g_mechattr.c b/src/lib/gssapi/mechglue/g_mechattr.c
index d23f32664..5f863e38b 100644
--- a/src/lib/gssapi/mechglue/g_mechattr.c
+++ b/src/lib/gssapi/mechglue/g_mechattr.c
@@ -91,7 +91,8 @@ testMechAttrsKnown(gss_const_OID_set critical,
     return 1;
 }
 
-OM_uint32 gss_indicate_mechs_by_attrs(
+OM_uint32 KRB5_CALLCONV
+gss_indicate_mechs_by_attrs(
       OM_uint32         *minor,
       gss_const_OID_set  desired_mech_attrs,
       gss_const_OID_set  except_mech_attrs,
@@ -154,7 +155,8 @@ cleanup:
     return status;
 }
 
-OM_uint32 gss_inquire_attrs_for_mech(
+OM_uint32 KRB5_CALLCONV
+gss_inquire_attrs_for_mech(
       OM_uint32         *minor,
       gss_const_OID      mech_oid,
       gss_OID_set       *mech_attrs,
@@ -213,7 +215,8 @@ OM_uint32 gss_inquire_attrs_for_mech(
     return GSS_S_COMPLETE;
 }
 
-OM_uint32 gss_display_mech_attr(
+OM_uint32 KRB5_CALLCONV
+gss_display_mech_attr(
       OM_uint32         *minor,
       gss_const_OID      mech_attr,
       gss_buffer_t       name,
diff --git a/src/lib/gssapi/mechglue/g_oid_ops.c b/src/lib/gssapi/mechglue/g_oid_ops.c
index a68aca9ed..f87febfb2 100644
--- a/src/lib/gssapi/mechglue/g_oid_ops.c
+++ b/src/lib/gssapi/mechglue/g_oid_ops.c
@@ -100,7 +100,7 @@ gss_str_to_oid(minor_status, oid_str, oid)
     return status;
 }
 
-OM_uint32 KRB5_CALLCONV
+OM_uint32
 gssint_copy_oid_set(
     OM_uint32 *minor_status,
     const gss_OID_set_desc * const oidset,
diff --git a/src/lib/gssapi/mechglue/g_store_cred.c b/src/lib/gssapi/mechglue/g_store_cred.c
index 3b286ecd4..f7de1d613 100644
--- a/src/lib/gssapi/mechglue/g_store_cred.c
+++ b/src/lib/gssapi/mechglue/g_store_cred.c
@@ -53,14 +53,15 @@ val_store_cred_args(
 }
 
 
-OM_uint32 gss_store_cred(minor_status,
-			input_cred_handle,
-			cred_usage,
-			desired_mech,
-			overwrite_cred,
-			default_cred,
-			elements_stored,
-			cred_usage_stored)
+OM_uint32 KRB5_CALLCONV
+gss_store_cred(minor_status,
+	       input_cred_handle,
+	       cred_usage,
+	       desired_mech,
+	       overwrite_cred,
+	       default_cred,
+	       elements_stored,
+	       cred_usage_stored)
 
 OM_uint32		*minor_status;
 gss_cred_id_t	         input_cred_handle;
diff --git a/src/lib/gssapi/mechglue/mglueP.h b/src/lib/gssapi/mechglue/mglueP.h
index 63d89c771..3524ceae4 100644
--- a/src/lib/gssapi/mechglue/mglueP.h
+++ b/src/lib/gssapi/mechglue/mglueP.h
@@ -727,18 +727,6 @@ gssint_userok(
 	int *			/* user_ok */
 );
 
-OM_uint32
-gss_store_cred(
-	OM_uint32 *,		/* minor_status */
-	const gss_cred_id_t,	/* input_cred_handle */
-	gss_cred_usage_t,	/* cred_usage */
-	const gss_OID,		/* desired_mech */
-	OM_uint32,		/* overwrite_cred */
-	OM_uint32,		/* default_cred */
-	gss_OID_set *,		/* elements_stored */
-	gss_cred_usage_t *	/* cred_usage_stored */
-);
-
 int
 gssint_get_der_length(
 	unsigned char **,	/* buf */
diff --git a/src/lib/gssapi/spnego/gssapiP_spnego.h b/src/lib/gssapi/spnego/gssapiP_spnego.h
index 50f05678d..3c2edbbdd 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 519050a14..784714669 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,