PC'fied gssapi directories. Mostly changing Makefile.in and adding the

windows INTERFACE keyword to functions. A few int/long fixes.

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

15 files changed, 128 insertions, 94 deletions

diff --git a/src/lib/gssapi/generic/ChangeLog b/src/lib/gssapi/generic/ChangeLog
index a1d1298d7..69d5aebd6 100644
--- a/src/lib/gssapi/generic/ChangeLog
+++ b/src/lib/gssapi/generic/ChangeLog
@@ -1,3 +1,17 @@
+Mon Feb 20 18:50:33 1995 Keith Vetter (keithv@fusion.com)
+
+	* Makefile.in: made to work on the PC
+        * Added windows INTERFACE keyword
+          disp_com.c disp_maj.c rel_buff.c rel_oid_.c
+          util_buf.c util_can.c util_dup.c util_oid.c
+          util_tok.c util_val.c utl_noha.c
+        * gssapiP_generic.h: 
+          added INTERFACE keyword
+          removed inclusion
+        * util_tok.c: had to coerce long to int on TWRITE_STR.
+        * gssapi.h: made typedef for OM_uint32 machine independent and
+          added INTERFACE to prototypes.
+
 Mon Feb 20 12:00:00 1994  Keith Vetter (keithv@fusion.com)
 
 	More DOS 8.3 renames--for files created by make
diff --git a/src/lib/gssapi/generic/Makefile.in b/src/lib/gssapi/generic/Makefile.in
index 251a9ac07..182c307e9 100644
--- a/src/lib/gssapi/generic/Makefile.in
+++ b/src/lib/gssapi/generic/Makefile.in
@@ -1,13 +1,18 @@
 CFLAGS = $(CCOPTS) $(DEFS) -I. -I$(srcdir)
 LDFLAGS = -g
 
+##DOSBUILDTOP = ..\..\..
+##DOSLIBNAME=..\libgssapi_krb5.$(LIBEXT)
+##DOSsrcdir = .
+##DOS!include $(BUILDTOP)\config\windows.in
+
 all:: $(OBJS)
 
 ETSRCS= gssapi_err_generic.c
-ETOBJS= gssapi_err_generic.o
+ETOBJS= gssapi_err_generic.$(OBJEXT)
 ETHDRS= gssapi_err_generic.h
 
-gssapi_err_generic.o: gssapi_err_generic.c
+gssapi_err_generic.$(OBJEXT): gssapi_err_generic.c
 
 gssapi_err_generic.h: gssapi_err_generic.et
 
@@ -15,10 +20,10 @@ gssapi_err_generic.c: gssapi_err_generic.et
 
 #if HasHashLibrary
 # UTIL_VALIDATE_SRC= $(srcdir)/util_validate.c
-# UTIL_VALIDATE_OBJ= util_validate.o
+# UTIL_VALIDATE_OBJ= util_validate.$(OBJEXT)
 #else
 UTIL_VALIDATE_SRC= $(srcdir)/utl_nohash_validate.c
-UTIL_VALIDATE_OBJ= utl_nohash_validate.o
+UTIL_VALIDATE_OBJ= utl_nohash_validate.$(OBJEXT)
 #endif
 
 CCSRCS = \
@@ -35,31 +40,46 @@ CCSRCS = \
 	$(UTIL_VALIDATE_SRC)
 
 CCOBJS = \
-	disp_major_status.o \
-	disp_com_err_status.o \
-	gssapi_generic.o \
-	rel_buffer.o \
-	rel_oid_set.o \
-	util_buffer.o \
-	util_canonhost.o \
-	util_dup.o \
-	util_oid.o \
-	util_token.o \
+	disp_major_status.$(OBJEXT) \
+	disp_com_err_status.$(OBJEXT) \
+	gssapi_generic.$(OBJEXT) \
+	rel_buffer.$(OBJEXT) \
+	rel_oid_set.$(OBJEXT) \
+	util_buffer.$(OBJEXT) \
+	util_canonhost.$(OBJEXT) \
+	util_dup.$(OBJEXT) \
+	util_oid.$(OBJEXT) \
+	util_token.$(OBJEXT) \
 	$(UTIL_VALIDATE_OBJ)
 
 
-EHDRDIR= $(BUILDTOP)/include/gssapi
+EHDRDIR= $(BUILDTOP)$(S)include$(S)gssapi
 EXPORTED_HEADERS= gssapi.h gssapi_generic.h
 
 SRCS= $(ETSRCS) $(CCSRCS)
 OBJS= $(ETOBJS) $(CCOBJS)
 HDRS= $(ETHDRS)
 
-all:: $(SRCS) $(HDRS) includes $(OBJS)
+all:: all-$(WHAT) $(SRCS) $(HDRS) includes $(OBJS)
+
+all-unix::
+
+all-windows::
+	if not exist $(EHDRDIR)\nul mkdir $(EHDRDIR)
+	copy gssapi.h $(EHDRDIR)
+	copy gssapi_generic.h $(EHDRDIR)
 
-clean::
+clean:: clean-$(WHAT)
+
+clean-unix::
 	$(RM) $(ETHDRS) $(ETSRCS)
 
+clean-windows::
+	$(RM) $(EHDRDIR)\gssapi.h $(EHDRDIR)\gssapi_generic.h
+	if exist $(EHDRDIR)\nul rmdir $(EHDRDIR)
+
 # Krb5InstallHeaders($(EXPORTED_HEADERS), $(KRB5_INCDIR)/krb5)
 
 depend:: $(ETSRCS)
+
+includes::
diff --git a/src/lib/gssapi/generic/disp_com_err_status.c b/src/lib/gssapi/generic/disp_com_err_status.c
index f0e66c3bb..627891275 100644
--- a/src/lib/gssapi/generic/disp_com_err_status.c
+++ b/src/lib/gssapi/generic/disp_com_err_status.c
@@ -40,7 +40,8 @@ static const char * const no_error = "No error";
    if status_type == GSS_C_MECH_CODE, return the output from error_message()
    */
 
-OM_uint32 g_display_com_err_status(minor_status, status_value, status_string)
+OM_uint32 INTERFACE
+g_display_com_err_status(minor_status, status_value, status_string)
      OM_uint32 *minor_status;
      OM_uint32 status_value;
      gss_buffer_t status_string;
diff --git a/src/lib/gssapi/generic/disp_major_status.c b/src/lib/gssapi/generic/disp_major_status.c
index 8bbf59538..d37b34e88 100644
--- a/src/lib/gssapi/generic/disp_major_status.c
+++ b/src/lib/gssapi/generic/disp_major_status.c
@@ -201,7 +201,7 @@ static OM_uint32 display_bit(minor_status, code, status_string)
      message_context > 2  : print supplementary info bit (message_context-2)
      */
 
-OM_uint32 g_display_major_status(minor_status, status_value, 
+OM_uint32 INTERFACE g_display_major_status(minor_status, status_value, 
 				 message_context, status_string)
      OM_uint32 *minor_status;
      OM_uint32 status_value;
diff --git a/src/lib/gssapi/generic/gssapi.h b/src/lib/gssapi/generic/gssapi.h
index 29eefdf03..edcef24a7 100644
--- a/src/lib/gssapi/generic/gssapi.h
+++ b/src/lib/gssapi/generic/gssapi.h
@@ -36,7 +36,7 @@
 /*
  * First, define the platform-dependent types.
  */
-typedef unsigned int OM_uint32;
+typedef krb5_ui_4 OM_uint32;
 typedef void * gss_name_t;
 typedef void * gss_cred_id_t;
 typedef void * gss_ctx_id_t;
@@ -232,7 +232,7 @@ typedef struct gss_channel_bindings_struct {
  * Finally, function prototypes for the GSSAPI routines.
  */
 
-OM_uint32 gss_acquire_cred
+OM_uint32 INTERFACE gss_acquire_cred
 PROTOTYPE( (OM_uint32*,       /* minor_status */
             gss_name_t,       /* desired_name */
             OM_uint32,        /* time_req */
@@ -243,12 +243,12 @@ PROTOTYPE( (OM_uint32*,       /* minor_status */
             OM_uint32*        /* time_rec */
            ));
 
-OM_uint32 gss_release_cred
+OM_uint32 INTERFACE gss_release_cred
 PROTOTYPE( (OM_uint32*,       /* minor_status */
             gss_cred_id_t*    /* cred_handle */
            ));
 
-OM_uint32 gss_init_sec_context
+OM_uint32 INTERFACE gss_init_sec_context
 PROTOTYPE( (OM_uint32*,       /* minor_status */
             gss_cred_id_t,    /* claimant_cred_handle */
             gss_ctx_id_t*,    /* context_handle */
@@ -265,7 +265,7 @@ PROTOTYPE( (OM_uint32*,       /* minor_status */
             OM_uint32*        /* time_rec */
            ));
 
-OM_uint32 gss_accept_sec_context
+OM_uint32 INTERFACE gss_accept_sec_context
 PROTOTYPE( (OM_uint32*,       /* minor_status */
             gss_ctx_id_t*,    /* context_handle */
             gss_cred_id_t,    /* verifier_cred_handle */
@@ -280,25 +280,25 @@ PROTOTYPE( (OM_uint32*,       /* minor_status */
             gss_cred_id_t*    /* delegated_cred_handle */
            ));
 
-OM_uint32 gss_process_context_token
+OM_uint32 INTERFACE gss_process_context_token
 PROTOTYPE( (OM_uint32*,       /* minor_status */
             gss_ctx_id_t,     /* context_handle */
             gss_buffer_t      /* token_buffer */
            ));
 
-OM_uint32 gss_delete_sec_context
+OM_uint32 INTERFACE gss_delete_sec_context
 PROTOTYPE( (OM_uint32*,       /* minor_status */
             gss_ctx_id_t*,    /* context_handle */
             gss_buffer_t      /* output_token */
            ));
 
-OM_uint32 gss_context_time
+OM_uint32 INTERFACE gss_context_time
 PROTOTYPE( (OM_uint32*,       /* minor_status */
             gss_ctx_id_t,     /* context_handle */
             OM_uint32*        /* time_rec */
            ));
 
-OM_uint32 gss_sign
+OM_uint32 INTERFACE gss_sign
 PROTOTYPE( (OM_uint32*,       /* minor_status */
             gss_ctx_id_t,     /* context_handle */
             int,              /* qop_req */
@@ -306,7 +306,7 @@ PROTOTYPE( (OM_uint32*,       /* minor_status */
             gss_buffer_t      /* message_token */
            ));
 
-OM_uint32 gss_verify
+OM_uint32 INTERFACE INTERFACE gss_verify
 PROTOTYPE( (OM_uint32*,       /* minor_status */
             gss_ctx_id_t,     /* context_handle */
             gss_buffer_t,     /* message_buffer */
@@ -314,7 +314,7 @@ PROTOTYPE( (OM_uint32*,       /* minor_status */
             int*              /* qop_state */
            ));
 
-OM_uint32 gss_seal
+OM_uint32 INTERFACE gss_seal
 PROTOTYPE( (OM_uint32*,       /* minor_status */
             gss_ctx_id_t,     /* context_handle */
             int,              /* conf_req_flag */
@@ -324,7 +324,7 @@ PROTOTYPE( (OM_uint32*,       /* minor_status */
             gss_buffer_t      /* output_message_buffer */
            ));
 
-OM_uint32 gss_unseal
+OM_uint32 INTERFACE gss_unseal
 PROTOTYPE( (OM_uint32*,       /* minor_status */
             gss_ctx_id_t,     /* context_handle */
             gss_buffer_t,     /* input_message_buffer */
@@ -333,7 +333,7 @@ PROTOTYPE( (OM_uint32*,       /* minor_status */
             int*              /* qop_state */
            ));
 
-OM_uint32 gss_display_status
+OM_uint32 INTERFACE gss_display_status
 PROTOTYPE( (OM_uint32*,       /* minor_status */
             OM_uint32,        /* status_value */
             int,              /* status_type */
@@ -342,48 +342,48 @@ PROTOTYPE( (OM_uint32*,       /* minor_status */
             gss_buffer_t      /* status_string */
            ));
 
-OM_uint32 gss_indicate_mechs
+OM_uint32 INTERFACE gss_indicate_mechs
 PROTOTYPE( (OM_uint32*,       /* minor_status */
             gss_OID_set*      /* mech_set */
            ));
 
-OM_uint32 gss_compare_name
+OM_uint32 INTERFACE gss_compare_name
 PROTOTYPE( (OM_uint32*,       /* minor_status */
             gss_name_t,       /* name1 */
             gss_name_t,       /* name2 */
             int*              /* name_equal */
            ));
 
-OM_uint32 gss_display_name
+OM_uint32 INTERFACE gss_display_name
 PROTOTYPE( (OM_uint32*,      /* minor_status */
             gss_name_t,      /* input_name */
             gss_buffer_t,     /* output_name_buffer */
             gss_OID*         /* output_name_type */
            ));
 
-OM_uint32 gss_import_name
+OM_uint32 INTERFACE gss_import_name
 PROTOTYPE( (OM_uint32*,       /* minor_status */
             gss_buffer_t,     /* input_name_buffer */
             const_gss_OID,    /* input_name_type */
             gss_name_t*       /* output_name */
            ));
 
-OM_uint32 gss_release_name
+OM_uint32 INTERFACE gss_release_name
 PROTOTYPE( (OM_uint32*,       /* minor_status */
             gss_name_t*       /* input_name */
            ));
 
-OM_uint32 gss_release_buffer
+OM_uint32 INTERFACE gss_release_buffer
 PROTOTYPE( (OM_uint32*,       /* minor_status */
             gss_buffer_t      /* buffer */
            ));
 
-OM_uint32 gss_release_oid_set
+OM_uint32 INTERFACE gss_release_oid_set
 PROTOTYPE( (OM_uint32*,       /* minor_status */
             gss_OID_set*      /* set */
            ));
 
-OM_uint32 gss_inquire_cred
+OM_uint32 INTERFACE gss_inquire_cred
 PROTOTYPE( (OM_uint32 *,      /* minor_status */
             gss_cred_id_t,    /* cred_handle */
             gss_name_t *,     /* name */
@@ -392,7 +392,7 @@ PROTOTYPE( (OM_uint32 *,      /* minor_status */
             gss_OID_set *     /* mechanisms */
            ));
 
-OM_uint32 gss_inquire_context
+OM_uint32 INTERFACE gss_inquire_context
 PROTOTYPE( (OM_uint32*,       /* minor_status */
 	    gss_ctx_id_t,     /* context_handle */
 	    gss_name_t*,      /* initiator_name */
diff --git a/src/lib/gssapi/generic/gssapiP_generic.h b/src/lib/gssapi/generic/gssapiP_generic.h
index 08ee040d1..54a25f783 100644
--- a/src/lib/gssapi/generic/gssapiP_generic.h
+++ b/src/lib/gssapi/generic/gssapiP_generic.h
@@ -28,13 +28,12 @@
 #include "gssapi_err_generic.h"
 #include <errno.h>
 #include <sys/types.h>
-#include <netinet/in.h>
 
 /** helper macros **/
 
 #define g_OID_equal(o1,o2) \
    (((o1)->length == (o2)->length) && \
-    (memcmp((o1)->elements,(o2)->elements,(o1)->length) == 0))
+    (memcmp((o1)->elements,(o2)->elements,(int) (o1)->length) == 0))
 
 /* this code knows that an int on the wire is 32 bits.  The type of
    num should be at least this big, or the extra shifts may do weird
@@ -77,51 +76,51 @@
 
 /** helper functions **/
 
-int g_save_name PROTOTYPE((void **vdb, gss_name_t *name));
-int g_save_cred_id PROTOTYPE((void **vdb, gss_cred_id_t *cred));
-int g_save_ctx_id PROTOTYPE((void **vdb, gss_ctx_id_t *ctx));
+int INTERFACE g_save_name PROTOTYPE((void **vdb, gss_name_t *name));
+int INTERFACE g_save_cred_id PROTOTYPE((void **vdb, gss_cred_id_t *cred));
+int INTERFACE g_save_ctx_id PROTOTYPE((void **vdb, gss_ctx_id_t *ctx));
 
-int g_validate_name PROTOTYPE((void **vdb, gss_name_t *name));
-int g_validate_cred_id PROTOTYPE((void **vdb, gss_cred_id_t *cred));
-int g_validate_ctx_id PROTOTYPE((void **vdb, gss_ctx_id_t *ctx));
+int INTERFACE g_validate_name PROTOTYPE((void **vdb, gss_name_t *name));
+int INTERFACE g_validate_cred_id PROTOTYPE((void **vdb, gss_cred_id_t *cred));
+int INTERFACE g_validate_ctx_id PROTOTYPE((void **vdb, gss_ctx_id_t *ctx));
 
-int g_delete_name PROTOTYPE((void **vdb, gss_name_t *name));
-int g_delete_cred_id PROTOTYPE((void **vdb, gss_cred_id_t *cred));
-int g_delete_ctx_id PROTOTYPE((void **vdb, gss_ctx_id_t *ctx));
+int INTERFACE g_delete_name PROTOTYPE((void **vdb, gss_name_t *name));
+int INTERFACE g_delete_cred_id PROTOTYPE((void **vdb, gss_cred_id_t *cred));
+int INTERFACE g_delete_ctx_id PROTOTYPE((void **vdb, gss_ctx_id_t *ctx));
 
-int g_make_string_buffer PROTOTYPE((const char *str, gss_buffer_t buffer));
+int INTERFACE g_make_string_buffer PROTOTYPE((const char *str, gss_buffer_t buffer));
 
-int g_copy_OID_set PROTOTYPE((const gss_OID_set_desc * const in, gss_OID_set *out));
+int INTERFACE g_copy_OID_set PROTOTYPE((const gss_OID_set_desc * const in, gss_OID_set *out));
 
-int g_token_size PROTOTYPE((const_gss_OID mech, unsigned int body_size));
+int INTERFACE g_token_size PROTOTYPE((const_gss_OID mech, unsigned int body_size));
 
-void g_make_token_header PROTOTYPE((const_gss_OID mech, int body_size,
+void INTERFACE g_make_token_header PROTOTYPE((const_gss_OID mech, int body_size,
 			  unsigned char **buf, int tok_type));
 
-int g_verify_token_header PROTOTYPE((const_gss_OID mech, int *body_size,
+int INTERFACE g_verify_token_header PROTOTYPE((const_gss_OID mech, int *body_size,
 			  unsigned char **buf, int tok_type, int toksize));
 
-OM_uint32 g_display_major_status PROTOTYPE((OM_uint32 *minor_status,
+OM_uint32 INTERFACE g_display_major_status PROTOTYPE((OM_uint32 *minor_status,
 				 OM_uint32 status_value,
 				 int *message_context,
 				 gss_buffer_t status_string));
 
-OM_uint32 g_display_com_err_status PROTOTYPE((OM_uint32 *minor_status,
+OM_uint32 INTERFACE INTERFACE g_display_com_err_status PROTOTYPE((OM_uint32 *minor_status,
 				   OM_uint32 status_value,
 				   gss_buffer_t status_string));
 
-char *g_canonicalize_host PROTOTYPE((char *hostname));
+char * INTERFACE g_canonicalize_host PROTOTYPE((char *hostname));
 
-char *g_strdup PROTOTYPE((char *str));
+char * INTERFACE g_strdup PROTOTYPE((char *str));
 
 /** declarations of internal name mechanism functions **/
 
-OM_uint32 generic_gss_release_buffer
+OM_uint32 INTERFACE generic_gss_release_buffer
 PROTOTYPE( (OM_uint32*,       /* minor_status */
             gss_buffer_t      /* buffer */
            ));
 
-OM_uint32 generic_gss_release_oid_set
+OM_uint32 INTERFACE generic_gss_release_oid_set
 PROTOTYPE( (OM_uint32*,       /* minor_status */
             gss_OID_set*      /* set */
            ));
diff --git a/src/lib/gssapi/generic/rel_buffer.c b/src/lib/gssapi/generic/rel_buffer.c
index b764a5b5f..2345fc4b0 100644
--- a/src/lib/gssapi/generic/rel_buffer.c
+++ b/src/lib/gssapi/generic/rel_buffer.c
@@ -22,7 +22,7 @@
 
 #include "gssapiP_generic.h"
 
-OM_uint32 generic_gss_release_buffer(minor_status, buffer)
+OM_uint32 INTERFACE generic_gss_release_buffer(minor_status, buffer)
      OM_uint32 *minor_status;
      gss_buffer_t buffer;
 {
diff --git a/src/lib/gssapi/generic/rel_oid_set.c b/src/lib/gssapi/generic/rel_oid_set.c
index 2edfe9a39..073664a19 100644
--- a/src/lib/gssapi/generic/rel_oid_set.c
+++ b/src/lib/gssapi/generic/rel_oid_set.c
@@ -22,7 +22,7 @@
 
 #include "gssapiP_generic.h"
 
-OM_uint32 generic_gss_release_oid_set(minor_status, set)
+OM_uint32 INTERFACE generic_gss_release_oid_set(minor_status, set)
      OM_uint32 *minor_status;
      gss_OID_set *set;
 {
diff --git a/src/lib/gssapi/generic/util_buffer.c b/src/lib/gssapi/generic/util_buffer.c
index cf144495f..5fd06721c 100644
--- a/src/lib/gssapi/generic/util_buffer.c
+++ b/src/lib/gssapi/generic/util_buffer.c
@@ -27,7 +27,7 @@
    make sure that buffer is consistent (release'able) when this
    function exits, no matter what the exit value */
 
-int g_make_string_buffer(str, buffer)
+int INTERFACE g_make_string_buffer(str, buffer)
      const char *str;
      gss_buffer_t buffer;
 {
diff --git a/src/lib/gssapi/generic/util_canonhost.c b/src/lib/gssapi/generic/util_canonhost.c
index 694d93354..89de87a02 100644
--- a/src/lib/gssapi/generic/util_canonhost.c
+++ b/src/lib/gssapi/generic/util_canonhost.c
@@ -21,15 +21,15 @@
  */
 
 /* This file could be OS specific */
-
 #include "gssapiP_generic.h"
-
+#ifndef _MSDOS
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netdb.h>
 #include <ctype.h>
 
-char *g_canonicalize_host(hostname)
+char * INTERFACE
+g_canonicalize_host(hostname)
      char *hostname;
 {
    struct hostent *hent;
@@ -61,3 +61,4 @@ char *g_canonicalize_host(hostname)
 
    return(canon);
 }
+#endif
diff --git a/src/lib/gssapi/generic/util_dup.c b/src/lib/gssapi/generic/util_dup.c
index 4e48d1704..e3e3e52a6 100644
--- a/src/lib/gssapi/generic/util_dup.c
+++ b/src/lib/gssapi/generic/util_dup.c
@@ -22,7 +22,7 @@
 
 #include "gssapiP_generic.h"
 
-char *g_strdup(str)
+char * INTERFACE g_strdup(str)
      char *str;
 {
    char *ret;
diff --git a/src/lib/gssapi/generic/util_oid.c b/src/lib/gssapi/generic/util_oid.c
index c415aad76..8f3d434eb 100644
--- a/src/lib/gssapi/generic/util_oid.c
+++ b/src/lib/gssapi/generic/util_oid.c
@@ -22,7 +22,7 @@
 
 #include "gssapiP_generic.h"
 
-int
+int INTERFACE
 g_copy_OID_set(in, out)
      const gss_OID_set_desc * const in;
      gss_OID_set *out;
diff --git a/src/lib/gssapi/generic/util_token.c b/src/lib/gssapi/generic/util_token.c
index 483126c5e..424125d5d 100644
--- a/src/lib/gssapi/generic/util_token.c
+++ b/src/lib/gssapi/generic/util_token.c
@@ -111,7 +111,7 @@ static int der_read_length(buf, bufsize)
 
 /* returns the length of a token, given the mech oid and the body size */
 
-int g_token_size(mech, body_size)
+int INTERFACE g_token_size(mech, body_size)
      const_gss_OID mech;
      unsigned int body_size;
 {
@@ -123,7 +123,7 @@ int g_token_size(mech, body_size)
 /* fills in a buffer with the token header.  The buffer is assumed to
    be the right size.  buf is advanced past the token header */
 
-void g_make_token_header(mech, body_size, buf, tok_type)
+void INTERFACE g_make_token_header(mech, body_size, buf, tok_type)
      const_gss_OID mech;
      int body_size;
      unsigned char **buf;
@@ -133,7 +133,7 @@ void g_make_token_header(mech, body_size, buf, tok_type)
    der_write_length(buf, 4 + mech->length + body_size);
    *(*buf)++ = 0x06;
    *(*buf)++ = (unsigned char) mech->length;
-   TWRITE_STR(*buf, mech->elements, mech->length);
+   TWRITE_STR(*buf, mech->elements, ((int) mech->length));
    *(*buf)++ = (unsigned char) ((tok_type>>8)&0xff);
    *(*buf)++ = (unsigned char) (tok_type&0xff);
 }
@@ -142,7 +142,7 @@ void g_make_token_header(mech, body_size, buf, tok_type)
    leaving buf advanced past the token header, and setting body_size
    to the number of remaining bytes */
 
-int g_verify_token_header(mech, body_size, buf, tok_type, toksize)
+int INTERFACE g_verify_token_header(mech, body_size, buf, tok_type, toksize)
      const_gss_OID mech;
      int *body_size;
      unsigned char **buf;
diff --git a/src/lib/gssapi/generic/util_validate.c b/src/lib/gssapi/generic/util_validate.c
index 72631341b..e60ed427b 100644
--- a/src/lib/gssapi/generic/util_validate.c
+++ b/src/lib/gssapi/generic/util_validate.c
@@ -105,45 +105,45 @@ static int g_delete(DB **vdb, int type, void *ptr)
 
 /* save */
 
-int g_save_name(void **vdb, gss_name_t *name)
+int INTERFACE g_save_name(void **vdb, gss_name_t *name)
 {
    return(g_save((DB **) vdb, V_NAME, (void *) name));
 }
-int g_save_cred_id(void **vdb, gss_cred_id_t *cred)
+int INTERFACE g_save_cred_id(void **vdb, gss_cred_id_t *cred)
 {
    return(g_save((DB **) vdb, V_CRED_ID, (void *) cred));
 }
-int g_save_ctx_id(void **vdb, gss_ctx_id_t *ctx)
+int INTERFACE g_save_ctx_id(void **vdb, gss_ctx_id_t *ctx)
 {
    return(g_save((DB **) vdb, V_CTX_ID, (void *) ctx));
 }
 
 /* validate */
 
-int g_validate_name(void **vdb, gss_name_t *name)
+int INTERFACE g_validate_name(void **vdb, gss_name_t *name)
 {
    return(g_validate((DB **) vdb, V_NAME, (void *) name));
 }
-int g_validate_cred_id(void **vdb, gss_cred_id_t *cred)
+int INTERFACE g_validate_cred_id(void **vdb, gss_cred_id_t *cred)
 {
    return(g_validate((DB **) vdb, V_CRED_ID, (void *) cred));
 }
-int g_validate_ctx_id(void **vdb, gss_ctx_id_t *ctx)
+int INTERFACE g_validate_ctx_id(void **vdb, gss_ctx_id_t *ctx)
 {
    return(g_validate((DB **) vdb, V_CTX_ID, (void *) ctx));
 }
 
 /* delete */
 
-int g_delete_name(void **vdb, gss_name_t *name)
+int INTERFACE g_delete_name(void **vdb, gss_name_t *name)
 {
    return(g_delete((DB **) vdb, V_NAME, (void *) name));
 }
-int g_delete_cred_id(void **vdb, gss_cred_id_t *cred)
+int INTERFACE g_delete_cred_id(void **vdb, gss_cred_id_t *cred)
 {
    return(g_delete((DB **) vdb, V_CRED_ID, (void *) cred));
 }
-int g_delete_ctx_id(void **vdb, gss_ctx_id_t *ctx)
+int INTERFACE g_delete_ctx_id(void **vdb, gss_ctx_id_t *ctx)
 {
    return(g_delete((DB **) vdb, V_CTX_ID, (void *) ctx));
 }
diff --git a/src/lib/gssapi/generic/utl_nohash_validate.c b/src/lib/gssapi/generic/utl_nohash_validate.c
index d3c4191aa..88ad5937c 100644
--- a/src/lib/gssapi/generic/utl_nohash_validate.c
+++ b/src/lib/gssapi/generic/utl_nohash_validate.c
@@ -27,26 +27,25 @@
 #include "gssapiP_generic.h"
 
 #include <sys/types.h>
-#include <sys/file.h>
 #include <limits.h>
 
 /* functions for each type */
 
 /* save */
 
-int g_save_name(vdb, name)
+int INTERFACE g_save_name(vdb, name)
      void **vdb;
      gss_name_t *name;
 {
 	return 1;
 }
-int g_save_cred_id(vdb, cred)
+int INTERFACE g_save_cred_id(vdb, cred)
      void **vdb;
      gss_cred_id_t *cred;
 {
 	return 1;
 }
-int g_save_ctx_id(vdb, ctx)
+int INTERFACE g_save_ctx_id(vdb, ctx)
      void **vdb;
      gss_ctx_id_t *ctx;
 {
@@ -55,19 +54,19 @@ int g_save_ctx_id(vdb, ctx)
 
 /* validate */
 
-int g_validate_name(vdb, name)
+int INTERFACE g_validate_name(vdb, name)
      void **vdb;
      gss_name_t *name;
 {
 	return 1;
 }
-int g_validate_cred_id(vdb, cred)
+int INTERFACE g_validate_cred_id(vdb, cred)
      void **vdb;
      gss_cred_id_t *cred;
 {
 	return 1;
 }
-int g_validate_ctx_id(vdb, ctx)
+int INTERFACE g_validate_ctx_id(vdb, ctx)
      void **vdb;
      gss_ctx_id_t *ctx;
 {
@@ -76,19 +75,19 @@ int g_validate_ctx_id(vdb, ctx)
 
 /* delete */
 
-int g_delete_name(vdb, name)
+int INTERFACE g_delete_name(vdb, name)
      void **vdb;
      gss_name_t *name;
 {
 	return 1;
 }
-int g_delete_cred_id(vdb, cred)
+int INTERFACE g_delete_cred_id(vdb, cred)
      void **vdb;
      gss_cred_id_t *cred;
 {
 	return 1;
 }
-int g_delete_ctx_id(vdb, ctx)
+int INTERFACE g_delete_ctx_id(vdb, ctx)
      void **vdb;
      gss_ctx_id_t *ctx;
 {