Windows/NT integration (V1_0_WIN32_BRANCH merge)

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9788 dc483132-0cff-0310-8789-dd5450dbe970

6 files changed, 167 insertions, 154 deletions

diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog
index 8f9ac2c0d4..67bf46319a 100644
--- a/src/lib/gssapi/krb5/ChangeLog
+++ b/src/lib/gssapi/krb5/ChangeLog
@@ -1,9 +1,26 @@
+Wed Feb  5 20:27:50 1997  Richard Basch  <basch@lehman.com>
+
+	* acquire_cred.c (acquire_accept_cred): Removed unused local variable
+
+Tue Feb  4 15:56:01 1997  Richard Basch  <basch@lehman.com>
+
+	* Makefile.in: Only override the object build of the error table
+		under Unix
+
 Wed Dec  4 13:06:13 1996  Barry Jaspan  <bjaspan@mit.edu>
 
 	* acquire_cred.c (acquire_accept_cred): use krb5_kt_get_entry
  	instead of scanning through keytab to find matching principal
  	[krb5-libs/210]
 
+Thu Nov 21 11:55:16 EST 1996    Richard Basch   <basch@lehman.com>
+
+        * Makefile.in: win32 build
+
+	* gssapiP_krb5.h krb5_gss_glue.c:
+	DLL export all public GSSAPI interfaces; adjusted some other
+	declarations accordingly (KRB5_CALLCONV, FAR keywords added)
+
 Wed Nov 20 19:55:29 1996  Marc Horowitz  <marc@cygnus.com>
 
 	* init_sec_context.c (make_ap_rep, krb5_gss_init_sec_context),
diff --git a/src/lib/gssapi/krb5/Makefile.in b/src/lib/gssapi/krb5/Makefile.in
index d48db0291b..45db67345d 100644
--- a/src/lib/gssapi/krb5/Makefile.in
+++ b/src/lib/gssapi/krb5/Makefile.in
@@ -1,18 +1,14 @@
-CFLAGS = $(CCOPTS) $(DEFS) -I. -I$(srcdir) -I../generic -I$(srcdir)/../generic -DUSE_AUTOCONF_H
+CFLAGS = $(CCOPTS) $(DEFS) -I. -I$(srcdir) -I../generic -I$(srcdir)/../generic
 
 ##DOSBUILDTOP = ..\..\..
-##DOSLIBNAME=..\gssapi.$(LIBEXT)
+##DOSMYNAME=krb5
+##DOSOBJFILE = ..\krb5.lst
+##WIN16##LIBNAME=..\gssapi.lib
 
 .c.o:
 	$(CC) $(CFLAGS) -c $(srcdir)/$*.c
 @SHARED_RULE@
 
-all-unix:: shared $(OBJS)
-
-all-mac:: shared $(OBJS)
-
-all-windows:: $(OBJS)
-
 shared:
 	mkdir shared
 
@@ -20,14 +16,13 @@ ETSRCS= gssapi_err_krb5.c
 ETOBJS= gssapi_err_krb5.$(OBJEXT)
 ETHDRS= gssapi_err_krb5.h
 
-gssapi_err_krb5.$(OBJEXT): gssapi_err_krb5.c
+gssapi_err_krb5.o: gssapi_err_krb5.c
 	$(CC) $(CFLAGS) -c $*.c
+
 @SHARED_RULE_LOCAL@
-##WIN16##	$(LIBCMD) $(PAGESIZE) /nologo $(LIBNAME) -+$@;
-##WIN32##	$(LIBCMD) /out:$(LIBNAME) /nologo $@
 
+gssapi_err_krb5.$(OBJEXT): gssapi_err_krb5.c
 gssapi_err_krb5.h: gssapi_err_krb5.et
-
 gssapi_err_krb5.c: gssapi_err_krb5.et
 
 SRCS = \
@@ -115,9 +110,14 @@ HDRS= $(ETHDRS)
 EHDRDIR=$(BUILDTOP)$(S)include$(S)gssapi
 EXPORTED_HEADERS= gssapi_krb5.h
 
-all-unix:: $(SRCS) $(HDRS) includes $(OBJS)
-all-mac:: $(SRCS) $(HDRS) includes $(OBJS)
-all-windows:: win-include $(SRCS) $(HDRS) $(OBJS)
+##DOS$(OBJFILE): $(OBJS)
+##DOS	$(RM) $(OBJFILE)
+##WIN16##	$(CP) nul: $(OBJFILE)
+##WIN32##	$(LIBECHO) -p $(MYNAME)\ *.obj >$(OBJFILE)
+
+all-unix:: shared $(SRCS) $(HDRS) includes $(OBJS)
+all-mac:: shared $(SRCS) $(HDRS) includes $(OBJS)
+all-windows:: win-include $(SRCS) $(HDRS) $(OBJS) $(OBJFILE)
 
 win-include::
 	if not exist $(EHDRDIR)\nul mkdir $(EHDRDIR)
@@ -130,7 +130,7 @@ clean-mac::
 	$(RM) $(ETHDRS) $(ETSRCS) shared/*
 
 clean-windows::
-	$(RM) $(EHDRDIR)\gssapi_krb5.h
+	$(RM) $(EHDRDIR)\gssapi_krb5.h $(OBJFILE)
 	if exist $(EHDRDIR)\nul rmdir $(EHDRDIR)
 
 install::
diff --git a/src/lib/gssapi/krb5/acquire_cred.c b/src/lib/gssapi/krb5/acquire_cred.c
index a99177758f..8f1935038d 100644
--- a/src/lib/gssapi/krb5/acquire_cred.c
+++ b/src/lib/gssapi/krb5/acquire_cred.c
@@ -50,7 +50,6 @@ acquire_accept_cred(context, minor_status, desired_name, output_princ, cred)
    krb5_principal princ;
    krb5_keytab kt;
    krb5_keytab_entry entry;
-   krb5_kt_cursor cur;
 
    *output_princ = NULL;
    cred->keytab = NULL;
diff --git a/src/lib/gssapi/krb5/gssapiP_krb5.h b/src/lib/gssapi/krb5/gssapiP_krb5.h
index 97f2d51d51..d7b01e0210 100644
--- a/src/lib/gssapi/krb5/gssapiP_krb5.h
+++ b/src/lib/gssapi/krb5/gssapiP_krb5.h
@@ -27,11 +27,7 @@
  * $Id$
  */
 
-#if (defined(_MSDOS) || defined(_WIN32) || defined(_MACINTOSH))
-#include <k5-int.h>
-#else
 #include <krb5.h>
-#endif
 #include <memory.h>
 
 /* work around sunos braindamage */
diff --git a/src/lib/gssapi/krb5/krb5_gss_glue.c b/src/lib/gssapi/krb5/krb5_gss_glue.c
index fe3b0208f7..8155d85777 100644
--- a/src/lib/gssapi/krb5/krb5_gss_glue.c
+++ b/src/lib/gssapi/krb5/krb5_gss_glue.c
@@ -26,21 +26,21 @@
 
 #include "gssapiP_krb5.h"
 
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_accept_sec_context(minor_status, context_handle, verifier_cred_handle,
 		       input_token, input_chan_bindings, src_name, mech_type, 
 		       output_token, ret_flags, time_rec, delegated_cred_handle)
-     OM_uint32 *minor_status;
-     gss_ctx_id_t *context_handle;
+     OM_uint32 FAR *minor_status;
+     gss_ctx_id_t FAR *context_handle;
      gss_cred_id_t verifier_cred_handle;
      gss_buffer_t input_token;
      gss_channel_bindings_t input_chan_bindings;
-     gss_name_t *src_name;
-     gss_OID *mech_type;
+     gss_name_t FAR *src_name;
+     gss_OID FAR *mech_type;
      gss_buffer_t output_token;
-     OM_uint32 *ret_flags;
-     OM_uint32 *time_rec;
-     gss_cred_id_t *delegated_cred_handle;
+     OM_uint32 FAR *ret_flags;
+     OM_uint32 FAR *time_rec;
+     gss_cred_id_t FAR *delegated_cred_handle;
 {
    return(krb5_gss_accept_sec_context(minor_status,
 				      context_handle,
@@ -55,17 +55,17 @@ gss_accept_sec_context(minor_status, context_handle, verifier_cred_handle,
 				      delegated_cred_handle));
 }
 
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_acquire_cred(minor_status, desired_name, time_req, desired_mechs,
 		 cred_usage, output_cred_handle, actual_mechs, time_rec)
-     OM_uint32 *minor_status;
+     OM_uint32 FAR *minor_status;
      gss_name_t desired_name;
      OM_uint32 time_req;
      gss_OID_set desired_mechs;
      gss_cred_usage_t cred_usage;
-     gss_cred_id_t *output_cred_handle;
-     gss_OID_set *actual_mechs;
-     OM_uint32 *time_rec;
+     gss_cred_id_t FAR *output_cred_handle;
+     gss_OID_set FAR *actual_mechs;
+     OM_uint32 FAR *time_rec;
 {
    return(krb5_gss_acquire_cred(minor_status,
 				desired_name,
@@ -78,22 +78,22 @@ gss_acquire_cred(minor_status, desired_name, time_req, desired_mechs,
 }
 
 /* V2 */
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_add_cred(minor_status, input_cred_handle, desired_name, desired_mech,
 	     cred_usage, initiator_time_req, acceptor_time_req,
 	     output_cred_handle, actual_mechs, initiator_time_rec,
 	     acceptor_time_rec)
-    OM_uint32		*minor_status;
+    OM_uint32		FAR *minor_status;
     gss_cred_id_t	input_cred_handle;
     gss_name_t		desired_name;
     gss_OID		desired_mech;
     gss_cred_usage_t	cred_usage;
     OM_uint32		initiator_time_req;
     OM_uint32		acceptor_time_req;
-    gss_cred_id_t	*output_cred_handle;
-    gss_OID_set		*actual_mechs;
-    OM_uint32		*initiator_time_rec;
-    OM_uint32		*acceptor_time_rec;
+    gss_cred_id_t	FAR *output_cred_handle;
+    gss_OID_set		FAR *actual_mechs;
+    OM_uint32		FAR *initiator_time_rec;
+    OM_uint32		FAR *acceptor_time_rec;
 {
     return(krb5_gss_add_cred(minor_status, input_cred_handle, desired_name,
 			     desired_mech, cred_usage, initiator_time_req,
@@ -103,74 +103,74 @@ gss_add_cred(minor_status, input_cred_handle, desired_name, desired_mech,
 }
 
 /* V2 */
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_add_oid_set_member(minor_status, member_oid, oid_set)
-    OM_uint32	*minor_status;
+    OM_uint32	FAR *minor_status;
     gss_OID	member_oid;
-    gss_OID_set	*oid_set;
+    gss_OID_set	FAR *oid_set;
 {
     return(generic_gss_add_oid_set_member(minor_status, member_oid, oid_set));
 }
 
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_compare_name(minor_status, name1, name2, name_equal)
-     OM_uint32 *minor_status;
+     OM_uint32 FAR *minor_status;
      gss_name_t name1;
      gss_name_t name2;
-     int *name_equal;
+     int FAR *name_equal;
 {
    return(krb5_gss_compare_name(minor_status, name1,
 				name2, name_equal));
 }
 
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_context_time(minor_status, context_handle, time_rec)
-     OM_uint32 *minor_status;
+     OM_uint32 FAR *minor_status;
      gss_ctx_id_t context_handle;
-     OM_uint32 *time_rec;
+     OM_uint32 FAR *time_rec;
 {
    return(krb5_gss_context_time(minor_status, context_handle,
 				time_rec));
 }
 
 /* V2 */
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_create_empty_oid_set(minor_status, oid_set)
-    OM_uint32	*minor_status;
-    gss_OID_set	*oid_set;
+    OM_uint32	FAR *minor_status;
+    gss_OID_set	FAR *oid_set;
 {
     return(generic_gss_create_empty_oid_set(minor_status, oid_set));
 }
 
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_delete_sec_context(minor_status, context_handle, output_token)
-     OM_uint32 *minor_status;
-     gss_ctx_id_t *context_handle;
+     OM_uint32 FAR *minor_status;
+     gss_ctx_id_t FAR *context_handle;
      gss_buffer_t output_token;
 {
    return(krb5_gss_delete_sec_context(minor_status,
 				      context_handle, output_token));
 }
 
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_display_name(minor_status, input_name, output_name_buffer, output_name_type)
-     OM_uint32 *minor_status;
+     OM_uint32 FAR *minor_status;
      gss_name_t input_name;
      gss_buffer_t output_name_buffer;
-     gss_OID *output_name_type;
+     gss_OID FAR *output_name_type;
 {
    return(krb5_gss_display_name(minor_status, input_name,
 				output_name_buffer, output_name_type));
 }
 
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_display_status(minor_status, status_value, status_type,
 		   mech_type, message_context, status_string)
-     OM_uint32 *minor_status;
+     OM_uint32 FAR *minor_status;
      OM_uint32 status_value;
      int status_type;
      gss_OID mech_type;
-     OM_uint32 *message_context;
+     OM_uint32 FAR *message_context;
      gss_buffer_t status_string;
 {
    return(krb5_gss_display_status(minor_status, status_value,
@@ -179,10 +179,10 @@ gss_display_status(minor_status, status_value, status_type,
 }
 
 /* V2 */
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_export_sec_context(minor_status, context_handle, interprocess_token)
-     OM_uint32		*minor_status;
-     gss_ctx_id_t	*context_handle;
+     OM_uint32		FAR *minor_status;
+     gss_ctx_id_t	FAR *context_handle;
      gss_buffer_t	interprocess_token;
 {
    return(krb5_gss_export_sec_context(minor_status,
@@ -191,10 +191,10 @@ gss_export_sec_context(minor_status, context_handle, interprocess_token)
 }
 
 /* V2 */
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_get_mic(minor_status, context_handle, qop_req,
 	    message_buffer, message_token)
-     OM_uint32		*minor_status;
+     OM_uint32		FAR *minor_status;
      gss_ctx_id_t	context_handle;
      gss_qop_t		qop_req;
      gss_buffer_t	message_buffer;
@@ -204,55 +204,55 @@ gss_get_mic(minor_status, context_handle, qop_req,
 			    qop_req, message_buffer, message_token));
 }
 
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_import_name(minor_status, input_name_buffer, input_name_type, output_name)
-     OM_uint32 *minor_status;
+     OM_uint32 FAR *minor_status;
      gss_buffer_t input_name_buffer;
      gss_OID input_name_type;
-     gss_name_t *output_name;
+     gss_name_t FAR *output_name;
 {
    return(krb5_gss_import_name(minor_status, input_name_buffer,
 			       input_name_type, output_name));
 }
 
 /* V2 */
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_import_sec_context(minor_status, interprocess_token, context_handle)
-     OM_uint32		*minor_status;
+     OM_uint32		FAR *minor_status;
      gss_buffer_t	interprocess_token;
-     gss_ctx_id_t	*context_handle;
+     gss_ctx_id_t	FAR *context_handle;
 {
    return(krb5_gss_import_sec_context(minor_status,
 				      interprocess_token,
 				      context_handle));
 }
 
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_indicate_mechs(minor_status, mech_set)
-     OM_uint32 *minor_status;
-     gss_OID_set *mech_set;
+     OM_uint32 FAR *minor_status;
+     gss_OID_set FAR *mech_set;
 {
    return(krb5_gss_indicate_mechs(minor_status, mech_set));
 }
 
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_init_sec_context(minor_status, claimant_cred_handle, context_handle,
 		     target_name, mech_type, req_flags, time_req,
 		     input_chan_bindings, input_token, actual_mech_type,
 		     output_token, ret_flags, time_rec)
-     OM_uint32 *minor_status;
+     OM_uint32 FAR *minor_status;
      gss_cred_id_t claimant_cred_handle;
-     gss_ctx_id_t *context_handle;
+     gss_ctx_id_t FAR *context_handle;
      gss_name_t target_name;
      gss_OID mech_type;
      OM_uint32 req_flags;
      OM_uint32 time_req;
      gss_channel_bindings_t input_chan_bindings;
      gss_buffer_t input_token;
-     gss_OID *actual_mech_type;
+     gss_OID FAR *actual_mech_type;
      gss_buffer_t output_token;
-     OM_uint32 *ret_flags;
-     OM_uint32 *time_rec;
+     OM_uint32 FAR *ret_flags;
+     OM_uint32 FAR *time_rec;
 {
    return(krb5_gss_init_sec_context(minor_status,
 				    claimant_cred_handle, context_handle,
@@ -262,19 +262,19 @@ gss_init_sec_context(minor_status, claimant_cred_handle, context_handle,
 				    time_rec));
 }
 
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_inquire_context(minor_status, context_handle, initiator_name, acceptor_name,
 		    lifetime_rec, mech_type, ret_flags,
 		    locally_initiated, open)
-     OM_uint32 *minor_status;
+     OM_uint32 FAR *minor_status;
      gss_ctx_id_t context_handle;
-     gss_name_t *initiator_name;
-     gss_name_t *acceptor_name;
-     OM_uint32 *lifetime_rec;
-     gss_OID *mech_type;
-     OM_uint32 *ret_flags;
-     int *locally_initiated;
-     int *open;
+     gss_name_t FAR *initiator_name;
+     gss_name_t FAR *acceptor_name;
+     OM_uint32 FAR *lifetime_rec;
+     gss_OID FAR *mech_type;
+     OM_uint32 FAR *ret_flags;
+     int FAR *locally_initiated;
+     int FAR *open;
 {
    return(krb5_gss_inquire_context(minor_status, context_handle,
 				   initiator_name, acceptor_name, lifetime_rec,
@@ -282,31 +282,31 @@ gss_inquire_context(minor_status, context_handle, initiator_name, acceptor_name,
 				   open));
 }
 
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_inquire_cred(minor_status, cred_handle, name, lifetime_ret,
 		 cred_usage, mechanisms)
-     OM_uint32 *minor_status;
+     OM_uint32 FAR *minor_status;
      gss_cred_id_t cred_handle;
-     gss_name_t *name;
-     OM_uint32 *lifetime_ret;
-     gss_cred_usage_t *cred_usage;
-     gss_OID_set *mechanisms;
+     gss_name_t FAR *name;
+     OM_uint32 FAR *lifetime_ret;
+     gss_cred_usage_t FAR *cred_usage;
+     gss_OID_set FAR *mechanisms;
 {
    return(krb5_gss_inquire_cred(minor_status, cred_handle,
 				name, lifetime_ret, cred_usage, mechanisms));
 }
 
 /* V2 */
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_inquire_cred_by_mech(minor_status, cred_handle, mech_type, name,
 			 initiator_lifetime, acceptor_lifetime, cred_usage)
-     OM_uint32		*minor_status;
+     OM_uint32		FAR *minor_status;
      gss_cred_id_t	cred_handle;
      gss_OID		mech_type;
-     gss_name_t		*name;
-     OM_uint32		*initiator_lifetime;
-     OM_uint32		*acceptor_lifetime;
-     gss_cred_usage_t	*cred_usage;
+     gss_name_t		FAR *name;
+     OM_uint32		FAR *initiator_lifetime;
+     OM_uint32		FAR *acceptor_lifetime;
+     gss_cred_usage_t	FAR *cred_usage;
 {
    return(krb5_gss_inquire_cred_by_mech(minor_status, cred_handle,
 					mech_type, name, initiator_lifetime,
@@ -314,11 +314,11 @@ gss_inquire_cred_by_mech(minor_status, cred_handle, mech_type, name,
 }
 
 /* V2 */
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_inquire_names_for_mech(minor_status, mechanism, name_types)
-    OM_uint32	*minor_status;
+    OM_uint32	FAR *minor_status;
     gss_OID	mechanism;
-    gss_OID_set	*name_types;
+    gss_OID_set	FAR *name_types;
 {
     return(krb5_gss_inquire_names_for_mech(minor_status,
 					   mechanism,
@@ -326,18 +326,18 @@ gss_inquire_names_for_mech(minor_status, mechanism, name_types)
 }
 
 /* V2 */
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_oid_to_str(minor_status, oid, oid_str)
-    OM_uint32		*minor_status;
+    OM_uint32		FAR *minor_status;
     gss_OID		oid;
     gss_buffer_t	oid_str;
 {
     return(generic_gss_oid_to_str(minor_status, oid, oid_str));
 }
 
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_process_context_token(minor_status, context_handle, token_buffer)
-     OM_uint32 *minor_status;
+     OM_uint32 FAR *minor_status;
      gss_ctx_id_t context_handle;
      gss_buffer_t token_buffer;
 {
@@ -345,25 +345,25 @@ gss_process_context_token(minor_status, context_handle, token_buffer)
 					 context_handle, token_buffer));
 }
 
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_release_cred(minor_status, cred_handle)
-     OM_uint32 *minor_status;
-     gss_cred_id_t *cred_handle;
+     OM_uint32 FAR *minor_status;
+     gss_cred_id_t FAR *cred_handle;
 {
    return(krb5_gss_release_cred(minor_status, cred_handle));
 }
 
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_release_name(minor_status, input_name)
-     OM_uint32 *minor_status;
-     gss_name_t *input_name;
+     OM_uint32 FAR *minor_status;
+     gss_name_t FAR *input_name;
 {
    return(krb5_gss_release_name(minor_status, input_name));
 }
 
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_release_buffer(minor_status, buffer)
-     OM_uint32 *minor_status;
+     OM_uint32 FAR *minor_status;
      gss_buffer_t buffer;
 {
    return(generic_gss_release_buffer(minor_status,
@@ -371,32 +371,32 @@ gss_release_buffer(minor_status, buffer)
 }
 
 /* V2 */
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_release_oid(minor_status, oid)
-     OM_uint32	*minor_status;
-     gss_OID	*oid;
+     OM_uint32	FAR *minor_status;
+     gss_OID	FAR *oid;
 {
     return(krb5_gss_release_oid(minor_status, oid));
 }
 
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_release_oid_set(minor_status, set)
-     OM_uint32* minor_status;
-     gss_OID_set *set;
+     OM_uint32 FAR * minor_status;
+     gss_OID_set FAR *set;
 {
    return(generic_gss_release_oid_set(minor_status, set));
 }
 
 /* V1 only */
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_seal(minor_status, context_handle, conf_req_flag, qop_req,
 	 input_message_buffer, conf_state, output_message_buffer)
-     OM_uint32 *minor_status;
+     OM_uint32 FAR *minor_status;
      gss_ctx_id_t context_handle;
      int conf_req_flag;
      int qop_req;
      gss_buffer_t input_message_buffer;
-     int *conf_state;
+     int FAR *conf_state;
      gss_buffer_t output_message_buffer;
 {
    return(krb5_gss_seal(minor_status, context_handle,
@@ -404,11 +404,11 @@ gss_seal(minor_status, context_handle, conf_req_flag, qop_req,
 			conf_state, output_message_buffer));
 }
 
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_sign(minor_status, context_handle,
 	      qop_req, message_buffer, 
 	      message_token)
-     OM_uint32 *minor_status;
+     OM_uint32 FAR *minor_status;
      gss_ctx_id_t context_handle;
      int qop_req;
      gss_buffer_t message_buffer;
@@ -419,29 +419,29 @@ gss_sign(minor_status, context_handle,
 }
 
 /* V2 */
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_verify_mic(minor_status, context_handle,
 	       message_buffer, token_buffer, qop_state)
-     OM_uint32		*minor_status;
+     OM_uint32		FAR *minor_status;
      gss_ctx_id_t	context_handle;
      gss_buffer_t	message_buffer;
      gss_buffer_t	token_buffer;
-     gss_qop_t		*qop_state;
+     gss_qop_t		FAR *qop_state;
 {
     return(krb5_gss_verify_mic(minor_status, context_handle,
 			       message_buffer, token_buffer, qop_state));
 }
 
 /* V2 */
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_wrap(minor_status, context_handle, conf_req_flag, qop_req,
 	 input_message_buffer, conf_state, output_message_buffer)
-    OM_uint32		*minor_status;
+    OM_uint32		FAR *minor_status;
     gss_ctx_id_t	context_handle;
     int			conf_req_flag;
     gss_qop_t		qop_req;
     gss_buffer_t	input_message_buffer;
-    int			*conf_state;
+    int			FAR *conf_state;
     gss_buffer_t	output_message_buffer;
 {
     return(krb5_gss_wrap(minor_status, context_handle, conf_req_flag, qop_req,
@@ -450,37 +450,37 @@ gss_wrap(minor_status, context_handle, conf_req_flag, qop_req,
 }
 
 /* V2 */
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_str_to_oid(minor_status, oid_str, oid)
-    OM_uint32		*minor_status;
+    OM_uint32		FAR *minor_status;
     gss_buffer_t	oid_str;
-    gss_OID		*oid;
+    gss_OID		FAR *oid;
 {
     return(generic_gss_str_to_oid(minor_status, oid_str, oid));
 }
 
 /* V2 */
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_test_oid_set_member(minor_status, member, set, present)
-    OM_uint32	*minor_status;
+    OM_uint32	FAR *minor_status;
     gss_OID	member;
     gss_OID_set	set;
-    int		*present;
+    int		FAR *present;
 {
     return(generic_gss_test_oid_set_member(minor_status, member, set,
 					   present));
 }
 
 /* V1 only */
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_unseal(minor_status, context_handle, input_message_buffer,
 	   output_message_buffer, conf_state, qop_state)
-     OM_uint32 *minor_status;
+     OM_uint32 FAR *minor_status;
      gss_ctx_id_t context_handle;
      gss_buffer_t input_message_buffer;
      gss_buffer_t output_message_buffer;
-     int *conf_state;
-     int *qop_state;
+     int FAR *conf_state;
+     int FAR *qop_state;
 {
    return(krb5_gss_unseal(minor_status, context_handle,
 			  input_message_buffer, output_message_buffer,
@@ -488,29 +488,29 @@ gss_unseal(minor_status, context_handle, input_message_buffer,
 }
 
 /* V2 */
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_unwrap(minor_status, context_handle, input_message_buffer, 
 	   output_message_buffer, conf_state, qop_state)
-    OM_uint32		*minor_status;
+    OM_uint32		FAR *minor_status;
     gss_ctx_id_t	context_handle;
     gss_buffer_t	input_message_buffer;
     gss_buffer_t	output_message_buffer;
-    int			*conf_state;
-    gss_qop_t		*qop_state;
+    int			FAR *conf_state;
+    gss_qop_t		FAR *qop_state;
 {
     return(krb5_gss_unwrap(minor_status, context_handle, input_message_buffer,
 			   output_message_buffer, conf_state, qop_state));
 }
 
 /* V1 only */
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_verify(minor_status, context_handle, message_buffer,
 	   token_buffer, qop_state)
-     OM_uint32 *minor_status;
+     OM_uint32 FAR *minor_status;
      gss_ctx_id_t context_handle;
      gss_buffer_t message_buffer;
      gss_buffer_t token_buffer;
-     int *qop_state;
+     int FAR *qop_state;
 {
    return(krb5_gss_verify(minor_status,
 			  context_handle,
@@ -520,15 +520,15 @@ gss_verify(minor_status, context_handle, message_buffer,
 }
 
 /* V2 interface */
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_wrap_size_limit(minor_status, context_handle, conf_req_flag,
 		    qop_req, req_output_size, max_input_size)
-    OM_uint32		*minor_status;
+    OM_uint32		FAR *minor_status;
     gss_ctx_id_t	context_handle;
     int			conf_req_flag;
     gss_qop_t		qop_req;
     OM_uint32		req_output_size;
-    OM_uint32		*max_input_size;
+    OM_uint32		FAR *max_input_size;
 {
    return(krb5_gss_wrap_size_limit(minor_status, context_handle,
 				   conf_req_flag, qop_req,
diff --git a/src/lib/gssapi/krb5/ser_sctx.c b/src/lib/gssapi/krb5/ser_sctx.c
index 22b5c367ce..36e70d742c 100644
--- a/src/lib/gssapi/krb5/ser_sctx.c
+++ b/src/lib/gssapi/krb5/ser_sctx.c
@@ -25,6 +25,7 @@
 /*
  * ser_sctx.c - Handle [de]serialization of GSSAPI security context.
  */
+#include "k5-int.h"
 #include "gssapiP_krb5.h"
 
 /*