21 files changed, 81 insertions, 46 deletions
diff --git a/src/lib/krb5/keytab/ChangeLog b/src/lib/krb5/keytab/ChangeLog
index e860ba5cd..85fbb79df 100644
--- a/src/lib/krb5/keytab/ChangeLog
+++ b/src/lib/krb5/keytab/ChangeLog
@@ -1,3 +1,10 @@
+Thu Nov 21 11:55:16 EST 1996    Richard Basch   <basch@lehman.com>
+
+        * Makefile.in: win32 build
+
+	* ktadd.c,ktbase.c,ktdefault.c,ktfr_entry.c,ktremove.c,read_servi.c:
+	DLL export the keytab dispatch functions
+
 Thu Jun  6 00:04:38 1996  Theodore Y. Ts'o  <tytso@mit.edu>
 
 	* Makefile.in (all-windows): Don't pass $(LIBCMD) on the command
diff --git a/src/lib/krb5/keytab/Makefile.in b/src/lib/krb5/keytab/Makefile.in
index 760fc4e97..fa7acc83a 100644
--- a/src/lib/krb5/keytab/Makefile.in
+++ b/src/lib/krb5/keytab/Makefile.in
@@ -1,7 +1,9 @@
 CFLAGS = $(CCOPTS) $(DEFS)
 
 ##DOSBUILDTOP = ..\..\..
-##DOSLIBNAME=..\krb5.lib
+##DOSMYNAME=keytab
+##DOSOBJFILE=..\$(MYNAME).lst
+##WIN16##LIBNAME=..\krb5.lib
 
 MAC_SUBDIRS = file
 
@@ -30,11 +32,19 @@ shared:
 
 all-unix:: shared $(OBJS)
 all-mac:: $(OBJS)
-all-windows:: $(OBJS)
-	cd file
-	@echo Making in keytab\file
-	-$(MAKE) -$(MFLAGS)
-	cd ..
+all-windows:: subdirs $(OBJFILE)
+
+##DOSsubdirs:: file\file.lst
+##DOSfile\file.lst::
+##DOS	cd file
+##DOS	@echo Making in krb5\keytab\file
+##DOS	-$(MAKE) -$(MFLAGS)
+##DOS	cd ..
+
+##DOS$(OBJFILE): $(OBJS) file\file.lst
+##DOS	$(RM) $(OBJFILE)
+##WIN16##	$(CP) nul: $(OBJFILE)
+##WIN32##	$(LIBECHO) -p $(MYNAME)\ *.obj file\*.obj > $(OBJFILE)
 
 clean-unix::
 	$(RM) shared/*
@@ -42,8 +52,9 @@ clean-unix::
 clean-mac::
 clean-windows::
 	cd file
-	@echo Making clean in keytab\file
+	@echo Making clean in krb5\keytab\file
 	-$(MAKE) -$(MFLAGS) clean
 	cd ..
-	@echo Making clean locally
+	@echo Making clean in krb5\keytab
+	$(RM) $(OBJFILE)
 
diff --git a/src/lib/krb5/keytab/file/ChangeLog b/src/lib/krb5/keytab/file/ChangeLog
index f14e2a030..7109cf7c1 100644
--- a/src/lib/krb5/keytab/file/ChangeLog
+++ b/src/lib/krb5/keytab/file/ChangeLog
@@ -1,3 +1,12 @@
+Thu Nov 21 11:55:16 EST 1996    Richard Basch   <basch@lehman.com>
+
+        * Makefile.in: win32 build
+
+	* ktf_add.c, ktf_close.c, ktf_g_ent.c, ktf_g_name.c, ktf_next.c,
+	ktf_remove.c, ktf_resolv.c, ktf_ssget.c, ktf_wreslv.c, ktfile.h
+		Change the functions declarations to include FAR pointers
+		and KRB5_CALLCONV so that they can be utilized by a DLL.
+	
 Tue Nov 19 17:06:59 1996  Barry Jaspan  <bjaspan@mit.edu>
 
 	* ktf_g_ent.c (krb5_ktfile_get_entry): return KRB5_KT_KVNONOTFOUND
diff --git a/src/lib/krb5/keytab/file/Makefile.in b/src/lib/krb5/keytab/file/Makefile.in
index 36291e9f0..4b27d33cf 100644
--- a/src/lib/krb5/keytab/file/Makefile.in
+++ b/src/lib/krb5/keytab/file/Makefile.in
@@ -1,7 +1,9 @@
 CFLAGS = $(CCOPTS) $(DEFS)
 
 ##DOSBUILDTOP = ..\..\..\..
-##DOSLIBNAME=..\..\krb5.lib
+##DOSMYNAME=keytab\file
+##DOSOBJFILE= file.lst
+##WIN16##LIBNAME=..\..\krb5.lib
 
 .c.o:
 	$(CC) $(CFLAGS) -c $(srcdir)/$*.c
@@ -43,7 +45,12 @@ OBJS = \
 
 all-unix:: shared $(OBJS)
 all-mac:: $(OBJS)
-all-windows:: $(OBJS)
+all-windows:: $(OBJFILE)
+
+##DOS$(OBJFILE): $(OBJS)
+##DOS	$(RM) $(OBJFILE)
+##WIN16##	$(CP) nul: $(OBJFILE)
+##WIN32##	$(LIBECHO) -p $(MYNAME)\ *.obj > $(OBJFILE)
 
 shared:
 	mkdir shared
@@ -53,3 +60,4 @@ clean-unix::
 
 clean-mac::
 clean-windows::
+	$(RM) $(OBJFILE)
diff --git a/src/lib/krb5/keytab/file/ktf_add.c b/src/lib/krb5/keytab/file/ktf_add.c
index aac429c04..8979ad8c9 100644
--- a/src/lib/krb5/keytab/file/ktf_add.c
+++ b/src/lib/krb5/keytab/file/ktf_add.c
@@ -27,7 +27,7 @@
 #include "k5-int.h"
 #include "ktfile.h"
 
-krb5_error_code
+krb5_error_code KRB5_CALLCONV 
 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 93ee92e68..a538aa719 100644
--- a/src/lib/krb5/keytab/file/ktf_close.c
+++ b/src/lib/krb5/keytab/file/ktf_close.c
@@ -28,7 +28,7 @@
 #include "k5-int.h"
 #include "ktfile.h"
 
-krb5_error_code
+krb5_error_code KRB5_CALLCONV 
 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 25ef4de7e..66f862e18 100644
--- a/src/lib/krb5/keytab/file/ktf_endget.c
+++ b/src/lib/krb5/keytab/file/ktf_endget.c
@@ -27,7 +27,7 @@
 #include "k5-int.h"
 #include "ktfile.h"
 
-krb5_error_code
+krb5_error_code KRB5_CALLCONV 
 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 e42dcdbd4..67050a838 100644
--- a/src/lib/krb5/keytab/file/ktf_g_ent.c
+++ b/src/lib/krb5/keytab/file/ktf_g_ent.c
@@ -29,7 +29,7 @@
 #include "k5-int.h"
 #include "ktfile.h"
 
-krb5_error_code
+krb5_error_code KRB5_CALLCONV
 krb5_ktfile_get_entry(context, id, principal, kvno, enctype, 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 fadb9bc94..b0cd4d8e6 100644
--- a/src/lib/krb5/keytab/file/ktf_g_name.c
+++ b/src/lib/krb5/keytab/file/ktf_g_name.c
@@ -27,7 +27,7 @@
 #include "k5-int.h"
 #include "ktfile.h"
 
-krb5_error_code
+krb5_error_code KRB5_CALLCONV
 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 7b13ede5a..acabb7c35 100644
--- a/src/lib/krb5/keytab/file/ktf_next.c
+++ b/src/lib/krb5/keytab/file/ktf_next.c
@@ -27,7 +27,7 @@
 #include "k5-int.h"
 #include "ktfile.h"
 
-krb5_error_code
+krb5_error_code KRB5_CALLCONV 
 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 644209f7a..3d9e627b5 100644
--- a/src/lib/krb5/keytab/file/ktf_remove.c
+++ b/src/lib/krb5/keytab/file/ktf_remove.c
@@ -27,7 +27,7 @@
 #include "k5-int.h"
 #include "ktfile.h"
 
-krb5_error_code
+krb5_error_code KRB5_CALLCONV 
 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 415f3c5f3..93c06d022 100644
--- a/src/lib/krb5/keytab/file/ktf_resolv.c
+++ b/src/lib/krb5/keytab/file/ktf_resolv.c
@@ -28,7 +28,7 @@
 #include "k5-int.h"
 #include "ktfile.h"
 
-krb5_error_code
+krb5_error_code KRB5_CALLCONV 
 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 1001b2ee7..b66c4caba 100644
--- a/src/lib/krb5/keytab/file/ktf_ssget.c
+++ b/src/lib/krb5/keytab/file/ktf_ssget.c
@@ -27,7 +27,7 @@
 #include "k5-int.h"
 #include "ktfile.h"
 
-krb5_error_code
+krb5_error_code KRB5_CALLCONV
 krb5_ktfile_start_seq_get(context, id, cursorp)
     krb5_context context;
 krb5_keytab id;
diff --git a/src/lib/krb5/keytab/file/ktf_wreslv.c b/src/lib/krb5/keytab/file/ktf_wreslv.c
index 9df5922a9..e132293a0 100644
--- a/src/lib/krb5/keytab/file/ktf_wreslv.c
+++ b/src/lib/krb5/keytab/file/ktf_wreslv.c
@@ -28,7 +28,7 @@
 #include "k5-int.h"
 #include "ktfile.h"
 
-krb5_error_code
+krb5_error_code KRB5_CALLCONV
 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 0b2542ceb..155f24603 100644
--- a/src/lib/krb5/keytab/file/ktfile.h
+++ b/src/lib/krb5/keytab/file/ktfile.h
@@ -62,27 +62,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 KRB5_CALLCONV krb5_ktfile_resolve 
 	PROTOTYPE((krb5_context,
 		   const char *,
 		   krb5_keytab *));
 
-krb5_error_code krb5_ktfile_wresolve 
+krb5_error_code KRB5_CALLCONV krb5_ktfile_wresolve 
 	PROTOTYPE((krb5_context,
 		   const char *,
 		   krb5_keytab *));
 
-krb5_error_code krb5_ktfile_get_name 
+krb5_error_code KRB5_CALLCONV krb5_ktfile_get_name 
 	PROTOTYPE((krb5_context,
 		   krb5_keytab,
 		   char *,
 		   int));
 
-krb5_error_code krb5_ktfile_close 
+krb5_error_code KRB5_CALLCONV krb5_ktfile_close 
 	PROTOTYPE((krb5_context,
 		   krb5_keytab));
 
-krb5_error_code krb5_ktfile_get_entry 
+krb5_error_code KRB5_CALLCONV krb5_ktfile_get_entry 
 	PROTOTYPE((krb5_context,
 		   krb5_keytab,
 		   krb5_principal,
@@ -90,29 +90,29 @@ krb5_error_code krb5_ktfile_get_entry
 		   krb5_enctype,
 		   krb5_keytab_entry *));
 
-krb5_error_code krb5_ktfile_start_seq_get 
+krb5_error_code KRB5_CALLCONV krb5_ktfile_start_seq_get 
 	PROTOTYPE((krb5_context,
 		   krb5_keytab,
 		   krb5_kt_cursor *));
 
-krb5_error_code krb5_ktfile_get_next 
+krb5_error_code KRB5_CALLCONV 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 KRB5_CALLCONV 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 KRB5_CALLCONV krb5_ktfile_add 
 	PROTOTYPE((krb5_context,
 		   krb5_keytab,
 		   krb5_keytab_entry *));
 
-krb5_error_code krb5_ktfile_remove 
+krb5_error_code KRB5_CALLCONV krb5_ktfile_remove 
 	PROTOTYPE((krb5_context,
 		   krb5_keytab,
 		   krb5_keytab_entry *));
diff --git a/src/lib/krb5/keytab/ktadd.c b/src/lib/krb5/keytab/ktadd.c
index 56d31028c..ab805c94d 100644
--- a/src/lib/krb5/keytab/ktadd.c
+++ b/src/lib/krb5/keytab/ktadd.c
@@ -26,11 +26,11 @@
 
 #include "k5-int.h"
 
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_kt_add_entry (context, id, entry)
     krb5_context context;
     krb5_keytab id;
-    krb5_keytab_entry *entry;
+    krb5_keytab_entry FAR *entry;
 {
     if (id->ops->add)
 	return (*id->ops->add)(context, id, entry);
diff --git a/src/lib/krb5/keytab/ktbase.c b/src/lib/krb5/keytab/ktbase.c
index e78c3dc71..3e821edc7 100644
--- a/src/lib/krb5/keytab/ktbase.c
+++ b/src/lib/krb5/keytab/ktbase.c
@@ -39,10 +39,10 @@ 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_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_kt_register(context, ops)
     krb5_context context;
-    krb5_kt_ops *ops;
+    krb5_kt_ops FAR *ops;
 {
     struct krb5_kt_typelist *t;
     for (t = kt_typehead;t && strcmp(t->ops->prefix,ops->prefix);t = t->next)
@@ -68,11 +68,11 @@ krb5_kt_register(context, ops)
  * particular keytab type.
  */
 
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_kt_resolve (context, name, ktid)
     krb5_context context;
-    const char *name;
-    krb5_keytab *ktid;
+    const char FAR *name;
+    krb5_keytab FAR *ktid;
 {
     struct krb5_kt_typelist *tlist;
     char *pfx, *resid, *cp;
@@ -184,7 +184,7 @@ krb5_keytab_internalize(kcontext, argp, buffer, lenremain)
     return(kret);
 }
 
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_ser_keytab_init(kcontext)
     krb5_context	kcontext;
 {
diff --git a/src/lib/krb5/keytab/ktdefault.c b/src/lib/krb5/keytab/ktdefault.c
index 1e34b76ce..6178d43dd 100644
--- a/src/lib/krb5/keytab/ktdefault.c
+++ b/src/lib/krb5/keytab/ktdefault.c
@@ -27,10 +27,10 @@
 #include "k5-int.h"
 #include <stdio.h>
 
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_kt_default(context, id)
     krb5_context context;
-    krb5_keytab *id;
+    krb5_keytab FAR *id;
 {
     char defname[BUFSIZ];
     krb5_error_code retval;
diff --git a/src/lib/krb5/keytab/ktfr_entry.c b/src/lib/krb5/keytab/ktfr_entry.c
index 5aaa77512..92c3235e4 100644
--- a/src/lib/krb5/keytab/ktfr_entry.c
+++ b/src/lib/krb5/keytab/ktfr_entry.c
@@ -26,10 +26,10 @@
 
 #include "k5-int.h"
 
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_kt_free_entry (context, entry)
     krb5_context context;
-    krb5_keytab_entry *entry;
+    krb5_keytab_entry FAR *entry;
 {
     if (!entry)
 	return 0;
diff --git a/src/lib/krb5/keytab/ktremove.c b/src/lib/krb5/keytab/ktremove.c
index 377c4a0a7..6fc9dd3cf 100644
--- a/src/lib/krb5/keytab/ktremove.c
+++ b/src/lib/krb5/keytab/ktremove.c
@@ -26,11 +26,11 @@
 
 #include "k5-int.h"
 
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_kt_remove_entry (context, id, entry)
     krb5_context context;
     krb5_keytab id;
-    krb5_keytab_entry *entry;
+    krb5_keytab_entry FAR *entry;
 {
     if (id->ops->remove)
 	return (*id->ops->remove)(context, id, entry);
diff --git a/src/lib/krb5/keytab/read_servi.c b/src/lib/krb5/keytab/read_servi.c
index a17443461..b6f058e49 100644
--- a/src/lib/krb5/keytab/read_servi.c
+++ b/src/lib/krb5/keytab/read_servi.c
@@ -40,14 +40,14 @@
  * returns: Either KSUCCESS or error code.
  * errors: error code if not found or keyprocarg is invalid.
  */
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_kt_read_service_key(context, keyprocarg, principal, vno, enctype, key)
     krb5_context context;
     krb5_pointer keyprocarg;
     krb5_principal principal;
     krb5_kvno vno;
     krb5_enctype enctype;
-    krb5_keyblock ** key;
+    krb5_keyblock FAR * FAR * key;
 {
     krb5_error_code kerror = KSUCCESS;
     char keytabname[MAX_KEYTAB_NAME_LEN + 1]; /* + 1 for NULL termination */