Fix windows build

Catch up to the split of preauth_plugin.h into client and
kdc specific portions.  While here, use copy's /y flag to suppress
an override-confirmation prompt (though we do not list any dependencies
for this target at the moment, so no such prompt will be generated).

Do not disable library finalizers for windows, erroneously disabled
in 4538146e1452e0966164119cefb0804993ce6bbb.

diff --git a/src/include/Makefile.in b/src/include/Makefile.in
index fffe76800268402596e04cc6f1fe565fbd004afe..50023492fa16e7c19abc6ee49692b0f3047a80b5 100644 (file)
--- a/src/include/Makefile.in
+++ b/src/include/Makefile.in
@@ -101,7 +101,7 @@ private-and-public-decls: $(HEADERS_TO_CHECK)
        cat $(HEADERS_TO_CHECK) > $@
 ##DOS##!endif
 ##DOS##private-and-public-decls:
-##DOS##        copy krb5\krb5.h+k5-int.h+krb5\preauth_plugin.h $@
+##DOS##        copy /y krb5\krb5.h+k5-int.h+krb5\clpreauth_plugin.h $@
 
 #
 # Build the error table include files:

diff --git a/src/include/k5-platform.h b/src/include/k5-platform.h
index f4021da71fc32050794ed60c621c206ee8728d12..ad7888ab12ab41d269dc6b7f804ddb32addc75f8 100644 (file)
--- a/src/include/k5-platform.h
+++ b/src/include/k5-platform.h
@@ -347,7 +347,7 @@ typedef struct { int error; unsigned char did_run; } k5_init_t;
 
 
 
-#if !defined(SHARED)
+#if !defined(SHARED) && !defined(_WIN32)
 
 /*
  * In this case, we just don't care about finalization.