9.2.7rc3

22 files changed, 1172 insertions, 932 deletions

diff --git a/lib/bind/api b/lib/bind/api
index 4222749f..8701441a 100644
--- a/lib/bind/api
+++ b/lib/bind/api
@@ -1,3 +1,3 @@
 LIBINTERFACE = 4
-LIBREVISION = 5
+LIBREVISION = 6
 LIBAGE = 0
diff --git a/lib/bind/include/netdb.h b/lib/bind/include/netdb.h
index 0a9bc1df..2d5bead3 100644
--- a/lib/bind/include/netdb.h
+++ b/lib/bind/include/netdb.h
@@ -86,7 +86,7 @@
 
 /*
  *      @(#)netdb.h	8.1 (Berkeley) 6/2/93
- *	$Id: netdb.h,v 1.12.2.9 2006/08/01 01:45:10 marka Exp $
+ *	$Id: netdb.h,v 1.12.2.10 2006/10/02 01:18:51 marka Exp $
  */
 
 #ifndef _NETDB_H_
@@ -493,7 +493,7 @@ int		innetgr_r __P((const char *, const char *, const char *,
 #endif
 #else
  /* defined(sun) || defined(bsdi) */
-#ifdef __GLIBC__
+#if defined(__GLIBC__) || defined(__FreeBSD__) && (__FreeBSD_version + 0 >= 601103)
 int gethostbyaddr_r __P((const char *, int, int, struct hostent *,
 		         char *, size_t, struct hostent **, int *));
 int gethostbyname_r __P((const char *, struct hostent *,
@@ -510,7 +510,7 @@ struct hostent	*gethostent_r __P((struct hostent *, char *, int, int *));
 void		sethostent_r __P((int));
 void		endhostent_r __P((void));
 
-#ifdef __GLIBC__
+#if defined(__GLIBC__) || defined(__FreeBSD__) && (__FreeBSD_version + 0 >= 601103)
 int getnetbyname_r __P((const char *, struct netent *,
 			char *, size_t, struct netent **, int*));
 int getnetbyaddr_r __P((unsigned long int, int, struct netent *,
@@ -526,7 +526,7 @@ struct netent	*getnetent_r __P((struct netent *, char *, int));
 void		setnetent_r __P((int));
 void		endnetent_r __P((void));
 
-#ifdef __GLIBC__
+#if defined(__GLIBC__) || defined(__FreeBSD__) && (__FreeBSD_version + 0 >= 601103)
 int getprotobyname_r __P((const char *, struct protoent *, char *,
 			  size_t, struct protoent **));
 int getprotobynumber_r __P((int, struct protoent *, char *, size_t,
@@ -542,7 +542,7 @@ struct protoent	*getprotoent_r __P((struct protoent *, char *, int));
 void		setprotoent_r __P((int));
 void		endprotoent_r __P((void));
 
-#ifdef __GLIBC__
+#if defined(__GLIBC__) || defined(__FreeBSD__) && (__FreeBSD_version + 0 >= 601103)
 int getservbyname_r __P((const char *name, const char *,
 			 struct servent *, char *, size_t, struct servent **));
 int getservbyport_r __P((int port, const char *,
diff --git a/lib/bind/inet/inet_cidr_ntop.c b/lib/bind/inet/inet_cidr_ntop.c
index 08516563..aec69235 100644
--- a/lib/bind/inet/inet_cidr_ntop.c
+++ b/lib/bind/inet/inet_cidr_ntop.c
@@ -16,7 +16,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: inet_cidr_ntop.c,v 1.1.2.4 2005/11/03 23:41:22 marka Exp $";
+static const char rcsid[] = "$Id: inet_cidr_ntop.c,v 1.1.2.5 2006/10/11 02:32:34 marka Exp $";
 #endif
 
 #include "port_before.h"
@@ -40,10 +40,10 @@ static const char rcsid[] = "$Id: inet_cidr_ntop.c,v 1.1.2.4 2005/11/03 23:41:22
 # define SPRINTF(x) ((size_t)sprintf x)
 #endif
 
-static char *	inet_cidr_ntop_ipv4 __P((const u_char *src, int bits,
-					 char *dst, size_t size));
-static char *	inet_cidr_ntop_ipv6 __P((const u_char *src, int bits,
-					 char *dst, size_t size));
+static char *
+inet_cidr_ntop_ipv4(const u_char *src, int bits, char *dst, size_t size);
+static char *
+inet_cidr_ntop_ipv6(const u_char *src, int bits, char *dst, size_t size);
 
 /*
  * char *
diff --git a/lib/bind/resolv/res_send.c b/lib/bind/resolv/res_send.c
index 8e5420d7..d85098b1 100644
--- a/lib/bind/resolv/res_send.c
+++ b/lib/bind/resolv/res_send.c
@@ -70,7 +70,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static const char sccsid[] = "@(#)res_send.c	8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$Id: res_send.c,v 1.5.2.10 2006/03/08 04:14:10 marka Exp $";
+static const char rcsid[] = "$Id: res_send.c,v 1.5.2.11 2006/10/16 23:02:41 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /*
@@ -295,7 +295,8 @@ res_nsend(res_state statp,
 	highestFD = sysconf(_SC_OPEN_MAX) - 1;
 #endif
 
-	if (statp->nscount == 0) {
+	/* No name servers or res_init() failure */
+	if (statp->nscount == 0 || EXT(statp).ext == NULL) {
 		errno = ESRCH;
 		return (-1);
 	}
diff --git a/lib/dns/api b/lib/dns/api
index d17f8380..057008de 100644
--- a/lib/dns/api
+++ b/lib/dns/api
@@ -1,3 +1,3 @@
 LIBINTERFACE = 18
-LIBREVISION = 1
+LIBREVISION = 2
 LIBAGE = 2
diff --git a/lib/dns/callbacks.c b/lib/dns/callbacks.c
index 4ca8ae6d..f99b7ad1 100644
--- a/lib/dns/callbacks.c
+++ b/lib/dns/callbacks.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,10 +15,12 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: callbacks.c,v 1.12.2.1 2004/03/09 06:11:00 marka Exp $ */
+/* $Id: callbacks.c,v 1.12.2.3 2006/10/03 23:50:49 marka Exp $ */
 
 #include <config.h>
 
+#include <isc/file.h>
+
 #include <isc/util.h>
 
 #include <dns/callbacks.h>
diff --git a/lib/dns/gen-win32.h b/lib/dns/gen-win32.h
index 82b37976..24d579e1 100644
--- a/lib/dns/gen-win32.h
+++ b/lib/dns/gen-win32.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -48,7 +48,7 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: gen-win32.h,v 1.14.2.1 2004/03/09 06:11:02 marka Exp $ */
+/* $Id: gen-win32.h,v 1.14.2.4 2006/10/03 23:50:49 marka Exp $ */
 
 /*
  * Principal Authors: Computer Systems Research Group at UC Berkeley
diff --git a/lib/dns/gen.c b/lib/dns/gen.c
index 7f565845..894da25f 100644
--- a/lib/dns/gen.c
+++ b/lib/dns/gen.c
@@ -15,7 +15,14 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: gen.c,v 1.65.2.9 2006/01/06 00:01:41 marka Exp $ */
+/* $Id: gen.c,v 1.65.2.11 2006/10/02 06:15:47 marka Exp $ */
+
+#ifdef WIN32
+/*
+ * Silence compiler warnings about using strcpy and friends.
+ */
+#define _CRT_SECURE_NO_DEPRECATE 1
+#endif
 
 #include <sys/types.h>
 
diff --git a/lib/dns/opensslrsa_link.c b/lib/dns/opensslrsa_link.c
index 0edcc443..d2aa4f05 100644
--- a/lib/dns/opensslrsa_link.c
+++ b/lib/dns/opensslrsa_link.c
@@ -17,7 +17,7 @@
 
 /*
  * Principal Author: Brian Wellington
- * $Id: opensslrsa_link.c,v 1.1.2.4 2006/03/01 02:48:37 marka Exp $
+ * $Id: opensslrsa_link.c,v 1.1.2.8 2006/10/11 04:00:01 marka Exp $
  */
 #ifdef OPENSSL
 
@@ -38,6 +38,21 @@
 #include <openssl/err.h>
 #include <openssl/objects.h>
 #include <openssl/rsa.h>
+#if OPENSSL_VERSION_NUMBER > 0x00908000L
+#include <openssl/bn.h>
+#endif
+
+/*
+ * We don't use configure for windows so enforce the OpenSSL version
+ * here.  Unlike with configure we don't support overriding this test.
+ */
+#ifdef WIN32
+#if !((OPENSSL_VERSION_NUMBER >= 0x009070cfL && \
+       OPENSSL_VERSION_NUMBER < 0x009080000L) || \
+      OPENSSL_VERSION_NUMBER >= 0x0090804fL) 
+#error Please upgrade OpenSSL to 0.9.8d/0.9.7l or greater.
+#endif
+#endif
 
 static isc_result_t opensslrsa_todns(const dst_key_t *key, isc_buffer_t *data);
 
@@ -205,103 +220,51 @@ opensslrsa_compare(const dst_key_t *key1, const dst_key_t *key2) {
 	return (ISC_TRUE);
 }
 
-#ifndef HAVE_RSA_GENERATE_KEY
-/* ====================================================================
- * Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-static RSA *
-RSA_generate_key(int bits, unsigned long e_value,
-		 void (*callback)(int,int,void *), void *cb_arg)
-{
-        BN_GENCB cb;
-        size_t i;
-        RSA *rsa = RSA_new();
-        BIGNUM *e = BN_new();
-
-        if (rsa == NULL || e == NULL)
+static isc_result_t
+opensslrsa_generate(dst_key_t *key, int exp) {
+#if OPENSSL_VERSION_NUMBER > 0x00908000L
+	BN_GENCB cb;
+	RSA *rsa = RSA_new();
+	BIGNUM *e = BN_new();
+
+	if (rsa == NULL || e == NULL)
 		goto err;
 
-        /* The problem is when building with 8, 16, or 32 BN_ULONG,
-         * unsigned long can be larger */
-        for (i = 0; i < sizeof(unsigned long) * 8; i++) {
-                if ((e_value & (1UL<<i)) != 0)
-                        BN_set_bit(e, i);
+	if (exp == 0) {
+		/* RSA_F4 0x10001 */
+		BN_set_bit(e, 0);
+		BN_set_bit(e, 16);
+	} else {
+		/* F5 0x100000001 */
+		BN_set_bit(e, 0);
+		BN_set_bit(e, 32);
 	}
 
-        BN_GENCB_set_old(&cb, callback, cb_arg);
+	BN_GENCB_set_old(&cb, NULL, NULL);
 
-        if (RSA_generate_key_ex(rsa, bits, e, &cb)) {
-                BN_free(e);
-                return (rsa);
-        }
-err:
-        if (e != NULL)
+	if (RSA_generate_key_ex(rsa, key->key_size, e, &cb)) {
 		BN_free(e);
-        if (rsa != NULL)
-		RSA_free(rsa);
-        return (NULL);
-}
-#endif
+		rsa->flags &= ~(RSA_FLAG_CACHE_PUBLIC | RSA_FLAG_CACHE_PRIVATE);
+		rsa->flags |= RSA_FLAG_BLINDING;
+		key->opaque = rsa;
+		return (ISC_R_SUCCESS);
+	}
 
-static isc_result_t
-opensslrsa_generate(dst_key_t *key, int exp) {
+ err:
+	if (e != NULL)
+		BN_free(e);
+	if (rsa != NULL)
+		RSA_free(rsa);
+	ERR_clear_error();
+	return (DST_R_OPENSSLFAILURE);
+#else
 	RSA *rsa;
 	unsigned long e;
 
 	if (exp == 0)
-		e = RSA_3;
-	else
 		e = RSA_F4;
+	else
+		e = 0x40000003;
 	rsa = RSA_generate_key(key->key_size, e, NULL, NULL);
 	if (rsa == NULL) {
 		ERR_clear_error();
@@ -314,6 +277,7 @@ opensslrsa_generate(dst_key_t *key, int exp) {
 	key->opaque = rsa;
 
 	return (ISC_R_SUCCESS);
+#endif
 }
 
 static isc_boolean_t
@@ -324,7 +288,7 @@ opensslrsa_isprivate(const dst_key_t *key) {
 
 static isc_boolean_t
 opensslrsa_issymmetric(void) {
-        return (ISC_FALSE);
+	return (ISC_FALSE);
 }
 
 static void
@@ -334,7 +298,6 @@ opensslrsa_destroy(dst_key_t *key) {
 	key->opaque = NULL;
 }
 
-
 static isc_result_t
 opensslrsa_todns(const dst_key_t *key, isc_buffer_t *data) {
 	RSA *rsa;
diff --git a/lib/dns/win32/gen.mak b/lib/dns/win32/gen.mak
index 09f67883..5800af14 100644
--- a/lib/dns/win32/gen.mak
+++ b/lib/dns/win32/gen.mak
@@ -29,6 +29,81 @@ CPP=cl.exe
 RSC=rc.exe

 

 !IF  "$(CFG)" == "gen - Win32 Release"

+_VC_MANIFEST_INC=0

+_VC_MANIFEST_BASENAME=__VC80

+!ELSE

+_VC_MANIFEST_INC=1

+_VC_MANIFEST_BASENAME=__VC80.Debug

+!ENDIF

+

+####################################################

+# Specifying name of temporary resource file used only in incremental builds:

+

+!if "$(_VC_MANIFEST_INC)" == "1"

+_VC_MANIFEST_AUTO_RES=$(_VC_MANIFEST_BASENAME).auto.res

+!else

+_VC_MANIFEST_AUTO_RES=

+!endif

+

+####################################################

+# _VC_MANIFEST_EMBED_EXE - command to embed manifest in EXE:

+

+!if "$(_VC_MANIFEST_INC)" == "1"

+

+#MT_SPECIAL_RETURN=1090650113

+#MT_SPECIAL_SWITCH=-notify_resource_update

+MT_SPECIAL_RETURN=0

+MT_SPECIAL_SWITCH=

+_VC_MANIFEST_EMBED_EXE= \

+if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \

+if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \

+rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \

+link $** /out:$@ $(LFLAGS)

+

+!else

+

+_VC_MANIFEST_EMBED_EXE= \

+if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;1

+

+!endif

+

+####################################################

+# _VC_MANIFEST_EMBED_DLL - command to embed manifest in DLL:

+

+!if "$(_VC_MANIFEST_INC)" == "1"

+

+#MT_SPECIAL_RETURN=1090650113

+#MT_SPECIAL_SWITCH=-notify_resource_update

+MT_SPECIAL_RETURN=0

+MT_SPECIAL_SWITCH=

+_VC_MANIFEST_EMBED_EXE= \

+if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \

+if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \

+rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \

+link $** /out:$@ $(LFLAGS)

+

+!else

+

+_VC_MANIFEST_EMBED_EXE= \

+if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2

+

+!endif

+####################################################

+# _VC_MANIFEST_CLEAN - command to clean resources files generated temporarily:

+

+!if "$(_VC_MANIFEST_INC)" == "1"

+

+_VC_MANIFEST_CLEAN=-del $(_VC_MANIFEST_BASENAME).auto.res \

+    $(_VC_MANIFEST_BASENAME).auto.rc \

+    $(_VC_MANIFEST_BASENAME).auto.manifest

+

+!else

+

+_VC_MANIFEST_CLEAN=

+

+!endif

+

+!IF  "$(CFG)" == "gen - Win32 Release"

 

 OUTDIR=.\Release

 INTDIR=.\Release

@@ -40,6 +115,7 @@ CLEAN :
 	-@erase "$(INTDIR)\gen.obj"

 	-@erase "$(INTDIR)\vc60.idb"

 	-@erase "..\gen.exe"

+	-@$(_VC_MANIFEST_CLEAN)

 

 "$(OUTDIR)" :

     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

@@ -58,6 +134,7 @@ LINK32_OBJS= \
     $(LINK32) @<<

   $(LINK32_FLAGS) $(LINK32_OBJS)

 <<

+  $(_VC_MANIFEST_EMBED_EXE)

 

 !ELSEIF  "$(CFG)" == "gen - Win32 Debug"

 

@@ -79,6 +156,7 @@ CLEAN :
 	-@erase "$(OUTDIR)\gen.pdb"

 	-@erase "..\gen.exe"

 	-@erase "..\gen.ilk"

+	-@$(_VC_MANIFEST_CLEAN)

 

 "$(OUTDIR)" :

     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

@@ -103,6 +181,7 @@ LINK32_OBJS= \
     $(LINK32) @<<

   $(LINK32_FLAGS) $(LINK32_OBJS)

 <<

+  $(_VC_MANIFEST_EMBED_EXE)

 

 !ENDIF 

 

@@ -168,3 +247,21 @@ SOURCE=..\gen.c
 

 !ENDIF 

 

+####################################################

+# Commands to generate initial empty manifest file and the RC file

+# that references it, and for generating the .res file:

+

+$(_VC_MANIFEST_BASENAME).auto.res : $(_VC_MANIFEST_BASENAME).auto.rc

+

+$(_VC_MANIFEST_BASENAME).auto.rc : $(_VC_MANIFEST_BASENAME).auto.manifest

+    type <<$@

+#include <winuser.h>

+1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest"

+<< KEEP

+

+$(_VC_MANIFEST_BASENAME).auto.manifest :

+    type <<$@

+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>

+<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>

+</assembly>

+<< KEEP

diff --git a/lib/dns/win32/libdns.dsp b/lib/dns/win32/libdns.dsp
index 192d25dc..56a57f7f 100644
--- a/lib/dns/win32/libdns.dsp
+++ b/lib/dns/win32/libdns.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "libdns_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../../../openssl-0.9.6k/inc32/openssl/include" /I "./" /I "../../../" /I "include" /I "../include" /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../../../openssl-0.9.6k/inc32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBDNS_EXPORTS" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../../../openssl-0.9.8d/inc32/openssl/include" /I "./" /I "../../../" /I "include" /I "../include" /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../../../openssl-0.9.8d/inc32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBDNS_EXPORTS" /YX /FD /c

 # SUBTRACT CPP /X

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

@@ -54,7 +54,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386

-# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Release/libisc.lib ../../../../openssl-0.9.6k/out32dll/libeay32.lib /nologo /dll /machine:I386 /out:"../../../Build/Release/libdns.dll"

+# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Release/libisc.lib ../../../../openssl-0.9.8d/out32dll/libeay32.lib /nologo /dll /machine:I386 /out:"../../../Build/Release/libdns.dll"

 

 !ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

 

@@ -70,7 +70,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "libdns_EXPORTS" /YX /FD /GZ /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "include" /I "../include" /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../../../openssl-0.9.6k/inc32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBDNS_EXPORTS" /FR /YX /FD /GZ /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "include" /I "../include" /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../../../openssl-0.9.8d/inc32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBDNS_EXPORTS" /FR /YX /FD /GZ /c

 # SUBTRACT CPP /X

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

@@ -81,7 +81,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../isc/win32/debug/libisc.lib  ../../../../openssl-0.9.6k/out32dll/libeay32.lib /nologo /dll /map /debug /machine:I386 /out:"../../../Build/Debug/libdns.dll" /pdbtype:sept

+# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../isc/win32/debug/libisc.lib  ../../../../openssl-0.9.8d/out32dll/libeay32.lib /nologo /dll /map /debug /machine:I386 /out:"../../../Build/Debug/libdns.dll" /pdbtype:sept

 

 !ENDIF 

 

diff --git a/lib/dns/win32/libdns.mak b/lib/dns/win32/libdns.mak
index 8d54dccb..eac434c0 100644
--- a/lib/dns/win32/libdns.mak
+++ b/lib/dns/win32/libdns.mak
@@ -26,6 +26,81 @@ NULL=nul
 !ENDIF 

 

 !IF  "$(CFG)" == "libdns - Win32 Release"

+_VC_MANIFEST_INC=0

+_VC_MANIFEST_BASENAME=__VC80

+!ELSE

+_VC_MANIFEST_INC=1

+_VC_MANIFEST_BASENAME=__VC80.Debug

+!ENDIF

+

+####################################################

+# Specifying name of temporary resource file used only in incremental builds:

+

+!if "$(_VC_MANIFEST_INC)" == "1"

+_VC_MANIFEST_AUTO_RES=$(_VC_MANIFEST_BASENAME).auto.res

+!else

+_VC_MANIFEST_AUTO_RES=

+!endif

+

+####################################################

+# _VC_MANIFEST_EMBED_EXE - command to embed manifest in EXE:

+

+!if "$(_VC_MANIFEST_INC)" == "1"

+

+#MT_SPECIAL_RETURN=1090650113

+#MT_SPECIAL_SWITCH=-notify_resource_update

+MT_SPECIAL_RETURN=0

+MT_SPECIAL_SWITCH=

+_VC_MANIFEST_EMBED_EXE= \

+if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \

+if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \

+rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \

+link $** /out:$@ $(LFLAGS)

+

+!else

+

+_VC_MANIFEST_EMBED_EXE= \

+if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;1

+

+!endif

+

+####################################################

+# _VC_MANIFEST_EMBED_DLL - command to embed manifest in DLL:

+

+!if "$(_VC_MANIFEST_INC)" == "1"

+

+#MT_SPECIAL_RETURN=1090650113

+#MT_SPECIAL_SWITCH=-notify_resource_update

+MT_SPECIAL_RETURN=0

+MT_SPECIAL_SWITCH=

+_VC_MANIFEST_EMBED_EXE= \

+if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \

+if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \

+rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \

+link $** /out:$@ $(LFLAGS)

+

+!else

+

+_VC_MANIFEST_EMBED_EXE= \

+if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2

+

+!endif

+####################################################

+# _VC_MANIFEST_CLEAN - command to clean resources files generated temporarily:

+

+!if "$(_VC_MANIFEST_INC)" == "1"

+

+_VC_MANIFEST_CLEAN=-del $(_VC_MANIFEST_BASENAME).auto.res \

+    $(_VC_MANIFEST_BASENAME).auto.rc \

+    $(_VC_MANIFEST_BASENAME).auto.manifest

+

+!else

+

+_VC_MANIFEST_CLEAN=

+

+!endif

+

+!IF  "$(CFG)" == "libdns - Win32 Release"

 

 OUTDIR=.\Release

 INTDIR=.\Release

@@ -106,12 +181,13 @@ CLEAN :
 	-@erase "$(OUTDIR)\libdns.exp"

 	-@erase "$(OUTDIR)\libdns.lib"

 	-@erase "..\..\..\Build\Release\libdns.dll"

+	-@$(_VC_MANIFEST_CLEAN)

 

 "$(OUTDIR)" :

     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

 

 CPP=cl.exe

-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "../../../../../openssl-0.9.6k/inc32/openssl/include" /I "./" /I "../../../" /I "include" /I "../include" /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../../../openssl-0.9.6k/inc32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBDNS_EXPORTS" /Fp"$(INTDIR)\libdns.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 

+CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "../../../../../openssl-0.9.8d/inc32/openssl/include" /I "./" /I "../../../" /I "include" /I "../include" /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../../../openssl-0.9.8d/inc32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBDNS_EXPORTS" /Fp"$(INTDIR)\libdns.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 

 

 .c{$(INTDIR)}.obj::

    $(CPP) @<<

@@ -151,7 +227,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\libdns.bsc"
 BSC32_SBRS= \

 	

 LINK32=link.exe

-LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Release/libisc.lib ../../../../openssl-0.9.6k/out32dll/libeay32.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\libdns.pdb" /machine:I386 /def:".\libdns.def" /out:"../../../Build/Release/libdns.dll" /implib:"$(OUTDIR)\libdns.lib" 

+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Release/libisc.lib ../../../../openssl-0.9.8d/out32dll/libeay32.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\libdns.pdb" /machine:I386 /def:".\libdns.def" /out:"../../../Build/Release/libdns.dll" /implib:"$(OUTDIR)\libdns.lib" 

 DEF_FILE= \

 	".\libdns.def"

 LINK32_OBJS= \

@@ -228,6 +304,7 @@ LINK32_OBJS= \
     $(LINK32) @<<

   $(LINK32_FLAGS) $(LINK32_OBJS)

 <<

+  $(_VC_MANIFEST_EMBED_DLL)

 

 !ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

 

@@ -386,12 +463,13 @@ CLEAN :
 	-@erase "$(OUTDIR)\libdns.pdb"

 	-@erase "..\..\..\Build\Debug\libdns.dll"

 	-@erase "..\..\..\Build\Debug\libdns.ilk"

+	-@$(_VC_MANIFEST_CLEAN)

 

 "$(OUTDIR)" :

     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

 

 CPP=cl.exe

-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "include" /I "../include" /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../../../openssl-0.9.6k/inc32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBDNS_EXPORTS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\libdns.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 

+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "include" /I "../include" /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../../../openssl-0.9.8d/inc32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBDNS_EXPORTS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\libdns.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 

 

 .c{$(INTDIR)}.obj::

    $(CPP) @<<

@@ -504,7 +582,7 @@ BSC32_SBRS= \
 <<

 

 LINK32=link.exe

-LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../isc/win32/debug/libisc.lib ../../../../openssl-0.9.6k/out32dll/libeay32.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\libdns.pdb" /map:"$(INTDIR)\libdns.map" /debug /machine:I386 /def:".\libdns.def" /out:"../../../Build/Debug/libdns.dll" /implib:"$(OUTDIR)\libdns.lib" /pdbtype:sept 

+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../isc/win32/debug/libisc.lib ../../../../openssl-0.9.8d/out32dll/libeay32.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\libdns.pdb" /map:"$(INTDIR)\libdns.map" /debug /machine:I386 /def:".\libdns.def" /out:"../../../Build/Debug/libdns.dll" /implib:"$(OUTDIR)\libdns.lib" /pdbtype:sept 

 DEF_FILE= \

 	".\libdns.def"

 LINK32_OBJS= \

@@ -581,6 +659,7 @@ LINK32_OBJS= \
     $(LINK32) @<<

   $(LINK32_FLAGS) $(LINK32_OBJS)

 <<

+  $(_VC_MANIFEST_EMBED_DLL)

 

 !ENDIF 

 

@@ -797,7 +876,7 @@ SOURCE=..\dispatch.c
 

 !IF  "$(CFG)" == "libdns - Win32 Release"

 

-CPP_SWITCHES=/nologo /MD /W3 /GX /O2 /I "../../../../../openssl-0.9.6k/inc32/openssl/include" /I "./" /I "../../../" /I "include" /I "../include" /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../../../openssl-0.9.6k/inc32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBDNS_EXPORTS" /Fp"$(INTDIR)\libdns.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 

+CPP_SWITCHES=/nologo /MD /W3 /GX /O2 /I "../../../../../openssl-0.9.8d/inc32/openssl/include" /I "./" /I "../../../" /I "include" /I "../include" /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../../../openssl-0.9.8d/inc32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBDNS_EXPORTS" /Fp"$(INTDIR)\libdns.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 

 

 "$(INTDIR)\dispatch.obj" : $(SOURCE) "$(INTDIR)"

 	$(CPP) @<<

@@ -807,7 +886,7 @@ CPP_SWITCHES=/nologo /MD /W3 /GX /O2 /I "../../../../../openssl-0.9.6k/inc32/ope
 

 !ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

 

-CPP_SWITCHES=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "include" /I "../include" /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../../../openssl-0.9.6k/inc32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBDNS_EXPORTS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\libdns.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 

+CPP_SWITCHES=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "include" /I "../include" /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../../../openssl-0.9.8d/inc32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBDNS_EXPORTS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\libdns.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 

 

 "$(INTDIR)\dispatch.obj"	"$(INTDIR)\dispatch.sbr" : $(SOURCE) "$(INTDIR)"

 	$(CPP) @<<

@@ -1824,3 +1903,21 @@ SOURCE=..\opensslrsa_link.c
 

 !ENDIF 

 

+####################################################

+# Commands to generate initial empty manifest file and the RC file

+# that references it, and for generating the .res file:

+

+$(_VC_MANIFEST_BASENAME).auto.res : $(_VC_MANIFEST_BASENAME).auto.rc

+

+$(_VC_MANIFEST_BASENAME).auto.rc : $(_VC_MANIFEST_BASENAME).auto.manifest

+    type <<$@

+#include <winuser.h>

+1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest"

+<< KEEP

+

+$(_VC_MANIFEST_BASENAME).auto.manifest :

+    type <<$@

+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>

+<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>

+</assembly>

+<< KEEP

diff --git a/lib/isc/win32/include/isc/ntfile.h b/lib/isc/win32/include/isc/ntfile.h
deleted file mode 100644
index a3e6f31e..00000000
--- a/lib/isc/win32/include/isc/ntfile.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 2001  Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-/* $Id: ntfile.h,v 1.5.2.1 2004/03/09 06:12:23 marka Exp $ */
-
-#ifndef ISC_NTFILE_H
-#define ISC_NTFILE_H 1
-
-/*
- * This file has been necessitated by the fact that the iov array is local
- * to the module, so passing the FILE ptr to a file I/O function in a
- * different module or DLL will cause the application to fail to find the
- * I/O channel and the application will terminate. The standard file I/O
- * functions are redefined to call these routines instead and there will
- * be just the one iov to deal with.
- */
-
-/*
- * Outside of lib isc we need to redefine these functions
- * This is due to the way _iob is set up.
- * liblwres should not use this.
- */
-
-#if !defined(LIBISC_EXPORTS) && !defined(LIBLWRES_EXPORTS)
-
-#undef fdopen
-#undef getc
-
-#define fopen    isc_ntfile_fopen
-#define fclose   isc_ntfile_fclose
-#define fwrite   isc_ntfile_fwrite
-#define fread    isc_ntfile_fread
-#define fseek    isc_ntfile_fseek
-#define fflush   isc_ntfile_flush
-#define fsync    isc_ntfile_sync
-#define printf   isc_ntfile_printf
-#define fprintf  isc_ntfile_fprintf
-#define vfprintf isc_ntfile_vfprintf
-#define getc     isc_ntfile_getc
-#define fgetc    isc_ntfile_fgetc
-#define fgets    isc_ntfile_fgets
-#define fputc    isc_ntfile_fputc
-#define fputs    isc_ntfile_fputs
-#define fgetpos  isc_ntfile_fgetpos
-#define freopen  isc_ntfile_freopen
-#define fdopen   isc_ntfile_fdopen
-#define open	 isc_ntfile_open
-#define close	 isc_ntfile_close
-#define read	 isc_ntfile_read
-#define write	 isc_ntfile_write
-
-#undef stdin
-#undef stdout
-#undef stderr
-
-#define stdin  isc_ntfile_getaddress(0)
-#define stdout isc_ntfile_getaddress(1)
-#define stderr isc_ntfile_getaddress(2)
-
-#endif
-
-FILE*
-isc_ntfile_fopen(const char *filename, const char *mode);
-
-int
-isc_ntfile_fclose(FILE *f);
-
-int
-isc_ntfile_fseek(FILE *f, long offset, int whence);
-
-size_t
-isc_ntfile_fread(void *ptr, size_t size, size_t nmemb, FILE *f);
-
-size_t
-isc_ntfile_fwrite(const void *ptr, size_t size, size_t nmemb, FILE *f);
-
-int
-isc_ntfile_flush(FILE *f);
-
-int
-isc_ntfile_sync(FILE *f);
-
-FILE*
-isc_ntfile_getaddress(int r);
-
-int
-isc_ntfile_printf(const char *format, ...);
-
-int
-isc_ntfile_fprintf(FILE *fp, const char *format, ...);
-
-int
-isc_ntfile_vfprintf(FILE *, const char *, va_list);
-
-int
-isc_ntfile_fputc(int iv, FILE *fp);
-
-int
-isc_ntfile_fputs(const char *bf, FILE *fp);
-
-int
-isc_ntfile_fgetc(FILE *fp);
-
-int
-isc_ntfile_fgetpos(FILE *, fpos_t *pos);
-
-char * 
-isc_ntfile_fgets(char *ch, int r, FILE *fp);
-
-int
-isc_ntfile_getc(FILE *fp);
-
-FILE *
-isc_ntfile_freopen(const char *path, const char *mode, FILE *fp);
-
-FILE *
-isc_ntfile_fdopen(int handle, const char *mode);
-
-int 
-isc_ntfile_open(const char *fn, int flags, ...);
-
-int
-isc_ntfile_close(int fd);
-
-int 
-isc_ntfile_read(int fd, char *buf, int len);
-
-int
-isc_ntfile_write(int fd, char *buf, int len);
-
-#endif /* ISC_NTFILE_H */
diff --git a/lib/isc/win32/libisc.def b/lib/isc/win32/libisc.def
index 8f7f4728..f0225f73 100644
--- a/lib/isc/win32/libisc.def
+++ b/lib/isc/win32/libisc.def
@@ -1,88 +1,118 @@
-LIBRARY libisc

-

-; Exported Functions

-EXPORTS

-

-isc_assertion_setcallback

-isc_assertion_typetotext

-isc_base64_totext

-isc_base64_decodestring

-isc_base64_tobuffer

-isc_bitstring_init

-isc_bitstring_invalidate

-isc_bitstring_copy

-isc_buffer_allocate

-isc_buffer_free

-isc__buffer_init

-isc__buffer_invalidate

-isc__buffer_region

-isc__buffer_usedregion

-isc__buffer_availableregion

-isc__buffer_add

-isc__buffer_subtract

-isc__buffer_clear

-isc__buffer_consumedregion

-isc__buffer_remainingregion

-isc__buffer_activeregion

-isc__buffer_setactive

-isc__buffer_first

-isc__buffer_forward

-isc__buffer_back

-isc_buffer_compact

-isc_buffer_getuint8

-isc__buffer_putuint8

-isc_buffer_getuint16

-isc__buffer_putuint16

-isc_buffer_getuint32

-isc__buffer_putuint32

-isc__buffer_putmem

-isc__buffer_putstr

-isc_buffer_copyregion

-isc_bufferlist_usedcount

-isc_bufferlist_availablecount

-isc_commandline_parse

-

-

-isc_entropy_create

-isc_entropy_attach

-isc_entropy_detach

-isc_entropy_createfilesource

-isc_entropy_destroysource

-isc_entropy_createsamplesource

-isc_entropy_createcallbacksource

-isc_entropy_stopcallbacksources

-isc_entropy_addcallbacksample

-isc_entropy_addsample

-isc_entropy_getdata

-isc_entropy_putdata

-isc_entropy_stats

-isc_entropy_usebestsource

-isc_error_setunexpected

-isc_error_setfatal

-isc_error_unexpected

-isc_error_fatal

-isc_error_runtimecheck

-isc_event_allocate

-isc_event_free

-isc_file_settime

-isc_file_getmodtime

-isc_file_mktemplate

-isc_file_openunique

-isc_file_remove

-isc_file_rename

-isc_file_exists

-isc_file_ischdiridempotent

-isc_file_isabsolute

-isc_file_iscurrentdir

-isc_file_template

-isc_file_renameunique

-isc_file_basename

-isc_file_progname

-isc_file_safemovefile

-isc_file_absolutepath

-isc_fsaccess_add

-isc_fsaccess_remove

-isc_fsaccess_set

+LIBRARY libisc
+
+; Exported Functions
+
+EXPORTS
+
+isc__buffer_activeregion
+isc__buffer_add
+isc__buffer_availableregion
+isc__buffer_back
+isc__buffer_clear
+isc__buffer_consumedregion
+isc__buffer_first
+isc__buffer_forward
+isc__buffer_init
+isc__buffer_invalidate
+isc__buffer_putmem
+isc__buffer_putstr
+isc__buffer_putuint16
+isc__buffer_putuint32
+isc__buffer_putuint8
+isc__buffer_region
+isc__buffer_remainingregion
+isc__buffer_setactive
+isc__buffer_subtract
+isc__buffer_usedregion
+isc__mem_allocate
+isc__mem_free
+isc__mem_get
+isc__mem_put
+isc__mem_putanddetach
+isc__mem_strdup
+isc__mempool_get
+isc__mempool_put
+isc__strerror
+isc_app_block
+isc_app_finish
+isc_app_onrun
+isc_app_reload
+isc_app_run
+isc_app_shutdown
+isc_app_start
+isc_app_unblock
+isc_assertion_setcallback
+isc_assertion_typetotext
+isc_base64_decodestring
+isc_base64_tobuffer
+isc_base64_totext
+isc_bitstring_copy
+isc_bitstring_init
+isc_bitstring_invalidate
+isc_buffer_allocate
+isc_buffer_compact
+isc_buffer_copyregion
+isc_buffer_free
+isc_buffer_getuint16
+isc_buffer_getuint32
+isc_buffer_getuint8
+isc_bufferlist_availablecount
+isc_bufferlist_usedcount
+isc_commandline_parse
+isc_condition_broadcast
+isc_condition_destroy
+isc_condition_init
+isc_condition_signal
+isc_condition_wait
+isc_condition_waituntil
+isc_dir_chdir
+isc_dir_chroot
+isc_dir_close
+isc_dir_current
+isc_dir_init
+isc_dir_open
+isc_dir_read
+isc_dir_reset
+isc_entropy_addcallbacksample
+isc_entropy_addsample
+isc_entropy_attach
+isc_entropy_create
+isc_entropy_createcallbacksource
+isc_entropy_createfilesource
+isc_entropy_createsamplesource
+isc_entropy_destroysource
+isc_entropy_detach
+isc_entropy_getdata
+isc_entropy_putdata
+isc_entropy_stats
+isc_entropy_stopcallbacksources
+isc_entropy_usebestsource
+isc_error_fatal
+isc_error_runtimecheck
+isc_error_setfatal
+isc_error_setunexpected
+isc_error_unexpected
+isc_event_allocate
+isc_event_free
+isc_file_absolutepath
+isc_file_basename
+isc_file_exists
+isc_file_getmodtime
+isc_file_isabsolute
+isc_file_ischdiridempotent
+isc_file_iscurrentdir
+isc_file_mktemplate
+isc_file_openunique
+isc_file_progname
+isc_file_remove
+isc_file_rename
+isc_file_renameunique
+isc_file_safemovefile
+isc_file_settime
+isc_file_template
+isc_fsaccess_add
+isc_fsaccess_remove
+isc_fsaccess_set
 isc_hash_calc
 isc_hash_create
 isc_hash_ctxattach
@@ -92,365 +122,289 @@ isc_hash_ctxdetach
 isc_hash_ctxinit
 isc_hash_destroy
 isc_hash_init
-isc_hex_totext

-isc_hex_decodestring

-isc_hex_tobuffer

-isc_hmacmd5_init

-isc_hmacmd5_invalidate

-isc_hmacmd5_update

-isc_hmacmd5_sign

-isc_hmacmd5_verify

-isc_interfaceiter_create

-isc_interfaceiter_first

-isc_interfaceiter_current

-isc_interfaceiter_next

-isc_interfaceiter_destroy

-isc_lex_setcomments

-isc_lex_create

-isc_lex_destroy

-isc_lex_getcomments

-isc_lex_setcomments

-isc_lex_getspecials

-isc_lex_setspecials

-isc_lex_openfile

-isc_lex_openstream

-isc_lex_openbuffer

-isc_lex_close

-isc_lex_gettoken

-isc_lex_getmastertoken

-isc_lex_ungettoken

-isc_lex_getlasttokentext

-isc_lex_getsourcename

-isc_lex_getsourceline

-isc_lex_isfile

-isc_lfsr_init

-isc_lfsr_generate

-isc_lfsr_skip

-isc_lfsr_generate32

-isc_lib_initmsgcat

-isc_log_createchannel

-isc_log_createchannel

-isc_log_create

-isc_logconfig_create

-isc_logconfig_get

-isc_logconfig_use

-isc_log_destroy

-isc_logconfig_destroy

-isc_log_registercategories

-isc_log_registermodules

-isc_log_createchannel

-isc_log_usechannel

-isc_log_write

-isc_log_vwrite

-isc_log_write1

-isc_log_vwrite1

-isc_log_iwrite

-isc_log_ivwrite

-isc_log_iwrite1

-isc_log_ivwrite1

-isc_log_setdebuglevel

-isc_log_getdebuglevel

-isc_log_wouldlog

-isc_log_write

-isc_log_setduplicateinterval

-isc_log_getduplicateinterval

-isc_log_settag

-isc_log_gettag

-isc_log_opensyslog

-isc_log_closefilelogs

-isc_log_categorybyname

-isc_log_modulebyname

-isc_log_setcontext

-isc_md5_init

-isc_md5_invalidate

-isc_md5_update

-isc_md5_final

-isc_mem_attach

-isc_mem_detach

-isc_mem_detach

-isc_mem_create

-isc_mem_createx

-isc_mem_attach

-isc_mem_detach

-isc_mem_destroy

-isc_mem_ondestroy

-isc_mem_stats

-isc_mem_setdestroycheck

-isc_mem_setquota

-isc_mem_getquota

-isc_mem_inuse

-isc_mem_setwater

-isc_mempool_create

-isc_mempool_destroy

-isc_mempool_setname

-isc_mempool_associatelock

-isc_mempool_getfreemax

-isc_mempool_setfreemax

-isc_mempool_getfreecount

-isc_mempool_getmaxalloc

-isc_mempool_setmaxalloc

-isc_mempool_getallocated

-isc_mempool_getfillcount

-isc_mempool_setfillcount

-isc__mem_get

-isc__mem_putanddetach

-isc__mem_put

-isc__mem_allocate

-isc__mem_free

-isc__mem_strdup

-isc__mempool_get

-isc__mempool_put

-isc_msgcat_open

-isc_msgcat_close

-isc_msgcat_get

-isc_mutexblock_init

-isc_mutexblock_destroy

-isc_netaddr_equal

-isc_netaddr_eqprefix

-isc_netaddr_masktoprefixlen

-isc_netaddr_totext

-isc_netaddr_format

-isc_netaddr_fromsockaddr

-isc_netaddr_fromin

-isc_netaddr_fromin6

-isc_netaddr_any

-isc_netaddr_any6

-isc_netaddr_ismulticast

-isc_netaddr_isexperimental

-isc_netaddr_fromv4mapped

-isc_ntpaths_init

-isc_ntpaths_get

-isc_ondestroy_init

-isc_ondestroy_register

-isc_ondestroy_notify

-isc_task_sendanddetach

-isc_os_ncpus

-isc_quota_init

-isc_quota_destroy

-isc_quota_reserve

-isc_quota_release

-isc_quota_attach

-isc_quota_detach

-isc_random_seed

-isc_random_get

-isc_random_jitter

-isc_ratelimiter_create

-isc_ratelimiter_setinterval

-isc_ratelimiter_setpertic

-isc_ratelimiter_enqueue

-isc_ratelimiter_shutdown

-isc_ratelimiter_attach

-isc_ratelimiter_detach

-isc_resource_setlimit

-isc_resource_getlimit

-isc_result_totext

-isc_result_register

-isc_rwlock_init

-isc_rwlock_lock

-isc_rwlock_trylock

-isc_rwlock_unlock

+isc_hex_decodestring
+isc_hex_tobuffer
+isc_hex_totext
+isc_hmacmd5_init
+isc_hmacmd5_invalidate
+isc_hmacmd5_sign
+isc_hmacmd5_update
+isc_hmacmd5_verify
+isc_interfaceiter_create
+isc_interfaceiter_current
+isc_interfaceiter_destroy
+isc_interfaceiter_first
+isc_interfaceiter_next
+isc_interval_iszero
+isc_interval_set
+isc_keyboard_canceled
+isc_keyboard_close
+isc_keyboard_getchar
+isc_keyboard_open
+isc_lex_close
+isc_lex_create
+isc_lex_destroy
+isc_lex_getcomments
+isc_lex_getlasttokentext
+isc_lex_getmastertoken
+isc_lex_getsourceline
+isc_lex_getsourcename
+isc_lex_getspecials
+isc_lex_gettoken
+isc_lex_isfile
+isc_lex_openbuffer
+isc_lex_openfile
+isc_lex_openstream
+isc_lex_setcomments
+isc_lex_setspecials
+isc_lex_ungettoken
+isc_lfsr_generate
+isc_lfsr_generate32
+isc_lfsr_init
+isc_lfsr_skip
+isc_lib_initmsgcat
+isc_log_categorybyname
+isc_log_closefilelogs
+isc_log_create
+isc_log_createchannel
+isc_log_destroy
+isc_log_getdebuglevel
+isc_log_getduplicateinterval
+isc_log_gettag
+isc_log_ivwrite
+isc_log_ivwrite1
+isc_log_iwrite
+isc_log_iwrite1
+isc_log_modulebyname
+isc_log_opensyslog
+isc_log_registercategories
+isc_log_registermodules
+isc_log_setcontext
+isc_log_setdebuglevel
+isc_log_setduplicateinterval
+isc_log_settag
+isc_log_usechannel
+isc_log_vwrite
+isc_log_vwrite1
+isc_log_wouldlog
+isc_log_write
+isc_log_write1
+isc_logconfig_create
+isc_logconfig_destroy
+isc_logconfig_get
+isc_logconfig_use
+isc_md5_final
+isc_md5_init
+isc_md5_invalidate
+isc_md5_update
+isc_mem_attach
+isc_mem_create
+isc_mem_createx
+isc_mem_destroy
+isc_mem_detach
+isc_mem_getquota
+isc_mem_inuse
+isc_mem_ondestroy
+isc_mem_setdestroycheck
+isc_mem_setquota
+isc_mem_setwater
+isc_mem_stats
+isc_mempool_associatelock
+isc_mempool_create
+isc_mempool_destroy
+isc_mempool_getallocated
+isc_mempool_getfillcount
+isc_mempool_getfreecount
+isc_mempool_getfreemax
+isc_mempool_getmaxalloc
+isc_mempool_setfillcount
+isc_mempool_setfreemax
+isc_mempool_setmaxalloc
+isc_mempool_setname
+isc_msgcat_close
+isc_msgcat_get
+isc_msgcat_open
+isc_mutexblock_destroy
+isc_mutexblock_init
+isc_net_aton
+isc_net_ntop
+isc_net_probeipv4
+isc_net_probeipv6
+isc_net_pton
+isc_netaddr_any
+isc_netaddr_any6
+isc_netaddr_eqprefix
+isc_netaddr_equal
+isc_netaddr_format
+isc_netaddr_fromin
+isc_netaddr_fromin6
+isc_netaddr_fromsockaddr
+isc_netaddr_fromv4mapped
+isc_netaddr_isexperimental
+isc_netaddr_ismulticast
+isc_netaddr_masktoprefixlen
+isc_netaddr_totext
+isc_ntpaths_get
+isc_ntpaths_init
+isc_once_do
+isc_ondestroy_init
+isc_ondestroy_notify
+isc_ondestroy_register
+isc_os_ncpus
+isc_quota_attach
+isc_quota_destroy
+isc_quota_detach
+isc_quota_init
+isc_quota_release
+isc_quota_reserve
+isc_random_get
+isc_random_jitter
+isc_random_seed
+isc_ratelimiter_attach
+isc_ratelimiter_create
+isc_ratelimiter_detach
+isc_ratelimiter_enqueue
+isc_ratelimiter_setinterval
+isc_ratelimiter_setpertic
+isc_ratelimiter_shutdown
+isc_resource_getlimit
+isc_resource_setlimit
+isc_result_register
+isc_result_totext
 isc_rwlock_destroy
-isc_rwlock_tryupgrade

-isc_rwlock_downgrade

-isc_serial_lt

-isc_serial_gt

-isc_serial_le

-isc_serial_ge

-isc_serial_eq

-isc_serial_ne

-isc_sha1_init

-isc_sha1_invalidate

-isc_sha1_update

-isc_sha1_final

-isc_sockaddr_equal

-isc_sockaddr_eqaddr

-isc_sockaddr_eqaddrprefix

-isc_sockaddr_hash

-isc_sockaddr_any

-isc_sockaddr_any6

-isc_sockaddr_anyofpf

-isc_sockaddr_fromin

-isc_sockaddr_fromin6

-isc_sockaddr_v6fromin

-isc_sockaddr_fromnetaddr

-isc_sockaddr_pf

-isc_sockaddr_setport

-isc_sockaddr_getport

-isc_sockaddr_totext

-isc_sockaddr_format

-isc_sockaddr_ismulticast

-isc_sockaddr_isexperimental

-isc_socket_create

-isc_socket_cancel

-;isc_socket_shutdown

-isc_socket_attach

-isc_socket_detach

-isc_socket_bind

-isc_socket_listen

-isc_socket_accept

-isc_socket_connect

-isc_socket_getpeername

-isc_socket_getsockname

-isc_socket_recv

-isc_socket_recvv

-isc_socket_recv2

-isc_socket_send

-isc_socket_sendto

-isc_socket_sendv

-isc_socket_sendtov

-isc_socket_sendto2

-isc_socketmgr_create

-isc_socketmgr_destroy

-isc_socket_gettype

-isc_socket_isbound

-isc_stdio_open

-isc_stdio_close

-isc_stdio_seek

-isc_stdio_read

-isc_stdio_write

-isc_stdio_flush

-isc_stdio_sync

-isc__strerror

-isc_string_touint64

-isc_string_separate

-isc_symtab_create

-isc_symtab_destroy

-isc_symtab_lookup

-isc_symtab_define

-isc_symtab_undefine

-isc_task_create

-isc_task_attach

-isc_task_detach

-isc_task_send

-isc_task_sendanddetach

-isc_task_purgerange

-isc_task_purge

-isc_task_purgeevent

-isc_task_unsendrange

-isc_task_unsend

-isc_task_onshutdown

-isc_task_shutdown

-isc_task_destroy

-isc_task_setname

-isc_task_getname

-isc_task_gettag

-isc_task_beginexclusive

-isc_task_endexclusive

-isc_task_endexclusive

-isc_taskmgr_create

-isc_taskmgr_destroy

-isc_taskpool_create

-isc_taskpool_gettask

-isc_taskpool_destroy

-isc_timer_create

-isc_timer_reset

-isc_timer_touch

-isc_timer_attach

-isc_timer_detach

-isc_timermgr_create

-isc_timermgr_destroy

-isc_condition_init

-isc_condition_wait

-isc_condition_signal

-isc_condition_broadcast

-isc_condition_destroy

-isc_condition_waituntil

-isc_dir_init

-isc_dir_open

-isc_dir_read

-isc_dir_reset

-isc_dir_close

-isc_dir_chdir

-isc_dir_chroot

-isc_dir_current

-isc_net_probeipv4

-isc_net_probeipv6

-isc_net_ntop

-isc_net_pton

-isc_net_aton

-isc_once_do

-isc_stdtime_get

-

-isc_thread_create

-isc_thread_join

-isc_thread_setconcurrency

-isc_interval_set

-isc_time_subtract

-isc_interval_iszero

-isc_time_settoepoch

-isc_time_isepoch

-isc_time_now

-isc_time_nowplusinterval

-isc_time_compare

-isc_time_add

-isc_time_subtract

-isc_time_microdiff

-isc_time_nanoseconds

-isc_keyboard_open

-isc_keyboard_close

-isc_keyboard_getchar

-isc_keyboard_canceled

-isc_app_start

-isc_app_onrun

-isc_app_run

-isc_app_shutdown

-isc_app_reload

-isc_app_finish

-isc_app_block

-isc_app_unblock

-isc_thread_create

-isc_thread_join

-isc_thread_setconcurrency

-isc_net_probeipv4

-isc_net_probeipv6

-isc_net_ntop

-isc_net_pton

-isc_net_aton

-openlog

-syslog

-closelog

-isc_syslog_facilityfromstring

-isc_ntfile_fopen

-isc_ntfile_fclose

-isc_ntfile_fwrite

-isc_ntfile_fread

-isc_ntfile_fseek

-isc_ntfile_flush

-isc_ntfile_sync

-isc_ntfile_printf

-isc_ntfile_fprintf

-isc_ntfile_vfprintf

-isc_ntfile_getaddress

-isc_ntfile_getc

-isc_ntfile_fgetc

-isc_ntfile_fgets

-isc_ntfile_fputc

-isc_ntfile_fputs

-isc_ntfile_fgetpos

-isc_ntfile_freopen

-isc_ntfile_fdopen

-isc_ntfile_open

-isc_ntfile_close

-isc_ntfile_read

-isc_ntfile_write

-

-

-; Exported Data

-

-EXPORTS

-

-;isc_categories

-;isc_lctx

-;isc_modules

-

-isc_mem_debugging			DATA

-

-isc_commandline_index	

-isc_commandline_option		DATA

-isc_commandline_argument	DATA

-isc_commandline_progname	DATA

-isc_commandline_errprint	DATA

-isc_commandline_reset		DATA

-isc_assertion_failed		DATA

-_iob						DATA

-			

+isc_rwlock_downgrade
+isc_rwlock_init
+isc_rwlock_lock
+isc_rwlock_trylock
+isc_rwlock_tryupgrade
+isc_rwlock_unlock
+isc_serial_eq
+isc_serial_ge
+isc_serial_gt
+isc_serial_le
+isc_serial_lt
+isc_serial_ne
+isc_sha1_final
+isc_sha1_init
+isc_sha1_invalidate
+isc_sha1_update
+isc_sockaddr_any
+isc_sockaddr_any6
+isc_sockaddr_anyofpf
+isc_sockaddr_eqaddr
+isc_sockaddr_eqaddrprefix
+isc_sockaddr_equal
+isc_sockaddr_format
+isc_sockaddr_fromin
+isc_sockaddr_fromin6
+isc_sockaddr_fromnetaddr
+isc_sockaddr_getport
+isc_sockaddr_hash
+isc_sockaddr_isexperimental
+isc_sockaddr_ismulticast
+isc_sockaddr_pf
+isc_sockaddr_setport
+isc_sockaddr_totext
+isc_sockaddr_v6fromin
+isc_socket_accept
+isc_socket_attach
+isc_socket_bind
+isc_socket_cancel
+isc_socket_connect
+isc_socket_create
+isc_socket_detach
+isc_socket_getpeername
+isc_socket_getsockname
+isc_socket_gettype
+isc_socket_isbound
+isc_socket_listen
+isc_socket_recv
+isc_socket_recv2
+isc_socket_recvv
+isc_socket_send
+isc_socket_sendto
+isc_socket_sendto2
+isc_socket_sendtov
+isc_socket_sendv
+;isc_socket_shutdown
+isc_socketmgr_create
+isc_socketmgr_destroy
+isc_stdio_close
+isc_stdio_flush
+isc_stdio_open
+isc_stdio_read
+isc_stdio_seek
+isc_stdio_sync
+isc_stdio_write
+isc_stdtime_get
+isc_string_separate
+isc_string_touint64
+isc_symtab_create
+isc_symtab_define
+isc_symtab_destroy
+isc_symtab_lookup
+isc_symtab_undefine
+isc_syslog_facilityfromstring
+isc_task_attach
+isc_task_beginexclusive
+isc_task_create
+isc_task_destroy
+isc_task_detach
+isc_task_endexclusive
+isc_task_getname
+isc_task_gettag
+isc_task_onshutdown
+isc_task_purge
+isc_task_purgeevent
+isc_task_purgerange
+isc_task_send
+isc_task_sendanddetach
+isc_task_setname
+isc_task_shutdown
+isc_task_unsend
+isc_task_unsendrange
+isc_taskmgr_create
+isc_taskmgr_destroy
+isc_taskpool_create
+isc_taskpool_destroy
+isc_taskpool_gettask
+isc_thread_create
+isc_thread_join
+isc_thread_setconcurrency
+isc_time_add
+isc_time_compare
+isc_time_isepoch
+isc_time_microdiff
+isc_time_nanoseconds
+isc_time_now
+isc_time_nowplusinterval
+isc_time_settoepoch
+isc_time_subtract
+isc_timer_attach
+isc_timer_create
+isc_timer_detach
+isc_timer_reset
+isc_timer_touch
+isc_timermgr_create
+isc_timermgr_destroy
+
+closelog
+openlog
+syslog
+
+; Exported Data
+
+EXPORTS
+
+;isc_categories
+;isc_lctx
+;isc_modules
+
+isc_mem_debugging		DATA
+isc_commandline_index		DATA
+isc_commandline_option		DATA
+isc_commandline_argument	DATA
+isc_commandline_progname	DATA
+isc_commandline_errprint	DATA
+isc_commandline_reset		DATA
+isc_assertion_failed	    	DATA
diff --git a/lib/isc/win32/libisc.dsp b/lib/isc/win32/libisc.dsp
index 0cfc4522..25ad6790 100644
--- a/lib/isc/win32/libisc.dsp
+++ b/lib/isc/win32/libisc.dsp
@@ -141,10 +141,6 @@ SOURCE=.\net.c
 # End Source File

 # Begin Source File

 

-SOURCE=.\ntfile.c

-# End Source File

-# Begin Source File

-

 SOURCE=.\ntpaths.c

 # End Source File

 # Begin Source File

@@ -377,10 +373,6 @@ SOURCE=.\include\isc\netdb.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\include\isc\ntfile.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\include\isc\ntpaths.h

 # End Source File

 # Begin Source File

diff --git a/lib/isc/win32/libisc.mak b/lib/isc/win32/libisc.mak
index bfb74a25..d44c5153 100644
--- a/lib/isc/win32/libisc.mak
+++ b/lib/isc/win32/libisc.mak
@@ -26,6 +26,81 @@ NULL=nul
 !ENDIF 

 

 !IF  "$(CFG)" == "libisc - Win32 Release"

+_VC_MANIFEST_INC=0

+_VC_MANIFEST_BASENAME=__VC80

+!ELSE

+_VC_MANIFEST_INC=1

+_VC_MANIFEST_BASENAME=__VC80.Debug

+!ENDIF

+

+####################################################

+# Specifying name of temporary resource file used only in incremental builds:

+

+!if "$(_VC_MANIFEST_INC)" == "1"

+_VC_MANIFEST_AUTO_RES=$(_VC_MANIFEST_BASENAME).auto.res

+!else

+_VC_MANIFEST_AUTO_RES=

+!endif

+

+####################################################

+# _VC_MANIFEST_EMBED_EXE - command to embed manifest in EXE:

+

+!if "$(_VC_MANIFEST_INC)" == "1"

+

+#MT_SPECIAL_RETURN=1090650113

+#MT_SPECIAL_SWITCH=-notify_resource_update

+MT_SPECIAL_RETURN=0

+MT_SPECIAL_SWITCH=

+_VC_MANIFEST_EMBED_EXE= \

+if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \

+if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \

+rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \

+link $** /out:$@ $(LFLAGS)

+

+!else

+

+_VC_MANIFEST_EMBED_EXE= \

+if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;1

+

+!endif

+

+####################################################

+# _VC_MANIFEST_EMBED_DLL - command to embed manifest in DLL:

+

+!if "$(_VC_MANIFEST_INC)" == "1"

+

+#MT_SPECIAL_RETURN=1090650113

+#MT_SPECIAL_SWITCH=-notify_resource_update

+MT_SPECIAL_RETURN=0

+MT_SPECIAL_SWITCH=

+_VC_MANIFEST_EMBED_EXE= \

+if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \

+if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \

+rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \

+link $** /out:$@ $(LFLAGS)

+

+!else

+

+_VC_MANIFEST_EMBED_EXE= \

+if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2

+

+!endif

+####################################################

+# _VC_MANIFEST_CLEAN - command to clean resources files generated temporarily:

+

+!if "$(_VC_MANIFEST_INC)" == "1"

+

+_VC_MANIFEST_CLEAN=-del $(_VC_MANIFEST_BASENAME).auto.res \

+    $(_VC_MANIFEST_BASENAME).auto.rc \

+    $(_VC_MANIFEST_BASENAME).auto.manifest

+

+!else

+

+_VC_MANIFEST_CLEAN=

+

+!endif

+

+!IF  "$(CFG)" == "libisc - Win32 Release"

 

 OUTDIR=.\Release

 INTDIR=.\Release

@@ -70,7 +145,6 @@ CLEAN :
 	-@erase "$(INTDIR)\mutexblock.obj"

 	-@erase "$(INTDIR)\net.obj"

 	-@erase "$(INTDIR)\netaddr.obj"

-	-@erase "$(INTDIR)\ntfile.obj"

 	-@erase "$(INTDIR)\ntpaths.obj"

 	-@erase "$(INTDIR)\once.obj"

 	-@erase "$(INTDIR)\ondestroy.obj"

@@ -102,6 +176,7 @@ CLEAN :
 	-@erase "$(OUTDIR)\libisc.exp"

 	-@erase "$(OUTDIR)\libisc.lib"

 	-@erase "..\..\..\Build\Release\libisc.dll"

+	-@$(_VC_MANIFEST_CLEAN)

 

 "$(OUTDIR)" :

     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

@@ -163,7 +238,6 @@ LINK32_OBJS= \
 	"$(INTDIR)\ipv6.obj" \

 	"$(INTDIR)\keyboard.obj" \

 	"$(INTDIR)\net.obj" \

-	"$(INTDIR)\ntfile.obj" \

 	"$(INTDIR)\ntpaths.obj" \

 	"$(INTDIR)\once.obj" \

 	"$(INTDIR)\os.obj" \

@@ -220,6 +294,7 @@ LINK32_OBJS= \
     $(LINK32) @<<

   $(LINK32_FLAGS) $(LINK32_OBJS)

 <<

+  $(_VC_MANIFEST_EMBED_DLL)

 

 !ELSEIF  "$(CFG)" == "libisc - Win32 Debug"

 

@@ -305,8 +380,6 @@ CLEAN :
 	-@erase "$(INTDIR)\net.sbr"

 	-@erase "$(INTDIR)\netaddr.obj"

 	-@erase "$(INTDIR)\netaddr.sbr"

-	-@erase "$(INTDIR)\ntfile.obj"

-	-@erase "$(INTDIR)\ntfile.sbr"

 	-@erase "$(INTDIR)\ntpaths.obj"

 	-@erase "$(INTDIR)\ntpaths.sbr"

 	-@erase "$(INTDIR)\once.obj"

@@ -370,6 +443,7 @@ CLEAN :
 	-@erase "$(OUTDIR)\libisc.pdb"

 	-@erase "..\..\..\Build\Debug\libisc.dll"

 	-@erase "..\..\..\Build\Debug\libisc.ilk"

+	-@$(_VC_MANIFEST_CLEAN)

 

 "$(OUTDIR)" :

     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

@@ -425,8 +499,6 @@ BSC32_SBRS= \
 	"$(INTDIR)\ipv6.sbr" \

 	"$(INTDIR)\keyboard.sbr" \

 	"$(INTDIR)\net.sbr" \

-	"$(INTDIR)\ntfile.sbr" \

-	"$(INTDIR)\ntpaths.sbr" \

 	"$(INTDIR)\once.sbr" \

 	"$(INTDIR)\os.sbr" \

 	"$(INTDIR)\resource.sbr" \

@@ -500,7 +572,6 @@ LINK32_OBJS= \
 	"$(INTDIR)\ipv6.obj" \

 	"$(INTDIR)\keyboard.obj" \

 	"$(INTDIR)\net.obj" \

-	"$(INTDIR)\ntfile.obj" \

 	"$(INTDIR)\ntpaths.obj" \

 	"$(INTDIR)\once.obj" \

 	"$(INTDIR)\os.obj" \

@@ -557,6 +628,7 @@ LINK32_OBJS= \
     $(LINK32) @<<

   $(LINK32_FLAGS) $(LINK32_OBJS)

 <<

+  $(_VC_MANIFEST_EMBED_DLL)

 

 !ENDIF 

 

@@ -763,22 +835,6 @@ SOURCE=.\net.c
 

 !ENDIF 

 

-SOURCE=.\ntfile.c

-

-!IF  "$(CFG)" == "libisc - Win32 Release"

-

-

-"$(INTDIR)\ntfile.obj" : $(SOURCE) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"

-

-

-"$(INTDIR)\ntfile.obj"	"$(INTDIR)\ntfile.sbr" : $(SOURCE) "$(INTDIR)"

-

-

-!ENDIF 

-

 SOURCE=.\ntpaths.c

 

 !IF  "$(CFG)" == "libisc - Win32 Release"

@@ -1676,3 +1732,21 @@ SOURCE=.\win32os.c
 

 !ENDIF 

 

+####################################################

+# Commands to generate initial empty manifest file and the RC file

+# that references it, and for generating the .res file:

+

+$(_VC_MANIFEST_BASENAME).auto.res : $(_VC_MANIFEST_BASENAME).auto.rc

+

+$(_VC_MANIFEST_BASENAME).auto.rc : $(_VC_MANIFEST_BASENAME).auto.manifest

+    type <<$@

+#include <winuser.h>

+1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest"

+<< KEEP

+

+$(_VC_MANIFEST_BASENAME).auto.manifest :

+    type <<$@

+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>

+<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>

+</assembly>

+<< KEEP

diff --git a/lib/isc/win32/ntfile.c b/lib/isc/win32/ntfile.c
deleted file mode 100644
index 747b326f..00000000
--- a/lib/isc/win32/ntfile.c
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 2001  Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-/* $Id: ntfile.c,v 1.5.2.1 2004/03/09 06:12:18 marka Exp $ */
-
-/*
- * This file has been necessitated by the fact that the iov array is local
- * to the module, so passing the FILE ptr to a file I/O function in a
- * different module or DLL will cause the application to fail to find the
- * I/O channel and the application will terminate. The standard file I/O
- * functions are redefined to call these routines instead and there will
- * be just the one iov to deal with.
- */
-
-#include <config.h>
-
-#include <io.h>
-
-#include <isc/ntfile.h>
-
-FILE *
-isc_ntfile_fopen(const char *filename, const char *mode) {
-	return (fopen(filename, mode));
-}
-
-int 
-isc_ntfile_fclose(FILE *f) {
-	return (fclose(f));
-}
-
-int 
-isc_ntfile_fseek(FILE *f, long offset, int whence) {
-	return (fseek(f, offset, whence));
-}
-
-size_t 
-isc_ntfile_fread(void *ptr, size_t size, size_t nmemb, FILE *f) {
-	return (fread(ptr, size, nmemb, f));
-}
-
-size_t 
-isc_ntfile_fwrite(const void *ptr, size_t size, size_t nmemb, FILE *f) {
-	int r;
-	r = fwrite(ptr, size, nmemb, f);
-	fflush(f);
-	return (r);
-}
-
-int 
-isc_ntfile_flush(FILE *f) {
-	return (fflush(f));
-}
-
-int 
-isc_ntfile_sync(FILE *f) {
-	return (_commit(_fileno(f)));
-}
-
-FILE * 
-isc_ntfile_getaddress(int r) {
-	return (&_iob[r]);
-}
-
-int 
-isc_ntfile_printf(const char *format, ...) {
-	int r;
-	FILE *fp = stdout;
-	va_list ap;
-	va_start(ap, format);
-	r = vfprintf(fp, format, ap);
-	va_end(ap);
-	fflush(fp);
-	return (r);
-}
-
-int 
-isc_ntfile_fprintf(FILE *fp, const char *format, ...) {
-	int r;
-	va_list ap;
-	va_start(ap, format);
-	r = vfprintf(fp, format, ap);
-	va_end(ap);
-	fflush(fp);
-	return (r);
-}
-
-int 
-isc_ntfile_vfprintf(FILE *fp, const char *format, va_list alist) {
-	int r;
-	r = vfprintf(fp, format, alist);
-	fflush(fp);
-	return (r);
-}
-
-int
-isc_ntfile_fputc(int iv, FILE *fp) {
-	int r;
-	r = fputc(iv, fp);
-	fflush(fp);
-	return (r);
-}
-
-int
-isc_ntfile_fputs(const char *bf, FILE *fp) {
-	int r;
-	r = fputs(bf, fp);
-	fflush(fp);
-	return (r);
-}
-
-int
-isc_ntfile_fgetc(FILE *fp) {
-	return (fgetc(fp));
-}
-
-int
-isc_ntfile_fgetpos(FILE *fp, fpos_t *pos) {
-	return (fgetpos(fp, pos));
-}
-
-char * 
-isc_ntfile_fgets(char *ch, int r, FILE *fp) {
-	return (fgets(ch,r, fp));
-}
-
-int
-isc_ntfile_getc(FILE *fp) {
-	return (getc(fp));
-}
-
-FILE *
-isc_ntfile_freopen(const char *path, const char *mode, FILE *fp) {
-	return (freopen(path, mode,fp));
-}
-
-FILE *
-isc_ntfile_fdopen(int handle, const char *mode) {
-	return (fdopen(handle, mode));
-}
-
-/*
- * open(), close(), read(), write(), fsync()
- * sockets are file descriptors in UNIX.  This is not so in NT
- * We keep track of what is a socket and what is an FD to
- * make everything flow right.
- */
-int 
-isc_ntfile_open(const char *fn, int flags, ...){
-	va_list args;
-	int pmode;
-	int fd;
-
- 	/* Extract the cmd parameter */
-	va_start(args, flags);
-	pmode = va_arg(args, int);
-	fd = _open(fn, flags, pmode);
-	return fd;
-}
-
-int
-isc_ntfile_close(int fd){
-	return (_close(fd));
-}
-
-int 
-isc_ntfile_read(int fd, char *buf, int len) {
-	return (_read(fd, buf, len));
-}
-
-int
-isc_ntfile_write(int fd, char *buf, int len){
-	int r;
-	r = _write(fd, buf, len);
-	_commit(fd);
-	return (r);
-}
diff --git a/lib/isccc/win32/libisccc.mak b/lib/isccc/win32/libisccc.mak
index 19771948..ffc5c071 100644
--- a/lib/isccc/win32/libisccc.mak
+++ b/lib/isccc/win32/libisccc.mak
@@ -26,6 +26,81 @@ NULL=nul
 !ENDIF 

 

 !IF  "$(CFG)" == "libisccc - Win32 Release"

+_VC_MANIFEST_INC=0

+_VC_MANIFEST_BASENAME=__VC80

+!ELSE

+_VC_MANIFEST_INC=1

+_VC_MANIFEST_BASENAME=__VC80.Debug

+!ENDIF

+

+####################################################

+# Specifying name of temporary resource file used only in incremental builds:

+

+!if "$(_VC_MANIFEST_INC)" == "1"

+_VC_MANIFEST_AUTO_RES=$(_VC_MANIFEST_BASENAME).auto.res

+!else

+_VC_MANIFEST_AUTO_RES=

+!endif

+

+####################################################

+# _VC_MANIFEST_EMBED_EXE - command to embed manifest in EXE:

+

+!if "$(_VC_MANIFEST_INC)" == "1"

+

+#MT_SPECIAL_RETURN=1090650113

+#MT_SPECIAL_SWITCH=-notify_resource_update

+MT_SPECIAL_RETURN=0

+MT_SPECIAL_SWITCH=

+_VC_MANIFEST_EMBED_EXE= \

+if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \

+if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \

+rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \

+link $** /out:$@ $(LFLAGS)

+

+!else

+

+_VC_MANIFEST_EMBED_EXE= \

+if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;1

+

+!endif

+

+####################################################

+# _VC_MANIFEST_EMBED_DLL - command to embed manifest in DLL:

+

+!if "$(_VC_MANIFEST_INC)" == "1"

+

+#MT_SPECIAL_RETURN=1090650113

+#MT_SPECIAL_SWITCH=-notify_resource_update

+MT_SPECIAL_RETURN=0

+MT_SPECIAL_SWITCH=

+_VC_MANIFEST_EMBED_EXE= \

+if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \

+if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \

+rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \

+link $** /out:$@ $(LFLAGS)

+

+!else

+

+_VC_MANIFEST_EMBED_EXE= \

+if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2

+

+!endif

+####################################################

+# _VC_MANIFEST_CLEAN - command to clean resources files generated temporarily:

+

+!if "$(_VC_MANIFEST_INC)" == "1"

+

+_VC_MANIFEST_CLEAN=-del $(_VC_MANIFEST_BASENAME).auto.res \

+    $(_VC_MANIFEST_BASENAME).auto.rc \

+    $(_VC_MANIFEST_BASENAME).auto.manifest

+

+!else

+

+_VC_MANIFEST_CLEAN=

+

+!endif

+

+!IF  "$(CFG)" == "libisccc - Win32 Release"

 

 OUTDIR=.\Release

 INTDIR=.\Release

@@ -48,6 +123,7 @@ CLEAN :
 	-@erase "$(OUTDIR)\libisccc.exp"

 	-@erase "$(OUTDIR)\libisccc.lib"

 	-@erase "..\..\..\Build\Release\libisccc.dll"

+	-@$(_VC_MANIFEST_CLEAN)

 

 "$(OUTDIR)" :

     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

@@ -112,6 +188,7 @@ LINK32_OBJS= \
     $(LINK32) @<<

   $(LINK32_FLAGS) $(LINK32_OBJS)

 <<

+  $(_VC_MANIFEST_EMBED_DLL)

 

 !ELSEIF  "$(CFG)" == "libisccc - Win32 Debug"

 

@@ -153,6 +230,7 @@ CLEAN :
 	-@erase "$(OUTDIR)\libisccc.pdb"

 	-@erase "..\..\..\Build\Debug\libisccc.dll"

 	-@erase "..\..\..\Build\Debug\libisccc.ilk"

+	-@$(_VC_MANIFEST_CLEAN)

 

 "$(OUTDIR)" :

     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

@@ -232,6 +310,7 @@ LINK32_OBJS= \
     $(LINK32) @<<

   $(LINK32_FLAGS) $(LINK32_OBJS)

 <<

+  $(_VC_MANIFEST_EMBED_DLL)

 

 !ENDIF 

 

@@ -425,3 +504,21 @@ SOURCE=.\version.c
 

 !ENDIF 

 

+####################################################

+# Commands to generate initial empty manifest file and the RC file

+# that references it, and for generating the .res file:

+

+$(_VC_MANIFEST_BASENAME).auto.res : $(_VC_MANIFEST_BASENAME).auto.rc

+

+$(_VC_MANIFEST_BASENAME).auto.rc : $(_VC_MANIFEST_BASENAME).auto.manifest

+    type <<$@

+#include <winuser.h>

+1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest"

+<< KEEP

+

+$(_VC_MANIFEST_BASENAME).auto.manifest :

+    type <<$@

+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>

+<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>

+</assembly>

+<< KEEP

diff --git a/lib/isccfg/win32/libisccfg.mak b/lib/isccfg/win32/libisccfg.mak
index 81220043..fc4fcb0a 100644
--- a/lib/isccfg/win32/libisccfg.mak
+++ b/lib/isccfg/win32/libisccfg.mak
@@ -30,6 +30,81 @@ MTL=midl.exe
 RSC=rc.exe

 

 !IF  "$(CFG)" == "libisccfg - Win32 Release"

+_VC_MANIFEST_INC=0

+_VC_MANIFEST_BASENAME=__VC80

+!ELSE

+_VC_MANIFEST_INC=1

+_VC_MANIFEST_BASENAME=__VC80.Debug

+!ENDIF

+

+####################################################

+# Specifying name of temporary resource file used only in incremental builds:

+

+!if "$(_VC_MANIFEST_INC)" == "1"

+_VC_MANIFEST_AUTO_RES=$(_VC_MANIFEST_BASENAME).auto.res

+!else

+_VC_MANIFEST_AUTO_RES=

+!endif

+

+####################################################

+# _VC_MANIFEST_EMBED_EXE - command to embed manifest in EXE:

+

+!if "$(_VC_MANIFEST_INC)" == "1"

+

+#MT_SPECIAL_RETURN=1090650113

+#MT_SPECIAL_SWITCH=-notify_resource_update

+MT_SPECIAL_RETURN=0

+MT_SPECIAL_SWITCH=

+_VC_MANIFEST_EMBED_EXE= \

+if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \

+if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \

+rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \

+link $** /out:$@ $(LFLAGS)

+

+!else

+

+_VC_MANIFEST_EMBED_EXE= \

+if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;1

+

+!endif

+

+####################################################

+# _VC_MANIFEST_EMBED_DLL - command to embed manifest in DLL:

+

+!if "$(_VC_MANIFEST_INC)" == "1"

+

+#MT_SPECIAL_RETURN=1090650113

+#MT_SPECIAL_SWITCH=-notify_resource_update

+MT_SPECIAL_RETURN=0

+MT_SPECIAL_SWITCH=

+_VC_MANIFEST_EMBED_EXE= \

+if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \

+if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \

+rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \

+link $** /out:$@ $(LFLAGS)

+

+!else

+

+_VC_MANIFEST_EMBED_EXE= \

+if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2

+

+!endif

+####################################################

+# _VC_MANIFEST_CLEAN - command to clean resources files generated temporarily:

+

+!if "$(_VC_MANIFEST_INC)" == "1"

+

+_VC_MANIFEST_CLEAN=-del $(_VC_MANIFEST_BASENAME).auto.res \

+    $(_VC_MANIFEST_BASENAME).auto.rc \

+    $(_VC_MANIFEST_BASENAME).auto.manifest

+

+!else

+

+_VC_MANIFEST_CLEAN=

+

+!endif

+

+!IF  "$(CFG)" == "libisccfg - Win32 Release"

 

 OUTDIR=.\Release

 INTDIR=.\Release

@@ -58,6 +133,7 @@ CLEAN :
 	-@erase "$(OUTDIR)\libisccfg.exp"

 	-@erase "$(OUTDIR)\libisccfg.lib"

 	-@erase "..\..\..\Build\Release\libisccfg.dll"

+	-@$(_VC_MANIFEST_CLEAN)

 

 "$(OUTDIR)" :

     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

@@ -85,6 +161,7 @@ LINK32_OBJS= \
     $(LINK32) @<<

   $(LINK32_FLAGS) $(LINK32_OBJS)

 <<

+  $(_VC_MANIFEST_EMBED_DLL)

 

 !ELSEIF  "$(CFG)" == "libisccfg - Win32 Debug"

 

@@ -127,6 +204,7 @@ CLEAN :
 	-@erase "$(OUTDIR)\libisccfg.pdb"

 	-@erase "..\..\..\Build\Debug\libisccfg.dll"

 	-@erase "..\..\..\Build\Debug\libisccfg.ilk"

+	-@$(_VC_MANIFEST_CLEAN)

 

 "$(OUTDIR)" :

     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

@@ -164,6 +242,7 @@ LINK32_OBJS= \
     $(LINK32) @<<

   $(LINK32_FLAGS) $(LINK32_OBJS)

 <<

+  $(_VC_MANIFEST_EMBED_DLL)

 

 !ENDIF 

 

@@ -349,3 +428,21 @@ SOURCE=.\version.c
 

 !ENDIF 

 

+####################################################

+# Commands to generate initial empty manifest file and the RC file

+# that references it, and for generating the .res file:

+

+$(_VC_MANIFEST_BASENAME).auto.res : $(_VC_MANIFEST_BASENAME).auto.rc

+

+$(_VC_MANIFEST_BASENAME).auto.rc : $(_VC_MANIFEST_BASENAME).auto.manifest

+    type <<$@

+#include <winuser.h>

+1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest"

+<< KEEP

+

+$(_VC_MANIFEST_BASENAME).auto.manifest :

+    type <<$@

+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>

+<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>

+</assembly>

+<< KEEP

diff --git a/lib/lwres/lwconfig.c b/lib/lwres/lwconfig.c
index 2c7891f2..07240f18 100644
--- a/lib/lwres/lwconfig.c
+++ b/lib/lwres/lwconfig.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001, 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwconfig.c,v 1.33.2.5 2005/06/08 00:12:18 marka Exp $ */
+/* $Id: lwconfig.c,v 1.33.2.7 2006/10/03 23:50:49 marka Exp $ */
 
 /***
  *** Module for parsing resolv.conf files.
@@ -559,7 +559,7 @@ lwres_conf_parse(lwres_context_t *ctx, const char *filename) {
 
 	errno = 0;
 	if ((fp = fopen(filename, "r")) == NULL)
-		return (LWRES_R_FAILURE);
+		return (LWRES_R_NOTFOUND);
 
 	ret = LWRES_R_SUCCESS;
 	do {
diff --git a/lib/lwres/win32/liblwres.mak b/lib/lwres/win32/liblwres.mak
index 3585cfc0..3616cea6 100644
--- a/lib/lwres/win32/liblwres.mak
+++ b/lib/lwres/win32/liblwres.mak
@@ -26,6 +26,81 @@ NULL=nul
 !ENDIF 

 

 !IF  "$(CFG)" == "liblwres - Win32 Release"

+_VC_MANIFEST_INC=0

+_VC_MANIFEST_BASENAME=__VC80

+!ELSE

+_VC_MANIFEST_INC=1

+_VC_MANIFEST_BASENAME=__VC80.Debug

+!ENDIF

+

+####################################################

+# Specifying name of temporary resource file used only in incremental builds:

+

+!if "$(_VC_MANIFEST_INC)" == "1"

+_VC_MANIFEST_AUTO_RES=$(_VC_MANIFEST_BASENAME).auto.res

+!else

+_VC_MANIFEST_AUTO_RES=

+!endif

+

+####################################################

+# _VC_MANIFEST_EMBED_EXE - command to embed manifest in EXE:

+

+!if "$(_VC_MANIFEST_INC)" == "1"

+

+#MT_SPECIAL_RETURN=1090650113

+#MT_SPECIAL_SWITCH=-notify_resource_update

+MT_SPECIAL_RETURN=0

+MT_SPECIAL_SWITCH=

+_VC_MANIFEST_EMBED_EXE= \

+if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \

+if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \

+rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \

+link $** /out:$@ $(LFLAGS)

+

+!else

+

+_VC_MANIFEST_EMBED_EXE= \

+if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;1

+

+!endif

+

+####################################################

+# _VC_MANIFEST_EMBED_DLL - command to embed manifest in DLL:

+

+!if "$(_VC_MANIFEST_INC)" == "1"

+

+#MT_SPECIAL_RETURN=1090650113

+#MT_SPECIAL_SWITCH=-notify_resource_update

+MT_SPECIAL_RETURN=0

+MT_SPECIAL_SWITCH=

+_VC_MANIFEST_EMBED_EXE= \

+if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \

+if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \

+rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \

+link $** /out:$@ $(LFLAGS)

+

+!else

+

+_VC_MANIFEST_EMBED_EXE= \

+if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2

+

+!endif

+####################################################

+# _VC_MANIFEST_CLEAN - command to clean resources files generated temporarily:

+

+!if "$(_VC_MANIFEST_INC)" == "1"

+

+_VC_MANIFEST_CLEAN=-del $(_VC_MANIFEST_BASENAME).auto.res \

+    $(_VC_MANIFEST_BASENAME).auto.rc \

+    $(_VC_MANIFEST_BASENAME).auto.manifest

+

+!else

+

+_VC_MANIFEST_CLEAN=

+

+!endif

+

+!IF  "$(CFG)" == "liblwres - Win32 Release"

 

 OUTDIR=.\Release

 INTDIR=.\Release

@@ -59,6 +134,7 @@ CLEAN :
 	-@erase "$(OUTDIR)\liblwres.exp"

 	-@erase "$(OUTDIR)\liblwres.lib"

 	-@erase "..\..\..\Build\Release\liblwres.dll"

+	-@$(_VC_MANIFEST_CLEAN)

 

 "$(OUTDIR)" :

     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

@@ -134,6 +210,7 @@ LINK32_OBJS= \
     $(LINK32) @<<

   $(LINK32_FLAGS) $(LINK32_OBJS)

 <<

+  $(_VC_MANIFEST_EMBED_DLL)

 

 !ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"

 

@@ -197,6 +274,7 @@ CLEAN :
 	-@erase "$(OUTDIR)\liblwres.pdb"

 	-@erase "..\..\..\Build\Debug\liblwres.dll"

 	-@erase "..\..\..\Build\Debug\liblwres.ilk"

+	-@$(_VC_MANIFEST_CLEAN)

 

 "$(OUTDIR)" :

     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

@@ -298,6 +376,7 @@ LINK32_OBJS= \
     $(LINK32) @<<

   $(LINK32_FLAGS) $(LINK32_OBJS)

 <<

+  $(_VC_MANIFEST_EMBED_DLL)

 

 !ENDIF 

 

@@ -689,3 +768,21 @@ SOURCE=.\version.c
 

 !ENDIF 

 

+####################################################

+# Commands to generate initial empty manifest file and the RC file

+# that references it, and for generating the .res file:

+

+$(_VC_MANIFEST_BASENAME).auto.res : $(_VC_MANIFEST_BASENAME).auto.rc

+

+$(_VC_MANIFEST_BASENAME).auto.rc : $(_VC_MANIFEST_BASENAME).auto.manifest

+    type <<$@

+#include <winuser.h>

+1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest"

+<< KEEP

+

+$(_VC_MANIFEST_BASENAME).auto.manifest :

+    type <<$@

+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>

+<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>

+</assembly>

+<< KEEP

diff --git a/lib/win32/bindevt/bindevt.mak b/lib/win32/bindevt/bindevt.mak
index c4aa47e4..f0a4ea16 100644
--- a/lib/win32/bindevt/bindevt.mak
+++ b/lib/win32/bindevt/bindevt.mak
@@ -30,6 +30,81 @@ MTL=midl.exe
 RSC=rc.exe

 

 !IF  "$(CFG)" == "bindevt - Win32 Release"

+_VC_MANIFEST_INC=0

+_VC_MANIFEST_BASENAME=__VC80

+!ELSE

+_VC_MANIFEST_INC=1

+_VC_MANIFEST_BASENAME=__VC80.Debug

+!ENDIF

+

+####################################################

+# Specifying name of temporary resource file used only in incremental builds:

+

+!if "$(_VC_MANIFEST_INC)" == "1"

+_VC_MANIFEST_AUTO_RES=$(_VC_MANIFEST_BASENAME).auto.res

+!else

+_VC_MANIFEST_AUTO_RES=

+!endif

+

+####################################################

+# _VC_MANIFEST_EMBED_EXE - command to embed manifest in EXE:

+

+!if "$(_VC_MANIFEST_INC)" == "1"

+

+#MT_SPECIAL_RETURN=1090650113

+#MT_SPECIAL_SWITCH=-notify_resource_update

+MT_SPECIAL_RETURN=0

+MT_SPECIAL_SWITCH=

+_VC_MANIFEST_EMBED_EXE= \

+if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \

+if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \

+rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \

+link $** /out:$@ $(LFLAGS)

+

+!else

+

+_VC_MANIFEST_EMBED_EXE= \

+if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;1

+

+!endif

+

+####################################################

+# _VC_MANIFEST_EMBED_DLL - command to embed manifest in DLL:

+

+!if "$(_VC_MANIFEST_INC)" == "1"

+

+#MT_SPECIAL_RETURN=1090650113

+#MT_SPECIAL_SWITCH=-notify_resource_update

+MT_SPECIAL_RETURN=0

+MT_SPECIAL_SWITCH=

+_VC_MANIFEST_EMBED_EXE= \

+if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \

+if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \

+rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \

+link $** /out:$@ $(LFLAGS)

+

+!else

+

+_VC_MANIFEST_EMBED_EXE= \

+if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2

+

+!endif

+####################################################

+# _VC_MANIFEST_CLEAN - command to clean resources files generated temporarily:

+

+!if "$(_VC_MANIFEST_INC)" == "1"

+

+_VC_MANIFEST_CLEAN=-del $(_VC_MANIFEST_BASENAME).auto.res \

+    $(_VC_MANIFEST_BASENAME).auto.rc \

+    $(_VC_MANIFEST_BASENAME).auto.manifest

+

+!else

+

+_VC_MANIFEST_CLEAN=

+

+!endif

+

+!IF  "$(CFG)" == "bindevt - Win32 Release"

 

 OUTDIR=.\Release

 INTDIR=.\Release

@@ -43,6 +118,7 @@ CLEAN :
 	-@erase "$(INTDIR)\vc60.idb"

 	-@erase "$(OUTDIR)\bindevt.exp"

 	-@erase "..\..\..\Build\Release\bindevt.dll"

+	-@$(_VC_MANIFEST_CLEAN)

 

 "$(OUTDIR)" :

     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

@@ -64,6 +140,7 @@ LINK32_OBJS= \
     $(LINK32) @<<

   $(LINK32_FLAGS) $(LINK32_OBJS)

 <<

+  $(_VC_MANIFEST_EMBED_DLL)

 

 !ELSEIF  "$(CFG)" == "bindevt - Win32 Debug"

 

@@ -85,6 +162,7 @@ CLEAN :
 	-@erase "$(OUTDIR)\bindevt.bsc"

 	-@erase "$(OUTDIR)\bindevt.exp"

 	-@erase "..\..\..\Build\Debug\bindevt.dll"

+	-@$(_VC_MANIFEST_CLEAN)

 

 "$(OUTDIR)" :

     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

@@ -112,6 +190,7 @@ LINK32_OBJS= \
     $(LINK32) @<<

   $(LINK32_FLAGS) $(LINK32_OBJS)

 <<

+  $(_VC_MANIFEST_EMBED_DLL)

 

 !ENDIF 

 

@@ -211,3 +290,21 @@ SOURCE=.\bindevt.rc
 

 !ENDIF 

 

+####################################################

+# Commands to generate initial empty manifest file and the RC file

+# that references it, and for generating the .res file:

+

+$(_VC_MANIFEST_BASENAME).auto.res : $(_VC_MANIFEST_BASENAME).auto.rc

+

+$(_VC_MANIFEST_BASENAME).auto.rc : $(_VC_MANIFEST_BASENAME).auto.manifest

+    type <<$@

+#include <winuser.h>

+1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest"

+<< KEEP

+

+$(_VC_MANIFEST_BASENAME).auto.manifest :

+    type <<$@

+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>

+<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>

+</assembly>

+<< KEEP