diff --git a/bin/named/config.c b/bin/named/config.c index e3e1f8f939..a2e4745418 100644 --- a/bin/named/config.c +++ b/bin/named/config.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: config.c,v 1.60 2005/08/24 23:53:56 marka Exp $ */ +/* $Id: config.c,v 1.61 2005/09/05 02:54:36 marka Exp $ */ /*! \file */ @@ -430,7 +430,7 @@ ns_config_getipandkeylist(cfg_obj_t *config, cfg_obj_t *list, isc_mem_t *mctx, dns_fixedname_t fname; isc_sockaddr_t *addrs = NULL; dns_name_t **keys = NULL; - const char **lists = NULL; + struct { const char *name; } *lists = NULL; struct { cfg_listelt_t *element; in_port_t port; @@ -498,7 +498,7 @@ ns_config_getipandkeylist(cfg_obj_t *config, cfg_obj_t *list, isc_mem_t *mctx, } /* Seen? */ for (j = 0; j < l; j++) - if (strcasecmp(lists[j], listname) == 0) + if (strcasecmp(lists[j].name, listname) == 0) break; if (j < l) continue; @@ -512,7 +512,7 @@ ns_config_getipandkeylist(cfg_obj_t *config, cfg_obj_t *list, isc_mem_t *mctx, } if (tresult != ISC_R_SUCCESS) goto cleanup; - lists[l++] = listname; + lists[l++].name = listname; /* Grow stack? */ if (stackcount == pushed) { void * new; diff --git a/lib/dns/cache.c b/lib/dns/cache.c index 0da82eacd1..4313dea2aa 100644 --- a/lib/dns/cache.c +++ b/lib/dns/cache.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: cache.c,v 1.63 2005/08/23 02:36:09 marka Exp $ */ +/* $Id: cache.c,v 1.64 2005/09/05 02:54:37 marka Exp $ */ /*! \file */ @@ -209,7 +209,7 @@ adjust_increment(cache_cleaner_t *cleaner, unsigned int remaining, else if (new > DNS_CACHE_CLEANERINCREMENT) new = DNS_CACHE_CLEANERINCREMENT; - cleaner->increment = new; + cleaner->increment = (unsigned int)new; isc_log_write(dns_lctx, DNS_LOGCATEGORY_DATABASE, DNS_LOGMODULE_CACHE, ISC_LOG_INFO, "new clear->increment = %u\n", cleaner->increment); diff --git a/lib/dns/masterdump.c b/lib/dns/masterdump.c index 0cb15f9486..790c19d724 100644 --- a/lib/dns/masterdump.c +++ b/lib/dns/masterdump.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: masterdump.c,v 1.79 2005/08/15 01:21:06 marka Exp $ */ +/* $Id: masterdump.c,v 1.80 2005/09/05 02:54:37 marka Exp $ */ /*! \file */ @@ -1389,7 +1389,7 @@ dumptostreaminc(dns_dumpctx_t *dctx) { dctx->nodes = 1000; } else { dctx->nodes = dctx->nodes * interval; - dctx->nodes /= usecs; + dctx->nodes /= (unsigned int)usecs; if (dctx->nodes == 0) dctx->nodes = 1; else if (dctx->nodes > 1000) diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c index 86420ec9c7..2e7a55d995 100644 --- a/lib/dns/rbtdb.c +++ b/lib/dns/rbtdb.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: rbtdb.c,v 1.215 2005/08/15 01:21:06 marka Exp $ */ +/* $Id: rbtdb.c,v 1.216 2005/09/05 02:54:37 marka Exp $ */ /*! \file */ @@ -573,7 +573,7 @@ adjust_quantum(unsigned int old, isc_time_t *start) { return (old); } old = old * interval; - old /= usecs; + old /= (unsigned int)usecs; if (old == 0) old = 1; else if (old > 1000) diff --git a/lib/dns/validator.c b/lib/dns/validator.c index 3126fa6537..69e1b95929 100644 --- a/lib/dns/validator.c +++ b/lib/dns/validator.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: validator.c,v 1.131 2005/08/25 00:56:07 marka Exp $ */ +/* $Id: validator.c,v 1.132 2005/09/05 02:54:37 marka Exp $ */ /*! \file */ @@ -550,7 +550,7 @@ nsecnoexistnodata(dns_validator_t *val, dns_name_t* name, dns_name_t *nsecname, "nsec proves name exists (owner) data=%d", *data); return (ISC_R_SUCCESS); - } + } if (relation == dns_namereln_subdomain && dns_nsec_typepresent(&rdata, dns_rdatatype_ns) && @@ -2129,7 +2129,7 @@ finddlvsep(dns_validator_t *val, isc_boolean_t resume) { dns_name_t noroot; isc_result_t result; unsigned int labels; - + INSIST(val->view->dlv != NULL); if (!resume) { @@ -2140,7 +2140,7 @@ finddlvsep(dns_validator_t *val, isc_boolean_t resume) { return (DNS_R_MUSTBESECURE); } - dns_fixedname_init(&val->dlvsep); + dns_fixedname_init(&val->dlvsep); dlvsep = dns_fixedname_name(&val->dlvsep); dns_name_copy(val->event->name, dlvsep, NULL); if (val->event->type == dns_rdatatype_ds) { @@ -2263,7 +2263,7 @@ proveunsecure(dns_validator_t *val, isc_boolean_t resume) { validator_log(val, ISC_LOG_DEBUG(3), "resuming proveunsecure"); if (val->frdataset.trust >= dns_trust_secure && !check_ds(val, dns_fixedname_name(&val->fname), - &val->frdataset)) { + &val->frdataset)) { dns_name_format(dns_fixedname_name(&val->fname), namebuf, sizeof(namebuf)); if (val->mustbesecure) { @@ -2281,7 +2281,7 @@ proveunsecure(dns_validator_t *val, isc_boolean_t resume) { result = ISC_R_SUCCESS; goto out; } - result = startfinddlvsep(val, + result = startfinddlvsep(val, dns_fixedname_name(&val->fname)); goto out; } diff --git a/lib/dns/win32/libdns.def b/lib/dns/win32/libdns.def index 699bfdeb74..de112103e0 100644 --- a/lib/dns/win32/libdns.def +++ b/lib/dns/win32/libdns.def @@ -335,6 +335,7 @@ dns_name_toregion dns_name_totext dns_name_towire dns_ncache_add +dns_ncache_getrdataset dns_ncache_towire dns_nsec_build dns_nsec_buildrdata diff --git a/lib/dns/win32/libdns.dsp b/lib/dns/win32/libdns.dsp index 1eb5c902fb..0d4ef6fabe 100644 --- a/lib/dns/win32/libdns.dsp +++ b/lib/dns/win32/libdns.dsp @@ -158,6 +158,10 @@ SOURCE=..\include\dns\dispatch.h # End Source File # Begin Source File +SOURCE=..\include\dns\dlz.h +# End Source File +# Begin Source File + SOURCE=..\include\dns\dnssec.h # End Source File # Begin Source File @@ -318,6 +322,10 @@ SOURCE=..\include\dns\sdb.h # End Source File # Begin Source File +SOURCE=..\include\dns\sdlz.h +# End Source File +# Begin Source File + SOURCE=..\include\dns\secalg.h # End Source File # Begin Source File @@ -450,6 +458,10 @@ SOURCE=..\dispatch.c # End Source File # Begin Source File +SOURCE=..\dlz.c +# End Source File +# Begin Source File + SOURCE=.\DLLMain.c # End Source File # Begin Source File @@ -582,6 +594,10 @@ SOURCE=..\soa.c # End Source File # Begin Source File +SOURCE=..\sdlz.c +# End Source File +# Begin Source File + SOURCE=..\ssu.c # End Source File # Begin Source File diff --git a/lib/dns/win32/libdns.mak b/lib/dns/win32/libdns.mak index 67d789db49..2fe29d4cc0 100644 --- a/lib/dns/win32/libdns.mak +++ b/lib/dns/win32/libdns.mak @@ -57,6 +57,7 @@ CLEAN : -@erase "$(INTDIR)\dbtable.obj" -@erase "$(INTDIR)\diff.obj" -@erase "$(INTDIR)\dispatch.obj" + -@erase "$(INTDIR)\dlz.obj" -@erase "$(INTDIR)\DLLMain.obj" -@erase "$(INTDIR)\dnssec.obj" -@erase "$(INTDIR)\ds.obj" @@ -101,6 +102,7 @@ CLEAN : -@erase "$(INTDIR)\result.obj" -@erase "$(INTDIR)\rootns.obj" -@erase "$(INTDIR)\sdb.obj" + -@erase "$(INTDIR)\sdlz.obj" -@erase "$(INTDIR)\soa.obj" -@erase "$(INTDIR)\ssu.obj" -@erase "$(INTDIR)\stats.obj" @@ -182,6 +184,7 @@ LINK32_OBJS= \ "$(INTDIR)\dbtable.obj" \ "$(INTDIR)\diff.obj" \ "$(INTDIR)\dispatch.obj" \ + "$(INTDIR)\dlz.obj" \ "$(INTDIR)\DLLMain.obj" \ "$(INTDIR)\dnssec.obj" \ "$(INTDIR)\ds.obj" \ @@ -214,6 +217,7 @@ LINK32_OBJS= \ "$(INTDIR)\result.obj" \ "$(INTDIR)\rootns.obj" \ "$(INTDIR)\sdb.obj" \ + "$(INTDIR)\sdlz.obj" \ "$(INTDIR)\soa.obj" \ "$(INTDIR)\ssu.obj" \ "$(INTDIR)\stats.obj" \ @@ -296,6 +300,8 @@ CLEAN : -@erase "$(INTDIR)\diff.sbr" -@erase "$(INTDIR)\dispatch.obj" -@erase "$(INTDIR)\dispatch.sbr" + -@erase "$(INTDIR)\dlz.obj" + -@erase "$(INTDIR)\dlz.sbr" -@erase "$(INTDIR)\DLLMain.obj" -@erase "$(INTDIR)\DLLMain.sbr" -@erase "$(INTDIR)\dnssec.obj" @@ -384,6 +390,8 @@ CLEAN : -@erase "$(INTDIR)\rootns.sbr" -@erase "$(INTDIR)\sdb.obj" -@erase "$(INTDIR)\sdb.sbr" + -@erase "$(INTDIR)\sdlz.obj" + -@erase "$(INTDIR)\sdlz.sbr" -@erase "$(INTDIR)\soa.obj" -@erase "$(INTDIR)\soa.sbr" -@erase "$(INTDIR)\ssu.obj" @@ -480,6 +488,7 @@ BSC32_SBRS= \ "$(INTDIR)\dbtable.sbr" \ "$(INTDIR)\diff.sbr" \ "$(INTDIR)\dispatch.sbr" \ + "$(INTDIR)\dlz.sbr" \ "$(INTDIR)\DLLMain.sbr" \ "$(INTDIR)\dnssec.sbr" \ "$(INTDIR)\ds.sbr" \ @@ -512,6 +521,7 @@ BSC32_SBRS= \ "$(INTDIR)\result.sbr" \ "$(INTDIR)\rootns.sbr" \ "$(INTDIR)\sdb.sbr" \ + "$(INTDIR)\sdlz.sbr" \ "$(INTDIR)\soa.sbr" \ "$(INTDIR)\ssu.sbr" \ "$(INTDIR)\stats.sbr" \ @@ -563,6 +573,7 @@ LINK32_OBJS= \ "$(INTDIR)\dbtable.obj" \ "$(INTDIR)\diff.obj" \ "$(INTDIR)\dispatch.obj" \ + "$(INTDIR)\dlz.obj" \ "$(INTDIR)\DLLMain.obj" \ "$(INTDIR)\dnssec.obj" \ "$(INTDIR)\ds.obj" \ @@ -595,6 +606,7 @@ LINK32_OBJS= \ "$(INTDIR)\result.obj" \ "$(INTDIR)\rootns.obj" \ "$(INTDIR)\sdb.obj" \ + "$(INTDIR)\sdlz.obj" \ "$(INTDIR)\soa.obj" \ "$(INTDIR)\ssu.obj" \ "$(INTDIR)\stats.obj" \ @@ -863,6 +875,30 @@ CPP_SWITCHES=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "include << +!ENDIF + +SOURCE=..\dlz.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 + +"$(INTDIR)\dlz.obj" : $(SOURCE) "$(INTDIR)" + $(CPP) @<< + $(CPP_SWITCHES) $(SOURCE) +<< + + +!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 + +"$(INTDIR)\dlz.obj" "$(INTDIR)\dlz.sbr" : $(SOURCE) "$(INTDIR)" + $(CPP) @<< + $(CPP_SWITCHES) $(SOURCE) +<< + + !ENDIF SOURCE=.\DLLMain.c @@ -1438,6 +1474,24 @@ SOURCE=..\sdb.c $(CPP) $(CPP_PROJ) $(SOURCE) +!ENDIF + +SOURCE=..\sdlz.c + +!IF "$(CFG)" == "libdns - Win32 Release" + + +"$(INTDIR)\sdlz.obj" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +!ELSEIF "$(CFG)" == "libdns - Win32 Debug" + + +"$(INTDIR)\sdlz.obj" "$(INTDIR)\sdlz.sbr" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + !ENDIF SOURCE=..\soa.c diff --git a/lib/isc/win32/libisc.def b/lib/isc/win32/libisc.def index f3b0e41130..160761f62d 100644 --- a/lib/isc/win32/libisc.def +++ b/lib/isc/win32/libisc.def @@ -159,7 +159,6 @@ isc_lex_openbuffer isc_lex_openfile isc_lex_openstream isc_lex_setcomments -isc_lex_setcomments isc_lex_setspecials isc_lex_ungettoken isc_lfsr_generate @@ -171,8 +170,6 @@ isc_log_categorybyname isc_log_closefilelogs isc_log_create isc_log_createchannel -isc_log_createchannel -isc_log_createchannel isc_log_destroy isc_log_getdebuglevel isc_log_getduplicateinterval @@ -194,7 +191,6 @@ isc_log_vwrite isc_log_vwrite1 isc_log_wouldlog isc_log_write -isc_log_write isc_log_write1 isc_logconfig_create isc_logconfig_destroy @@ -205,15 +201,12 @@ isc_md5_init isc_md5_invalidate isc_md5_update isc_mem_attach -isc_mem_attach isc_mem_create isc_mem_create2 isc_mem_createx isc_mem_createx2 isc_mem_destroy isc_mem_detach -isc_mem_detach -isc_mem_detach isc_mem_getquota isc_mem_inuse isc_mem_ondestroy @@ -239,20 +232,15 @@ isc_msgcat_open isc_mutexblock_destroy isc_mutexblock_init isc_net_aton -isc_net_aton isc_net_disableipv4 isc_net_disableipv6 isc_net_ntop -isc_net_ntop isc_net_probe_ipv6only isc_net_probe_ipv6pktinfo isc_net_probeipv4 -isc_net_probeipv4 -isc_net_probeipv6 isc_net_probeipv6 isc_net_probeunix isc_net_pton -isc_net_pton isc_netaddr_any isc_netaddr_any6 isc_netaddr_eqprefix @@ -283,6 +271,7 @@ isc_quota_attach isc_quota_destroy isc_quota_detach isc_quota_init +isc_quota_max isc_quota_release isc_quota_reserve isc_quota_soft @@ -296,6 +285,7 @@ isc_ratelimiter_enqueue isc_ratelimiter_setinterval isc_ratelimiter_setpertic isc_ratelimiter_shutdown +isc_refcount_init isc_region_compare isc_resource_getlimit isc_resource_setlimit @@ -375,7 +365,6 @@ isc_stdtime_get isc_string_separate isc_string_strlcat isc_string_strlcpy -isc_string_strlcpy isc_string_touint64 isc_symtab_create isc_symtab_define @@ -389,7 +378,6 @@ isc_task_create isc_task_destroy isc_task_detach isc_task_endexclusive -isc_task_endexclusive isc_task_getcurrenttime isc_task_getname isc_task_gettag @@ -399,7 +387,6 @@ isc_task_purgeevent isc_task_purgerange isc_task_send isc_task_sendanddetach -isc_task_sendanddetach isc_task_setname isc_task_shutdown isc_task_unsend @@ -410,10 +397,7 @@ isc_taskpool_create isc_taskpool_destroy isc_taskpool_gettask isc_thread_create -isc_thread_create isc_thread_join -isc_thread_join -isc_thread_setconcurrency isc_thread_setconcurrency isc_time_add isc_time_compare @@ -424,7 +408,6 @@ isc_time_now isc_time_nowplusinterval isc_time_settoepoch isc_time_subtract -isc_time_subtract isc_timer_attach isc_timer_create isc_timer_detach diff --git a/lib/isc/win32/libisc.dsp b/lib/isc/win32/libisc.dsp index 2c207217f0..163515420e 100644 --- a/lib/isc/win32/libisc.dsp +++ b/lib/isc/win32/libisc.dsp @@ -421,6 +421,10 @@ SOURCE=..\include\isc\ratelimiter.h # End Source File # Begin Source File +SOURCE=..\include\isc\refcount.h +# End Source File +# Begin Source File + SOURCE=..\include\isc\region.h # End Source File # Begin Source File @@ -657,6 +661,10 @@ SOURCE=..\ratelimiter.c # End Source File # Begin Source File +SOURCE=..\refcount.c +# End Source File +# Begin Source File + SOURCE=..\region.c # End Source File # Begin Source File diff --git a/lib/isc/win32/libisc.mak b/lib/isc/win32/libisc.mak index 5d64aebb1a..3adbae7566 100644 --- a/lib/isc/win32/libisc.mak +++ b/lib/isc/win32/libisc.mak @@ -83,6 +83,7 @@ CLEAN : -@erase "$(INTDIR)\quota.obj" -@erase "$(INTDIR)\random.obj" -@erase "$(INTDIR)\ratelimiter.obj" + -@erase "$(INTDIR)\refcount.obj" -@erase "$(INTDIR)\region.obj" -@erase "$(INTDIR)\resource.obj" -@erase "$(INTDIR)\result.obj" @@ -177,6 +178,7 @@ LINK32_OBJS= \ "$(INTDIR)\quota.obj" \ "$(INTDIR)\random.obj" \ "$(INTDIR)\ratelimiter.obj" \ + "$(INTDIR)\refcount.obj" \ "$(INTDIR)\result.obj" \ "$(INTDIR)\rwlock.obj" \ "$(INTDIR)\serial.obj" \ @@ -297,6 +299,8 @@ CLEAN : -@erase "$(INTDIR)\random.sbr" -@erase "$(INTDIR)\ratelimiter.obj" -@erase "$(INTDIR)\ratelimiter.sbr" + -@erase "$(INTDIR)\refcount.obj" + -@erase "$(INTDIR)\refcount.sbr" -@erase "$(INTDIR)\region.obj" -@erase "$(INTDIR)\region.sbr" -@erase "$(INTDIR)\resource.obj" @@ -411,6 +415,7 @@ BSC32_SBRS= \ "$(INTDIR)\quota.sbr" \ "$(INTDIR)\random.sbr" \ "$(INTDIR)\ratelimiter.sbr" \ + "$(INTDIR)\refcount.sbr" \ "$(INTDIR)\result.sbr" \ "$(INTDIR)\rwlock.sbr" \ "$(INTDIR)\serial.sbr" \ @@ -488,6 +493,7 @@ LINK32_OBJS= \ "$(INTDIR)\quota.obj" \ "$(INTDIR)\random.obj" \ "$(INTDIR)\ratelimiter.obj" \ + "$(INTDIR)\refcount.obj" \ "$(INTDIR)\result.obj" \ "$(INTDIR)\rwlock.obj" \ "$(INTDIR)\serial.obj" \ @@ -1487,6 +1493,24 @@ SOURCE=..\ratelimiter.c $(CPP) $(CPP_PROJ) $(SOURCE) +!ENDIF + +SOURCE=..\refcount.c + +!IF "$(CFG)" == "libisc - Win32 Release" + + +"$(INTDIR)\refcount.obj" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +!ELSEIF "$(CFG)" == "libisc - Win32 Debug" + + +"$(INTDIR)\refcount.obj" "$(INTDIR)\refcount.sbr" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + !ENDIF SOURCE=..\region.c