Windows/NT integration (V1_0_WIN32_BRANCH merge)

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

4 files changed, 37 insertions, 25 deletions

diff --git a/src/lib/kadm/ChangeLog b/src/lib/kadm/ChangeLog
index 33c7dbb32..62570f32b 100644
--- a/src/lib/kadm/ChangeLog
+++ b/src/lib/kadm/ChangeLog
@@ -1,3 +1,10 @@
+Thu Nov 21 00:58:04 EST 1996    Richard Basch   <basch@lehman.com>
+
+        * Makefile.in: Win32 build
+	* adm_conn.c, adm_rw.c:
+		DLL export krb5_adm_connect, krb5_adm_disconnect,
+		krb5_free_adm_data, krb5_send_adm_cmd, krb5_read_adm_reply
+
 Tue Sep 24 13:25:50 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
 	* Makefile.in: Eliminate extra files not needed for Macintosh and
diff --git a/src/lib/kadm/Makefile.in b/src/lib/kadm/Makefile.in
index 9cd60e717..f76a58abc 100644
--- a/src/lib/kadm/Makefile.in
+++ b/src/lib/kadm/Makefile.in
@@ -2,6 +2,8 @@ CFLAGS = $(CCOPTS) $(DEFS)
 
 ##DOSBUILDTOP = ..\..
 ##DOSLIBNAME=kadm.lib
+##DOSOBJFILE=kadm.lst
+
 RUN_SETUP=@KRB5_RUN_ENV@
 BASE_OBJS= adm_conn.$(OBJEXT)	\
 	adm_kt_dec.$(OBJEXT)	\
@@ -35,12 +37,15 @@ SRCS=	$(srcdir)/adm_conn.c	\
 #	$(srcdir)/adm_kw_enc.c
 
 
-all:: $(BASE_OBJS) 
-
-all-unix:: $(DB_OBJS) $(UNIX_OBJS)
+all-unix:: $(BASE_OBJS) $(DB_OBJS) $(UNIX_OBJS)
 all-unix:: libkadm.a
-all-mac:: $(DB_OBJS)
-all-windows::
+all-mac:: $(BASE_OBJS) $(DB_OBJS)
+all-windows:: $(OBJFILE)
+
+##DOS$(OBJFILE): $(BASE_OBJS)
+##DOS	$(RM) $(OBJFILE)
+##WIN16##	$(CP) nul: $(OBJFILE)
+##WIN32##	$(LIBECHO) *.obj > $(OBJFILE)
 
 libkadm.a: $(OBJS) $(UNIX_OBJS)
 	$(RM) $@
@@ -56,7 +61,7 @@ clean-unix::
 clean-mac::
 	$(RM) libkadm.$(LIBEXT)
 clean-windows::
-	$(RM) kadm.lib kadm.bak
+	$(RM) kadm.lib kadm.bak $(OBJFILE)
 
 #
 # t_dbentry
diff --git a/src/lib/kadm/adm_conn.c b/src/lib/kadm/adm_conn.c
index 1534b4b02..d341b8301 100644
--- a/src/lib/kadm/adm_conn.c
+++ b/src/lib/kadm/adm_conn.c
@@ -602,17 +602,17 @@ kadm_get_auth(kcontext, ctxp, local, remote)
  *	free auth_context
  *	close socket.
  */
-krb5_error_code INTERFACE
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_adm_connect(kcontext, user, prompt, opassword, sockp, ctxp,
 		 ccachep, ccname, tlife)
     krb5_context	kcontext;	/* Context handle	(In ) */
-    char		*user;		/* User specified	(In ) */
-    char		*prompt;	/* Old password prompt	(In ) */
-    char		*opassword;	/* Old Password		(I/O) */
-    int			*sockp;		/* Socket for conn.	(Out) */
-    krb5_auth_context	*ctxp;		/* Auth context		(Out) */
-    krb5_ccache		*ccachep;	/* Credentials cache	(I/O) */
-    char		*ccname;	/* Cred cache name	(In ) */
+    char		FAR *user;	/* User specified	(In ) */
+    char		FAR *prompt;	/* Old password prompt	(In ) */
+    char		FAR *opassword;	/* Old Password		(I/O) */
+    int			FAR *sockp;	/* Socket for conn.	(Out) */
+    krb5_auth_context	FAR *ctxp;	/* Auth context		(Out) */
+    krb5_ccache		FAR *ccachep;	/* Credentials cache	(I/O) */
+    char		FAR *ccname;	/* Cred cache name	(In ) */
     krb5_timestamp	tlife;		/* Ticket lifetime	(In ) */
 {
     krb5_error_code	kret;
@@ -745,10 +745,10 @@ krb5_adm_connect(kcontext, user, prompt, opassword, sockp, ctxp,
  * If ccache is supplied, then it is destroyed.  Otherwise, the ccache is
  * the caller's responsibility to close.
  */
-void INTERFACE
+KRB5_DLLIMP void KRB5_CALLCONV
 krb5_adm_disconnect(kcontext, socketp, auth_context, ccache)
     krb5_context	kcontext;
-    int			*socketp;
+    int			FAR *socketp;
     krb5_auth_context	auth_context;
     krb5_ccache		ccache;
 {
diff --git a/src/lib/kadm/adm_rw.c b/src/lib/kadm/adm_rw.c
index bed4e4bb1..0d823304d 100644
--- a/src/lib/kadm/adm_rw.c
+++ b/src/lib/kadm/adm_rw.c
@@ -68,11 +68,11 @@ kadm_copyout_int32(outint, cp)
 /*
  * krb5_free_adm_data()	- Free data blocks allocated by read_adm... routines.
  */
-void INTERFACE
+KRB5_DLLIMP void KRB5_CALLCONV
 krb5_free_adm_data(kcontext, ncomp, datap)
     krb5_context	kcontext;
     krb5_int32		ncomp;
-    krb5_data		*datap;
+    krb5_data		FAR *datap;
 {
     int i;
     
@@ -96,13 +96,13 @@ krb5_free_adm_data(kcontext, ncomp, datap)
  *		.
  *		.
  */
-krb5_error_code INTERFACE
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_send_adm_cmd(kcontext, sock, ctx, nargs, arglist)
     krb5_context	kcontext;	/* Context handle	(In ) */
     krb5_pointer	sock;		/* Socket to write to	(In ) */
     krb5_auth_context	ctx;		/* Auth context		(In ) */
-    krb5_int32			nargs;		/* Number of arguments	(In ) */
-    krb5_data		*arglist;	/* Components to write	(In ) */
+    krb5_int32		nargs;		/* Number of arguments	(In ) */
+    krb5_data		FAR *arglist;	/* Components to write	(In ) */
 {
     int	writebufsize;
     int i;
@@ -412,14 +412,14 @@ krb5_read_adm_cmd(kcontext, sock, ctx, nargs, arglist)
  * It is the caller's responsibility to free the memory allocated for
  * the read in component list.
  */
-krb5_error_code INTERFACE
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_read_adm_reply(kcontext, sock, ctx, cmd_stat, ncomps, complist)
     krb5_context	kcontext;	/* Context handle	(In ) */
     krb5_pointer	sock;		/* Socket to read from	(In ) */
     krb5_auth_context	ctx;		/* Auth context		(In ) */
-    krb5_int32		*cmd_stat;	/* Command status	(Out) */
-    krb5_int32		*ncomps;	/* # of reply components(Out) */
-    krb5_data		**complist;	/* List of components	(Out) */
+    krb5_int32		FAR *cmd_stat;	/* Command status	(Out) */
+    krb5_int32		FAR *ncomps;	/* # of reply components(Out) */
+    krb5_data		FAR * FAR *complist;	/* List of components (Out) */
 {
     krb5_data		read_data;
     krb5_error_code	ret;