Fix Windows build

Repair the Windows build.  Tested with the prepare-on-Unix method.
Some specific changes include:

* Removed the IPC finalizer (no longer used after r20787) from
  ccapi/lib/ccapi_ipc.c, as it was creating a difficult dependency
  chain for the pingtest build in ccapi/test.  Also updated pingtest
  to use the k5_ipc_stream interfaces since cci_stream is gone.

* Reverted the apparently non-functional r20277.

* klist -V prints just "Kerberos for Windows", since it has no access
  to PACKAGE_NAME and PACKAGE_VERSION from autoconf.  This should be
  addressed correctly.

* krb5, telnet, gssftp, and NIM are removed from the build.

* Some files had CRLFs; these were replaced with LFs and the
  svn:eol-style property set on the files.  Otherwise the CRLFs became
  CRCRLFs after the zip transfer.

* Windows does not have opendir/readdir, so added Windows code to
  prof_parse.c for includedir.  Probable fodder for a libkrb5support
  portability shim.

ticket: 6826
target_version: 1.9
tags: pullup

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

11 files changed, 59 insertions, 53 deletions

diff --git a/src/lib/crypto/builtin/Makefile.in b/src/lib/crypto/builtin/Makefile.in
index 240d2895b..603c57cd0 100644
--- a/src/lib/crypto/builtin/Makefile.in
+++ b/src/lib/crypto/builtin/Makefile.in
@@ -20,11 +20,9 @@ DEFS=
 EXTRADEPSRCS= $(srcdir)/t_cf2.c 
 
 
-##DOSBUILDTOP = ..\..\..
-##DOSLIBNAME=$(OUTPRE)crypto.lib
-##DOSOBJFILE=$(OUTPRE)crypto.lst
-##DOSOBJFILELIST=@$(OUTPRE)crypto.lst @$(OUTPRE)des.lst @$(OUTPRE)md4.lst @$(OUTPRE)md5.lst @$(OUTPRE)sha1.lst @$(OUTPRE)crc32.lst @$(OUTPRE)dk.lst @$(OUTPRE)old.lst @$(OUTPRE)raw.lst @$(OUTPRE)enc_prov.lst @$(OUTPRE)hash_pro.lst @$(OUTPRE)kh_pro.lst @$(OUTPRE)yarrow.lst @$(OUTPRE)aes.lst $(OUTPRE)camellia.lst
-##DOSOBJFILEDEP =$(OUTPRE)crypto.lst $(OUTPRE)des.lst $(OUTPRE)md4.lst $(OUTPRE)md5.lst $(OUTPRE)sha1.lst $(OUTPRE)crc32.lst $(OUTPRE)dk.lst $(OUTPRE)old.lst $(OUTPRE)raw.lst $(OUTPRE)enc_prov.lst $(OUTPRE)hash_pro.lst $(OUTPRE)kh_pro.lst $(OUTPRE)aes.lst $(OUTPRE)camellia.lst
+##DOS##BUILDTOP = ..\..\..
+##DOS##PREFIXDIR = builtin
+##DOS##OBJFILE = ..\$(OUTPRE)builtin.lst
 
 STLIBOBJS=\
 	hmac.o	\
@@ -78,91 +76,97 @@ clean::
 
 
 all-windows::
-	cd ..\des
-	@echo Making in crypto\des
+	cd des
+	@echo Making in crypto\builtin\des
 	$(MAKE) -$(MFLAGS)
 	cd ..\md4
-	@echo Making in crypto\md4
+	@echo Making in crypto\builtin\md4
 	$(MAKE) -$(MFLAGS)
 	cd ..\md5
-	@echo Making in crypto\md5
+	@echo Making in crypto\builtin\md5
 	$(MAKE) -$(MFLAGS)
 	cd ..\sha1
-	@echo Making in crypto\sha1
+	@echo Making in crypto\builtin\sha1
 	$(MAKE) -$(MFLAGS)
-	cd ..\sh2a
-	@echo Making in crypto\sha2
+	cd ..\sha2
+	@echo Making in crypto\builtin\sha2
 	$(MAKE) -$(MFLAGS)
 	cd ..\hash_provider
-	@echo Making in crypto\hash_provider
+	@echo Making in crypto\builtin\hash_provider
 	$(MAKE) -$(MFLAGS)
 	cd ..\enc_provider
-	@echo Making in crypto\enc_provider
+	@echo Making in crypto\builtin\enc_provider
 	$(MAKE) -$(MFLAGS)
 	cd ..\aes
-	@echo Making in crypto\aes
+	@echo Making in crypto\builtin\aes
 	$(MAKE) -$(MFLAGS)
 	cd ..\camellia
-	@echo Making in crypto\camellia
+	@echo Making in crypto\builtin\camellia
 	$(MAKE) -$(MFLAGS)
 	cd ..
+	@echo Making in crypto\builtin
 
 clean-windows::
-	cd ..\des
-	@echo Making clean in crypto\des
+	cd des
+	@echo Making clean in crypto\builtin\des
 	$(MAKE) -$(MFLAGS) clean
 	cd ..\md4
-	@echo Making clean in crypto\md4
+	@echo Making clean in crypto\builtin\md4
 	$(MAKE) -$(MFLAGS) clean
 	cd ..\md5
-	@echo Making clean in crypto\md5
+	@echo Making clean in crypto\builtin\md5
 	$(MAKE) -$(MFLAGS) clean
 	cd ..\sha1
-	@echo Making clean in crypto\sha1
+	@echo Making clean in crypto\builtin\sha1
 	$(MAKE) -$(MFLAGS) clean
 	cd ..\sha2
-	@echo Making clean in crypto\sha2
+	@echo Making clean in crypto\builtin\sha2
 	$(MAKE) -$(MFLAGS) clean
 	cd ..\hash_provider
-	@echo Making clean in crypto\hash_provider
+	@echo Making clean in crypto\builtin\hash_provider
 	$(MAKE) -$(MFLAGS) clean
 	cd ..\enc_provider
-	@echo Making clean in crypto\enc_provider
+	@echo Making clean in crypto\builtin\enc_provider
 	$(MAKE) -$(MFLAGS) clean
 	cd ..\aes
-	@echo Making clean in crypto\aes
+	@echo Making clean in crypto\builtin\aes
 	$(MAKE) -$(MFLAGS) clean
 	cd ..\camellia
-	@echo Making clean in crypto\camellia
+	@echo Making clean in crypto\builtin\camellia
 	$(MAKE) -$(MFLAGS) clean
 	cd ..
+	@echo Making clean in crypto\builtin
 
 check-windows::
-	cd ..\des
-	@echo Making check in crypto\des
+	cd des
+	@echo Making check in crypto\builtin\des
 	$(MAKE) -$(MFLAGS) check
 	cd ..\md4
-	@echo Making check in crypto\md4
+	@echo Making check in crypto\builtin\md4
 	$(MAKE) -$(MFLAGS) check
 	cd ..\md5
-	@echo Making check in crypto\md5
+	@echo Making check in crypto\builtin\md5
 	$(MAKE) -$(MFLAGS) check
 	cd ..\sha1
-	@echo Making check in crypto\sha1
+	@echo Making check in crypto\builtin\sha1
+	$(MAKE) -$(MFLAGS) check
+	cd ..\sha2
+	@echo Making check in crypto\builtin\sha2
 	$(MAKE) -$(MFLAGS) check
 	cd ..\hash_provider
-	@echo Making check in crypto\hash_provider
+	@echo Making check in crypto\builtin\hash_provider
 	$(MAKE) -$(MFLAGS) check
 	cd ..\enc_provider
-	@echo Making check in crypto\enc_provider
+	@echo Making check in crypto\builtin\enc_provider
 	$(MAKE) -$(MFLAGS) check
 	cd ..\aes
-	@echo Making check in crypto\aes
+	@echo Making check in crypto\builtin\aes
 	$(MAKE) -$(MFLAGS) check
 	cd ..\camellia
-	@echo Making check in crypto\camellia
+	@echo Making check in crypto\builtin\camellia
 	$(MAKE) -$(MFLAGS) check
 	cd ..
+	@echo Making check in crypto\builtin
 
 
 @lib_frag@
diff --git a/src/lib/crypto/builtin/aes/Makefile.in b/src/lib/crypto/builtin/aes/Makefile.in
index 260cc97cc..64f73a379 100644
--- a/src/lib/crypto/builtin/aes/Makefile.in
+++ b/src/lib/crypto/builtin/aes/Makefile.in
@@ -4,8 +4,8 @@ LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../krb/dk  -I$(srcdir)/../../../..
 DEFS=
 
 ##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=aes
-##DOS##OBJFILE=..\$(OUTPRE)aes.lst
+##DOS##PREFIXDIR = builtin\aes
+##DOS##OBJFILE = ..\..\$(OUTPRE)aes.lst
 
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/lib/crypto/builtin/camellia/Makefile.in b/src/lib/crypto/builtin/camellia/Makefile.in
index d848defd8..2ad3e73f6 100644
--- a/src/lib/crypto/builtin/camellia/Makefile.in
+++ b/src/lib/crypto/builtin/camellia/Makefile.in
@@ -7,8 +7,8 @@ LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../krb/dk \
 DEFS=
 
 ##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=camellia
-##DOS##OBJFILE=..\$(OUTPRE)camellia.lst
+##DOS##PREFIXDIR = builtin\camellia
+##DOS##OBJFILE = ..\..\$(OUTPRE)camellia.lst
 
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/lib/crypto/builtin/des/Makefile.in b/src/lib/crypto/builtin/des/Makefile.in
index 325fdc262..5001d48bf 100644
--- a/src/lib/crypto/builtin/des/Makefile.in
+++ b/src/lib/crypto/builtin/des/Makefile.in
@@ -4,8 +4,8 @@ LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../.. -I$(srcdir)/../../krb
 DEFS=
 
 ##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=des
-##DOS##OBJFILE=..\$(OUTPRE)des.lst
+##DOS##PREFIXDIR = builtin\des
+##DOS##OBJFILE = ..\..\$(OUTPRE)des.lst
 
 RUN_SETUP = @KRB5_RUN_ENV@
 PROG_LIBPATH=-L$(TOPLIBD)
diff --git a/src/lib/crypto/builtin/enc_provider/Makefile.in b/src/lib/crypto/builtin/enc_provider/Makefile.in
index aadec6e6a..80bfc60bd 100644
--- a/src/lib/crypto/builtin/enc_provider/Makefile.in
+++ b/src/lib/crypto/builtin/enc_provider/Makefile.in
@@ -10,8 +10,8 @@ LOCALINCLUDES = -I$(srcdir)/../des 	\
 DEFS=
 
 ##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=enc_provider
-##DOS##OBJFILE=..\$(OUTPRE)enc_prov.lst
+##DOS##PREFIXDIR = builtin\enc_provider
+##DOS##OBJFILE = ..\..\$(OUTPRE)enc_provider.lst
 
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/lib/crypto/builtin/enc_provider/camellia.c b/src/lib/crypto/builtin/enc_provider/camellia.c
index 566f2d78f..337a3104d 100644
--- a/src/lib/crypto/builtin/enc_provider/camellia.c
+++ b/src/lib/crypto/builtin/enc_provider/camellia.c
@@ -358,9 +358,11 @@ krb5int_camellia_cbc_mac(krb5_key key, const krb5_crypto_iov *data,
 }
 
 const struct krb5_enc_provider krb5int_enc_camellia128 = {
+    0
 };
 
 const struct krb5_enc_provider krb5int_enc_camellia256 = {
+    0
 };
 
 #endif /* CAMELLIA */
diff --git a/src/lib/crypto/builtin/hash_provider/Makefile.in b/src/lib/crypto/builtin/hash_provider/Makefile.in
index 36ec412c5..e91901ee5 100644
--- a/src/lib/crypto/builtin/hash_provider/Makefile.in
+++ b/src/lib/crypto/builtin/hash_provider/Makefile.in
@@ -5,8 +5,8 @@ LOCALINCLUDES = -I$(srcdir)/../../krb/crc32 -I$(srcdir)/../md4 \
 DEFS=
 
 ##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=hash_provider
-##DOS##OBJFILE=..\$(OUTPRE)hash_pro.lst
+##DOS##PREFIXDIR = builtin\hash_provider
+##DOS##OBJFILE = ..\..\$(OUTPRE)hash_provider.lst
 
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/lib/crypto/builtin/md4/Makefile.in b/src/lib/crypto/builtin/md4/Makefile.in
index 561927a1e..00ec64315 100644
--- a/src/lib/crypto/builtin/md4/Makefile.in
+++ b/src/lib/crypto/builtin/md4/Makefile.in
@@ -4,8 +4,8 @@ LOCALINCLUDES = -I$(srcdir)
 DEFS=
 
 ##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=md4
-##DOS##OBJFILE=..\$(OUTPRE)md4.lst
+##DOS##PREFIXDIR = builtin\md4
+##DOS##OBJFILE = ..\..\$(OUTPRE)md4.lst
 
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/lib/crypto/builtin/md5/Makefile.in b/src/lib/crypto/builtin/md5/Makefile.in
index 6a1f52fa6..840bb62b9 100644
--- a/src/lib/crypto/builtin/md5/Makefile.in
+++ b/src/lib/crypto/builtin/md5/Makefile.in
@@ -3,8 +3,8 @@ BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 DEFS=
 
 ##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=md5
-##DOS##OBJFILE=..\$(OUTPRE)md5.lst
+##DOS##PREFIXDIR = builtin\md5
+##DOS##OBJFILE = ..\..\$(OUTPRE)md5.lst
 
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/lib/crypto/builtin/sha1/Makefile.in b/src/lib/crypto/builtin/sha1/Makefile.in
index ec51713a1..719f63370 100644
--- a/src/lib/crypto/builtin/sha1/Makefile.in
+++ b/src/lib/crypto/builtin/sha1/Makefile.in
@@ -3,8 +3,8 @@ BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 DEFS=
 
 ##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=sha1
-##DOS##OBJFILE=..\$(OUTPRE)sha1.lst
+##DOS##PREFIXDIR = builtin\sha1
+##DOS##OBJFILE = ..\..\$(OUTPRE)sha1.lst
 
 RUN_SETUP = @KRB5_RUN_ENV@
 PROG_LIBPATH=-L$(TOPLIBD)
diff --git a/src/lib/crypto/builtin/sha2/Makefile.in b/src/lib/crypto/builtin/sha2/Makefile.in
index 535d7eeb8..3b854ec29 100644
--- a/src/lib/crypto/builtin/sha2/Makefile.in
+++ b/src/lib/crypto/builtin/sha2/Makefile.in
@@ -3,8 +3,8 @@ BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 DEFS=
 
 ##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=sha2
-##DOS##OBJFILE=..\$(OUTPRE)sha2.lst
+##DOS##PREFIXDIR = builtin\sha2
+##DOS##OBJFILE = ..\..\$(OUTPRE)sha2.lst
 
 RUN_SETUP = @KRB5_RUN_ENV@
 PROG_LIBPATH=-L$(TOPLIBD)