Converted krb/keytab to work on the PC. Mostly just adding the windows

INTERFACE keyword to all functions and prototypes.

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

24 files changed, 125 insertions, 83 deletions

diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog
index e06bf651d..c7a557458 100644
--- a/src/include/krb5/ChangeLog
+++ b/src/include/krb5/ChangeLog
@@ -1,3 +1,7 @@
+Wed Feb 22 01:45:17 1995 Keith Vetter (keithv@fusion.com)
+
+	* keytab.h: added windows INTERFACE keyword to prototypes
+
 Tue Feb 21 17:31:06 1995 Keith Vetter (keithv@fusion.com)
 
 	* config.h: added HAVE_ERRNO for the windows section
diff --git a/src/include/krb5/keytab.h b/src/include/krb5/keytab.h
index a603b0cf1..c9e138c14 100644
--- a/src/include/krb5/keytab.h
+++ b/src/include/krb5/keytab.h
@@ -54,44 +54,44 @@ typedef struct _krb5_kt_ops {
     krb5_magic magic;
     char *prefix;
     /* routines always present */
-    krb5_error_code (*resolve) 
+    krb5_error_code (INTERFACE *resolve) 
 	NPROTOTYPE((krb5_context,
 		    const char *,
 		    krb5_keytab *));
-    krb5_error_code (*get_name) 
+    krb5_error_code (INTERFACE *get_name) 
 	NPROTOTYPE((krb5_context,
 		    krb5_keytab,
 		    char *,
 		    int));
-    krb5_error_code (*close) 
+    krb5_error_code (INTERFACE *close) 
 	NPROTOTYPE((krb5_context,
 		    krb5_keytab));
-    krb5_error_code (*get) 
+    krb5_error_code (INTERFACE *get) 
 	NPROTOTYPE((krb5_context,
 		    krb5_keytab,
 		    krb5_principal,
 		    krb5_kvno,
 		    krb5_keytype,
 		    krb5_keytab_entry *));
-    krb5_error_code (*start_seq_get) 
+    krb5_error_code (INTERFACE *start_seq_get) 
 	NPROTOTYPE((krb5_context,
 		    krb5_keytab,
 		    krb5_kt_cursor *));	
-    krb5_error_code (*get_next) 
+    krb5_error_code (INTERFACE *get_next) 
 	NPROTOTYPE((krb5_context,
 		    krb5_keytab,
 		    krb5_keytab_entry *,
 		    krb5_kt_cursor *));
-    krb5_error_code (*end_get) 
+    krb5_error_code (INTERFACE *end_get) 
 	NPROTOTYPE((krb5_context,
 		    krb5_keytab,
 		    krb5_kt_cursor *));
     /* routines to be included on extended version (write routines) */
-    krb5_error_code (*add) 
+    krb5_error_code (INTERFACE *add) 
 	NPROTOTYPE((krb5_context,
 		    krb5_keytab,
 		    krb5_keytab_entry *));
-    krb5_error_code (*remove) 
+    krb5_error_code (INTERFACE *remove) 
 	NPROTOTYPE((krb5_context,
 		    krb5_keytab,
 		  krb5_keytab_entry *));
diff --git a/src/lib/krb5/keytab/ChangeLog b/src/lib/krb5/keytab/ChangeLog
index ab3d872c2..5d25cae4a 100644
--- a/src/lib/krb5/keytab/ChangeLog
+++ b/src/lib/krb5/keytab/ChangeLog
@@ -1,3 +1,8 @@
+Wed Feb 22 01:38:54 1995 Keith Vetter (keithv@fusion.com)
+
+	* Makefile.in: made to work on the PC
+        * *.c: added windows INTERFACE keyword
+
 Fri Jan 13 15:23:47 1995  Chris Provenzano (proven@mit.edu)
 
 	* read_servi.c (krb5_kt_read_service_key) Add krb5_keytype arg.
diff --git a/src/lib/krb5/keytab/Makefile.in b/src/lib/krb5/keytab/Makefile.in
index 5fccd3ec9..87807387d 100644
--- a/src/lib/krb5/keytab/Makefile.in
+++ b/src/lib/krb5/keytab/Makefile.in
@@ -1,17 +1,17 @@
 CFLAGS = $(CCOPTS) $(DEFS)
 LDFLAGS = -g
 
-all:: $(OBJS)
-
-
+##DOSBUILDTOP = ..\..\..
+##DOSLIBNAME=..\libkrb5.lib
+##DOS!include $(BUILDTOP)\config\windows.in
 
 OBJS=	\
-	ktadd.o		\
-	ktbase.o	\
-	ktdefault.o	\
-	ktfr_entry.o	\
-	ktremove.o	\
-	read_servi.o
+	ktadd.$(OBJEXT)		\
+	ktbase.$(OBJEXT)	\
+	ktdefault.$(OBJEXT)	\
+	ktfr_entry.$(OBJEXT)	\
+	ktremove.$(OBJEXT)	\
+	read_servi.$(OBJEXT)
 
 SRCS=	\
 	$(srcdir)/ktadd.c	\
@@ -20,3 +20,23 @@ SRCS=	\
 	$(srcdir)/ktfr_entry.c	\
 	$(srcdir)/ktremove.c	\
 	$(srcdir)/read_servi.c
+
+all:: $(OBJS) all-$(WHAT)
+
+all-unix::
+
+all-windows::
+	cd file
+	@echo Making in ..\file
+	-$(MAKE) -$(MFLAGS) LIB=$(LIB)
+	cd ..
+
+clean:: clean-$(WHAT)
+
+clean-unix::
+
+clean-windows::
+	cd file
+	@echo Making clean in ..\file
+	-$(MAKE) -$(MFLAGS) clean
+	cd ..
diff --git a/src/lib/krb5/keytab/file/ChangeLog b/src/lib/krb5/keytab/file/ChangeLog
index 83b804c67..2da51ef57 100644
--- a/src/lib/krb5/keytab/file/ChangeLog
+++ b/src/lib/krb5/keytab/file/ChangeLog
@@ -1,3 +1,10 @@
+Wed Feb 22 01:27:05 1995 Keith Vetter (keithv@fusion.com)
+
+        * Makefile.in: made to work on the PC
+        * *.c, ktfile.h: added windows INTERFACE keyword
+	* ktf_util.c: removed include of <netinet/in.h>
+           cast some 32bit ints to size_t ints
+
 Fri Feb  3 01:53:44 1995  John Gilmore  <gnu@cygnus.com>
 
 	Rename files for DOS 8.3 uniqueness:
diff --git a/src/lib/krb5/keytab/file/Makefile.in b/src/lib/krb5/keytab/file/Makefile.in
index 5e88a72ff..a49073c86 100644
--- a/src/lib/krb5/keytab/file/Makefile.in
+++ b/src/lib/krb5/keytab/file/Makefile.in
@@ -1,7 +1,9 @@
 CFLAGS = $(CCOPTS) $(DEFS)
 LDFLAGS = -g
 
-all:: $(OBJS)
+##DOSBUILDTOP = ..\..\..\..
+##DOSLIBNAME=..\..\libkrb5.lib
+##DOS!include $(BUILDTOP)\config\windows.in
 
 SRCS= \
 	$(srcdir)/ktf_add.c \
@@ -20,18 +22,19 @@ SRCS= \
 	$(srcdir)/ktf_util.c
 
 OBJS = \
-	ktf_add.o	\
-	ktf_close.o	\
-	ktf_endget.o	\
-	ktf_g_ent.o	\
-	ktf_g_name.o	\
-	ktf_next.o	\
-	ktf_resolv.o	\
-	ktf_remove.o	\
-	ktf_ssget.o	\
-	ktf_util.o	\
-	ktf_ops.o	\
-	ktf_wops.o	\
-	ktf_wreslv.o	\
-	ktf_defops.o
+	ktf_add.$(OBJEXT)	\
+	ktf_close.$(OBJEXT)	\
+	ktf_endget.$(OBJEXT)	\
+	ktf_g_ent.$(OBJEXT)	\
+	ktf_g_name.$(OBJEXT)	\
+	ktf_next.$(OBJEXT)	\
+	ktf_resolv.$(OBJEXT)	\
+	ktf_remove.$(OBJEXT)	\
+	ktf_ssget.$(OBJEXT)	\
+	ktf_util.$(OBJEXT)	\
+	ktf_ops.$(OBJEXT)	\
+	ktf_wops.$(OBJEXT)	\
+	ktf_wreslv.$(OBJEXT)	\
+	ktf_defops.$(OBJEXT)
 
+all:: $(OBJS)
diff --git a/src/lib/krb5/keytab/file/ktf_add.c b/src/lib/krb5/keytab/file/ktf_add.c
index 140fb6a2c..2a2f15dd8 100644
--- a/src/lib/krb5/keytab/file/ktf_add.c
+++ b/src/lib/krb5/keytab/file/ktf_add.c
@@ -30,7 +30,7 @@
 
 #include "ktfile.h"
 
-krb5_error_code
+krb5_error_code INTERFACE
 krb5_ktfile_add(context, id, entry)
    krb5_context context;
    krb5_keytab id;
diff --git a/src/lib/krb5/keytab/file/ktf_close.c b/src/lib/krb5/keytab/file/ktf_close.c
index ebe8726e3..d051933f0 100644
--- a/src/lib/krb5/keytab/file/ktf_close.c
+++ b/src/lib/krb5/keytab/file/ktf_close.c
@@ -31,7 +31,7 @@
 
 #include "ktfile.h"
 
-krb5_error_code 
+krb5_error_code INTERFACE
 krb5_ktfile_close(context, id)
     krb5_context context;
   krb5_keytab id;
diff --git a/src/lib/krb5/keytab/file/ktf_endget.c b/src/lib/krb5/keytab/file/ktf_endget.c
index a1f1fc40a..e733af713 100644
--- a/src/lib/krb5/keytab/file/ktf_endget.c
+++ b/src/lib/krb5/keytab/file/ktf_endget.c
@@ -30,7 +30,7 @@
 
 #include "ktfile.h"
 
-krb5_error_code
+krb5_error_code INTERFACE
 krb5_ktfile_end_get(context, id, cursor)
     krb5_context context;
 krb5_keytab id;
diff --git a/src/lib/krb5/keytab/file/ktf_g_ent.c b/src/lib/krb5/keytab/file/ktf_g_ent.c
index e5dbea41e..a56e45133 100644
--- a/src/lib/krb5/keytab/file/ktf_g_ent.c
+++ b/src/lib/krb5/keytab/file/ktf_g_ent.c
@@ -32,7 +32,7 @@
 
 #include "ktfile.h"
 
-krb5_error_code
+krb5_error_code INTERFACE
 krb5_ktfile_get_entry(context, id, principal, kvno, keytype, entry)
    krb5_context context;
    krb5_keytab id;
diff --git a/src/lib/krb5/keytab/file/ktf_g_name.c b/src/lib/krb5/keytab/file/ktf_g_name.c
index 62cd10e7f..293bf13dc 100644
--- a/src/lib/krb5/keytab/file/ktf_g_name.c
+++ b/src/lib/krb5/keytab/file/ktf_g_name.c
@@ -30,7 +30,7 @@
 
 #include "ktfile.h"
 
-krb5_error_code
+krb5_error_code INTERFACE
 krb5_ktfile_get_name(context, id, name, len)
     krb5_context context;
   krb5_keytab id;
diff --git a/src/lib/krb5/keytab/file/ktf_next.c b/src/lib/krb5/keytab/file/ktf_next.c
index 57b74ba75..991231526 100644
--- a/src/lib/krb5/keytab/file/ktf_next.c
+++ b/src/lib/krb5/keytab/file/ktf_next.c
@@ -30,7 +30,7 @@
 
 #include "ktfile.h"
 
-krb5_error_code
+krb5_error_code INTERFACE
 krb5_ktfile_get_next(context, id, entry, cursor)
     krb5_context context;
 krb5_keytab id;
diff --git a/src/lib/krb5/keytab/file/ktf_remove.c b/src/lib/krb5/keytab/file/ktf_remove.c
index 8881d0275..8f2f64b96 100644
--- a/src/lib/krb5/keytab/file/ktf_remove.c
+++ b/src/lib/krb5/keytab/file/ktf_remove.c
@@ -30,7 +30,7 @@
 
 #include "ktfile.h"
 
-krb5_error_code
+krb5_error_code INTERFACE
 krb5_ktfile_remove(context, id, entry)
     krb5_context context;
 krb5_keytab id;
diff --git a/src/lib/krb5/keytab/file/ktf_resolv.c b/src/lib/krb5/keytab/file/ktf_resolv.c
index e5bef9803..4f52eb902 100644
--- a/src/lib/krb5/keytab/file/ktf_resolv.c
+++ b/src/lib/krb5/keytab/file/ktf_resolv.c
@@ -31,7 +31,7 @@
 
 #include "ktfile.h"
 
-krb5_error_code
+krb5_error_code INTERFACE
 krb5_ktfile_resolve(context, name, id)
     krb5_context context;
   const char *name;
diff --git a/src/lib/krb5/keytab/file/ktf_ssget.c b/src/lib/krb5/keytab/file/ktf_ssget.c
index b9872d3f6..aa9304910 100644
--- a/src/lib/krb5/keytab/file/ktf_ssget.c
+++ b/src/lib/krb5/keytab/file/ktf_ssget.c
@@ -30,7 +30,7 @@
 
 #include "ktfile.h"
 
-krb5_error_code
+krb5_error_code INTERFACE
 krb5_ktfile_start_seq_get(context, id, cursorp)
     krb5_context context;
 krb5_keytab id;
diff --git a/src/lib/krb5/keytab/file/ktf_util.c b/src/lib/krb5/keytab/file/ktf_util.c
index 0ea747b65..301abbb9c 100644
--- a/src/lib/krb5/keytab/file/ktf_util.c
+++ b/src/lib/krb5/keytab/file/ktf_util.c
@@ -75,7 +75,6 @@
 #include <krb5/libos.h>
 #include <krb5/los-proto.h>
 #include <krb5/osconf.h>
-#include <netinet/in.h>
 #include <stdio.h>
 
 #include "ktfile.h"
@@ -100,7 +99,9 @@ static char *fopen_mode_rbplus= "r+";
 static char *fopen_mode_rb = "r";
 #endif
 
+#ifndef HAVE_ERRNO
 extern int errno;
+#endif
 
 static krb5_error_code
 krb5_ktfileint_open(context, id, mode)
@@ -164,7 +165,7 @@ int mode;
     return 0;
 }
 
-krb5_error_code
+krb5_error_code INTERFACE
 krb5_ktfileint_openr(context, id)
     krb5_context context;
 krb5_keytab id;
@@ -172,7 +173,7 @@ krb5_keytab id;
     return krb5_ktfileint_open(context, id, KRB5_LOCKMODE_SHARED);
 }
 
-krb5_error_code
+krb5_error_code INTERFACE
 krb5_ktfileint_openw(context, id)
     krb5_context context;
 krb5_keytab id;
@@ -180,7 +181,7 @@ krb5_keytab id;
     return krb5_ktfileint_open(context, id, KRB5_LOCKMODE_EXCLUSIVE);
 }
 
-krb5_error_code
+krb5_error_code INTERFACE
 krb5_ktfileint_close(context, id)
     krb5_context context;
 krb5_keytab id;
@@ -195,7 +196,7 @@ krb5_keytab id;
     return kerror;
 }
 
-krb5_error_code
+krb5_error_code INTERFACE
 krb5_ktfileint_delete_entry(context, id, delete_point)
     krb5_context context;
 krb5_keytab id;
@@ -233,9 +234,9 @@ krb5_int32 delete_point;
             len = BUFSIZ;
         }
 
-        memset(iobuf, 0, len);
+        memset(iobuf, 0, (size_t) len);
         while (size > 0) {
-            xfwrite(iobuf, 1, len, KTFILEP(id));
+            xfwrite(iobuf, 1, (size_t) len, KTFILEP(id));
             size -= len;
             if (size < len) {
                 len = size;
@@ -248,7 +249,7 @@ krb5_int32 delete_point;
     return 0;
 }
 
-krb5_error_code
+krb5_error_code INTERFACE
 krb5_ktfileint_internal_read_entry(context, id, ret_entry, delete_point)
     krb5_context context;
 krb5_keytab id;
@@ -456,7 +457,7 @@ fail:
     return error;
 }
 
-krb5_error_code
+krb5_error_code INTERFACE
 krb5_ktfileint_read_entry(context, id, entryp)
     krb5_context context;
 krb5_keytab id;
@@ -467,7 +468,7 @@ krb5_keytab_entry *entryp;
     return krb5_ktfileint_internal_read_entry(context, id, entryp, &delete_point);
 }
 
-krb5_error_code
+krb5_error_code INTERFACE
 krb5_ktfileint_write_entry(context, id, entry)
     krb5_context context;
 krb5_keytab id;
@@ -613,7 +614,7 @@ krb5_keytab_entry *entry;
  * Determine the size needed for a file entry for the given
  * keytab entry.
  */
-krb5_error_code
+krb5_error_code INTERFACE
 krb5_ktfileint_size_entry(context, entry, size_needed)
     krb5_context context;
 krb5_keytab_entry *entry;
@@ -655,7 +656,7 @@ krb5_int32 *size_needed;
  * to commit the write, but that this field must indicate the size of the
  * block in the file rather than the size of the actual entry)  
  */
-krb5_error_code
+krb5_error_code INTERFACE
 krb5_ktfileint_find_slot(context, id, size_needed, commit_point)
     krb5_context context;
 krb5_keytab id;
@@ -754,8 +755,8 @@ krb5_int32 *commit_point;
                         return errno;
                     }
 
-                    memset(iobuf, 0, size);
-                    xfwrite(iobuf, 1, size, KTFILEP(id));
+                    memset(iobuf, 0, (size_t) size);
+                    xfwrite(iobuf, 1, (size_t) size, KTFILEP(id));
                     if (feof(KTFILEP(id))) {
                         break;
                     }
diff --git a/src/lib/krb5/keytab/file/ktf_wreslv.c b/src/lib/krb5/keytab/file/ktf_wreslv.c
index 9d6632ac4..cb716d760 100644
--- a/src/lib/krb5/keytab/file/ktf_wreslv.c
+++ b/src/lib/krb5/keytab/file/ktf_wreslv.c
@@ -31,7 +31,7 @@
 
 #include "ktfile.h"
 
-krb5_error_code
+krb5_error_code INTERFACE
 krb5_ktfile_wresolve(context, name, id)
     krb5_context context;
   const char *name;
diff --git a/src/lib/krb5/keytab/file/ktfile.h b/src/lib/krb5/keytab/file/ktfile.h
index c1c55dc88..4bb7e1dc5 100644
--- a/src/lib/krb5/keytab/file/ktfile.h
+++ b/src/lib/krb5/keytab/file/ktfile.h
@@ -61,27 +61,27 @@ typedef struct _krb5_ktfile_data {
 extern struct _krb5_kt_ops krb5_ktf_ops;
 extern struct _krb5_kt_ops krb5_ktf_writable_ops;
 
-krb5_error_code krb5_ktfile_resolve 
+krb5_error_code INTERFACE krb5_ktfile_resolve 
 	PROTOTYPE((krb5_context,
 		   const char *,
 		   krb5_keytab *));
 
-krb5_error_code krb5_ktfile_wresolve 
+krb5_error_code INTERFACE krb5_ktfile_wresolve 
 	PROTOTYPE((krb5_context,
 		   const char *,
 		   krb5_keytab *));
 
-krb5_error_code krb5_ktfile_get_name 
+krb5_error_code INTERFACE krb5_ktfile_get_name 
 	PROTOTYPE((krb5_context,
 		   krb5_keytab,
 		   char *,
 		   int));
 
-krb5_error_code krb5_ktfile_close 
+krb5_error_code INTERFACE krb5_ktfile_close 
 	PROTOTYPE((krb5_context,
 		   krb5_keytab));
 
-krb5_error_code krb5_ktfile_get_entry 
+krb5_error_code INTERFACE krb5_ktfile_get_entry 
 	PROTOTYPE((krb5_context,
 		   krb5_keytab,
 		   krb5_principal,
@@ -89,72 +89,72 @@ krb5_error_code krb5_ktfile_get_entry
 		   krb5_keytype,
 		   krb5_keytab_entry *));
 
-krb5_error_code krb5_ktfile_start_seq_get 
+krb5_error_code INTERFACE krb5_ktfile_start_seq_get 
 	PROTOTYPE((krb5_context,
 		   krb5_keytab,
 		   krb5_kt_cursor *));
 
-krb5_error_code krb5_ktfile_get_next 
+krb5_error_code INTERFACE krb5_ktfile_get_next 
 	PROTOTYPE((krb5_context,
 		   krb5_keytab,
 		   krb5_keytab_entry *,
 		   krb5_kt_cursor *));
 
-krb5_error_code krb5_ktfile_end_get 
+krb5_error_code INTERFACE krb5_ktfile_end_get 
 	PROTOTYPE((krb5_context,
 		   krb5_keytab,
 		   krb5_kt_cursor *));
 
 /* routines to be included on extended version (write routines) */
-krb5_error_code krb5_ktfile_add 
+krb5_error_code INTERFACE krb5_ktfile_add 
 	PROTOTYPE((krb5_context,
 		   krb5_keytab,
 		   krb5_keytab_entry *));
 
-krb5_error_code krb5_ktfile_remove 
+krb5_error_code INTERFACE krb5_ktfile_remove 
 	PROTOTYPE((krb5_context,
 		   krb5_keytab,
 		   krb5_keytab_entry *));
 
-krb5_error_code krb5_ktfileint_openr 
+krb5_error_code INTERFACE krb5_ktfileint_openr 
 	PROTOTYPE((krb5_context,
 		   krb5_keytab));
 
-krb5_error_code krb5_ktfileint_openw 
+krb5_error_code INTERFACE krb5_ktfileint_openw 
 	PROTOTYPE((krb5_context,
 		   krb5_keytab));
 
-krb5_error_code krb5_ktfileint_close 
+krb5_error_code INTERFACE krb5_ktfileint_close 
 	PROTOTYPE((krb5_context,
 		   krb5_keytab));
 
-krb5_error_code krb5_ktfileint_read_entry 
+krb5_error_code INTERFACE krb5_ktfileint_read_entry 
 	PROTOTYPE((krb5_context,
 		   krb5_keytab,
 		   krb5_keytab_entry *));
 
-krb5_error_code krb5_ktfileint_write_entry 
+krb5_error_code INTERFACE krb5_ktfileint_write_entry 
 	PROTOTYPE((krb5_context,
 		   krb5_keytab,
 		   krb5_keytab_entry *));
 
-krb5_error_code krb5_ktfileint_delete_entry 
+krb5_error_code INTERFACE krb5_ktfileint_delete_entry 
 	PROTOTYPE((krb5_context,
 		   krb5_keytab,
                    krb5_int32));
 
-krb5_error_code krb5_ktfileint_internal_read_entry 
+krb5_error_code INTERFACE krb5_ktfileint_internal_read_entry 
 	PROTOTYPE((krb5_context,
 		   krb5_keytab,
 		   krb5_keytab_entry *,
                    krb5_int32 *));
 
-krb5_error_code krb5_ktfileint_size_entry 
+krb5_error_code INTERFACE krb5_ktfileint_size_entry 
 	PROTOTYPE((krb5_context,
 		   krb5_keytab_entry *,
                    krb5_int32 *));
 
-krb5_error_code krb5_ktfileint_find_slot 
+krb5_error_code INTERFACE krb5_ktfileint_find_slot 
 	PROTOTYPE((krb5_context,
 		   krb5_keytab,
                    krb5_int32 *,
diff --git a/src/lib/krb5/keytab/ktadd.c b/src/lib/krb5/keytab/ktadd.c
index 8e9b1853e..42a6c4b44 100644
--- a/src/lib/krb5/keytab/ktadd.c
+++ b/src/lib/krb5/keytab/ktadd.c
@@ -27,7 +27,7 @@
 
 #include <krb5/krb5.h>
 
-krb5_error_code
+krb5_error_code INTERFACE
 krb5_kt_add_entry (context, id, entry)
     krb5_context context;
     krb5_keytab id;
diff --git a/src/lib/krb5/keytab/ktbase.c b/src/lib/krb5/keytab/ktbase.c
index c359b0e26..c12642189 100644
--- a/src/lib/krb5/keytab/ktbase.c
+++ b/src/lib/krb5/keytab/ktbase.c
@@ -41,7 +41,7 @@ static struct krb5_kt_typelist *kt_typehead = &krb5_kt_typelist_dfl;
  * don't replace if it already exists; return an error instead.
  */
 
-krb5_error_code
+krb5_error_code INTERFACE
 krb5_kt_register(context, ops)
     krb5_context context;
     krb5_kt_ops *ops;
@@ -70,7 +70,8 @@ krb5_kt_register(context, ops)
  * particular keytab type.
  */
 
-krb5_error_code krb5_kt_resolve (context, name, ktid)
+krb5_error_code INTERFACE
+krb5_kt_resolve (context, name, ktid)
     krb5_context context;
     const char *name;
     krb5_keytab *ktid;
diff --git a/src/lib/krb5/keytab/ktdefault.c b/src/lib/krb5/keytab/ktdefault.c
index 17bbf6d6b..dc53abbea 100644
--- a/src/lib/krb5/keytab/ktdefault.c
+++ b/src/lib/krb5/keytab/ktdefault.c
@@ -28,7 +28,8 @@
 #include <krb5/krb5.h>
 #include <stdio.h>
 
-krb5_error_code krb5_kt_default(context, id)
+krb5_error_code INTERFACE
+krb5_kt_default(context, id)
     krb5_context context;
     krb5_keytab *id;
 {
diff --git a/src/lib/krb5/keytab/ktfr_entry.c b/src/lib/krb5/keytab/ktfr_entry.c
index efe39329e..c7bb1241f 100644
--- a/src/lib/krb5/keytab/ktfr_entry.c
+++ b/src/lib/krb5/keytab/ktfr_entry.c
@@ -28,7 +28,7 @@
 #include <krb5/krb5.h>
 #include <krb5/ext-proto.h>
 
-krb5_error_code
+krb5_error_code INTERFACE
 krb5_kt_free_entry (context, entry)
     krb5_context context;
     krb5_keytab_entry *entry;
diff --git a/src/lib/krb5/keytab/ktremove.c b/src/lib/krb5/keytab/ktremove.c
index 795ce742d..e8b433ca4 100644
--- a/src/lib/krb5/keytab/ktremove.c
+++ b/src/lib/krb5/keytab/ktremove.c
@@ -27,7 +27,7 @@
 
 #include <krb5/krb5.h>
 
-krb5_error_code
+krb5_error_code INTERFACE
 krb5_kt_remove_entry (context, id, entry)
     krb5_context context;
     krb5_keytab id;
diff --git a/src/lib/krb5/keytab/read_servi.c b/src/lib/krb5/keytab/read_servi.c
index 5ed735b16..77db43d86 100644
--- a/src/lib/krb5/keytab/read_servi.c
+++ b/src/lib/krb5/keytab/read_servi.c
@@ -43,7 +43,7 @@
  * returns: Either KSUCCESS or error code.
  * errors: error code if not found or keyprocarg is invalid.
  */
-krb5_error_code 
+krb5_error_code INTERFACE
 krb5_kt_read_service_key(context, keyprocarg, principal, vno, keytype, key)
     krb5_context context;
     krb5_pointer keyprocarg;