From: Francis Dupont Date: Wed, 12 Jun 2013 17:09:40 +0000 (+0200) Subject: merge rt33812: trivial updates for WIN32 build X-Git-Tag: v9.10.0a1~288 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c213258356638f9af1e1c68425df527b856567a2;p=thirdparty%2Fbind9.git merge rt33812: trivial updates for WIN32 build --- diff --git a/config.h.win32 b/config.h.win32 index abcaddbe6e7..9403b426bbd 100644 --- a/config.h.win32 +++ b/config.h.win32 @@ -185,6 +185,7 @@ #define getcwd _getcwd #define utime _utime #define utimbuf _utimbuf +#define lseek _lseek /* #define EAFNOSUPPORT EINVAL */ #define chmod _chmod diff --git a/lib/dns/win32/libdns.def b/lib/dns/win32/libdns.def index 269f71a9d49..8e42da4667f 100644 --- a/lib/dns/win32/libdns.def +++ b/lib/dns/win32/libdns.def @@ -116,6 +116,7 @@ dns_db_findzonecut dns_db_getnsec3parameters dns_db_getoriginnode dns_db_getrrsetstats +dns_db_getsigningtime dns_db_getsoaserial dns_db_hashsize dns_db_iscache @@ -136,8 +137,8 @@ dns_db_printnode dns_db_register dns_db_rpz_attach dns_db_rpz_ready -dns_db_setcachestats dns_db_serialize +dns_db_setcachestats dns_db_subtractrdataset dns_db_unregister dns_dbiterator_current @@ -235,6 +236,7 @@ dns_dnssec_verifymessage dns_dnsseckey_create dns_dnsseckey_destroy dns_ds_buildrdata +dns_dsdigest_fromtext dns_dumpctx_detach dns_fwdtable_add dns_fwdtable_addfwd @@ -463,35 +465,35 @@ dns_peer_detach dns_peer_getbogus dns_peer_getkey dns_peer_getmaxudp -dns_peer_getnotifysource dns_peer_getnotifydscp +dns_peer_getnotifysource dns_peer_getprovideixfr -dns_peer_getquerysource dns_peer_getquerydscp +dns_peer_getquerysource dns_peer_getrequestixfr dns_peer_getsupportedns +dns_peer_gettransferdscp dns_peer_gettransferformat dns_peer_gettransfers dns_peer_gettransfersource -dns_peer_gettransferdscp dns_peer_new dns_peer_newprefix dns_peer_setbogus dns_peer_setkey dns_peer_setkeybycharp dns_peer_setmaxudp -dns_peer_setnotifysource dns_peer_setnotifydscp +dns_peer_setnotifysource dns_peer_setprovideixfr -dns_peer_setquerysource dns_peer_setquerydscp +dns_peer_setquerysource dns_peer_setrequestixfr dns_peer_setrequestnsid dns_peer_setsupportedns +dns_peer_settransferdscp dns_peer_settransferformat dns_peer_settransfers dns_peer_settransfersource -dns_peer_settransferdscp dns_peer_setudpsize dns_peerlist_addpeer dns_peerlist_attach @@ -846,14 +848,17 @@ dns_zone_getchecknames dns_zone_getclass dns_zone_getdb dns_zone_getdbtype +dns_zone_getexpiretime dns_zone_getfile dns_zone_getforwardacl dns_zone_getidlein dns_zone_getidleout +dns_zone_getincludes dns_zone_getjournal dns_zone_getjournalsize dns_zone_getkeydirectory dns_zone_getkeyopts +dns_zone_getloadtime dns_zone_getmaxxfrin dns_zone_getmaxxfrout dns_zone_getmctx @@ -867,8 +872,11 @@ dns_zone_getoptions dns_zone_getorigin dns_zone_getprivatetype dns_zone_getqueryacl -dns_zone_getraw dns_zone_getqueryaoncl +dns_zone_getraw +dns_zone_getrcvquerystats +dns_zone_getrefreshkeytime +dns_zone_getrefreshtime dns_zone_getrequeststats dns_zone_getserial dns_zone_getserial2 @@ -961,6 +969,7 @@ dns_zone_setprivatetype dns_zone_setqueryacl dns_zone_setqueryonacl dns_zone_setrawdata +dns_zone_setrcvquerystats dns_zone_setrefreshkeyinterval dns_zone_setrequestixfr dns_zone_setrequeststats diff --git a/lib/isc/win32/file.c b/lib/isc/win32/file.c index 4f0893704cf..b33ed9aec16 100644 --- a/lib/isc/win32/file.c +++ b/lib/isc/win32/file.c @@ -264,6 +264,22 @@ isc_file_getmodtime(const char *file, isc_time_t *time) { return (ISC_R_SUCCESS); } +isc_result_t +isc_file_getsize(const char *file, off_t *size) { + isc_result_t result; + struct stat stats; + + REQUIRE(file != NULL); + REQUIRE(size != NULL); + + result = file_stats(file, &stats); + + if (result == ISC_R_SUCCESS) + *size = stats.st_size; + + return (result); +} + isc_result_t isc_file_settime(const char *file, isc_time_t *time) { int fh; diff --git a/lib/isc/win32/libisc.def b/lib/isc/win32/libisc.def index 5b383634a3f..fb343531825 100644 --- a/lib/isc/win32/libisc.def +++ b/lib/isc/win32/libisc.def @@ -192,9 +192,9 @@ isc_condition_init isc_condition_signal isc_condition_wait isc_condition_waituntil +isc_crc64_final isc_crc64_init isc_crc64_update -isc_crc64_final isc_dir_chdir isc_dir_chroot isc_dir_close @@ -241,7 +241,9 @@ isc_file_isdirectory isc_file_isplainfile isc_file_isplainfilefd isc_file_mktemplate +isc_file_mmap isc_file_mode +isc_file_munmap isc_file_openunique isc_file_openuniquemode isc_file_openuniqueprivate diff --git a/win32utils/setpk11provider.pl b/win32utils/setpk11provider.pl index a11f7ef05f2..3906f1b8ef1 100644 --- a/win32utils/setpk11provider.pl +++ b/win32utils/setpk11provider.pl @@ -75,7 +75,7 @@ sub updateconfig { foreach $line (@Lines) { if ($havexml) { - $line =~ s/^.*#undef USE_PKCS11.*$/define USE_PKCS11 1/; + $line =~ s/^.*#undef USE_PKCS11.*$/#define USE_PKCS11 1/; } else { $line =~ s/^#define USE_PKCS11 .*$/\/\* #undef USE_PKCS11 \*\//; }