Windows changes in krb5: makefile cleanup and some small code changes

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

14 files changed, 120 insertions, 26 deletions

diff --git a/src/lib/krb5/ChangeLog b/src/lib/krb5/ChangeLog
index 18f619adb9..5854c130e6 100644
--- a/src/lib/krb5/ChangeLog
+++ b/src/lib/krb5/ChangeLog
@@ -1,3 +1,7 @@
+Wed Mar 15 12:26:21 1995 Keith Vetter (keithv@fusion.com)
+
+	* Makefile.in: made so it recurses into the subdirs for the PC.
+
 Fri Nov 18 00:17:47 1994  Mark Eichin  <eichin@cygnus.com>
 
 	* configure.in: move WITH_CCOPTS, WITH_KRB5ROOT.
diff --git a/src/lib/krb5/Makefile.in b/src/lib/krb5/Makefile.in
index c546ddbe1b..a9d85fb354 100644
--- a/src/lib/krb5/Makefile.in
+++ b/src/lib/krb5/Makefile.in
@@ -1,10 +1,17 @@
+##DOSBUILDTOP = ..\..
+##DOS!include $(BUILDTOP)\config\windows.in
+
 TST=if test -n "`cat DONE`" ; then
 
 LIB_SUBDIRS= error_tables asn.1 ccache ccache/stdio ccache/file \
 	keytab keytab/file krb rcache free os posix
 LIBUPDATE= $(BUILDTOP)/util/libupdate
 
-all:: 
+all:: all-$(WHAT)
+
+all-unix::
+
+all-windows::
 
 libkrb5_ranlib: libkrb5.a
 	$(RANLIB) libkrb5.a
@@ -25,11 +32,77 @@ libkrb5.a: error_tables/DONE asn.1/DONE ccache/DONE ccache/stdio/DONE \
 		done ; \
 	fi
 	touch libkrb5.stamp
-		
 
 install:: libkrb5_ranlib
 	$(INSTALL_DATA) libkrb5.a $(DESTDIR)$(KRB5_LIBDIR)/libkrb5.a
 	$(RANLIB) $(DESTDIR)$(KRB5_LIBDIR)/libkrb5.a
 
-clean::
-	$(RM) libkrb5.a libkrb5_ranlib libkrb5.stamp
+clean:: clean-$(WHAT)
+
+clean-unix::
+	$(RM) libkrb5.$(LIBEXT) libkrb5_ranlib libkrb5.stamp
+
+clean-windows::
+	$(RM) krb5.lib krb5.bak
+
+all-windows::
+	cd ASN.1
+	@echo Making in ASN.1
+	-$(MAKE) -$(MFLAGS) LIBCMD="$(LIBCMD)"
+	cd ..\CCACHE
+	@echo Making in CCACHE
+	-$(MAKE) -$(MFLAGS) LIBCMD="$(LIBCMD)"
+	cd ..\ERROR_TA
+	@echo Making in ERROR_TA
+	-$(MAKE) -$(MFLAGS) LIBCMD="$(LIBCMD)"
+	cd ..\FREE
+	@echo Making in FREE
+	-$(MAKE) -$(MFLAGS) LIBCMD="$(LIBCMD)"
+	cd ..\KEYTAB
+	@echo Making in KEYTAB
+	-$(MAKE) -$(MFLAGS) LIBCMD="$(LIBCMD)"
+	cd ..\KRB
+	@echo Making in KRB
+	-$(MAKE) -$(MFLAGS) LIBCMD="$(LIBCMD)"
+	cd ..\OS
+	@echo Making in OS
+	-$(MAKE) -$(MFLAGS) LIBCMD="$(LIBCMD)"
+	cd ..\POSIX
+	@echo Making in POSIX
+	-$(MAKE) -$(MFLAGS) LIBCMD="$(LIBCMD)"
+	cd ..\RCACHE
+	@echo Making in RCACHE
+	-$(MAKE) -$(MFLAGS) LIBCMD="$(LIBCMD)"
+	cd ..
+
+clean-windows::
+	cd ASN.1
+	@echo Making clean in ASN.1
+	-$(MAKE) -$(MFLAGS) clean
+	cd ..\CCACHE
+	@echo Making clean in CCACHE
+	-$(MAKE) -$(MFLAGS) clean
+	cd ..\ERROR_TA
+	@echo Making clean in ERROR_TA
+	-$(MAKE) -$(MFLAGS) clean
+	cd ..\FREE
+	@echo Making clean in FREE
+	-$(MAKE) -$(MFLAGS) clean
+	cd ..\KEYTAB
+	@echo Making clean in KEYTAB
+	-$(MAKE) -$(MFLAGS) clean
+	cd ..\KRB
+	@echo Making clean in KRB
+	-$(MAKE) -$(MFLAGS) clean
+	cd ..\OS
+	@echo Making clean in OS
+	-$(MAKE) -$(MFLAGS) clean
+	cd ..\POSIX
+	@echo Making clean in POSIX
+	-$(MAKE) -$(MFLAGS) clean
+	cd ..\RCACHE
+	@echo Making clean in RCACHE
+	-$(MAKE) -$(MFLAGS) clean
+	cd ..
+	@echo Making clean locally
+
diff --git a/src/lib/krb5/ccache/file/ChangeLog b/src/lib/krb5/ccache/file/ChangeLog
index de6fb958f6..af710145d2 100644
--- a/src/lib/krb5/ccache/file/ChangeLog
+++ b/src/lib/krb5/ccache/file/ChangeLog
@@ -1,3 +1,9 @@
+Wed Mar 15 12:07:28 1995 Keith Vetter (keithv@fusion.com)
+
+	* fcc_eseq.c, fcc_init.c, fcc_maybe.c, fcc_dest.c:
+	   Initialized return code.
+	* fcc_genn.c, fcc_init.c: removed chmod call for the PC
+
 Thu Mar 09 18:43:10 1995  Chris Provenzano (proven@mit.edu)
 
 	* fcc_destry.c (krb5_fcc_destroy())
diff --git a/src/lib/krb5/ccache/file/fcc_eseq.c b/src/lib/krb5/ccache/file/fcc_eseq.c
index d888aa9955..369d667a6e 100644
--- a/src/lib/krb5/ccache/file/fcc_eseq.c
+++ b/src/lib/krb5/ccache/file/fcc_eseq.c
@@ -46,7 +46,7 @@ krb5_fcc_end_seq_get(context, id, cursor)
    krb5_ccache id;
    krb5_cc_cursor *cursor;
 {
-     int kret = KRB5_OK;
+     krb5_error_code kret = KRB5_OK;
      
      /* don't close; it may be left open by the caller,
 	and if not, fcc_start_seq_get and/or fcc_next_cred will do the
diff --git a/src/lib/krb5/ccache/file/fcc_gennew.c b/src/lib/krb5/ccache/file/fcc_gennew.c
index 507893350a..d299903c75 100644
--- a/src/lib/krb5/ccache/file/fcc_gennew.c
+++ b/src/lib/krb5/ccache/file/fcc_gennew.c
@@ -111,7 +111,9 @@ krb5_fcc_generate_new (context, id)
 
 	  /* Ignore user's umask, set mode = 0600 */
 #ifdef NOFCHMOD
+#ifndef NOCHMOD
 	  chmod(((krb5_fcc_data *) lid->data)->filename, S_IRUSR | S_IWUSR);
+#endif
 #else
 	  fchmod(ret, S_IRUSR | S_IWUSR);
 #endif
diff --git a/src/lib/krb5/ccache/file/fcc_init.c b/src/lib/krb5/ccache/file/fcc_init.c
index ec497892a9..4411ebcb80 100644
--- a/src/lib/krb5/ccache/file/fcc_init.c
+++ b/src/lib/krb5/ccache/file/fcc_init.c
@@ -52,7 +52,9 @@ krb5_fcc_initialize(context, id, princ)
      MAYBE_OPEN(context, id, FCC_OPEN_AND_ERASE);
 
 #ifdef NOFCHMOD
+#ifndef NOCHMOD
      reti = chmod(((krb5_fcc_data *) id->data)->filename, S_IREAD | S_IWRITE);
+#endif
 #else
      reti = fchmod(((krb5_fcc_data *) id->data)->fd, S_IREAD | S_IWRITE);
 #endif
diff --git a/src/lib/krb5/ccache/file/fcc_maybe.c b/src/lib/krb5/ccache/file/fcc_maybe.c
index 7b9fa6eee5..f0e316f4e6 100644
--- a/src/lib/krb5/ccache/file/fcc_maybe.c
+++ b/src/lib/krb5/ccache/file/fcc_maybe.c
@@ -214,7 +214,7 @@ krb5_fcc_open_file (context, id, mode)
      krb5_ui_2 fcc_fvno;
      int fd;
      int open_flag;
-     krb5_error_code retval;
+     krb5_error_code retval = 0;
 
      if (data->fd != -1) {
 	  /* Don't know what state it's in; shut down and start anew.  */
diff --git a/src/lib/krb5/error_tables/ChangeLog b/src/lib/krb5/error_tables/ChangeLog
index 2c2a5c8d7a..0dfc4a79f9 100644
--- a/src/lib/krb5/error_tables/ChangeLog
+++ b/src/lib/krb5/error_tables/ChangeLog
@@ -1,3 +1,7 @@
+Wed Mar 15 12:24:25 1995 Keith Vetter (keithv@fusion.com)
+
+	* Makefile.in: disabled the awk part of the makefile.
+
 Tue Mar 7 21:40:18 1995 Keith Vetter (keithv@fusion.com)
 
 	* Makefile.in: changed library name for the PC.
diff --git a/src/lib/krb5/error_tables/Makefile.in b/src/lib/krb5/error_tables/Makefile.in
index d35cf4afc9..9a0d4a9698 100644
--- a/src/lib/krb5/error_tables/Makefile.in
+++ b/src/lib/krb5/error_tables/Makefile.in
@@ -17,7 +17,7 @@ all:: all-$(WHAT)
 
 all-unix:: $(HDRS) includes $(OBJS)
 
-all-windows:: awk-windows $(OBJS)
+all-windows:: $(OBJS)
 
 unixmac: $(HDRS)
 
diff --git a/src/lib/krb5/free/ChangeLog b/src/lib/krb5/free/ChangeLog
index 07c538eba0..1dc25294ac 100644
--- a/src/lib/krb5/free/ChangeLog
+++ b/src/lib/krb5/free/ChangeLog
@@ -1,3 +1,9 @@
+Wed Mar 15 12:21:24 1995 Keith Vetter (keithv@fusion.com)
+
+	* f_cksum.c renamed to f_chksum.c because of module name conflicts
+	   with crypto/des/f_cksum.
+	* Makefile.in: reflected above name change.
+
 Tue Mar 7 21:40:18 1995 Keith Vetter (keithv@fusion.com)
 
 	* Makefile.in: changed library name for the PC.
diff --git a/src/lib/krb5/free/Makefile.in b/src/lib/krb5/free/Makefile.in
index 2e8732f617..afd00e3f4d 100644
--- a/src/lib/krb5/free/Makefile.in
+++ b/src/lib/krb5/free/Makefile.in
@@ -14,7 +14,7 @@ OBJS=	\
 	f_authdata.$(OBJEXT)	\
 	f_authent.$(OBJEXT)	\
 	f_auth_cnt.$(OBJEXT)	\
-	f_cksum.$(OBJEXT)	\
+	f_chksum.$(OBJEXT)	\
 	f_creds.$(OBJEXT)	\
 	f_cred_cnt.$(OBJEXT)	\
 	f_enc_kdc.$(OBJEXT)	\
@@ -47,7 +47,7 @@ SRCS=	\
 	$(srcdir)/f_authdata.c	\
 	$(srcdir)/f_authent.c	\
 	$(srcdir)/f_auth_cnt.c	\
-	$(srcdir)/f_cksum.c	\
+	$(srcdir)/f_chksum.c	\
 	$(srcdir)/f_creds.c	\
 	$(srcdir)/f_cred_cnt.c	\
 	$(srcdir)/f_enc_kdc.c	\
diff --git a/src/lib/krb5/free/f_cksum.c b/src/lib/krb5/free/f_chksum.c
index 68d2960584..9149ce22e7 100644
--- a/src/lib/krb5/free/f_cksum.c
+++ b/src/lib/krb5/free/f_chksum.c
@@ -1,5 +1,5 @@
 /*
- * lib/krb5/free/f_cksum.c
+ * lib/krb5/free/f_chksum.c
  *
  * Copyright 1990 by the Massachusetts Institute of Technology.
  * All Rights Reserved.
diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog
index 978acecc98..ed6d7896d7 100644
--- a/src/lib/krb5/os/ChangeLog
+++ b/src/lib/krb5/os/ChangeLog
@@ -1,3 +1,7 @@
+Wed Mar 15 12:19:47 1995 Keith Vetter (keithv@fusion.com)
+
+	* sendto_kdc.c: made to work on the PC.
+
 Tue Mar  7 22:15:00 1995 Keith Vetter <keithv@fusion.com>
 
 	* sendto_kdc.c: stubbed on the PC for now.
diff --git a/src/lib/krb5/os/sendto_kdc.c b/src/lib/krb5/os/sendto_kdc.c
index d1fa774c9c..fb0b726539 100644
--- a/src/lib/krb5/os/sendto_kdc.c
+++ b/src/lib/krb5/os/sendto_kdc.c
@@ -25,12 +25,19 @@
  * as necessary.
  */
 
+#define NEED_SOCKETS
+#define NEED_LOWLEVEL_IO
 #include "k5-int.h"
-#ifndef _MSDOS    /* Not yet for Windows */
 
 #include <sys/types.h>
+#ifndef _WINSOCKAPI_
 #include <sys/socket.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
+#else
+#include <time.h>
+#endif
 #include "os-proto.h"
 
 #ifdef _AIX
@@ -53,7 +60,7 @@ extern int krb5_max_skdc_timeout;
 extern int krb5_skdc_timeout_shift;
 extern int krb5_skdc_timeout_1;
 
-krb5_error_code
+krb5_error_code INTERFACE
 krb5_sendto_kdc (context, message, realm, reply)
     krb5_context context;
     const krb5_data * message;
@@ -206,17 +213,3 @@ krb5_sendto_kdc (context, message, realm, reply)
     }
     return retval;
 }
-#else /* MSDOS */
-
-/* Stub for now to satisfy the linker in making the DLL.
-*/
-krb5_error_code INTERFACE
-krb5_sendto_kdc (context, message, realm, reply)
-    krb5_context context;
-    const krb5_data * message;
-    const krb5_data * realm;
-    krb5_data * reply;
-{
-   return 0;
-}
-#endif