From 8eb88aafee951859264e36c315b1289cd8c2088b Mon Sep 17 00:00:00 2001 From: Evan Hunt Date: Fri, 8 Sep 2017 13:39:09 -0700 Subject: [PATCH] [master] add libns and remove liblwres 4708. [cleanup] Legacy Windows builds (i.e. for XP and earlier) are no longer supported. [RT #45186] 4707. [func] The lightweight resolver daemon and library (lwresd and liblwres) have been removed. [RT #45186] 4706. [func] Code implementing name server query processing has been moved from bin/named to a new library "libns". Functions remaining in bin/named are now prefixed with "named_" rather than "ns_". This will make it easier to write unit tests for name server code, or link name server functionality into new tools. [RT #45186] --- .gitignore | 1 - CHANGES | 14 + bin/check/win32/checkconf.dsp.in | 107 - bin/check/win32/checkconf.dsw | 29 - bin/check/win32/checkconf.mak.in | 404 --- bin/check/win32/checktool.dsp.in | 113 - bin/check/win32/checktool.dsw | 29 - bin/check/win32/checkzone.dsp.in | 108 - bin/check/win32/checkzone.dsw | 29 - bin/check/win32/checkzone.mak.in | 404 --- bin/confgen/win32/confgentool.dsp.in | 135 - bin/confgen/win32/confgentool.dsw | 29 - bin/confgen/win32/ddnsconfgen.dsp.in | 103 - bin/confgen/win32/ddnsconfgen.dsw | 29 - bin/confgen/win32/ddnsconfgen.mak.in | 337 -- bin/confgen/win32/rndcconfgen.dsp.in | 103 - bin/confgen/win32/rndcconfgen.dsw | 29 - bin/confgen/win32/rndcconfgen.mak.in | 336 -- bin/delv/win32/delv.dsp.in | 103 - bin/delv/win32/delv.dsw | 29 - bin/delv/win32/delv.mak.in | 299 -- bin/dig/Makefile.in | 20 +- bin/dig/dighost.c | 187 +- bin/dig/win32/dig.dsp.in | 107 - bin/dig/win32/dig.dsw | 29 - bin/dig/win32/dig.mak.in | 427 --- bin/dig/win32/dig.vcxproj.in | 12 +- bin/dig/win32/dighost.dsp.in | 113 - bin/dig/win32/dighost.dsw | 29 - bin/dig/win32/dighost.vcxproj.in | 4 +- bin/dig/win32/host.dsp.in | 103 - bin/dig/win32/host.dsw | 29 - bin/dig/win32/host.mak.in | 427 --- bin/dig/win32/host.vcxproj.in | 12 +- bin/dig/win32/nslookup.dsp.in | 107 - bin/dig/win32/nslookup.dsw | 29 - bin/dig/win32/nslookup.mak.in | 427 --- bin/dig/win32/nslookup.vcxproj.in | 12 +- bin/dnssec/win32/dnssectool.dsp.in | 113 - bin/dnssec/win32/dnssectool.dsw | 29 - bin/dnssec/win32/dsfromkey.dsp.in | 103 - bin/dnssec/win32/dsfromkey.dsw | 29 - bin/dnssec/win32/dsfromkey.mak.in | 324 -- bin/dnssec/win32/importkey.dsp.in | 103 - bin/dnssec/win32/importkey.dsw | 29 - bin/dnssec/win32/importkey.mak.in | 324 -- bin/dnssec/win32/keyfromlabel.dsp.in | 103 - bin/dnssec/win32/keyfromlabel.dsw | 29 - bin/dnssec/win32/keyfromlabel.mak.in | 324 -- bin/dnssec/win32/keygen.dsp.in | 103 - bin/dnssec/win32/keygen.dsw | 29 - bin/dnssec/win32/keygen.mak.in | 324 -- bin/dnssec/win32/revoke.dsp.in | 103 - bin/dnssec/win32/revoke.dsw | 29 - bin/dnssec/win32/revoke.mak.in | 324 -- bin/dnssec/win32/settime.dsp.in | 103 - bin/dnssec/win32/settime.dsw | 29 - bin/dnssec/win32/settime.mak.in | 324 -- bin/dnssec/win32/signzone.dsp.in | 103 - bin/dnssec/win32/signzone.dsw | 29 - bin/dnssec/win32/signzone.mak.in | 324 -- bin/dnssec/win32/verify.dsp.in | 103 - bin/dnssec/win32/verify.dsw | 29 - bin/dnssec/win32/verify.mak.in | 324 -- bin/named/.gitignore | 1 - bin/named/Makefile.in | 69 +- bin/named/builtin.c | 62 +- bin/named/config.c | 85 +- bin/named/control.c | 230 +- bin/named/controlconf.c | 156 +- bin/named/fuzz.c | 52 +- bin/named/geoip.c | 52 +- bin/named/include/named/builtin.h | 8 +- bin/named/include/named/config.h | 30 +- bin/named/include/named/control.h | 104 +- bin/named/include/named/fuzz.h | 13 +- bin/named/include/named/geoip.h | 8 +- bin/named/include/named/globals.h | 170 +- bin/named/include/named/log.h | 44 +- bin/named/include/named/logconf.h | 4 +- bin/named/include/named/lwaddr.h | 27 - bin/named/include/named/lwdclient.h | 226 -- bin/named/include/named/lwresd.h | 114 - bin/named/include/named/lwsearch.h | 103 - bin/named/include/named/main.h | 10 +- bin/named/include/named/ns_smf_globals.h | 36 - bin/named/include/named/server.h | 533 +-- bin/named/include/named/smf_globals.h | 34 + bin/named/include/named/statschannel.h | 14 +- bin/named/include/named/tkeyconf.h | 14 +- bin/named/include/named/tsigconf.h | 14 +- bin/named/include/named/types.h | 41 +- bin/named/include/named/zoneconf.h | 26 +- bin/named/log.c | 90 +- bin/named/logconf.c | 24 +- bin/named/lwaddr.c | 85 - bin/named/lwdclient.c | 507 --- bin/named/lwderror.c | 71 - bin/named/lwdgabn.c | 648 ---- bin/named/lwdgnba.c | 261 -- bin/named/lwdgrbn.c | 509 --- bin/named/lwdnoop.c | 78 - bin/named/lwresd.8 | 250 -- bin/named/lwresd.c | 889 ----- bin/named/lwresd.docbook | 359 -- bin/named/lwresd.html | 295 -- bin/named/lwsearch.c | 196 -- bin/named/main.c | 659 ++-- bin/named/named.conf.docbook | 15 - bin/named/named.docbook | 4 - bin/named/server.c | 2585 ++++++++------- bin/named/statschannel.c | 316 +- bin/named/tkeyconf.c | 12 +- bin/named/tsigconf.c | 15 +- bin/named/unix/include/named/os.h | 42 +- bin/named/unix/os.c | 189 +- bin/named/win32/include/named/os.h | 42 +- bin/named/win32/named.dsp.in | 341 -- bin/named/win32/named.dsw | 29 - bin/named/win32/named.mak.in | 1233 ------- bin/named/win32/named.vcxproj.filters.in | 89 +- bin/named/win32/named.vcxproj.in | 41 +- bin/named/win32/ntservice.c | 10 +- bin/named/win32/os.c | 85 +- bin/named/zoneconf.c | 299 +- bin/nsupdate/Makefile.in | 22 +- bin/nsupdate/nsupdate.c | 114 +- bin/nsupdate/win32/nsupdate.dsp.in | 103 - bin/nsupdate/win32/nsupdate.dsw | 29 - bin/nsupdate/win32/nsupdate.mak.in | 375 --- bin/nsupdate/win32/nsupdate.vcxproj.in | 12 +- bin/pkcs11/win32/pk11destroy.dsp.in | 103 - bin/pkcs11/win32/pk11destroy.dsw | 29 - bin/pkcs11/win32/pk11destroy.mak.in | 296 -- bin/pkcs11/win32/pk11keygen.dsp.in | 103 - bin/pkcs11/win32/pk11keygen.dsw | 29 - bin/pkcs11/win32/pk11keygen.mak.in | 296 -- bin/pkcs11/win32/pk11list.dsp.in | 103 - bin/pkcs11/win32/pk11list.dsw | 29 - bin/pkcs11/win32/pk11list.mak.in | 296 -- bin/pkcs11/win32/pk11tokens.dsp.in | 103 - bin/pkcs11/win32/pk11tokens.dsw | 29 - bin/pkcs11/win32/pk11tokens.mak.in | 296 -- bin/rndc/win32/rndc.dsp.in | 107 - bin/rndc/win32/rndc.dsw | 29 - bin/rndc/win32/rndc.mak.in | 425 --- bin/rndc/win32/rndcutil.dsp.in | 119 - bin/rndc/win32/rndcutil.dsw | 29 - bin/tests/.gitignore | 1 - bin/tests/Makefile.in | 26 - bin/tests/atomic/win32/t_atomic.dsp.in | 95 - bin/tests/atomic/win32/t_atomic.dsw | 29 - bin/tests/atomic/win32/t_atomic.mak.in | 375 --- bin/tests/db/win32/t_db.dsp.in | 95 - bin/tests/db/win32/t_db.dsw | 29 - bin/tests/db/win32/t_db.mak.in | 403 --- bin/tests/dst/win32/t_dst.dsp.in | 95 - bin/tests/dst/win32/t_dst.dsw | 29 - bin/tests/dst/win32/t_dst.mak.in | 375 --- bin/tests/gxba_test.c | 90 - bin/tests/gxbn_test.c | 78 - bin/tests/hashes/win32/t_hashes.dsp.in | 95 - bin/tests/hashes/win32/t_hashes.dsw | 29 - bin/tests/hashes/win32/t_hashes.mak.in | 347 -- bin/tests/lwres_test.c | 296 -- bin/tests/lwresconf_test.c | 90 - bin/tests/master/win32/t_master.dsp.in | 95 - bin/tests/master/win32/t_master.dsw | 29 - bin/tests/master/win32/t_master.mak.in | 375 --- bin/tests/mem/win32/t_mem.dsp.in | 95 - bin/tests/mem/win32/t_mem.dsw | 29 - bin/tests/mem/win32/t_mem.mak.in | 347 -- bin/tests/names/win32/t_names.dsp.in | 95 - bin/tests/names/win32/t_names.dsw | 29 - bin/tests/names/win32/t_names.mak.in | 375 --- bin/tests/rbt/win32/t_rbt.dsp.in | 95 - bin/tests/rbt/win32/t_rbt.dsw | 29 - bin/tests/rbt/win32/t_rbt.mak.in | 375 --- bin/tests/resolver/win32/t_resolver.dsp.in | 95 - bin/tests/resolver/win32/t_resolver.dsw | 29 - bin/tests/resolver/win32/t_resolver.mak.in | 375 --- bin/tests/sockaddr/win32/t_sockaddr.dsp.in | 95 - bin/tests/sockaddr/win32/t_sockaddr.dsw | 29 - bin/tests/sockaddr/win32/t_sockaddr.mak.in | 347 -- bin/tests/system/Makefile.in | 4 +- bin/tests/system/README | 5 +- bin/tests/system/cleanall.sh | 4 +- bin/tests/system/conf.sh.in | 8 +- bin/tests/system/conf.sh.win32 | 8 +- bin/tests/system/feature-test.c | 4 +- bin/tests/system/lwresd/Makefile.in | 47 - bin/tests/system/lwresd/clean.sh | 19 - bin/tests/system/lwresd/lwresd1/lwresd.conf | 25 - bin/tests/system/lwresd/lwresd1/nosearch.conf | 24 - bin/tests/system/lwresd/lwresd1/resolv.conf | 12 - bin/tests/system/lwresd/lwtest.c | 793 ----- .../lwresd/ns1/10.10.10.in-addr.arpa.db | 20 - bin/tests/system/lwresd/ns1/e.example1.db | 54 - bin/tests/system/lwresd/ns1/example1.db | 26 - bin/tests/system/lwresd/ns1/example2.db | 21 - bin/tests/system/lwresd/ns1/ip6.arpa.db | 21 - bin/tests/system/lwresd/ns1/ip6.int.db | 20 - bin/tests/system/lwresd/ns1/named.conf | 60 - bin/tests/system/lwresd/ns1/root.db | 24 - bin/tests/system/lwresd/resolv.conf | 12 - bin/tests/system/lwresd/tests.sh | 84 - bin/tests/system/nsupdate/tests.sh | 4 +- bin/tests/system/start.pl | 32 +- bin/tests/system/stop.pl | 7 +- bin/tests/system/win32/bigkey.dsp.in | 95 - bin/tests/system/win32/bigkey.dsw | 29 - bin/tests/system/win32/bigkey.mak.in | 346 -- bin/tests/system/win32/feature-test.dsp.in | 95 - bin/tests/system/win32/feature-test.dsw | 29 - bin/tests/system/win32/feature-test.mak.in | 318 -- bin/tests/system/win32/gencheck.dsp.in | 95 - bin/tests/system/win32/gencheck.dsw | 29 - bin/tests/system/win32/gencheck.mak.in | 318 -- bin/tests/system/win32/keycreate.dsp.in | 95 - bin/tests/system/win32/keycreate.dsw | 29 - bin/tests/system/win32/keycreate.mak.in | 346 -- bin/tests/system/win32/keydelete.dsp.in | 95 - bin/tests/system/win32/keydelete.dsw | 29 - bin/tests/system/win32/keydelete.mak.in | 346 -- bin/tests/system/win32/lwtest.dsp.in | 95 - bin/tests/system/win32/lwtest.dsw | 29 - bin/tests/system/win32/lwtest.mak.in | 346 -- .../system/win32/lwtest.vcxproj.filters.in | 22 - bin/tests/system/win32/lwtest.vcxproj.in | 110 - bin/tests/system/win32/pipequeries.dsp.in | 95 - bin/tests/system/win32/pipequeries.dsw | 29 - bin/tests/system/win32/pipequeries.mak.in | 346 -- bin/tests/tasks/win32/t_tasks.dsp.in | 95 - bin/tests/tasks/win32/t_tasks.dsw | 29 - bin/tests/tasks/win32/t_tasks.mak.in | 347 -- bin/tests/timers/win32/t_timers.dsp.in | 95 - bin/tests/timers/win32/t_timers.dsw | 29 - bin/tests/timers/win32/t_timers.mak.in | 347 -- bin/tests/virtual-time/cleanall.sh | 4 +- bin/tests/virtual-time/conf.sh.in | 7 +- bin/tests/win32/backtrace_test.dsp.in | 103 - bin/tests/win32/backtrace_test.dsw | 29 - bin/tests/win32/backtrace_test.mak.in | 299 -- bin/tests/win32/inter_test.dsp.in | 103 - bin/tests/win32/inter_test.dsw | 29 - bin/tests/win32/inter_test.mak.in | 299 -- bin/tests/win32/makejournal.dsp.in | 103 - bin/tests/win32/makejournal.dsw | 29 - bin/tests/win32/makejournal.mak.in | 299 -- bin/tests/win32/rwlock_test.dsp.in | 103 - bin/tests/win32/rwlock_test.dsw | 29 - bin/tests/win32/rwlock_test.mak.in | 299 -- bin/tests/win32/shutdown_test.dsp.in | 103 - bin/tests/win32/shutdown_test.dsw | 29 - bin/tests/win32/shutdown_test.mak.in | 299 -- bin/tests/win32/sock_test.dsp.in | 103 - bin/tests/win32/sock_test.dsw | 29 - bin/tests/win32/sock_test.mak.in | 299 -- bin/tests/win32/task_test.dsp.in | 103 - bin/tests/win32/task_test.dsw | 29 - bin/tests/win32/task_test.mak.in | 299 -- bin/tests/win32/timer_test.dsp.in | 103 - bin/tests/win32/timer_test.dsw | 29 - bin/tests/win32/timer_test.mak.in | 299 -- bin/tools/Makefile.in | 5 +- bin/tools/win32/arpaname.dsp.in | 103 - bin/tools/win32/arpaname.dsw | 29 - bin/tools/win32/arpaname.mak.in | 299 -- bin/tools/win32/genrandom.dsp.in | 103 - bin/tools/win32/genrandom.dsw | 29 - bin/tools/win32/genrandom.mak.in | 299 -- bin/tools/win32/ischmacfixup.dsp.in | 103 - bin/tools/win32/ischmacfixup.dsw | 29 - bin/tools/win32/ischmacfixup.mak.in | 299 -- bin/tools/win32/journalprint.dsp.in | 103 - bin/tools/win32/journalprint.dsw | 29 - bin/tools/win32/journalprint.mak.in | 299 -- bin/tools/win32/mdig.dsp.in | 103 - bin/tools/win32/mdig.dsw | 29 - bin/tools/win32/mdig.mak.in | 299 -- bin/tools/win32/nsec3hash.dsp.in | 103 - bin/tools/win32/nsec3hash.dsw | 29 - bin/tools/win32/nsec3hash.mak.in | 299 -- bin/tools/win32/rrchecker.dsp.in | 103 - bin/tools/win32/rrchecker.dsw | 29 - bin/tools/win32/rrchecker.mak.in | 299 -- bin/win32/BINDInstall/BINDInstall.dsp.in | 177 - bin/win32/BINDInstall/BINDInstall.dsw | 29 - bin/win32/BINDInstall/BINDInstall.mak.in | 428 --- bin/win32/BINDInstall/BINDInstallDlg.cpp | 1 - configure | 359 +- configure.in | 210 +- contrib/dlz/drivers/dlz_bdb_driver.c | 6 +- contrib/dlz/drivers/dlz_bdbhpt_driver.c | 6 +- contrib/dlz/drivers/dlz_filesystem_driver.c | 42 +- contrib/dlz/drivers/dlz_ldap_driver.c | 72 +- contrib/dlz/drivers/dlz_mysql_driver.c | 62 +- contrib/dlz/drivers/dlz_odbc_driver.c | 80 +- contrib/dlz/drivers/dlz_postgres_driver.c | 42 +- contrib/dlz/drivers/dlz_stub_driver.c | 30 +- contrib/dlz/drivers/include/dlz/sdlz_helper.h | 2 +- doc/arm/Bv9ARM-book.xml | 172 +- doc/arm/man.lwresd.html | 334 -- doc/arm/notes.xml | 15 + doc/design/lwres | 168 - doc/dev/dev.md | 6 +- doc/doxygen/Doxyfile.in | 1 + doc/misc/options | 26 +- doc/misc/roadmap | 5 +- doc/misc/sdb | 4 +- isc-config.sh.docbook | 4 +- isc-config.sh.in | 9 +- lib/Atffile | 2 +- lib/Makefile.in | 6 +- lib/bind9/win32/libbind9.dsp.in | 137 - lib/bind9/win32/libbind9.dsw | 29 - lib/bind9/win32/libbind9.mak.in | 452 --- lib/dns/acl.c | 30 +- lib/dns/include/dns/acl.h | 14 +- lib/dns/include/dns/lib.h | 4 +- lib/dns/include/dns/message.h | 21 +- lib/dns/include/dns/stats.h | 293 +- lib/dns/include/dns/types.h | 1 + lib/dns/mapapi | 2 +- lib/dns/message.c | 20 +- lib/dns/rdataset.c | 1 - lib/dns/win32/gen.dsp.in | 107 - lib/dns/win32/gen.dsw | 29 - lib/dns/win32/gen.mak.in | 267 -- lib/dns/win32/libdns.def.in | 1 + lib/dns/win32/libdns.dsp.in | 937 ------ lib/dns/win32/libdns.dsw | 29 - lib/dns/win32/libdns.mak.in | 2890 ----------------- lib/irs/include/irs/netdb.h.in | 6 +- lib/irs/resconf.c | 4 +- lib/irs/win32/include/irs/netdb.h | 6 +- lib/irs/win32/libirs.dsp.in | 169 - lib/irs/win32/libirs.dsw | 29 - lib/irs/win32/libirs.mak.in | 548 ---- lib/isc/include/isc/eventclass.h | 3 +- lib/isc/include/isc/fuzz.h | 21 + lib/isc/include/isc/ipv6.h | 10 +- lib/isc/include/isc/platform.h.in | 8 +- lib/isc/include/isc/task.h | 20 +- lib/isc/mem.c | 40 +- lib/isc/task.c | 12 +- lib/isc/task_p.h | 30 - lib/isc/tests/socket_test.c | 4 +- lib/isc/tests/task_test.c | 5 +- lib/isc/timer_p.h | 4 +- lib/isc/unix/app.c | 1 - lib/isc/unix/socket.c | 1 - lib/isc/win32/include/isc/net.h | 12 +- lib/isc/win32/include/isc/ntpaths.h | 8 +- lib/isc/win32/include/isc/platform.h.in | 8 +- lib/isc/win32/libisc.dsp.in | 949 ------ lib/isc/win32/libisc.dsw | 29 - lib/isc/win32/libisc.mak.in | 2398 -------------- lib/isc/win32/libisc.vcxproj.in | 1 - lib/isc/win32/ntpaths.c | 28 +- lib/isccc/win32/libisccc.dsp.in | 201 -- lib/isccc/win32/libisccc.dsw | 29 - lib/isccc/win32/libisccc.mak.in | 540 --- lib/isccfg/namedconf.c | 46 +- lib/isccfg/win32/libisccfg.dsp.in | 169 - lib/isccfg/win32/libisccfg.dsw | 29 - lib/isccfg/win32/libisccfg.mak.in | 490 --- lib/lwres/Makefile.in | 80 - lib/lwres/assert_p.h | 27 - lib/lwres/compat.c | 147 - lib/lwres/context.c | 507 --- lib/lwres/context_p.h | 58 - lib/lwres/gai_strerror.c | 75 - lib/lwres/getaddrinfo.c | 807 ----- lib/lwres/gethost.c | 356 -- lib/lwres/getipnode.c | 1157 ------- lib/lwres/getnameinfo.c | 338 -- lib/lwres/getrrset.c | 283 -- lib/lwres/herror.c | 111 - lib/lwres/include/Makefile.in | 16 - lib/lwres/include/lwres/Makefile.in | 43 - lib/lwres/include/lwres/context.h | 127 - lib/lwres/include/lwres/int.h | 25 - lib/lwres/include/lwres/ipv6.h | 115 - lib/lwres/include/lwres/lang.h | 24 - lib/lwres/include/lwres/list.h | 112 - lib/lwres/include/lwres/lwbuffer.h | 397 --- lib/lwres/include/lwres/lwpacket.h | 150 - lib/lwres/include/lwres/lwres.h | 573 ---- lib/lwres/include/lwres/netdb.h.in | 513 --- lib/lwres/include/lwres/platform.h.in | 116 - lib/lwres/include/lwres/result.h | 33 - lib/lwres/include/lwres/stdlib.h | 29 - lib/lwres/include/lwres/string.h | 29 - lib/lwres/include/lwres/version.h | 19 - lib/lwres/lwbuffer.c | 352 -- lib/lwres/lwconfig.c | 793 ----- lib/lwres/lwinetaton.c | 193 -- lib/lwres/lwinetntop.c | 188 -- lib/lwres/lwinetpton.c | 206 -- lib/lwres/lwpacket.c | 120 - lib/lwres/lwres_gabn.c | 496 --- lib/lwres/lwres_gnba.c | 406 --- lib/lwres/lwres_grbn.c | 417 --- lib/lwres/lwres_noop.c | 333 -- lib/lwres/lwresutil.c | 567 ---- lib/lwres/man/Makefile.in | 300 -- lib/lwres/man/lwres.3 | 176 - lib/lwres/man/lwres.docbook | 253 -- lib/lwres/man/lwres.html | 248 -- lib/lwres/man/lwres_buffer.3 | 252 -- lib/lwres/man/lwres_buffer.docbook | 382 --- lib/lwres/man/lwres_buffer.html | 449 --- lib/lwres/man/lwres_config.3 | 116 - lib/lwres/man/lwres_config.docbook | 160 - lib/lwres/man/lwres_config.html | 169 - lib/lwres/man/lwres_context.3 | 181 -- lib/lwres/man/lwres_context.docbook | 251 -- lib/lwres/man/lwres_context.html | 294 -- lib/lwres/man/lwres_gabn.3 | 217 -- lib/lwres/man/lwres_gabn.docbook | 249 -- lib/lwres/man/lwres_gabn.html | 304 -- lib/lwres/man/lwres_gai_strerror.3 | 140 - lib/lwres/man/lwres_gai_strerror.docbook | 187 -- lib/lwres/man/lwres_gai_strerror.html | 160 - lib/lwres/man/lwres_getaddrinfo.3 | 254 -- lib/lwres/man/lwres_getaddrinfo.docbook | 376 --- lib/lwres/man/lwres_getaddrinfo.html | 374 --- lib/lwres/man/lwres_gethostent.3 | 329 -- lib/lwres/man/lwres_gethostent.docbook | 428 --- lib/lwres/man/lwres_gethostent.html | 477 --- lib/lwres/man/lwres_getipnode.3 | 220 -- lib/lwres/man/lwres_getipnode.docbook | 318 -- lib/lwres/man/lwres_getipnode.html | 316 -- lib/lwres/man/lwres_getnameinfo.3 | 127 - lib/lwres/man/lwres_getnameinfo.docbook | 192 -- lib/lwres/man/lwres_getnameinfo.html | 199 -- lib/lwres/man/lwres_getrrsetbyname.3 | 170 - lib/lwres/man/lwres_getrrsetbyname.docbook | 210 -- lib/lwres/man/lwres_getrrsetbyname.html | 204 -- lib/lwres/man/lwres_gnba.3 | 202 -- lib/lwres/man/lwres_gnba.docbook | 250 -- lib/lwres/man/lwres_gnba.html | 304 -- lib/lwres/man/lwres_hstrerror.3 | 110 - lib/lwres/man/lwres_hstrerror.docbook | 139 - lib/lwres/man/lwres_hstrerror.html | 126 - lib/lwres/man/lwres_inetntop.3 | 88 - lib/lwres/man/lwres_inetntop.docbook | 109 - lib/lwres/man/lwres_inetntop.html | 112 - lib/lwres/man/lwres_noop.3 | 202 -- lib/lwres/man/lwres_noop.docbook | 244 -- lib/lwres/man/lwres_noop.html | 298 -- lib/lwres/man/lwres_packet.3 | 186 -- lib/lwres/man/lwres_packet.docbook | 278 -- lib/lwres/man/lwres_packet.html | 264 -- lib/lwres/man/lwres_resutil.3 | 185 -- lib/lwres/man/lwres_resutil.docbook | 225 -- lib/lwres/man/lwres_resutil.html | 260 -- lib/lwres/man/resolver.5 | 206 -- lib/lwres/print.c | 575 ---- lib/lwres/print_p.h | 86 - lib/lwres/tests/Makefile.in | 46 - lib/lwres/tests/config_test.c | 65 - lib/lwres/tests/testdata/link-local.conf | 1 - lib/lwres/unix/Makefile.in | 16 - lib/lwres/unix/include/lwres/net.h | 126 - lib/lwres/version.c | 19 - lib/lwres/win32/Makefile.in | 16 - lib/lwres/win32/include/Makefile.in | 16 - lib/lwres/win32/include/lwres/.gitignore | 2 - lib/lwres/win32/include/lwres/Makefile.in | 25 - lib/lwres/win32/include/lwres/int.h | 23 - lib/lwres/win32/include/lwres/net.h | 227 -- lib/lwres/win32/include/lwres/netdb.h | 509 --- lib/lwres/win32/include/lwres/platform.h | 96 - lib/lwres/win32/liblwres.def | 90 - lib/lwres/win32/liblwres.dsp.in | 261 -- lib/lwres/win32/liblwres.dsw | 29 - lib/lwres/win32/liblwres.mak.in | 798 ----- lib/lwres/win32/liblwres.vcxproj.user | 3 - lib/lwres/win32/lwconfig.c | 145 - lib/lwres/win32/socket.c | 34 - lib/lwres/win32/version.c | 19 - lib/{lwres => ns}/Atffile | 0 lib/ns/Makefile.in | 91 + lib/{lwres => ns}/api | 7 +- {bin/named => lib/ns}/client.c | 609 ++-- lib/{lwres/unix => ns}/include/Makefile.in | 6 +- .../lwres => ns/include/ns}/Makefile.in | 16 +- .../named => lib/ns/include/ns}/client.h | 123 +- .../ns/include/ns}/interfacemgr.h | 53 +- lib/ns/include/ns/lib.h | 36 + .../named => lib/ns/include/ns}/listenlist.h | 22 +- lib/ns/include/ns/log.h | 66 + .../named => lib/ns/include/ns}/notify.h | 13 +- .../named => lib/ns/include/ns}/query.h | 10 +- lib/ns/include/ns/server.h | 199 ++ .../named => lib/ns/include/ns}/sortlist.h | 21 +- lib/ns/include/ns/stats.h | 120 + lib/ns/include/ns/types.h | 30 + .../named => lib/ns/include/ns}/update.h | 10 +- lib/ns/include/ns/version.h | 17 + .../named => lib/ns/include/ns}/xfrout.h | 10 +- {bin/named => lib/ns}/interfacemgr.c | 138 +- lib/ns/lib.c | 102 + {bin/named => lib/ns}/listenlist.c | 6 +- lib/ns/log.c | 68 + {bin/named => lib/ns}/notify.c | 9 +- {bin/named => lib/ns}/query.c | 211 +- lib/ns/server.c | 257 ++ {bin/named => lib/ns}/sortlist.c | 62 +- lib/ns/stats.c | 125 + lib/{lwres => ns}/tests/Atffile | 0 lib/ns/tests/Makefile.in | 58 + lib/ns/tests/listenlist_test.c | 101 + lib/ns/tests/notify_test.c | 161 + lib/ns/tests/nstest.c | 552 ++++ lib/ns/tests/nstest.h | 90 + lib/ns/tests/testdata/notify/notify1.msg | 3 + lib/ns/tests/testdata/notify/zone1.db | 21 + {bin/named => lib/ns}/update.c | 53 +- lib/ns/version.c | 17 + lib/{lwres => ns}/win32/DLLMain.c | 7 +- lib/ns/win32/libns.def | 80 + .../win32/libns.vcxproj.filters} | 246 +- .../win32/libns.vcxproj.in} | 93 +- .../ns/win32/libns.vcxproj.user | 0 lib/ns/win32/version.c | 21 + {bin/named => lib/ns}/xfrout.c | 29 +- lib/samples/win32/async.dsp.in | 103 - lib/samples/win32/async.dsw | 29 - lib/samples/win32/async.mak.in | 299 -- lib/samples/win32/gai.dsp.in | 103 - lib/samples/win32/gai.dsw | 29 - lib/samples/win32/gai.mak.in | 299 -- lib/samples/win32/nsprobe.dsp.in | 103 - lib/samples/win32/nsprobe.dsw | 29 - lib/samples/win32/nsprobe.mak.in | 299 -- lib/samples/win32/request.dsp.in | 103 - lib/samples/win32/request.dsw | 29 - lib/samples/win32/request.mak.in | 299 -- lib/samples/win32/resolve.dsp.in | 103 - lib/samples/win32/resolve.dsw | 29 - lib/samples/win32/resolve.mak.in | 299 -- lib/samples/win32/update.dsp.in | 103 - lib/samples/win32/update.dsw | 29 - lib/samples/win32/update.mak.in | 299 -- lib/tests/win32/libtests.dsp.in | 121 - lib/tests/win32/libtests.dsw | 29 - lib/tests/win32/libtests.mak.in | 378 --- lib/win32/bindevt/bindevt.dsp.in | 132 - lib/win32/bindevt/bindevt.dsw | 29 - lib/win32/bindevt/bindevt.mak.in | 310 -- make/includes.in | 11 +- util/check-includes.pl | 38 +- util/copyrights | 608 +--- util/kit.sh | 6 +- util/merge_copyrights | 2 - win32utils/Configure | 205 +- win32utils/bind9.sln.in | 66 +- win32utils/build.txt | 17 +- win32utils/legacy/BINDBuild.dsw.in | 1522 --------- win32utils/legacy/BuildAll.bat.in | 248 -- win32utils/legacy/BuildPost.bat.in | 52 - win32utils/legacy/BuildSetup.bat.in | 185 -- win32utils/legacy/makedefs.pl | 162 - win32utils/legacy/win32-build.txt | 105 - 567 files changed, 7123 insertions(+), 85013 deletions(-) delete mode 100644 bin/check/win32/checkconf.dsp.in delete mode 100644 bin/check/win32/checkconf.dsw delete mode 100644 bin/check/win32/checkconf.mak.in delete mode 100644 bin/check/win32/checktool.dsp.in delete mode 100644 bin/check/win32/checktool.dsw delete mode 100644 bin/check/win32/checkzone.dsp.in delete mode 100644 bin/check/win32/checkzone.dsw delete mode 100644 bin/check/win32/checkzone.mak.in delete mode 100644 bin/confgen/win32/confgentool.dsp.in delete mode 100644 bin/confgen/win32/confgentool.dsw delete mode 100644 bin/confgen/win32/ddnsconfgen.dsp.in delete mode 100644 bin/confgen/win32/ddnsconfgen.dsw delete mode 100644 bin/confgen/win32/ddnsconfgen.mak.in delete mode 100644 bin/confgen/win32/rndcconfgen.dsp.in delete mode 100644 bin/confgen/win32/rndcconfgen.dsw delete mode 100644 bin/confgen/win32/rndcconfgen.mak.in delete mode 100644 bin/delv/win32/delv.dsp.in delete mode 100644 bin/delv/win32/delv.dsw delete mode 100644 bin/delv/win32/delv.mak.in delete mode 100644 bin/dig/win32/dig.dsp.in delete mode 100644 bin/dig/win32/dig.dsw delete mode 100644 bin/dig/win32/dig.mak.in delete mode 100644 bin/dig/win32/dighost.dsp.in delete mode 100644 bin/dig/win32/dighost.dsw delete mode 100644 bin/dig/win32/host.dsp.in delete mode 100644 bin/dig/win32/host.dsw delete mode 100644 bin/dig/win32/host.mak.in delete mode 100644 bin/dig/win32/nslookup.dsp.in delete mode 100644 bin/dig/win32/nslookup.dsw delete mode 100644 bin/dig/win32/nslookup.mak.in delete mode 100644 bin/dnssec/win32/dnssectool.dsp.in delete mode 100644 bin/dnssec/win32/dnssectool.dsw delete mode 100644 bin/dnssec/win32/dsfromkey.dsp.in delete mode 100644 bin/dnssec/win32/dsfromkey.dsw delete mode 100644 bin/dnssec/win32/dsfromkey.mak.in delete mode 100644 bin/dnssec/win32/importkey.dsp.in delete mode 100644 bin/dnssec/win32/importkey.dsw delete mode 100644 bin/dnssec/win32/importkey.mak.in delete mode 100644 bin/dnssec/win32/keyfromlabel.dsp.in delete mode 100644 bin/dnssec/win32/keyfromlabel.dsw delete mode 100644 bin/dnssec/win32/keyfromlabel.mak.in delete mode 100644 bin/dnssec/win32/keygen.dsp.in delete mode 100644 bin/dnssec/win32/keygen.dsw delete mode 100644 bin/dnssec/win32/keygen.mak.in delete mode 100644 bin/dnssec/win32/revoke.dsp.in delete mode 100644 bin/dnssec/win32/revoke.dsw delete mode 100644 bin/dnssec/win32/revoke.mak.in delete mode 100644 bin/dnssec/win32/settime.dsp.in delete mode 100644 bin/dnssec/win32/settime.dsw delete mode 100644 bin/dnssec/win32/settime.mak.in delete mode 100644 bin/dnssec/win32/signzone.dsp.in delete mode 100644 bin/dnssec/win32/signzone.dsw delete mode 100644 bin/dnssec/win32/signzone.mak.in delete mode 100644 bin/dnssec/win32/verify.dsp.in delete mode 100644 bin/dnssec/win32/verify.dsw delete mode 100644 bin/dnssec/win32/verify.mak.in delete mode 100644 bin/named/include/named/lwaddr.h delete mode 100644 bin/named/include/named/lwdclient.h delete mode 100644 bin/named/include/named/lwresd.h delete mode 100644 bin/named/include/named/lwsearch.h delete mode 100644 bin/named/include/named/ns_smf_globals.h create mode 100644 bin/named/include/named/smf_globals.h delete mode 100644 bin/named/lwaddr.c delete mode 100644 bin/named/lwdclient.c delete mode 100644 bin/named/lwderror.c delete mode 100644 bin/named/lwdgabn.c delete mode 100644 bin/named/lwdgnba.c delete mode 100644 bin/named/lwdgrbn.c delete mode 100644 bin/named/lwdnoop.c delete mode 100644 bin/named/lwresd.8 delete mode 100644 bin/named/lwresd.c delete mode 100644 bin/named/lwresd.docbook delete mode 100644 bin/named/lwresd.html delete mode 100644 bin/named/lwsearch.c delete mode 100644 bin/named/win32/named.dsp.in delete mode 100644 bin/named/win32/named.dsw delete mode 100644 bin/named/win32/named.mak.in delete mode 100644 bin/nsupdate/win32/nsupdate.dsp.in delete mode 100644 bin/nsupdate/win32/nsupdate.dsw delete mode 100644 bin/nsupdate/win32/nsupdate.mak.in delete mode 100644 bin/pkcs11/win32/pk11destroy.dsp.in delete mode 100644 bin/pkcs11/win32/pk11destroy.dsw delete mode 100644 bin/pkcs11/win32/pk11destroy.mak.in delete mode 100644 bin/pkcs11/win32/pk11keygen.dsp.in delete mode 100644 bin/pkcs11/win32/pk11keygen.dsw delete mode 100644 bin/pkcs11/win32/pk11keygen.mak.in delete mode 100644 bin/pkcs11/win32/pk11list.dsp.in delete mode 100644 bin/pkcs11/win32/pk11list.dsw delete mode 100644 bin/pkcs11/win32/pk11list.mak.in delete mode 100644 bin/pkcs11/win32/pk11tokens.dsp.in delete mode 100644 bin/pkcs11/win32/pk11tokens.dsw delete mode 100644 bin/pkcs11/win32/pk11tokens.mak.in delete mode 100644 bin/rndc/win32/rndc.dsp.in delete mode 100644 bin/rndc/win32/rndc.dsw delete mode 100644 bin/rndc/win32/rndc.mak.in delete mode 100644 bin/rndc/win32/rndcutil.dsp.in delete mode 100644 bin/rndc/win32/rndcutil.dsw delete mode 100644 bin/tests/atomic/win32/t_atomic.dsp.in delete mode 100644 bin/tests/atomic/win32/t_atomic.dsw delete mode 100644 bin/tests/atomic/win32/t_atomic.mak.in delete mode 100644 bin/tests/db/win32/t_db.dsp.in delete mode 100644 bin/tests/db/win32/t_db.dsw delete mode 100644 bin/tests/db/win32/t_db.mak.in delete mode 100644 bin/tests/dst/win32/t_dst.dsp.in delete mode 100644 bin/tests/dst/win32/t_dst.dsw delete mode 100644 bin/tests/dst/win32/t_dst.mak.in delete mode 100644 bin/tests/gxba_test.c delete mode 100644 bin/tests/gxbn_test.c delete mode 100644 bin/tests/hashes/win32/t_hashes.dsp.in delete mode 100644 bin/tests/hashes/win32/t_hashes.dsw delete mode 100644 bin/tests/hashes/win32/t_hashes.mak.in delete mode 100644 bin/tests/lwres_test.c delete mode 100644 bin/tests/lwresconf_test.c delete mode 100644 bin/tests/master/win32/t_master.dsp.in delete mode 100644 bin/tests/master/win32/t_master.dsw delete mode 100644 bin/tests/master/win32/t_master.mak.in delete mode 100644 bin/tests/mem/win32/t_mem.dsp.in delete mode 100644 bin/tests/mem/win32/t_mem.dsw delete mode 100644 bin/tests/mem/win32/t_mem.mak.in delete mode 100644 bin/tests/names/win32/t_names.dsp.in delete mode 100644 bin/tests/names/win32/t_names.dsw delete mode 100644 bin/tests/names/win32/t_names.mak.in delete mode 100644 bin/tests/rbt/win32/t_rbt.dsp.in delete mode 100644 bin/tests/rbt/win32/t_rbt.dsw delete mode 100644 bin/tests/rbt/win32/t_rbt.mak.in delete mode 100644 bin/tests/resolver/win32/t_resolver.dsp.in delete mode 100644 bin/tests/resolver/win32/t_resolver.dsw delete mode 100644 bin/tests/resolver/win32/t_resolver.mak.in delete mode 100644 bin/tests/sockaddr/win32/t_sockaddr.dsp.in delete mode 100644 bin/tests/sockaddr/win32/t_sockaddr.dsw delete mode 100644 bin/tests/sockaddr/win32/t_sockaddr.mak.in delete mode 100644 bin/tests/system/lwresd/Makefile.in delete mode 100644 bin/tests/system/lwresd/clean.sh delete mode 100644 bin/tests/system/lwresd/lwresd1/lwresd.conf delete mode 100644 bin/tests/system/lwresd/lwresd1/nosearch.conf delete mode 100644 bin/tests/system/lwresd/lwresd1/resolv.conf delete mode 100644 bin/tests/system/lwresd/lwtest.c delete mode 100644 bin/tests/system/lwresd/ns1/10.10.10.in-addr.arpa.db delete mode 100644 bin/tests/system/lwresd/ns1/e.example1.db delete mode 100644 bin/tests/system/lwresd/ns1/example1.db delete mode 100644 bin/tests/system/lwresd/ns1/example2.db delete mode 100644 bin/tests/system/lwresd/ns1/ip6.arpa.db delete mode 100644 bin/tests/system/lwresd/ns1/ip6.int.db delete mode 100644 bin/tests/system/lwresd/ns1/named.conf delete mode 100644 bin/tests/system/lwresd/ns1/root.db delete mode 100644 bin/tests/system/lwresd/resolv.conf delete mode 100644 bin/tests/system/lwresd/tests.sh delete mode 100644 bin/tests/system/win32/bigkey.dsp.in delete mode 100644 bin/tests/system/win32/bigkey.dsw delete mode 100644 bin/tests/system/win32/bigkey.mak.in delete mode 100644 bin/tests/system/win32/feature-test.dsp.in delete mode 100644 bin/tests/system/win32/feature-test.dsw delete mode 100644 bin/tests/system/win32/feature-test.mak.in delete mode 100644 bin/tests/system/win32/gencheck.dsp.in delete mode 100644 bin/tests/system/win32/gencheck.dsw delete mode 100644 bin/tests/system/win32/gencheck.mak.in delete mode 100644 bin/tests/system/win32/keycreate.dsp.in delete mode 100644 bin/tests/system/win32/keycreate.dsw delete mode 100644 bin/tests/system/win32/keycreate.mak.in delete mode 100644 bin/tests/system/win32/keydelete.dsp.in delete mode 100644 bin/tests/system/win32/keydelete.dsw delete mode 100644 bin/tests/system/win32/keydelete.mak.in delete mode 100644 bin/tests/system/win32/lwtest.dsp.in delete mode 100644 bin/tests/system/win32/lwtest.dsw delete mode 100644 bin/tests/system/win32/lwtest.mak.in delete mode 100644 bin/tests/system/win32/lwtest.vcxproj.filters.in delete mode 100644 bin/tests/system/win32/lwtest.vcxproj.in delete mode 100644 bin/tests/system/win32/pipequeries.dsp.in delete mode 100644 bin/tests/system/win32/pipequeries.dsw delete mode 100644 bin/tests/system/win32/pipequeries.mak.in delete mode 100644 bin/tests/tasks/win32/t_tasks.dsp.in delete mode 100644 bin/tests/tasks/win32/t_tasks.dsw delete mode 100644 bin/tests/tasks/win32/t_tasks.mak.in delete mode 100644 bin/tests/timers/win32/t_timers.dsp.in delete mode 100644 bin/tests/timers/win32/t_timers.dsw delete mode 100644 bin/tests/timers/win32/t_timers.mak.in delete mode 100644 bin/tests/win32/backtrace_test.dsp.in delete mode 100644 bin/tests/win32/backtrace_test.dsw delete mode 100644 bin/tests/win32/backtrace_test.mak.in delete mode 100644 bin/tests/win32/inter_test.dsp.in delete mode 100644 bin/tests/win32/inter_test.dsw delete mode 100644 bin/tests/win32/inter_test.mak.in delete mode 100644 bin/tests/win32/makejournal.dsp.in delete mode 100644 bin/tests/win32/makejournal.dsw delete mode 100644 bin/tests/win32/makejournal.mak.in delete mode 100644 bin/tests/win32/rwlock_test.dsp.in delete mode 100644 bin/tests/win32/rwlock_test.dsw delete mode 100644 bin/tests/win32/rwlock_test.mak.in delete mode 100644 bin/tests/win32/shutdown_test.dsp.in delete mode 100644 bin/tests/win32/shutdown_test.dsw delete mode 100644 bin/tests/win32/shutdown_test.mak.in delete mode 100644 bin/tests/win32/sock_test.dsp.in delete mode 100644 bin/tests/win32/sock_test.dsw delete mode 100644 bin/tests/win32/sock_test.mak.in delete mode 100644 bin/tests/win32/task_test.dsp.in delete mode 100644 bin/tests/win32/task_test.dsw delete mode 100644 bin/tests/win32/task_test.mak.in delete mode 100644 bin/tests/win32/timer_test.dsp.in delete mode 100644 bin/tests/win32/timer_test.dsw delete mode 100644 bin/tests/win32/timer_test.mak.in delete mode 100644 bin/tools/win32/arpaname.dsp.in delete mode 100644 bin/tools/win32/arpaname.dsw delete mode 100644 bin/tools/win32/arpaname.mak.in delete mode 100644 bin/tools/win32/genrandom.dsp.in delete mode 100644 bin/tools/win32/genrandom.dsw delete mode 100644 bin/tools/win32/genrandom.mak.in delete mode 100755 bin/tools/win32/ischmacfixup.dsp.in delete mode 100755 bin/tools/win32/ischmacfixup.dsw delete mode 100755 bin/tools/win32/ischmacfixup.mak.in delete mode 100644 bin/tools/win32/journalprint.dsp.in delete mode 100644 bin/tools/win32/journalprint.dsw delete mode 100644 bin/tools/win32/journalprint.mak.in delete mode 100644 bin/tools/win32/mdig.dsp.in delete mode 100644 bin/tools/win32/mdig.dsw delete mode 100644 bin/tools/win32/mdig.mak.in delete mode 100644 bin/tools/win32/nsec3hash.dsp.in delete mode 100644 bin/tools/win32/nsec3hash.dsw delete mode 100644 bin/tools/win32/nsec3hash.mak.in delete mode 100644 bin/tools/win32/rrchecker.dsp.in delete mode 100644 bin/tools/win32/rrchecker.dsw delete mode 100644 bin/tools/win32/rrchecker.mak.in delete mode 100644 bin/win32/BINDInstall/BINDInstall.dsp.in delete mode 100644 bin/win32/BINDInstall/BINDInstall.dsw delete mode 100644 bin/win32/BINDInstall/BINDInstall.mak.in delete mode 100644 doc/arm/man.lwresd.html delete mode 100644 doc/design/lwres delete mode 100644 lib/bind9/win32/libbind9.dsp.in delete mode 100644 lib/bind9/win32/libbind9.dsw delete mode 100644 lib/bind9/win32/libbind9.mak.in delete mode 100644 lib/dns/win32/gen.dsp.in delete mode 100644 lib/dns/win32/gen.dsw delete mode 100644 lib/dns/win32/gen.mak.in delete mode 100644 lib/dns/win32/libdns.dsp.in delete mode 100644 lib/dns/win32/libdns.dsw delete mode 100644 lib/dns/win32/libdns.mak.in delete mode 100644 lib/irs/win32/libirs.dsp.in delete mode 100644 lib/irs/win32/libirs.dsw delete mode 100644 lib/irs/win32/libirs.mak.in create mode 100644 lib/isc/include/isc/fuzz.h delete mode 100644 lib/isc/task_p.h delete mode 100644 lib/isc/win32/libisc.dsp.in delete mode 100644 lib/isc/win32/libisc.dsw delete mode 100644 lib/isc/win32/libisc.mak.in delete mode 100644 lib/isccc/win32/libisccc.dsp.in delete mode 100644 lib/isccc/win32/libisccc.dsw delete mode 100644 lib/isccc/win32/libisccc.mak.in delete mode 100644 lib/isccfg/win32/libisccfg.dsp.in delete mode 100644 lib/isccfg/win32/libisccfg.dsw delete mode 100644 lib/isccfg/win32/libisccfg.mak.in delete mode 100644 lib/lwres/Makefile.in delete mode 100644 lib/lwres/assert_p.h delete mode 100644 lib/lwres/compat.c delete mode 100644 lib/lwres/context.c delete mode 100644 lib/lwres/context_p.h delete mode 100644 lib/lwres/gai_strerror.c delete mode 100644 lib/lwres/getaddrinfo.c delete mode 100644 lib/lwres/gethost.c delete mode 100644 lib/lwres/getipnode.c delete mode 100644 lib/lwres/getnameinfo.c delete mode 100644 lib/lwres/getrrset.c delete mode 100644 lib/lwres/herror.c delete mode 100644 lib/lwres/include/Makefile.in delete mode 100644 lib/lwres/include/lwres/Makefile.in delete mode 100644 lib/lwres/include/lwres/context.h delete mode 100644 lib/lwres/include/lwres/int.h delete mode 100644 lib/lwres/include/lwres/ipv6.h delete mode 100644 lib/lwres/include/lwres/lang.h delete mode 100644 lib/lwres/include/lwres/list.h delete mode 100644 lib/lwres/include/lwres/lwbuffer.h delete mode 100644 lib/lwres/include/lwres/lwpacket.h delete mode 100644 lib/lwres/include/lwres/lwres.h delete mode 100644 lib/lwres/include/lwres/netdb.h.in delete mode 100644 lib/lwres/include/lwres/platform.h.in delete mode 100644 lib/lwres/include/lwres/result.h delete mode 100644 lib/lwres/include/lwres/stdlib.h delete mode 100644 lib/lwres/include/lwres/string.h delete mode 100644 lib/lwres/include/lwres/version.h delete mode 100644 lib/lwres/lwbuffer.c delete mode 100644 lib/lwres/lwconfig.c delete mode 100644 lib/lwres/lwinetaton.c delete mode 100644 lib/lwres/lwinetntop.c delete mode 100644 lib/lwres/lwinetpton.c delete mode 100644 lib/lwres/lwpacket.c delete mode 100644 lib/lwres/lwres_gabn.c delete mode 100644 lib/lwres/lwres_gnba.c delete mode 100644 lib/lwres/lwres_grbn.c delete mode 100644 lib/lwres/lwres_noop.c delete mode 100644 lib/lwres/lwresutil.c delete mode 100644 lib/lwres/man/Makefile.in delete mode 100644 lib/lwres/man/lwres.3 delete mode 100644 lib/lwres/man/lwres.docbook delete mode 100644 lib/lwres/man/lwres.html delete mode 100644 lib/lwres/man/lwres_buffer.3 delete mode 100644 lib/lwres/man/lwres_buffer.docbook delete mode 100644 lib/lwres/man/lwres_buffer.html delete mode 100644 lib/lwres/man/lwres_config.3 delete mode 100644 lib/lwres/man/lwres_config.docbook delete mode 100644 lib/lwres/man/lwres_config.html delete mode 100644 lib/lwres/man/lwres_context.3 delete mode 100644 lib/lwres/man/lwres_context.docbook delete mode 100644 lib/lwres/man/lwres_context.html delete mode 100644 lib/lwres/man/lwres_gabn.3 delete mode 100644 lib/lwres/man/lwres_gabn.docbook delete mode 100644 lib/lwres/man/lwres_gabn.html delete mode 100644 lib/lwres/man/lwres_gai_strerror.3 delete mode 100644 lib/lwres/man/lwres_gai_strerror.docbook delete mode 100644 lib/lwres/man/lwres_gai_strerror.html delete mode 100644 lib/lwres/man/lwres_getaddrinfo.3 delete mode 100644 lib/lwres/man/lwres_getaddrinfo.docbook delete mode 100644 lib/lwres/man/lwres_getaddrinfo.html delete mode 100644 lib/lwres/man/lwres_gethostent.3 delete mode 100644 lib/lwres/man/lwres_gethostent.docbook delete mode 100644 lib/lwres/man/lwres_gethostent.html delete mode 100644 lib/lwres/man/lwres_getipnode.3 delete mode 100644 lib/lwres/man/lwres_getipnode.docbook delete mode 100644 lib/lwres/man/lwres_getipnode.html delete mode 100644 lib/lwres/man/lwres_getnameinfo.3 delete mode 100644 lib/lwres/man/lwres_getnameinfo.docbook delete mode 100644 lib/lwres/man/lwres_getnameinfo.html delete mode 100644 lib/lwres/man/lwres_getrrsetbyname.3 delete mode 100644 lib/lwres/man/lwres_getrrsetbyname.docbook delete mode 100644 lib/lwres/man/lwres_getrrsetbyname.html delete mode 100644 lib/lwres/man/lwres_gnba.3 delete mode 100644 lib/lwres/man/lwres_gnba.docbook delete mode 100644 lib/lwres/man/lwres_gnba.html delete mode 100644 lib/lwres/man/lwres_hstrerror.3 delete mode 100644 lib/lwres/man/lwres_hstrerror.docbook delete mode 100644 lib/lwres/man/lwres_hstrerror.html delete mode 100644 lib/lwres/man/lwres_inetntop.3 delete mode 100644 lib/lwres/man/lwres_inetntop.docbook delete mode 100644 lib/lwres/man/lwres_inetntop.html delete mode 100644 lib/lwres/man/lwres_noop.3 delete mode 100644 lib/lwres/man/lwres_noop.docbook delete mode 100644 lib/lwres/man/lwres_noop.html delete mode 100644 lib/lwres/man/lwres_packet.3 delete mode 100644 lib/lwres/man/lwres_packet.docbook delete mode 100644 lib/lwres/man/lwres_packet.html delete mode 100644 lib/lwres/man/lwres_resutil.3 delete mode 100644 lib/lwres/man/lwres_resutil.docbook delete mode 100644 lib/lwres/man/lwres_resutil.html delete mode 100644 lib/lwres/man/resolver.5 delete mode 100644 lib/lwres/print.c delete mode 100644 lib/lwres/print_p.h delete mode 100644 lib/lwres/tests/Makefile.in delete mode 100644 lib/lwres/tests/config_test.c delete mode 100644 lib/lwres/tests/testdata/link-local.conf delete mode 100644 lib/lwres/unix/Makefile.in delete mode 100644 lib/lwres/unix/include/lwres/net.h delete mode 100644 lib/lwres/version.c delete mode 100644 lib/lwres/win32/Makefile.in delete mode 100644 lib/lwres/win32/include/Makefile.in delete mode 100644 lib/lwres/win32/include/lwres/.gitignore delete mode 100644 lib/lwres/win32/include/lwres/Makefile.in delete mode 100644 lib/lwres/win32/include/lwres/int.h delete mode 100644 lib/lwres/win32/include/lwres/net.h delete mode 100644 lib/lwres/win32/include/lwres/netdb.h delete mode 100644 lib/lwres/win32/include/lwres/platform.h delete mode 100644 lib/lwres/win32/liblwres.def delete mode 100644 lib/lwres/win32/liblwres.dsp.in delete mode 100644 lib/lwres/win32/liblwres.dsw delete mode 100644 lib/lwres/win32/liblwres.mak.in delete mode 100644 lib/lwres/win32/liblwres.vcxproj.user delete mode 100644 lib/lwres/win32/lwconfig.c delete mode 100644 lib/lwres/win32/socket.c delete mode 100644 lib/lwres/win32/version.c rename lib/{lwres => ns}/Atffile (100%) create mode 100644 lib/ns/Makefile.in rename lib/{lwres => ns}/api (61%) rename {bin/named => lib/ns}/client.c (90%) rename lib/{lwres/unix => ns}/include/Makefile.in (64%) rename lib/{lwres/unix/include/lwres => ns/include/ns}/Makefile.in (50%) rename {bin/named/include/named => lib/ns/include/ns}/client.h (81%) rename {bin/named/include/named => lib/ns/include/ns}/interfacemgr.h (83%) create mode 100644 lib/ns/include/ns/lib.h rename {bin/named/include/named => lib/ns/include/ns}/listenlist.h (86%) create mode 100644 lib/ns/include/ns/log.h rename {bin/named/include/named => lib/ns/include/ns}/notify.h (72%) rename {bin/named/include/named => lib/ns/include/ns}/query.h (92%) create mode 100644 lib/ns/include/ns/server.h rename {bin/named/include/named => lib/ns/include/ns}/sortlist.h (79%) create mode 100644 lib/ns/include/ns/stats.h create mode 100644 lib/ns/include/ns/types.h rename {bin/named/include/named => lib/ns/include/ns}/update.h (68%) create mode 100644 lib/ns/include/ns/version.h rename {bin/named/include/named => lib/ns/include/ns}/xfrout.h (64%) rename {bin/named => lib/ns}/interfacemgr.c (91%) create mode 100644 lib/ns/lib.c rename {bin/named => lib/ns}/listenlist.c (93%) create mode 100644 lib/ns/log.c rename {bin/named => lib/ns}/notify.c (95%) rename {bin/named => lib/ns}/query.c (98%) create mode 100644 lib/ns/server.c rename {bin/named => lib/ns}/sortlist.c (69%) create mode 100644 lib/ns/stats.c rename lib/{lwres => ns}/tests/Atffile (100%) create mode 100644 lib/ns/tests/Makefile.in create mode 100644 lib/ns/tests/listenlist_test.c create mode 100644 lib/ns/tests/notify_test.c create mode 100644 lib/ns/tests/nstest.c create mode 100644 lib/ns/tests/nstest.h create mode 100644 lib/ns/tests/testdata/notify/notify1.msg create mode 100644 lib/ns/tests/testdata/notify/zone1.db rename {bin/named => lib/ns}/update.c (98%) create mode 100644 lib/ns/version.c rename lib/{lwres => ns}/win32/DLLMain.c (84%) create mode 100644 lib/ns/win32/libns.def rename lib/{lwres/win32/liblwres.vcxproj.filters.in => ns/win32/libns.vcxproj.filters} (51%) rename lib/{lwres/win32/liblwres.vcxproj.in => ns/win32/libns.vcxproj.in} (64%) rename bin/tests/system/win32/lwtest.vcxproj.user => lib/ns/win32/libns.vcxproj.user (100%) create mode 100644 lib/ns/win32/version.c rename {bin/named => lib/ns}/xfrout.c (98%) delete mode 100644 lib/samples/win32/async.dsp.in delete mode 100644 lib/samples/win32/async.dsw delete mode 100644 lib/samples/win32/async.mak.in delete mode 100644 lib/samples/win32/gai.dsp.in delete mode 100644 lib/samples/win32/gai.dsw delete mode 100644 lib/samples/win32/gai.mak.in delete mode 100644 lib/samples/win32/nsprobe.dsp.in delete mode 100644 lib/samples/win32/nsprobe.dsw delete mode 100644 lib/samples/win32/nsprobe.mak.in delete mode 100644 lib/samples/win32/request.dsp.in delete mode 100644 lib/samples/win32/request.dsw delete mode 100644 lib/samples/win32/request.mak.in delete mode 100644 lib/samples/win32/resolve.dsp.in delete mode 100644 lib/samples/win32/resolve.dsw delete mode 100644 lib/samples/win32/resolve.mak.in delete mode 100644 lib/samples/win32/update.dsp.in delete mode 100644 lib/samples/win32/update.dsw delete mode 100644 lib/samples/win32/update.mak.in delete mode 100644 lib/tests/win32/libtests.dsp.in delete mode 100644 lib/tests/win32/libtests.dsw delete mode 100644 lib/tests/win32/libtests.mak.in delete mode 100644 lib/win32/bindevt/bindevt.dsp.in delete mode 100644 lib/win32/bindevt/bindevt.dsw delete mode 100644 lib/win32/bindevt/bindevt.mak.in delete mode 100644 win32utils/legacy/BINDBuild.dsw.in delete mode 100644 win32utils/legacy/BuildAll.bat.in delete mode 100644 win32utils/legacy/BuildPost.bat.in delete mode 100644 win32utils/legacy/BuildSetup.bat.in delete mode 100644 win32utils/legacy/makedefs.pl delete mode 100644 win32utils/legacy/win32-build.txt diff --git a/.gitignore b/.gitignore index 12a7a6f51b..ac40c4795e 100644 --- a/.gitignore +++ b/.gitignore @@ -18,7 +18,6 @@ autom4te.cache/ *-symtbl.c timestamp ans.run -lwresd.run named.run named.memstats gen.dSYM/ diff --git a/CHANGES b/CHANGES index b53ece0e02..050eadda22 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,17 @@ +4708. [cleanup] Legacy Windows builds (i.e. for XP and earlier) + are no longer supported. [RT #45186] + +4707. [func] The lightweight resolver daemon and library (lwresd + and liblwres) have been removed. [RT #45186] + +4706. [func] Code implementing name server query processing has + been moved from bin/named to a new library "libns". + Functions remaining in bin/named are now prefixed + with "named_" rather than "ns_". This will make it + easier to write unit tests for name server code, or + link name server functionality into new tools. + [RT #45186] + 4705. [placeholder] 4704. [cleanup] Silence Visual Studio compiler warnings. [RT #45898] diff --git a/bin/check/win32/checkconf.dsp.in b/bin/check/win32/checkconf.dsp.in deleted file mode 100644 index 6f8dafc18f..0000000000 --- a/bin/check/win32/checkconf.dsp.in +++ /dev/null @@ -1,107 +0,0 @@ -# Microsoft Developer Studio Project File - Name="checkconf" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103 - -CFG=checkconf - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "checkconf.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "checkconf.mak" CFG="checkconf - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "checkconf - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "checkconf - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "checkconf - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/isccfg/include" @CRYPTO@ /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__STDC__" /FR @COPTY@ /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console @MACHINE@ -# ADD LINK32 user32.lib advapi32.lib ws2_32.lib Release/checktool.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/bind9/win32/Release/libbind9.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/named-checkconf.exe" - -!ELSEIF "$(CFG)" == "checkconf - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/isccfg/include" @CRYPTO@ /D "_DEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c -# SUBTRACT CPP /X @COPTY@ -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console /debug @MACHINE@ /pdbtype:sept -# ADD LINK32 user32.lib advapi32.lib ws2_32.lib Debug/checktool.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/bind9/win32/Debug/libbind9.lib ../../../lib/bind9/win32/Debug/libbind9.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/named-checkconf.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "checkconf - @PLATFORM@ Release" -# Name "checkconf - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE="..\named-checkconf.c" -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE="..\check-tool.h" -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/bin/check/win32/checkconf.dsw b/bin/check/win32/checkconf.dsw deleted file mode 100644 index 6e09cd056d..0000000000 --- a/bin/check/win32/checkconf.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "checkconf"=".\checkconf.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/bin/check/win32/checkconf.mak.in b/bin/check/win32/checkconf.mak.in deleted file mode 100644 index cb2789242e..0000000000 --- a/bin/check/win32/checkconf.mak.in +++ /dev/null @@ -1,404 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on checkconf.dsp -!IF "$(CFG)" == "" -CFG=checkconf - @PLATFORM@ Debug -!MESSAGE No configuration specified. Defaulting to checkconf - @PLATFORM@ Debug. -!ENDIF - -!IF "$(CFG)" != "checkconf - @PLATFORM@ Release" && "$(CFG)" != "checkconf - @PLATFORM@ Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "checkconf.mak" CFG="checkconf - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "checkconf - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "checkconf - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "checkconf - @PLATFORM@ 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)" == "checkconf - @PLATFORM@ Release" - -OUTDIR=.\Release -INTDIR=.\Release -# Begin Custom Macros -OutDir=.\Release -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : "..\..\..\Build\Release\named-checkconf.exe" "$(OUTDIR)\checkconf.bsc" - -!ELSE - -ALL : "libdns - @PLATFORM@ Release" "libisccfg - @PLATFORM@ Release" "libisc - @PLATFORM@ Release" "..\..\..\Build\Release\named-checkconf.exe" "$(OUTDIR)\checkconf.bsc" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"libisc - @PLATFORM@ ReleaseCLEAN" "libisccfg - @PLATFORM@ ReleaseCLEAN" "libdns - @PLATFORM@ ReleaseCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\check-tool.obj" - -@erase "$(INTDIR)\check-tool.sbr" - -@erase "$(INTDIR)\named-checkconf.obj" - -@erase "$(INTDIR)\named-checkconf.sbr" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(OUTDIR)\checkconf.bsc" - -@erase "..\..\..\Build\Release\named-checkconf.exe" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/isccfg/include" @CRYPTO@ /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__STDC__" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\checkconf.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\checkconf.bsc" -BSC32_SBRS= \ - "$(INTDIR)\check-tool.sbr" \ - "$(INTDIR)\named-checkconf.sbr" - -"$(OUTDIR)\checkconf.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/bind9/win32/Release/libbind9.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\named-checkconf.pdb" @MACHINE@ /out:"../../../Build/Release/named-checkconf.exe" -LINK32_OBJS= \ - "$(INTDIR)\check-tool.obj" \ - "$(INTDIR)\named-checkconf.obj" \ - "..\..\..\lib\isc\win32\Release\libisc.lib" \ - "..\..\..\lib\isccfg\win32\Release\libisccfg.lib" \ - "..\..\..\lib\dns\win32\Release\libdns.lib" - -"..\..\..\Build\Release\named-checkconf.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ELSEIF "$(CFG)" == "checkconf - @PLATFORM@ Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : "..\..\..\Build\Debug\named-checkconf.exe" "$(OUTDIR)\checkconf.bsc" - -!ELSE - -ALL : "libdns - @PLATFORM@ Debug" "libisccfg - @PLATFORM@ Debug" "libisc - @PLATFORM@ Debug" "..\..\..\Build\Debug\named-checkconf.exe" "$(OUTDIR)\checkconf.bsc" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"libisc - @PLATFORM@ DebugCLEAN" "libisccfg - @PLATFORM@ DebugCLEAN" "libdns - @PLATFORM@ DebugCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\check-tool.obj" - -@erase "$(INTDIR)\check-tool.sbr" - -@erase "$(INTDIR)\named-checkconf.obj" - -@erase "$(INTDIR)\named-checkconf.sbr" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\named-checkconf.pdb" - -@erase "$(OUTDIR)\checkconf.bsc" - -@erase "..\..\..\Build\Debug\named-checkconf.exe" - -@erase "..\..\..\Build\Debug\named-checkconf.ilk" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/isccfg/include" @CRYPTO@ /D "_DEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\checkconf.bsc" -BSC32_SBRS= \ - "$(INTDIR)\check-tool.sbr" \ - "$(INTDIR)\named-checkconf.sbr" - -"$(OUTDIR)\checkconf.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/bind9/win32/Debug/libbind9.lib ../../../lib/bind9/win32/Debug/libbind9.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\named-checkconf.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/named-checkconf.exe" /pdbtype:sept -LINK32_OBJS= \ - "$(INTDIR)\check-tool.obj" \ - "$(INTDIR)\named-checkconf.obj" \ - "..\..\..\lib\isc\win32\Debug\libisc.lib" \ - "..\..\..\lib\isccfg\win32\Debug\libisccfg.lib" \ - "..\..\..\lib\dns\win32\Debug\libdns.lib" - -"..\..\..\Build\Debug\named-checkconf.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ENDIF - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("checkconf.dep") -!INCLUDE "checkconf.dep" -!ELSE -!MESSAGE Warning: cannot find "checkconf.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "checkconf - @PLATFORM@ Release" || "$(CFG)" == "checkconf - @PLATFORM@ Debug" -SOURCE="..\check-tool.c" - -"$(INTDIR)\check-tool.obj" "$(INTDIR)\check-tool.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE="..\named-checkconf.c" - -"$(INTDIR)\named-checkconf.obj" "$(INTDIR)\named-checkconf.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!IF "$(CFG)" == "checkconf - @PLATFORM@ Release" - -"libisc - @PLATFORM@ Release" : - cd "..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" - cd "..\..\..\bin\check\win32" - -"libisc - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\check\win32" - -!ELSEIF "$(CFG)" == "checkconf - @PLATFORM@ Debug" - -"libisc - @PLATFORM@ Debug" : - cd "..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" - cd "..\..\..\bin\check\win32" - -"libisc - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\check\win32" - -!ENDIF - -!IF "$(CFG)" == "checkconf - @PLATFORM@ Release" - -"libisccfg - @PLATFORM@ Release" : - cd "..\..\..\lib\isccfg\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - @PLATFORM@ Release" - cd "..\..\..\bin\check\win32" - -"libisccfg - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\lib\isccfg\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\check\win32" - -!ELSEIF "$(CFG)" == "checkconf - @PLATFORM@ Debug" - -"libisccfg - @PLATFORM@ Debug" : - cd "..\..\..\lib\isccfg\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - @PLATFORM@ Debug" - cd "..\..\..\bin\check\win32" - -"libisccfg - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\lib\isccfg\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\check\win32" - -!ENDIF - -!IF "$(CFG)" == "checkconf - @PLATFORM@ Release" - -"libdns - @PLATFORM@ Release" : - cd "..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" - cd "..\..\..\bin\check\win32" - -"libdns - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\check\win32" - -!ELSEIF "$(CFG)" == "checkconf - @PLATFORM@ Debug" - -"libdns - @PLATFORM@ Debug" : - cd "..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" - cd "..\..\..\bin\check\win32" - -"libdns - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\check\win32" - -!ENDIF - - -!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 -1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest" -<< KEEP - -$(_VC_MANIFEST_BASENAME).auto.manifest : - type <<$@ - - - -<< KEEP -#################################################### -# 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 -1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest" -<< KEEP - -$(_VC_MANIFEST_BASENAME).auto.manifest : - type <<$@ - - - -<< KEEP diff --git a/bin/check/win32/checktool.dsp.in b/bin/check/win32/checktool.dsp.in deleted file mode 100644 index 2ecaabee22..0000000000 --- a/bin/check/win32/checktool.dsp.in +++ /dev/null @@ -1,113 +0,0 @@ -# Microsoft Developer Studio Project File - Name="checktool" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Static-Link Library" 0x0104 - -CFG=checktool - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "checktool.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "checktool.mak" CFG="checktool - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "checktool - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Static-Link Library") -!MESSAGE "checktool - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Static-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "checktool - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isccfg/include" /I "../../../lib/dns/include" @CRYPTO@ /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" @COPTY@ /FD /c /Fdchecktool -# SUBTRACT CPP /X -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 -# ADD LINK32 /out:"Release/checktool.lib" - -!ELSEIF "$(CFG)" == "checktool - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isccfg/include" /I "../../../lib/dns/include" @CRYPTO@ /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /FR @COPTY@ /FD /GZ /c /Fdchecktool -# SUBTRACT CPP /X -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 -# ADD LINK32 /debug out:"Debug/checktool.lib" - -!ENDIF - -# Begin Target - -# Name "checktool - @PLATFORM@ Release" -# Name "checktool - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# Begin Group "Main Dns Lib" - -# PROP Default_Filter "c" -# Begin Source File - -SOURCE=..\check-tool.c -# End Source File -# End Group -# End Target -# End Project diff --git a/bin/check/win32/checktool.dsw b/bin/check/win32/checktool.dsw deleted file mode 100644 index bb139e774a..0000000000 --- a/bin/check/win32/checktool.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "checktool"=".\checktool.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/bin/check/win32/checkzone.dsp.in b/bin/check/win32/checkzone.dsp.in deleted file mode 100644 index 8a7b176a2c..0000000000 --- a/bin/check/win32/checkzone.dsp.in +++ /dev/null @@ -1,108 +0,0 @@ -# Microsoft Developer Studio Project File - Name="checkzone" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103 - -CFG=checkzone - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "checkzone.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "checkzone.mak" CFG="checkzone - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "checkzone - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "checkzone - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "checkzone - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /I "../../../lib/isccfg/include" @CRYPTO@ /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__STDC__" @COPTY@ /FD /c -# SUBTRACT CPP /Fr -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console @MACHINE@ -# ADD LINK32 user32.lib advapi32.lib ws2_32.lib Release/checktool.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/dns/win32/Release/libdns.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/named-checkzone.exe" - -!ELSEIF "$(CFG)" == "checkzone - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /I "../../../lib/isccfg/include" @CRYPTO@ /D "_DEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c -# SUBTRACT CPP /X @COPTY@ -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console /debug @MACHINE@ /pdbtype:sept -# ADD LINK32 user32.lib advapi32.lib ws2_32.lib Debug/checktool.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/dns/win32/Debug/libdns.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/named-checkzone.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "checkzone - @PLATFORM@ Release" -# Name "checkzone - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE="..\named-checkzone.c" -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE="..\check-tool.h" -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/bin/check/win32/checkzone.dsw b/bin/check/win32/checkzone.dsw deleted file mode 100644 index 0173dbaced..0000000000 --- a/bin/check/win32/checkzone.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "checkzone"=".\checkzone.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/bin/check/win32/checkzone.mak.in b/bin/check/win32/checkzone.mak.in deleted file mode 100644 index 31c9378823..0000000000 --- a/bin/check/win32/checkzone.mak.in +++ /dev/null @@ -1,404 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on checkzone.dsp -!IF "$(CFG)" == "" -CFG=checkzone - @PLATFORM@ Debug -!MESSAGE No configuration specified. Defaulting to checkzone - @PLATFORM@ Debug. -!ENDIF - -!IF "$(CFG)" != "checkzone - @PLATFORM@ Release" && "$(CFG)" != "checkzone - @PLATFORM@ Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "checkzone.mak" CFG="checkzone - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "checkzone - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "checkzone - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -!IF "$(CFG)" == "checkzone - @PLATFORM@ 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)" == "checkzone - @PLATFORM@ Release" - -OUTDIR=.\Release -INTDIR=.\Release - -!IF "$(RECURSE)" == "0" - -ALL : "..\..\..\Build\Release\named-checkzone.exe" - -!ELSE - -ALL : "libisc - @PLATFORM@ Release" "libdns - @PLATFORM@ Release" "..\..\..\Build\Release\named-checkzone.exe" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"libdns - @PLATFORM@ ReleaseCLEAN" "libisc - @PLATFORM@ ReleaseCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\check-tool.obj" - -@erase "$(INTDIR)\named-checkzone.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "..\..\..\Build\Release\named-checkzone.exe" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /I "../../../lib/isccfg/include" @CRYPTO@ /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__STDC__" /Fp"$(INTDIR)\checkzone.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\checkzone.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/dns/win32/Release/libdns.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\named-checkzone.pdb" @MACHINE@ /out:"../../../Build/Release/named-checkzone.exe" -LINK32_OBJS= \ - "$(INTDIR)\check-tool.obj" \ - "$(INTDIR)\named-checkzone.obj" \ - "..\..\..\lib\dns\win32\Release\libdns.lib" \ - "..\..\..\lib\isccfg\win32\Release\libisccfg.lib" \ - "..\..\..\lib\isc\win32\Release\libisc.lib" - -"..\..\..\Build\Release\named-checkzone.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ELSEIF "$(CFG)" == "checkzone - @PLATFORM@ Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : "..\..\..\Build\Debug\named-checkzone.exe" "$(OUTDIR)\checkzone.bsc" - -!ELSE - -ALL : "libisc - @PLATFORM@ Debug" "libdns - @PLATFORM@ Debug" "..\..\..\Build\Debug\named-checkzone.exe" "$(OUTDIR)\checkzone.bsc" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"libdns - @PLATFORM@ DebugCLEAN" "libisc - @PLATFORM@ DebugCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\check-tool.obj" - -@erase "$(INTDIR)\check-tool.sbr" - -@erase "$(INTDIR)\named-checkzone.obj" - -@erase "$(INTDIR)\named-checkzone.sbr" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\named-checkzone.pdb" - -@erase "$(OUTDIR)\checkzone.bsc" - -@erase "..\..\..\Build\Debug\named-checkzone.exe" - -@erase "..\..\..\Build\Debug\named-checkzone.ilk" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /I "../../../lib/isccfg/include" @CRYPTO@ /D "_DEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\checkzone.bsc" -BSC32_SBRS= \ - "$(INTDIR)\check-tool.sbr" \ - "$(INTDIR)\named-checkzone.sbr" - -"$(OUTDIR)\checkzone.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/dns/win32/Debug/libdns.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\named-checkzone.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/named-checkzone.exe" /pdbtype:sept -LINK32_OBJS= \ - "$(INTDIR)\check-tool.obj" \ - "$(INTDIR)\named-checkzone.obj" \ - "..\..\..\lib\dns\win32\Debug\libdns.lib" \ - "..\..\..\lib\isccfg\win32\Debug\libisccfg.lib" \ - "..\..\..\lib\isc\win32\Debug\libisc.lib" - -"..\..\..\Build\Debug\named-checkzone.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ENDIF - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("checkzone.dep") -!INCLUDE "checkzone.dep" -!ELSE -!MESSAGE Warning: cannot find "checkzone.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "checkzone - @PLATFORM@ Release" || "$(CFG)" == "checkzone - @PLATFORM@ Debug" -SOURCE="..\check-tool.c" - -!IF "$(CFG)" == "checkzone - @PLATFORM@ Release" - - -"$(INTDIR)\check-tool.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "checkzone - @PLATFORM@ Debug" - - -"$(INTDIR)\check-tool.obj" "$(INTDIR)\check-tool.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE="..\named-checkzone.c" - -!IF "$(CFG)" == "checkzone - @PLATFORM@ Release" - - -"$(INTDIR)\named-checkzone.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "checkzone - @PLATFORM@ Debug" - - -"$(INTDIR)\named-checkzone.obj" "$(INTDIR)\named-checkzone.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -!IF "$(CFG)" == "checkzone - @PLATFORM@ Release" - -"libdns - @PLATFORM@ Release" : - cd "..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" - cd "..\..\..\bin\check\win32" - -"libdns - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\check\win32" - -!ELSEIF "$(CFG)" == "checkzone - @PLATFORM@ Debug" - -"libdns - @PLATFORM@ Debug" : - cd "..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" - cd "..\..\..\bin\check\win32" - -"libdns - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\check\win32" - -!ENDIF - -!IF "$(CFG)" == "checkzone - @PLATFORM@ Release" - -"libisc - @PLATFORM@ Release" : - cd "..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" - cd "..\..\..\bin\check\win32" - -"libisc - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\check\win32" - -!ELSEIF "$(CFG)" == "checkzone - @PLATFORM@ Debug" - -"libisc - @PLATFORM@ Debug" : - cd "..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" - cd "..\..\..\bin\check\win32" - -"libisc - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\check\win32" - -!ENDIF - - -!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 -1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest" -<< KEEP - -$(_VC_MANIFEST_BASENAME).auto.manifest : - type <<$@ - - - -<< KEEP diff --git a/bin/confgen/win32/confgentool.dsp.in b/bin/confgen/win32/confgentool.dsp.in deleted file mode 100644 index 833361b951..0000000000 --- a/bin/confgen/win32/confgentool.dsp.in +++ /dev/null @@ -1,135 +0,0 @@ -# Microsoft Developer Studio Project File - Name="confgentool" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Static-Link Library" 0x0104 - -CFG=confgentool - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "confgentool.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "confgentool.mak" CFG="confgentool - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "confgentool - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Static-Link Library") -!MESSAGE "confgentool - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Static-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "confgentool - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" @COPTY@ /FD /c /Fdconfgentool -# SUBTRACT CPP /X -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 -# ADD LINK32 /out:"Release/confgentool.lib" -LIB32=lib.exe -# ADD BASE LIB32 -# ADD LIB32 /out:"Release/confgentool.lib" - -!ELSEIF "$(CFG)" == "confgentool - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /FR @COPTY@ /FD /GZ /c /Fdconfgentool -# SUBTRACT CPP /X -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 -# ADD LINK32 /debug /out:"Debug/confgentool.lib" -LIB32=lib.exe -# ADD BASE LIB32 -# ADD LIB32 /out:"Debug/confgentool.lib" - -!ENDIF - -# Begin Target - -# Name "confgentool - @PLATFORM@ Release" -# Name "confgentool - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\keygen.h -# End Source File -# Begin Source File - -SOURCE=..\util.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# Begin Group "Main Dns Lib" - -# PROP Default_Filter "c" -# Begin Source File - -SOURCE=..\keygen.c -# End Source File -# Begin Source File - -SOURCE=..\util.c -# End Source File -# Begin Source File - -SOURCE=.\os.c -# End Source File -# End Group -# End Target -# End Project diff --git a/bin/confgen/win32/confgentool.dsw b/bin/confgen/win32/confgentool.dsw deleted file mode 100644 index 5a2717476e..0000000000 --- a/bin/confgen/win32/confgentool.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "confgentool"=".\confgentool.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/bin/confgen/win32/ddnsconfgen.dsp.in b/bin/confgen/win32/ddnsconfgen.dsp.in deleted file mode 100644 index 625351de9b..0000000000 --- a/bin/confgen/win32/ddnsconfgen.dsp.in +++ /dev/null @@ -1,103 +0,0 @@ -# Microsoft Developer Studio Project File - Name="ddnsconfgen" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103 - -CFG=ddnsconfgen - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "ddnsconfgen.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "ddnsconfgen.mak" CFG="ddnsconfgen - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "ddnsconfgen - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "ddnsconfgen - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "ddnsconfgen - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isccc/include" /I "../../../lib/isccfg/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console @MACHINE@ -# ADD LINK32 user32.lib advapi32.lib ws2_32.lib Release/confgentool.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/isccc/win32/Release/libisccc.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/ddns-confgen.exe" - -!ELSEIF "$(CFG)" == "ddnsconfgen - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isccc/include" /I "../../../lib/isccfg/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c -# SUBTRACT CPP /X @COPTY@ -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console /debug @MACHINE@ /pdbtype:sept -# ADD LINK32 user32.lib advapi32.lib ws2_32.lib Debug/confgentool.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/isccc/win32/Debug/libisccc.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/ddns-confgen.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "ddnsconfgen - @PLATFORM@ Release" -# Name "ddnsconfgen - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE="..\ddns-confgen.c" -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/bin/confgen/win32/ddnsconfgen.dsw b/bin/confgen/win32/ddnsconfgen.dsw deleted file mode 100644 index bf543db6c7..0000000000 --- a/bin/confgen/win32/ddnsconfgen.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "ddnsconfgen"=".\ddnsconfgen.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/bin/confgen/win32/ddnsconfgen.mak.in b/bin/confgen/win32/ddnsconfgen.mak.in deleted file mode 100644 index 9433404abb..0000000000 --- a/bin/confgen/win32/ddnsconfgen.mak.in +++ /dev/null @@ -1,337 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on ddnsconfgen.dsp -!IF "$(CFG)" == "" -CFG=ddnsconfgen - @PLATFORM@ Debug -!MESSAGE No configuration specified. Defaulting to ddnsconfgen - @PLATFORM@ Debug. -!ENDIF - -!IF "$(CFG)" != "ddnsconfgen - @PLATFORM@ Release" && "$(CFG)" != "ddnsconfgen - @PLATFORM@ Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "ddnsconfgen.mak" CFG="ddnsconfgen - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "ddnsconfgen - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "ddnsconfgen - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "ddnsconfgen - @PLATFORM@ 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)" == "ddnsconfgen - @PLATFORM@ Release" - -OUTDIR=.\Release -INTDIR=.\Release - -ALL : "..\..\..\Build\Release\ddns-confgen.exe" - - -CLEAN : - -@erase "$(INTDIR)\os.obj" - -@erase "$(INTDIR)\ddns-confgen.obj" - -@erase "$(INTDIR)\keygen.obj" - -@erase "$(INTDIR)\util.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "..\..\..\Build\Release\ddns-confgen.exe" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isccc/include" /I "../../../lib/isccfg/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\ddnsconfgen.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\ddnsconfgen.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/isccc/win32/Release/libisccc.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\ddns-confgen.pdb" @MACHINE@ /out:"../../../Build/Release/ddns-confgen.exe" -LINK32_OBJS= \ - "$(INTDIR)\os.obj" \ - "$(INTDIR)\ddns-confgen.obj" \ - "$(INTDIR)\keygen.obj" \ - "$(INTDIR)\util.obj" - -"..\..\..\Build\Release\ddns-confgen.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ELSEIF "$(CFG)" == "ddnsconfgen - @PLATFORM@ Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -ALL : "..\..\..\Build\Debug\ddns-confgen.exe" "$(OUTDIR)\ddnsconfgen.bsc" - - -CLEAN : - -@erase "$(INTDIR)\os.obj" - -@erase "$(INTDIR)\os.sbr" - -@erase "$(INTDIR)\ddns-confgen.obj" - -@erase "$(INTDIR)\ddns-confgen.sbr" - -@erase "$(INTDIR)\keygen.obj" - -@erase "$(INTDIR)\keygen.sbr" - -@erase "$(INTDIR)\util.obj" - -@erase "$(INTDIR)\util.sbr" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\ddnsconfgen.bsc" - -@erase "$(OUTDIR)\ddns-confgen.pdb" - -@erase "..\..\..\Build\Debug\ddns-confgen.exe" - -@erase "..\..\..\Build\Debug\ddns-confgen.ilk" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isccc/include" /I "../../../lib/isccfg/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\ddnsconfgen.bsc" -BSC32_SBRS= \ - "$(INTDIR)\os.sbr" \ - "$(INTDIR)\ddns-confgen.sbr" \ - "$(INTDIR)\keygen.sbr" \ - "$(INTDIR)\util.sbr" - -"$(OUTDIR)\ddnsconfgen.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/isccc/win32/Debug/libisccc.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\ddns-confgen.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/ddns-confgen.exe" /pdbtype:sept -LINK32_OBJS= \ - "$(INTDIR)\os.obj" \ - "$(INTDIR)\ddns-confgen.obj" \ - "$(INTDIR)\keygen.obj" \ - "$(INTDIR)\util.obj" - -"..\..\..\Build\Debug\ddns-confgen.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ENDIF - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("ddnsconfgen.dep") -!INCLUDE "ddnsconfgen.dep" -!ELSE -!MESSAGE Warning: cannot find "ddnsconfgen.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "ddnsconfgen - @PLATFORM@ Release" || "$(CFG)" == "ddnsconfgen - @PLATFORM@ Debug" -SOURCE=.\os.c - -!IF "$(CFG)" == "ddnsconfgen - @PLATFORM@ Release" - - -"$(INTDIR)\os.obj" : $(SOURCE) "$(INTDIR)" - - -!ELSEIF "$(CFG)" == "ddnsconfgen - @PLATFORM@ Debug" - - -"$(INTDIR)\os.obj" "$(INTDIR)\os.sbr" : $(SOURCE) "$(INTDIR)" - - -!ENDIF - -SOURCE="..\ddns-confgen.c" - -!IF "$(CFG)" == "ddnsconfgen - @PLATFORM@ Release" - - -"$(INTDIR)\ddns-confgen.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "ddnsconfgen - @PLATFORM@ Debug" - - -"$(INTDIR)\ddns-confgen.obj" "$(INTDIR)\ddns-confgen.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=..\keygen.c - -!IF "$(CFG)" == "ddnsconfgen - @PLATFORM@ Release" - - -"$(INTDIR)\keygen.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "ddnsconfgen - @PLATFORM@ Debug" - - -"$(INTDIR)\keygen.obj" "$(INTDIR)\keygen.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=..\util.c - -!IF "$(CFG)" == "ddnsconfgen - @PLATFORM@ Release" - - -"$(INTDIR)\util.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "ddnsconfgen - @PLATFORM@ Debug" - - -"$(INTDIR)\util.obj" "$(INTDIR)\util.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - - -!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 -1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest" -<< KEEP - -$(_VC_MANIFEST_BASENAME).auto.manifest : - type <<$@ - - - -<< KEEP diff --git a/bin/confgen/win32/rndcconfgen.dsp.in b/bin/confgen/win32/rndcconfgen.dsp.in deleted file mode 100644 index e4569c6aaa..0000000000 --- a/bin/confgen/win32/rndcconfgen.dsp.in +++ /dev/null @@ -1,103 +0,0 @@ -# Microsoft Developer Studio Project File - Name="rndcconfgen" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103 - -CFG=rndcconfgen - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "rndcconfgen.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "rndcconfgen.mak" CFG="rndcconfgen - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "rndcconfgen - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "rndcconfgen - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "rndcconfgen - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isccc/include" /I "../../../lib/isccfg/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console @MACHINE@ -# ADD LINK32 user32.lib advapi32.lib ws2_32.lib Release/confgentool.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/isccc/win32/Release/libisccc.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/rndc-confgen.exe" - -!ELSEIF "$(CFG)" == "rndcconfgen - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isccc/include" /I "../../../lib/isccfg/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c -# SUBTRACT CPP /X @COPTY@ -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console /debug @MACHINE@ /pdbtype:sept -# ADD LINK32 user32.lib advapi32.lib ws2_32.lib Debug/confgentool.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/isccc/win32/Debug/libisccc.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/rndc-confgen.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "rndcconfgen - @PLATFORM@ Release" -# Name "rndcconfgen - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE="..\rndc-confgen.c" -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/bin/confgen/win32/rndcconfgen.dsw b/bin/confgen/win32/rndcconfgen.dsw deleted file mode 100644 index 2cc0d7c94d..0000000000 --- a/bin/confgen/win32/rndcconfgen.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "rndconfgen"=".\rndconfgen.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/bin/confgen/win32/rndcconfgen.mak.in b/bin/confgen/win32/rndcconfgen.mak.in deleted file mode 100644 index 4b0814de80..0000000000 --- a/bin/confgen/win32/rndcconfgen.mak.in +++ /dev/null @@ -1,336 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on confgen.dsp -!IF "$(CFG)" == "" -CFG=rndcconfgen - @PLATFORM@ Debug -!MESSAGE No configuration specified. Defaulting to rndcconfgen - @PLATFORM@ Debug. -!ENDIF - -!IF "$(CFG)" != "rndcconfgen - @PLATFORM@ Release" && "$(CFG)" != "rndcconfgen - @PLATFORM@ Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "rndcconfgen.mak" CFG="rndcconfgen - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "rndcconfgen - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "rndcconfgen - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "rndcconfgen - @PLATFORM@ 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)" == "rndcconfgen - @PLATFORM@ Release" - -OUTDIR=.\Release -INTDIR=.\Release - -ALL : "..\..\..\Build\Release\rndc-confgen.exe" - - -CLEAN : - -@erase "$(INTDIR)\os.obj" - -@erase "$(INTDIR)\rndc-confgen.obj" - -@erase "$(INTDIR)\keygen.obj" - -@erase "$(INTDIR)\util.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "..\..\..\Build\Release\rndc-confgen.exe" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isccc/include" /I "../../../lib/isccfg/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\confgen.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\confgen.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/isccc/win32/Release/libisccc.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\rndc-confgen.pdb" @MACHINE@ /out:"../../../Build/Release/rndc-confgen.exe" -LINK32_OBJS= \ - "$(INTDIR)\os.obj" \ - "$(INTDIR)\rndc-confgen.obj" \ - "$(INTDIR)\keygen.obj" \ - "$(INTDIR)\util.obj" - -"..\..\..\Build\Release\rndc-confgen.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ELSEIF "$(CFG)" == "rndcconfgen - @PLATFORM@ Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -ALL : "..\..\..\Build\Debug\rndc-confgen.exe" "$(OUTDIR)\confgen.bsc" - - -CLEAN : - -@erase "$(INTDIR)\os.obj" - -@erase "$(INTDIR)\os.sbr" - -@erase "$(INTDIR)\rndc-confgen.obj" - -@erase "$(INTDIR)\rndc-confgen.sbr" - -@erase "$(INTDIR)\keygen.obj" - -@erase "$(INTDIR)\keygen.sbr" - -@erase "$(INTDIR)\util.obj" - -@erase "$(INTDIR)\util.sbr" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\confgen.bsc" - -@erase "$(OUTDIR)\rndc-confgen.pdb" - -@erase "..\..\..\Build\Debug\rndc-confgen.exe" - -@erase "..\..\..\Build\Debug\rndc-confgen.ilk" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isccc/include" /I "../../../lib/isccfg/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\confgen.bsc" -BSC32_SBRS= \ - "$(INTDIR)\os.sbr" \ - "$(INTDIR)\rndc-confgen.sbr" \ - "$(INTDIR)\keygen.sbr" \ - "$(INTDIR)\util.sbr" - -"$(OUTDIR)\confgen.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/isccc/win32/Debug/libisccc.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\rndc-confgen.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/rndc-confgen.exe" /pdbtype:sept -LINK32_OBJS= \ - "$(INTDIR)\os.obj" \ - "$(INTDIR)\rndc-confgen.obj" \ - "$(INTDIR)\keygen.obj" \ - "$(INTDIR)\util.obj" - -"..\..\..\Build\Debug\rndc-confgen.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ENDIF - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("confgen.dep") -!INCLUDE "confgen.dep" -!ELSE -!MESSAGE Warning: cannot find "confgen.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "rndcconfgen - @PLATFORM@ Release" || "$(CFG)" == "rndcconfgen - @PLATFORM@ Debug" -SOURCE=.\os.c - -!IF "$(CFG)" == "rndcconfgen - @PLATFORM@ Release" - - -"$(INTDIR)\os.obj" : $(SOURCE) "$(INTDIR)" - - -!ELSEIF "$(CFG)" == "rndcconfgen - @PLATFORM@ Debug" - - -"$(INTDIR)\os.obj" "$(INTDIR)\os.sbr" : $(SOURCE) "$(INTDIR)" - - -!ENDIF - -SOURCE="..\rndc-confgen.c" - -!IF "$(CFG)" == "rndcconfgen - @PLATFORM@ Release" - - -"$(INTDIR)\rndc-confgen.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "rndcconfgen - @PLATFORM@ Debug" - - -"$(INTDIR)\rndc-confgen.obj" "$(INTDIR)\rndc-confgen.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=..\keygen.c - -!IF "$(CFG)" == "rndcconfgen - @PLATFORM@ Release" - - -"$(INTDIR)\keygen.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "rndcconfgen - @PLATFORM@ Debug" - - -"$(INTDIR)\keygen.obj" "$(INTDIR)\keygen.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=..\util.c - -!IF "$(CFG)" == "rndcconfgen - @PLATFORM@ Release" - - -"$(INTDIR)\util.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "rndcconfgen - @PLATFORM@ Debug" - - -"$(INTDIR)\util.obj" "$(INTDIR)\util.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -!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 -1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest" -<< KEEP - -$(_VC_MANIFEST_BASENAME).auto.manifest : - type <<$@ - - - -<< KEEP diff --git a/bin/delv/win32/delv.dsp.in b/bin/delv/win32/delv.dsp.in deleted file mode 100644 index 403ec3eecb..0000000000 --- a/bin/delv/win32/delv.dsp.in +++ /dev/null @@ -1,103 +0,0 @@ -# Microsoft Developer Studio Project File - Name="delv" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103 - -CFG=delv - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "delv.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "delv.mak" CFG="delv - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "delv - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "delv - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "delv - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isccfg/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/irs/win32/include" /I "../../../lib/irs/include" @CRYPTO@ /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console @MACHINE@ -# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/irs/win32/Release/libirs.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/delv.exe" - -!ELSEIF "$(CFG)" == "delv - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isccfg/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/irs/win32/include" /I "../../../lib/irs/include" @CRYPTO@ /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c -# SUBTRACT CPP /X @COPTY@ -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console /debug @MACHINE@ /pdbtype:sept -# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/irs/win32/Debug/libirs.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/delv.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "delv - @PLATFORM@ Release" -# Name "delv - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE="..\delv.c" -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/bin/delv/win32/delv.dsw b/bin/delv/win32/delv.dsw deleted file mode 100644 index e45fea55bc..0000000000 --- a/bin/delv/win32/delv.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "delv"=".\delv.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/bin/delv/win32/delv.mak.in b/bin/delv/win32/delv.mak.in deleted file mode 100644 index 3797f978b8..0000000000 --- a/bin/delv/win32/delv.mak.in +++ /dev/null @@ -1,299 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on delv.dsp -!IF "$(CFG)" == "" -CFG=delv - @PLATFORM@ Debug -!MESSAGE No configuration specified. Defaulting to delv - @PLATFORM@ Debug. -!ENDIF - -!IF "$(CFG)" != "delv - @PLATFORM@ Release" && "$(CFG)" != "delv - @PLATFORM@ Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "delv.mak" CFG="delv - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "delv - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "delv - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -!IF "$(CFG)" == "delv - @PLATFORM@ 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)" == "delv - @PLATFORM@ Release" - -OUTDIR=.\Release -INTDIR=.\Release - -ALL : "..\..\..\Build\Release\delv.exe" - - -CLEAN : - -@erase "$(INTDIR)\delv.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "..\..\..\Build\Release\delv.exe" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isccfg/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/irs/win32/include" /I "../../../lib/irs/include" @CRYPTO@ /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\delv.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\delv.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/irs/win32/Release/libirs.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\delv.pdb" @MACHINE@ /out:"../../../Build/Release/delv.exe" -LINK32_OBJS= \ - "$(INTDIR)\delv.obj" - -"..\..\..\Build\Release\delv.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ELSEIF "$(CFG)" == "delv - @PLATFORM@ Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -ALL : "..\..\..\Build\Debug\delv.exe" "$(OUTDIR)\delv.bsc" - - -CLEAN : - -@erase "$(INTDIR)\delv.obj" - -@erase "$(INTDIR)\delv.sbr" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\delv.pdb" - -@erase "$(OUTDIR)\delv.bsc" - -@erase "..\..\..\Build\Debug\delv.exe" - -@erase "..\..\..\Build\Debug\delv.ilk" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isccfg/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/irs/win32/include" /I "../../../lib/irs/include" @CRYPTO@ /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\delv.bsc" -BSC32_SBRS= \ - "$(INTDIR)\delv.sbr" - -"$(OUTDIR)\delv.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/irs/win32/Debug/libirs.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\delv.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/delv.exe" /pdbtype:sept -LINK32_OBJS= \ - "$(INTDIR)\delv.obj" - -"..\..\..\Build\Debug\delv.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ENDIF - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("delv.dep") -!INCLUDE "delv.dep" -!ELSE -!MESSAGE Warning: cannot find "delv.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "delv - @PLATFORM@ Release" || "$(CFG)" == "delv - @PLATFORM@ Debug" -SOURCE="..\delv.c" - -!IF "$(CFG)" == "delv - @PLATFORM@ Release" - - -"$(INTDIR)\delv.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "delv - @PLATFORM@ Debug" - - -"$(INTDIR)\delv.obj" "$(INTDIR)\delv.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -!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 -1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest" -<< KEEP - -$(_VC_MANIFEST_BASENAME).auto.manifest : - type <<$@ - - - -<< KEEP diff --git a/bin/dig/Makefile.in b/bin/dig/Makefile.in index 511fdfe86e..26177bdcb5 100644 --- a/bin/dig/Makefile.in +++ b/bin/dig/Makefile.in @@ -16,7 +16,7 @@ READLINE_LIB = @READLINE_LIB@ CINCLUDES = -I${srcdir}/include ${DNS_INCLUDES} \ ${BIND9_INCLUDES} ${ISC_INCLUDES} \ - ${LWRES_INCLUDES} ${ISCCFG_INCLUDES} @DST_OPENSSL_INC@ + ${IRS_INCLUDES} ${ISCCFG_INCLUDES} @DST_OPENSSL_INC@ CDEFINES = -DVERSION=\"${VERSION}\" @CRYPTO@ CWARNINGS = @@ -26,21 +26,21 @@ DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@ BIND9LIBS = ../../lib/bind9/libbind9.@A@ ISCLIBS = ../../lib/isc/libisc.@A@ ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ -LWRESLIBS = ../../lib/lwres/liblwres.@A@ +IRSLIBS = ../../lib/irs/libirs.@A@ ISCCFGDEPLIBS = ../../lib/isccfg/libisccfg.@A@ DNSDEPLIBS = ../../lib/dns/libdns.@A@ BIND9DEPLIBS = ../../lib/bind9/libbind9.@A@ ISCDEPLIBS = ../../lib/isc/libisc.@A@ -LWRESDEPLIBS = ../../lib/lwres/liblwres.@A@ +IRSDEPLIBS = ../../lib/irs/libirs.@A@ -DEPLIBS = ${DNSDEPLIBS} ${BIND9DEPLIBS} ${ISCDEPLIBS} \ - ${ISCCFGDEPLIBS} ${LWRESDEPLIBS} +DEPLIBS = ${DNSDEPLIBS} ${IRSDEPLIBS} ${BIND9DEPLIBS} \ + ${ISCDEPLIBS} ${ISCCFGDEPLIBS} -LIBS = ${LWRESLIBS} ${BIND9LIBS} ${ISCCFGLIBS} \ +LIBS = ${DNSLIBS} ${IRSLIBS} ${BIND9LIBS} ${ISCCFGLIBS} \ ${ISCLIBS} @IDNLIBS@ @LIBS@ -NOSYMLIBS = ${LWRESLIBS} ${BIND9LIBS} ${ISCCFGLIBS} \ +NOSYMLIBS = ${DNSLIBS} ${IRSLIBS} ${BIND9LIBS} ${ISCCFGLIBS} \ ${ISCNOSYMLIBS} @IDNLIBS@ @LIBS@ SUBDIRS = @@ -63,17 +63,17 @@ MANOBJS = ${MANPAGES} ${HTMLPAGES} dig@EXEEXT@: dig.@O@ dighost.@O@ ${UOBJS} ${DEPLIBS} export BASEOBJS="dig.@O@ dighost.@O@ ${UOBJS}"; \ - export LIBS0="${DNSLIBS}"; \ + export LIBS0="${DNSLIBS} ${IRSLIBS}"; \ ${FINALBUILDCMD} host@EXEEXT@: host.@O@ dighost.@O@ ${UOBJS} ${DEPLIBS} export BASEOBJS="host.@O@ dighost.@O@ ${UOBJS}"; \ - export LIBS0="${DNSLIBS}"; \ + export LIBS0="${DNSLIBS} ${IRSLIBS}"; \ ${FINALBUILDCMD} nslookup@EXEEXT@: nslookup.@O@ dighost.@O@ ${UOBJS} ${DEPLIBS} export BASEOBJS="nslookup.@O@ dighost.@O@ ${READLINE_LIB} ${UOBJS}"; \ - export LIBS0="${DNSLIBS}"; \ + export LIBS0="${DNSLIBS} ${IRSLIBS}"; \ ${FINALBUILDCMD} doc man:: ${MANOBJS} diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c index f0147f34f5..5e8b15e28e 100644 --- a/bin/dig/dighost.c +++ b/bin/dig/dighost.c @@ -77,8 +77,8 @@ #include -#include -#include +#include +#include #include @@ -96,9 +96,6 @@ #define NS_IN6ADDRSZ 16 #endif -static lwres_context_t *lwctx = NULL; -static lwres_conf_t *lwconf; - dig_lookuplist_t lookup_list; dig_serverlist_t server_list; dig_searchlistlist_t search_list; @@ -237,16 +234,6 @@ check_next_lookup(dig_lookup_t *lookup); static isc_boolean_t next_origin(dig_lookup_t *oldlookup); -static void * -mem_alloc(void *arg, size_t size) { - return (isc_mem_get(arg, size)); -} - -static void -mem_free(void *arg, void *mem, size_t size) { - isc_mem_put(arg, mem, size); -} - char * next_token(char **stringp, const char *delim) { char *res; @@ -454,56 +441,47 @@ make_server(const char *servname, const char *userarg) { return (srv); } -static int -addr2af(int lwresaddrtype) -{ - int af = 0; - - switch (lwresaddrtype) { - case LWRES_ADDRTYPE_V4: - af = AF_INET; - break; - - case LWRES_ADDRTYPE_V6: - af = AF_INET6; - break; - } - - return (af); -} - /*% - * Create a copy of the server list from the lwres configuration structure. + * Create a copy of the server list from the resolver configuration structure. * The dest list must have already had ISC_LIST_INIT applied. */ static void -copy_server_list(lwres_conf_t *confdata, dig_serverlist_t *dest) { +get_server_list(irs_resconf_t *resconf) { + isc_sockaddrlist_t *servers; + isc_sockaddr_t *sa; dig_server_t *newsrv; char tmp[sizeof("ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255") + sizeof("%4000000000")]; - int af; - int i; + debug("get_server_list()"); + servers = irs_resconf_getnameservers(resconf); + for (sa = ISC_LIST_HEAD(*servers); + sa != NULL; + sa = ISC_LIST_NEXT(sa, link)) + { + int pf = isc_sockaddr_pf(sa); + isc_netaddr_t na; + isc_result_t result; + isc_buffer_t b; - debug("copy_server_list()"); - for (i = 0; i < confdata->nsnext; i++) { - af = addr2af(confdata->nameservers[i].family); - - if (af == AF_INET && !have_ipv4) + if (pf == AF_INET && !have_ipv4) continue; - if (af == AF_INET6 && !have_ipv6) + if (pf == AF_INET6 && !have_ipv6) continue; - lwres_net_ntop(af, confdata->nameservers[i].address, - tmp, sizeof(tmp)); - if (af == AF_INET6 && confdata->nameservers[i].zone != 0) { + isc_buffer_init(&b, tmp, sizeof(tmp)); + isc_netaddr_fromsockaddr(&na, sa); + result = isc_netaddr_totext(&na, &b); + if (result != ISC_R_SUCCESS) + continue; + isc_buffer_putuint8(&b, 0); + if (pf == AF_INET6 && na.zone != 0) { char buf[sizeof("%4000000000")]; - snprintf(buf, sizeof(buf), "%%%u", - confdata->nameservers[i].zone); + snprintf(buf, sizeof(buf), "%%%u", na.zone); strlcat(tmp, buf, sizeof(tmp)); } newsrv = make_server(tmp, tmp); ISC_LINK_INIT(newsrv, link); - ISC_LIST_ENQUEUE(*dest, newsrv, link); + ISC_LIST_APPEND(server_list, newsrv, link); } } @@ -551,34 +529,6 @@ set_nameserver(char *opt) { } } -static isc_result_t -add_nameserver(lwres_conf_t *confdata, const char *addr, int af) { - - int i = confdata->nsnext; - - if (confdata->nsnext >= LWRES_CONFMAXNAMESERVERS) - return (ISC_R_FAILURE); - - switch (af) { - case AF_INET: - confdata->nameservers[i].family = LWRES_ADDRTYPE_V4; - confdata->nameservers[i].length = NS_INADDRSZ; - break; - case AF_INET6: - confdata->nameservers[i].family = LWRES_ADDRTYPE_V6; - confdata->nameservers[i].length = NS_IN6ADDRSZ; - break; - default: - return (ISC_R_FAILURE); - } - - if (lwres_net_pton(af, addr, &confdata->nameservers[i].address) == 1) { - confdata->nsnext++; - return (ISC_R_SUCCESS); - } - return (ISC_R_FAILURE); -} - /*% * Produce a cloned server list. The dest list must have already had * ISC_LIST_INIT applied. @@ -1200,15 +1150,20 @@ clear_searchlist(void) { } static void -create_search_list(lwres_conf_t *confdata) { - int i; +create_search_list(irs_resconf_t *resconf) { + irs_resconf_searchlist_t *list; + irs_resconf_search_t *entry; dig_searchlist_t *search; debug("create_search_list()"); clear_searchlist(); - for (i = 0; i < confdata->searchnxt; i++) { - search = make_searchlist_entry(confdata->search[i]); + list = irs_resconf_getsearchlist(resconf); + for (entry = ISC_LIST_HEAD(*list); + entry != NULL; + entry = ISC_LIST_NEXT(entry, link)) + { + search = make_searchlist_entry(entry->domain); ISC_LIST_APPEND(search_list, search, link); } } @@ -1219,9 +1174,7 @@ create_search_list(lwres_conf_t *confdata) { */ void setup_system(isc_boolean_t ipv4only, isc_boolean_t ipv6only) { - dig_searchlist_t *domain = NULL; - lwres_result_t lwresult; - unsigned int lwresflags; + irs_resconf_t *resconf = NULL; isc_result_t result; debug("setup_system()"); @@ -1244,73 +1197,24 @@ setup_system(isc_boolean_t ipv4only, isc_boolean_t ipv6only) { } } - lwresflags = LWRES_CONTEXT_SERVERMODE; - if (have_ipv4) - lwresflags |= LWRES_CONTEXT_USEIPV4; - if (have_ipv6) - lwresflags |= LWRES_CONTEXT_USEIPV6; - - lwresult = lwres_context_create(&lwctx, mctx, mem_alloc, mem_free, - lwresflags); - if (lwresult != LWRES_R_SUCCESS) - fatal("lwres_context_create failed"); - - lwresult = lwres_conf_parse(lwctx, RESOLV_CONF); - if (lwresult != LWRES_R_SUCCESS && lwresult != LWRES_R_NOTFOUND) + result = irs_resconf_load(mctx, RESOLV_CONF, &resconf); + if (result != ISC_R_SUCCESS && result != ISC_R_FILENOTFOUND) { fatal("parse of %s failed", RESOLV_CONF); - - lwconf = lwres_conf_get(lwctx); - - /* Make the search list */ - if (lwconf->searchnxt > 0) - create_search_list(lwconf); - else { /* No search list. Use the domain name if any */ - if (lwconf->domainname != NULL) { - domain = make_searchlist_entry(lwconf->domainname); - ISC_LIST_APPEND(search_list, domain, link); - domain = NULL; - } } - if (lwconf->resdebug) { - verbose = ISC_TRUE; - debug("verbose is on"); - } + create_search_list(resconf); if (ndots == -1) { - ndots = lwconf->ndots; + ndots = irs_resconf_getndots(resconf); debug("ndots is %d.", ndots); } - if (lwconf->attempts) { - tries = lwconf->attempts + 1; - if (tries < 2) - tries = 2; - debug("tries is %d.", tries); - } - if (lwconf->timeout) { - timeout = lwconf->timeout; - debug("timeout is %d.", timeout); - } /* If user doesn't specify server use nameservers from resolv.conf. */ - if (ISC_LIST_EMPTY(server_list)) - copy_server_list(lwconf, &server_list); - - /* If we don't find a nameserver fall back to localhost */ if (ISC_LIST_EMPTY(server_list)) { - if (have_ipv4) { - lwresult = add_nameserver(lwconf, "127.0.0.1", AF_INET); - if (lwresult != ISC_R_SUCCESS) - fatal("add_nameserver failed"); - } - if (have_ipv6) { - lwresult = add_nameserver(lwconf, "::1", AF_INET6); - if (lwresult != ISC_R_SUCCESS) - fatal("add_nameserver failed"); - } - - copy_server_list(lwconf, &server_list); + get_server_list(resconf); } + irs_resconf_destroy(&resconf); + #ifdef WITH_IDN initialize_idn(); #endif @@ -4161,9 +4065,6 @@ destroy_libs(void) { free_now = ISC_TRUE; - lwres_conf_clear(lwctx); - lwres_context_destroy(&lwctx); - flush_server_list(); clear_searchlist(); diff --git a/bin/dig/win32/dig.dsp.in b/bin/dig/win32/dig.dsp.in deleted file mode 100644 index 8e577071c8..0000000000 --- a/bin/dig/win32/dig.dsp.in +++ /dev/null @@ -1,107 +0,0 @@ -# Microsoft Developer Studio Project File - Name="dig" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103 - -CFG=dig - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "dig.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "dig.mak" CFG="dig - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "dig - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "dig - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "dig - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../include" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ @IDN_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isccfg/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" @CRYPTO@ /D "WIN32" /D "__STDC__" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console @MACHINE@ -# ADD LINK32 user32.lib advapi32.lib ws2_32.lib Release/dighost.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/bind9/win32/Release/libbind9.lib ../../../lib/lwres/win32/Release/liblwres.lib @IDN_LIB@ /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/dig.exe" - -!ELSEIF "$(CFG)" == "dig - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../include" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ @IDN_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isccfg/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" @CRYPTO@ /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c -# SUBTRACT CPP /X /u @COPTY@ -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console /debug @MACHINE@ /pdbtype:sept -# ADD LINK32 user32.lib advapi32.lib ws2_32.lib Debug/dighost.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/bind9/win32/Debug/libbind9.lib ../../../lib/lwres/win32/Debug/liblwres.lib @IDN_LIB@ /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/dig.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "dig - @PLATFORM@ Release" -# Name "dig - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\dig.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\include\dig\dig.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/bin/dig/win32/dig.dsw b/bin/dig/win32/dig.dsw deleted file mode 100644 index bccc267774..0000000000 --- a/bin/dig/win32/dig.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "dig"=".\dig.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/bin/dig/win32/dig.mak.in b/bin/dig/win32/dig.mak.in deleted file mode 100644 index 10cdf75115..0000000000 --- a/bin/dig/win32/dig.mak.in +++ /dev/null @@ -1,427 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on dig.dsp -!IF "$(CFG)" == "" -CFG=dig - @PLATFORM@ Debug -!MESSAGE No configuration specified. Defaulting to dig - @PLATFORM@ Debug. -!ENDIF - -!IF "$(CFG)" != "dig - @PLATFORM@ Release" && "$(CFG)" != "dig - @PLATFORM@ Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "dig.mak" CFG="dig - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "dig - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "dig - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "dig - @PLATFORM@ 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)" == "dig - @PLATFORM@ Release" - -OUTDIR=.\Release -INTDIR=.\Release - -!IF "$(RECURSE)" == "0" - -ALL : "..\..\..\Build\Release\dig.exe" - -!ELSE - -ALL : "liblwres - @PLATFORM@ Release" "libbind9 - @PLATFORM@ Release" "libisc - @PLATFORM@ Release" "libdns - @PLATFORM@ Release" "..\..\..\Build\Release\dig.exe" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"libdns - @PLATFORM@ ReleaseCLEAN" "libisc - @PLATFORM@ ReleaseCLEAN" "libbind9 - @PLATFORM@ ReleaseCLEAN" "liblwres - @PLATFORM@ ReleaseCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\dig.obj" - -@erase "$(INTDIR)\dighost.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "..\..\..\Build\Release\dig.exe" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../include" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ @IDN_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isccfg/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" @CRYPTO@ /D "WIN32" /D "__STDC__" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\dig.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\dig.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/bind9/win32/Release/libbind9.lib ../../../lib/lwres/win32/Release/liblwres.lib @IDN_LIB@ /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\dig.pdb" @MACHINE@ /out:"../../../Build/Release/dig.exe" -LINK32_OBJS= \ - "$(INTDIR)\dig.obj" \ - "$(INTDIR)\dighost.obj" \ - "..\..\..\lib\dns\win32\Release\libdns.lib" \ - "..\..\..\lib\isc\win32\Release\libisc.lib" \ - "..\..\..\lib\isccfg\win32\Release\libisccfg.lib" \ - "..\..\..\lib\bind9\win32\Release\libbind9.lib" \ - "..\..\..\lib\lwres\win32\Release\liblwres.lib" - -"..\..\..\Build\Release\dig.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ELSEIF "$(CFG)" == "dig - @PLATFORM@ Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : "..\..\..\Build\Debug\dig.exe" "$(OUTDIR)\dig.bsc" - -!ELSE - -ALL : "liblwres - @PLATFORM@ Debug" "libbind9 - @PLATFORM@ Debug" "libisc - @PLATFORM@ Debug" "libdns - @PLATFORM@ Debug" "..\..\..\Build\Debug\dig.exe" "$(OUTDIR)\dig.bsc" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"libdns - @PLATFORM@ DebugCLEAN" "libisc - @PLATFORM@ DebugCLEAN" "libbind9 - @PLATFORM@ DebugCLEAN" "liblwres - @PLATFORM@ DebugCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\dig.obj" - -@erase "$(INTDIR)\dig.sbr" - -@erase "$(INTDIR)\dighost.obj" - -@erase "$(INTDIR)\dighost.sbr" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\dig.bsc" - -@erase "$(OUTDIR)\dig.pdb" - -@erase "..\..\..\Build\Debug\dig.exe" - -@erase "..\..\..\Build\Debug\dig.ilk" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../include" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ @IDN_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isccfg/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" @CRYPTO@ /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\dig.bsc" -BSC32_SBRS= \ - "$(INTDIR)\dig.sbr" \ - "$(INTDIR)\dighost.sbr" - -"$(OUTDIR)\dig.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/bind9/win32/Debug/libbind9.lib ../../../lib/lwres/win32/Debug/liblwres.lib @IDN_LIB@ /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\dig.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/dig.exe" /pdbtype:sept -LINK32_OBJS= \ - "$(INTDIR)\dig.obj" \ - "$(INTDIR)\dighost.obj" \ - "..\..\..\lib\dns\win32\Debug\libdns.lib" \ - "..\..\..\lib\isc\win32\Debug\libisc.lib" \ - "..\..\..\lib\isccfg\win32\Debug\libisccfg.lib" \ - "..\..\..\lib\bind9\win32\Debug\libbind9.lib" \ - "..\..\..\lib\lwres\win32\Debug\liblwres.lib" - -"..\..\..\Build\Debug\dig.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ENDIF - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("dig.dep") -!INCLUDE "dig.dep" -!ELSE -!MESSAGE Warning: cannot find "dig.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "dig - @PLATFORM@ Release" || "$(CFG)" == "dig - @PLATFORM@ Debug" -SOURCE=..\dig.c - -!IF "$(CFG)" == "dig - @PLATFORM@ Release" - - -"$(INTDIR)\dig.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "dig - @PLATFORM@ Debug" - - -"$(INTDIR)\dig.obj" "$(INTDIR)\dig.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=..\dighost.c - -!IF "$(CFG)" == "dig - @PLATFORM@ Release" - - -"$(INTDIR)\dighost.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "dig - @PLATFORM@ Debug" - - -"$(INTDIR)\dighost.obj" "$(INTDIR)\dighost.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -!IF "$(CFG)" == "dig - @PLATFORM@ Release" - -"libdns - @PLATFORM@ Release" : - cd "..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" - cd "..\..\..\bin\dig\win32" - -"libdns - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\dig\win32" - -!ELSEIF "$(CFG)" == "dig - @PLATFORM@ Debug" - -"libdns - @PLATFORM@ Debug" : - cd "..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" - cd "..\..\..\bin\dig\win32" - -"libdns - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\dig\win32" - -!ENDIF - -!IF "$(CFG)" == "dig - @PLATFORM@ Release" - -"libisc - @PLATFORM@ Release" : - cd "..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" - cd "..\..\..\bin\dig\win32" - -"libisc - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\dig\win32" - -!ELSEIF "$(CFG)" == "dig - @PLATFORM@ Debug" - -"libisc - @PLATFORM@ Debug" : - cd "..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" - cd "..\..\..\bin\dig\win32" - -"libisc - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\dig\win32" - -!ENDIF - -!IF "$(CFG)" == "dig - @PLATFORM@ Release" - -"libbind9 - @PLATFORM@ Release" : - cd "..\..\..\lib\bind9\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - @PLATFORM@ Release" - cd "..\..\..\bin\dig\win32" - -"libbind9 - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\lib\bind9\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\dig\win32" - -!ELSEIF "$(CFG)" == "dig - @PLATFORM@ Debug" - -"libbind9 - @PLATFORM@ Debug" : - cd "..\..\..\lib\bind9\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - @PLATFORM@ Debug" - cd "..\..\..\bin\dig\win32" - -"libbind9 - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\lib\bind9\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\dig\win32" - -!ENDIF - -!IF "$(CFG)" == "dig - @PLATFORM@ Release" - -"liblwres - @PLATFORM@ Release" : - cd "..\..\..\lib\lwres\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - @PLATFORM@ Release" - cd "..\..\..\bin\dig\win32" - -"liblwres - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\lib\lwres\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\dig\win32" - -!ELSEIF "$(CFG)" == "dig - @PLATFORM@ Debug" - -"liblwres - @PLATFORM@ Debug" : - cd "..\..\..\lib\lwres\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - @PLATFORM@ Debug" - cd "..\..\..\bin\dig\win32" - -"liblwres - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\lib\lwres\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\dig\win32" - -!ENDIF - - -!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 -1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest" -<< KEEP - -$(_VC_MANIFEST_BASENAME).auto.manifest : - type <<$@ - - - -<< KEEP diff --git a/bin/dig/win32/dig.vcxproj.in b/bin/dig/win32/dig.vcxproj.in index 2214a51bdd..7242bc1b7d 100644 --- a/bin/dig/win32/dig.vcxproj.in +++ b/bin/dig/win32/dig.vcxproj.in @@ -60,15 +60,15 @@ .\$(Configuration)\ $(OutDir)$(TargetName).pdb true - .\;..\include;..\..\..\;@LIBXML2_INC@@OPENSSL_INC@@IDN_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\isccfg\include;..\..\..\lib\dns\include;..\..\..\lib\bind9\include;..\..\..\lib\lwres\win32\include;..\..\..\lib\lwres\include;%(AdditionalIncludeDirectories) + .\;..\include;..\..\..\;@LIBXML2_INC@@OPENSSL_INC@@IDN_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\isccfg\include;..\..\..\lib\dns\include;..\..\..\lib\bind9\include;%(AdditionalIncludeDirectories) CompileAsC Console true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) - $(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);..\..\..\lib\lwres\win32\$(Configuration);%(AdditionalLibraryDirectories) - dighost.lib;libisc.lib;libisccfg.lib;libdns.lib;libbind9.lib;liblwres.lib;@IDN_LIB@ws2_32.lib;%(AdditionalDependencies) + $(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\irs\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);%(AdditionalLibraryDirectories) + dighost.lib;libisc.lib;libisccfg.lib;libirs.lib;libdns.lib;libbind9.lib;@IDN_LIB@ws2_32.lib;%(AdditionalDependencies) @@ -87,7 +87,7 @@ .\$(Configuration)\ .\$(Configuration)\ $(OutDir)$(TargetName).pdb - .\;..\include;..\..\..\;@LIBXML2_INC@@OPENSSL_INC@@IDN_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\isccfg\include;..\..\..\lib\dns\include;..\..\..\lib\bind9\include;..\..\..\lib\lwres\win32\include;..\..\..\lib\lwres\include;%(AdditionalIncludeDirectories) + .\;..\include;..\..\..\;@LIBXML2_INC@@OPENSSL_INC@@IDN_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\isccfg\include;..\..\..\lib\dns\include;..\..\..\lib\bind9\include;%(AdditionalIncludeDirectories) CompileAsC @@ -97,8 +97,8 @@ true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) Default - $(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);..\..\..\lib\lwres\win32\$(Configuration);%(AdditionalLibraryDirectories) - dighost.lib;libisc.lib;libisccfg.lib;libdns.lib;libbind9.lib;liblwres.lib;@IDN_LIB@ws2_32.lib;%(AdditionalDependencies) + $(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\irs\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);%(AdditionalLibraryDirectories) + dighost.lib;libisc.lib;libisccfg.lib;libirs.lib;libdns.lib;libbind9.lib;@IDN_LIB@ws2_32.lib;%(AdditionalDependencies) diff --git a/bin/dig/win32/dighost.dsp.in b/bin/dig/win32/dighost.dsp.in deleted file mode 100644 index 33b7c8df24..0000000000 --- a/bin/dig/win32/dighost.dsp.in +++ /dev/null @@ -1,113 +0,0 @@ -# Microsoft Developer Studio Project File - Name="dighost" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Static-Link Library" 0x0104 - -CFG=dighost - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "dighost.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "dighost.mak" CFG="dighost - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "dighost - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Static-Link Library") -!MESSAGE "dighost - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Static-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "dighost - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ @IDN_INC@ /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isccfg/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /D "NDEBUG" @CRYPTO@ /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" @COPTY@ /FD /c /Fddighost -# SUBTRACT CPP /X -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 -# ADD LINK32 /out:"Release/dighost.lib" - -!ELSEIF "$(CFG)" == "dighost - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ @IDN_INC@ /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isccfg/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" @CRYPTO@ /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /FR @COPTY@ /FD /GZ /c /Fddighost -# SUBTRACT CPP /X -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 -# ADD LINK32 /debug out:"Debug/dighost.lib" - -!ENDIF - -# Begin Target - -# Name "dighost - @PLATFORM@ Release" -# Name "dighost - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# Begin Group "Main Dns Lib" - -# PROP Default_Filter "c" -# Begin Source File - -SOURCE=..\dighost.c -# End Source File -# End Group -# End Target -# End Project diff --git a/bin/dig/win32/dighost.dsw b/bin/dig/win32/dighost.dsw deleted file mode 100644 index fdae6d4711..0000000000 --- a/bin/dig/win32/dighost.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "dighost"=".\dighost.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/bin/dig/win32/dighost.vcxproj.in b/bin/dig/win32/dighost.vcxproj.in index 23805067dc..7940eca659 100644 --- a/bin/dig/win32/dighost.vcxproj.in +++ b/bin/dig/win32/dighost.vcxproj.in @@ -60,7 +60,7 @@ .\$(Configuration)\ $(OutDir)$(TargetName).pdb true - .\;..\..\..\;@LIBXML2_INC@@OPENSSL_INC@@IDN_INC@..\include;..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\isccfg\include;..\..\..\lib\lwres\win32\include;..\..\..\lib\lwres\include;..\..\..\lib\dns\include;..\..\..\lib\bind9\include;%(AdditionalIncludeDirectories) + .\;..\..\..\;@LIBXML2_INC@@OPENSSL_INC@@IDN_INC@..\include;..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\isccfg\include;..\..\..\lib\dns\include;..\..\..\lib\irs\include;..\..\..\lib\irs\win32\include;..\..\..\lib\bind9\include;%(AdditionalIncludeDirectories) CompileAsC @@ -85,7 +85,7 @@ .\$(Configuration)\ .\$(Configuration)\ $(OutDir)$(TargetName).pdb - .\;..\..\..\;@LIBXML2_INC@@OPENSSL_INC@@IDN_INC@..\include;..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\isccfg\include;..\..\..\lib\lwres\win32\include;..\..\..\lib\lwres\include;..\..\..\lib\dns\include;..\..\..\lib\bind9\include;%(AdditionalIncludeDirectories) + .\;..\..\..\;@LIBXML2_INC@@OPENSSL_INC@@IDN_INC@..\include;..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\isccfg\include;..\..\..\lib\dns\include;..\..\..\lib\irs\include;..\..\..\lib\irs\win32\include;..\..\..\lib\bind9\include;%(AdditionalIncludeDirectories) CompileAsC diff --git a/bin/dig/win32/host.dsp.in b/bin/dig/win32/host.dsp.in deleted file mode 100644 index adb48d573e..0000000000 --- a/bin/dig/win32/host.dsp.in +++ /dev/null @@ -1,103 +0,0 @@ -# Microsoft Developer Studio Project File - Name="host" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103 - -CFG=host - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "host.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "host.mak" CFG="host - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "host - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "host - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "host - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../include" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ @IDN_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isccfg/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" @CRYPTO@ /D "WIN32" /D "__STDC__" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console @MACHINE@ -# ADD LINK32 user32.lib advapi32.lib ws2_32.lib Release/dighost.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/bind9/win32/Release/libbind9.lib ../../../lib/lwres/win32/Release/liblwres.lib @IDN_LIB@ /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/host.exe" - -!ELSEIF "$(CFG)" == "host - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../include" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ @IDN_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isccfg/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" @CRYPTO@ /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c -# SUBTRACT CPP /X /u @COPTY@ -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console /debug @MACHINE@ /pdbtype:sept -# ADD LINK32 user32.lib advapi32.lib ws2_32.lib Debug/dighost.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/bind9/win32/Debug/libbind9.lib ../../../lib/lwres/win32/Debug/liblwres.lib @IDN_LIB@ /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/host.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "host - @PLATFORM@ Release" -# Name "host - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\host.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/bin/dig/win32/host.dsw b/bin/dig/win32/host.dsw deleted file mode 100644 index 5a217b309a..0000000000 --- a/bin/dig/win32/host.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "host"=".\host.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/bin/dig/win32/host.mak.in b/bin/dig/win32/host.mak.in deleted file mode 100644 index 2653ef0dcb..0000000000 --- a/bin/dig/win32/host.mak.in +++ /dev/null @@ -1,427 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on host.dsp -!IF "$(CFG)" == "" -CFG=host - @PLATFORM@ Debug -!MESSAGE No configuration specified. Defaulting to host - @PLATFORM@ Debug. -!ENDIF - -!IF "$(CFG)" != "host - @PLATFORM@ Release" && "$(CFG)" != "host - @PLATFORM@ Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "host.mak" CFG="host - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "host - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "host - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "host - @PLATFORM@ 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)" == "host - @PLATFORM@ Release" - -OUTDIR=.\Release -INTDIR=.\Release - -!IF "$(RECURSE)" == "0" - -ALL : "..\..\..\Build\Release\host.exe" - -!ELSE - -ALL : "liblwres - @PLATFORM@ Release" "libbind9 - @PLATFORM@ Release" "libisc - @PLATFORM@ Release" "libdns - @PLATFORM@ Release" "..\..\..\Build\Release\host.exe" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"libdns - @PLATFORM@ ReleaseCLEAN" "libisc - @PLATFORM@ ReleaseCLEAN" "libbind9 - @PLATFORM@ ReleaseCLEAN" "liblwres - @PLATFORM@ ReleaseCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\dighost.obj" - -@erase "$(INTDIR)\host.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "..\..\..\Build\Release\host.exe" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../include" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ @IDN_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isccfg/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" @CRYPTO@ /D "WIN32" /D "__STDC__" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\host.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\host.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/bind9/win32/Release/libbind9.lib ../../../lib/lwres/win32/Release/liblwres.lib @IDN_LIB@ /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\host.pdb" @MACHINE@ /out:"../../../Build/Release/host.exe" -LINK32_OBJS= \ - "$(INTDIR)\dighost.obj" \ - "$(INTDIR)\host.obj" \ - "..\..\..\lib\dns\win32\Release\libdns.lib" \ - "..\..\..\lib\isc\win32\Release\libisc.lib" \ - "..\..\..\lib\isccfg\win32\Release\libisccfg.lib" \ - "..\..\..\lib\bind9\win32\Release\libbind9.lib" \ - "..\..\..\lib\lwres\win32\Release\liblwres.lib" - -"..\..\..\Build\Release\host.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ELSEIF "$(CFG)" == "host - @PLATFORM@ Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : "..\..\..\Build\Debug\host.exe" "$(OUTDIR)\host.bsc" - -!ELSE - -ALL : "liblwres - @PLATFORM@ Debug" "libbind9 - @PLATFORM@ Debug" "libisc - @PLATFORM@ Debug" "libdns - @PLATFORM@ Debug" "..\..\..\Build\Debug\host.exe" "$(OUTDIR)\host.bsc" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"libdns - @PLATFORM@ DebugCLEAN" "libisc - @PLATFORM@ DebugCLEAN" "libbind9 - @PLATFORM@ DebugCLEAN" "liblwres - @PLATFORM@ DebugCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\dighost.obj" - -@erase "$(INTDIR)\dighost.sbr" - -@erase "$(INTDIR)\host.obj" - -@erase "$(INTDIR)\host.sbr" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\host.bsc" - -@erase "$(OUTDIR)\host.pdb" - -@erase "..\..\..\Build\Debug\host.exe" - -@erase "..\..\..\Build\Debug\host.ilk" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../include" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ @IDN_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isccfg/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" @CRYPTO@ /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\host.bsc" -BSC32_SBRS= \ - "$(INTDIR)\dighost.sbr" \ - "$(INTDIR)\host.sbr" - -"$(OUTDIR)\host.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/bind9/win32/Debug/libbind9.lib ../../../lib/lwres/win32/Debug/liblwres.lib @IDN_LIB@ /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\host.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/host.exe" /pdbtype:sept -LINK32_OBJS= \ - "$(INTDIR)\dighost.obj" \ - "$(INTDIR)\host.obj" \ - "..\..\..\lib\dns\win32\Debug\libdns.lib" \ - "..\..\..\lib\isc\win32\Debug\libisc.lib" \ - "..\..\..\lib\isccfg\win32\Debug\libisccfg.lib" \ - "..\..\..\lib\bind9\win32\Debug\libbind9.lib" \ - "..\..\..\lib\lwres\win32\Debug\liblwres.lib" - -"..\..\..\Build\Debug\host.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ENDIF - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("host.dep") -!INCLUDE "host.dep" -!ELSE -!MESSAGE Warning: cannot find "host.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "host - @PLATFORM@ Release" || "$(CFG)" == "host - @PLATFORM@ Debug" -SOURCE=..\dighost.c - -!IF "$(CFG)" == "host - @PLATFORM@ Release" - - -"$(INTDIR)\dighost.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "host - @PLATFORM@ Debug" - - -"$(INTDIR)\dighost.obj" "$(INTDIR)\dighost.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=..\host.c - -!IF "$(CFG)" == "host - @PLATFORM@ Release" - - -"$(INTDIR)\host.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "host - @PLATFORM@ Debug" - - -"$(INTDIR)\host.obj" "$(INTDIR)\host.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -!IF "$(CFG)" == "host - @PLATFORM@ Release" - -"libdns - @PLATFORM@ Release" : - cd "..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" - cd "..\..\..\bin\dig\win32" - -"libdns - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\dig\win32" - -!ELSEIF "$(CFG)" == "host - @PLATFORM@ Debug" - -"libdns - @PLATFORM@ Debug" : - cd "..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" - cd "..\..\..\bin\dig\win32" - -"libdns - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\dig\win32" - -!ENDIF - -!IF "$(CFG)" == "host - @PLATFORM@ Release" - -"libisc - @PLATFORM@ Release" : - cd "..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" - cd "..\..\..\bin\dig\win32" - -"libisc - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\dig\win32" - -!ELSEIF "$(CFG)" == "host - @PLATFORM@ Debug" - -"libisc - @PLATFORM@ Debug" : - cd "..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" - cd "..\..\..\bin\dig\win32" - -"libisc - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\dig\win32" - -!ENDIF - -!IF "$(CFG)" == "host - @PLATFORM@ Release" - -"libbind9 - @PLATFORM@ Release" : - cd "..\..\..\lib\bind9\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - @PLATFORM@ Release" - cd "..\..\..\bin\dig\win32" - -"libbind9 - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\lib\bind9\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\dig\win32" - -!ELSEIF "$(CFG)" == "host - @PLATFORM@ Debug" - -"libbind9 - @PLATFORM@ Debug" : - cd "..\..\..\lib\bind9\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - @PLATFORM@ Debug" - cd "..\..\..\bin\dig\win32" - -"libbind9 - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\lib\bind9\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\dig\win32" - -!ENDIF - -!IF "$(CFG)" == "host - @PLATFORM@ Release" - -"liblwres - @PLATFORM@ Release" : - cd "..\..\..\lib\lwres\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - @PLATFORM@ Release" - cd "..\..\..\bin\dig\win32" - -"liblwres - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\lib\lwres\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\dig\win32" - -!ELSEIF "$(CFG)" == "host - @PLATFORM@ Debug" - -"liblwres - @PLATFORM@ Debug" : - cd "..\..\..\lib\lwres\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - @PLATFORM@ Debug" - cd "..\..\..\bin\dig\win32" - -"liblwres - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\lib\lwres\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\dig\win32" - -!ENDIF - - -!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 -1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest" -<< KEEP - -$(_VC_MANIFEST_BASENAME).auto.manifest : - type <<$@ - - - -<< KEEP diff --git a/bin/dig/win32/host.vcxproj.in b/bin/dig/win32/host.vcxproj.in index e909608ae1..05a269b533 100644 --- a/bin/dig/win32/host.vcxproj.in +++ b/bin/dig/win32/host.vcxproj.in @@ -60,15 +60,15 @@ .\$(Configuration)\ $(OutDir)$(TargetName).pdb true - .\;..\include;..\..\..\;@LIBXML2_INC@@OPENSSL_INC@@IDN_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\isccfg\include;..\..\..\lib\dns\include;..\..\..\lib\bind9\include;..\..\..\lib\lwres\win32\include;..\..\..\lib\lwres\include;%(AdditionalIncludeDirectories) + .\;..\include;..\..\..\;@LIBXML2_INC@@OPENSSL_INC@@IDN_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\isccfg\include;..\..\..\lib\dns\include;..\..\..\lib\bind9\include;%(AdditionalIncludeDirectories) CompileAsC Console true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) - $(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);..\..\..\lib\lwres\win32\$(Configuration);%(AdditionalLibraryDirectories) - dighost.lib;@IDN_LIB@libisc.lib;libisccfg.lib;libdns.lib;libbind9.lib;liblwres.lib;ws2_32.lib;%(AdditionalDependencies) + $(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\irs\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);%(AdditionalLibraryDirectories) + dighost.lib;@IDN_LIB@libisc.lib;libisccfg.lib;libirs.lib;libdns.lib;libbind9.lib;ws2_32.lib;%(AdditionalDependencies) @@ -87,7 +87,7 @@ .\$(Configuration)\ .\$(Configuration)\ $(OutDir)$(TargetName).pdb - .\;..\include;..\..\..\;@LIBXML2_INC@@OPENSSL_INC@@IDN_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\isccfg\include;..\..\..\lib\dns\include;..\..\..\lib\bind9\include;..\..\..\lib\lwres\win32\include;..\..\..\lib\lwres\include;%(AdditionalIncludeDirectories) + .\;..\include;..\..\..\;@LIBXML2_INC@@OPENSSL_INC@@IDN_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\isccfg\include;..\..\..\lib\dns\include;..\..\..\lib\bind9\include;%(AdditionalIncludeDirectories) CompileAsC @@ -97,8 +97,8 @@ true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) Default - $(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);..\..\..\lib\lwres\win32\$(Configuration);%(AdditionalLibraryDirectories) - dighost.lib;@IDN_LIB@libisc.lib;libisccfg.lib;libdns.lib;libbind9.lib;liblwres.lib;ws2_32.lib;%(AdditionalDependencies) + $(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\irs\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);%(AdditionalLibraryDirectories) + dighost.lib;@IDN_LIB@libisc.lib;libisccfg.lib;libirs.lib;libdns.lib;libbind9.lib;ws2_32.lib;%(AdditionalDependencies) diff --git a/bin/dig/win32/nslookup.dsp.in b/bin/dig/win32/nslookup.dsp.in deleted file mode 100644 index 9c4800ac26..0000000000 --- a/bin/dig/win32/nslookup.dsp.in +++ /dev/null @@ -1,107 +0,0 @@ -# Microsoft Developer Studio Project File - Name="nslookup" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103 - -CFG=nslookup - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "nslookup.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "nslookup.mak" CFG="nslookup - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "nslookup - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "nslookup - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "nslookup - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../include" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ @READLINE_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isccfg/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" @CRYPTO@ /D "WIN32" /D "USE_READLINE_STATIC" /D "__STDC__" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console @MACHINE@ -# ADD LINK32 @READLINE_LIB@ @IDN_LIB@ user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/bind9/win32/Release/libbind9.lib ../../../lib/lwres/win32/Release/liblwres.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/nslookup.exe" - -!ELSEIF "$(CFG)" == "nslookup - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../include" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ @READLINE_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isccfg/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" @CRYPTO@ /D "WIN32" /D "USE_READLINE_STATIC" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c -# SUBTRACT CPP /X /u @COPTY@ -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console /debug @MACHINE@ /pdbtype:sept -# ADD LINK32 @READLINE_LIBD@ @IDN_LIB@ user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/bind9/win32/Debug/libbind9.lib ../../../lib/lwres/win32/Debug/liblwres.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/nslookup.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "nslookup - @PLATFORM@ Release" -# Name "nslookup - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\dighost.c -# End Source File -# Begin Source File - -SOURCE=..\nslookup.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/bin/dig/win32/nslookup.dsw b/bin/dig/win32/nslookup.dsw deleted file mode 100644 index 7ffdc8e9ef..0000000000 --- a/bin/dig/win32/nslookup.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "nslookup"=".\nslookup.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/bin/dig/win32/nslookup.mak.in b/bin/dig/win32/nslookup.mak.in deleted file mode 100644 index 233231e53e..0000000000 --- a/bin/dig/win32/nslookup.mak.in +++ /dev/null @@ -1,427 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on nslookup.dsp -!IF "$(CFG)" == "" -CFG=nslookup - @PLATFORM@ Debug -!MESSAGE No configuration specified. Defaulting to nslookup - @PLATFORM@ Debug. -!ENDIF - -!IF "$(CFG)" != "nslookup - @PLATFORM@ Release" && "$(CFG)" != "nslookup - @PLATFORM@ Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "nslookup.mak" CFG="nslookup - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "nslookup - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "nslookup - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "nslookup - @PLATFORM@ 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)" == "nslookup - @PLATFORM@ Release" - -OUTDIR=.\Release -INTDIR=.\Release - -!IF "$(RECURSE)" == "0" - -ALL : "..\..\..\Build\Release\nslookup.exe" - -!ELSE - -ALL : "liblwres - @PLATFORM@ Release" "libbind9 - @PLATFORM@ Release" "libisc - @PLATFORM@ Release" "libdns - @PLATFORM@ Release" "..\..\..\Build\Release\nslookup.exe" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"libdns - @PLATFORM@ ReleaseCLEAN" "libisc - @PLATFORM@ ReleaseCLEAN" "libbind9 - @PLATFORM@ ReleaseCLEAN" "liblwres - @PLATFORM@ ReleaseCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\dighost.obj" - -@erase "$(INTDIR)\nslookup.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "..\..\..\Build\Release\nslookup.exe" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../include" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ @READLINE_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isccfg/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" @CRYPTO@ /D "WIN32" /D "USE_READLINE_STATIC" /D "__STDC__" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\nslookup.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\nslookup.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/bind9/win32/Release/libbind9.lib ../../../lib/lwres/win32/Release/liblwres.lib @READLINE_LIB@ @IDN_LIB@ /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\nslookup.pdb" @MACHINE@ /out:"../../../Build/Release/nslookup.exe" -LINK32_OBJS= \ - "$(INTDIR)\dighost.obj" \ - "$(INTDIR)\nslookup.obj" \ - "..\..\..\lib\dns\win32\Release\libdns.lib" \ - "..\..\..\lib\isc\win32\Release\libisc.lib" \ - "..\..\..\lib\isccfg\win32\Release\libisccfg.lib" \ - "..\..\..\lib\bind9\win32\Release\libbind9.lib" \ - "..\..\..\lib\lwres\win32\Release\liblwres.lib" - -"..\..\..\Build\Release\nslookup.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ELSEIF "$(CFG)" == "nslookup - @PLATFORM@ Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : "..\..\..\Build\Debug\nslookup.exe" "$(OUTDIR)\nslookup.bsc" - -!ELSE - -ALL : "liblwres - @PLATFORM@ Debug" "libbind9 - @PLATFORM@ Debug" "libisc - @PLATFORM@ Debug" "libdns - @PLATFORM@ Debug" "..\..\..\Build\Debug\nslookup.exe" "$(OUTDIR)\nslookup.bsc" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"libdns - @PLATFORM@ DebugCLEAN" "libisc - @PLATFORM@ DebugCLEAN" "libbind9 - @PLATFORM@ DebugCLEAN" "liblwres - @PLATFORM@ DebugCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\dighost.obj" - -@erase "$(INTDIR)\dighost.sbr" - -@erase "$(INTDIR)\nslookup.obj" - -@erase "$(INTDIR)\nslookup.sbr" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\nslookup.bsc" - -@erase "$(OUTDIR)\nslookup.pdb" - -@erase "..\..\..\Build\Debug\nslookup.exe" - -@erase "..\..\..\Build\Debug\nslookup.ilk" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../include" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ @READLINE_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isccfg/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" @CRYPTO@ /D "WIN32" /D "USE_READLINE_STATIC" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\nslookup.bsc" -BSC32_SBRS= \ - "$(INTDIR)\dighost.sbr" \ - "$(INTDIR)\nslookup.sbr" - -"$(OUTDIR)\nslookup.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/bind9/win32/Debug/libbind9.lib ../../../lib/lwres/win32/Debug/liblwres.lib @READLINE_LIBD@ @IDN_LIB@ /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\nslookup.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/nslookup.exe" /pdbtype:sept -LINK32_OBJS= \ - "$(INTDIR)\dighost.obj" \ - "$(INTDIR)\nslookup.obj" \ - "..\..\..\lib\dns\win32\Debug\libdns.lib" \ - "..\..\..\lib\isc\win32\Debug\libisc.lib" \ - "..\..\..\lib\isccfg\win32\Debug\libisccfg.lib" \ - "..\..\..\lib\bind9\win32\Debug\libbind9.lib" \ - "..\..\..\lib\lwres\win32\Debug\liblwres.lib" - -"..\..\..\Build\Debug\nslookup.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ENDIF - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("nslookup.dep") -!INCLUDE "nslookup.dep" -!ELSE -!MESSAGE Warning: cannot find "nslookup.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "nslookup - @PLATFORM@ Release" || "$(CFG)" == "nslookup - @PLATFORM@ Debug" -SOURCE=..\dighost.c - -!IF "$(CFG)" == "nslookup - @PLATFORM@ Release" - - -"$(INTDIR)\dighost.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "nslookup - @PLATFORM@ Debug" - - -"$(INTDIR)\dighost.obj" "$(INTDIR)\dighost.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=..\nslookup.c - -!IF "$(CFG)" == "nslookup - @PLATFORM@ Release" - - -"$(INTDIR)\nslookup.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "nslookup - @PLATFORM@ Debug" - - -"$(INTDIR)\nslookup.obj" "$(INTDIR)\nslookup.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -!IF "$(CFG)" == "nslookup - @PLATFORM@ Release" - -"libdns - @PLATFORM@ Release" : - cd "..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" - cd "..\..\..\bin\dig\win32" - -"libdns - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\dig\win32" - -!ELSEIF "$(CFG)" == "nslookup - @PLATFORM@ Debug" - -"libdns - @PLATFORM@ Debug" : - cd "..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" - cd "..\..\..\bin\dig\win32" - -"libdns - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\dig\win32" - -!ENDIF - -!IF "$(CFG)" == "nslookup - @PLATFORM@ Release" - -"libisc - @PLATFORM@ Release" : - cd "..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" - cd "..\..\..\bin\dig\win32" - -"libisc - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\dig\win32" - -!ELSEIF "$(CFG)" == "nslookup - @PLATFORM@ Debug" - -"libisc - @PLATFORM@ Debug" : - cd "..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" - cd "..\..\..\bin\dig\win32" - -"libisc - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\dig\win32" - -!ENDIF - -!IF "$(CFG)" == "nslookup - @PLATFORM@ Release" - -"libbind9 - @PLATFORM@ Release" : - cd "..\..\..\lib\bind9\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - @PLATFORM@ Release" - cd "..\..\..\bin\dig\win32" - -"libbind9 - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\lib\bind9\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\dig\win32" - -!ELSEIF "$(CFG)" == "nslookup - @PLATFORM@ Debug" - -"libbind9 - @PLATFORM@ Debug" : - cd "..\..\..\lib\bind9\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - @PLATFORM@ Debug" - cd "..\..\..\bin\dig\win32" - -"libbind9 - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\lib\bind9\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\dig\win32" - -!ENDIF - -!IF "$(CFG)" == "nslookup - @PLATFORM@ Release" - -"liblwres - @PLATFORM@ Release" : - cd "..\..\..\lib\lwres\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - @PLATFORM@ Release" - cd "..\..\..\bin\dig\win32" - -"liblwres - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\lib\lwres\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\dig\win32" - -!ELSEIF "$(CFG)" == "nslookup - @PLATFORM@ Debug" - -"liblwres - @PLATFORM@ Debug" : - cd "..\..\..\lib\lwres\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - @PLATFORM@ Debug" - cd "..\..\..\bin\dig\win32" - -"liblwres - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\lib\lwres\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\dig\win32" - -!ENDIF - - -!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 -1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest" -<< KEEP - -$(_VC_MANIFEST_BASENAME).auto.manifest : - type <<$@ - - - -<< KEEP diff --git a/bin/dig/win32/nslookup.vcxproj.in b/bin/dig/win32/nslookup.vcxproj.in index 5c338ae939..a3f7f233a4 100644 --- a/bin/dig/win32/nslookup.vcxproj.in +++ b/bin/dig/win32/nslookup.vcxproj.in @@ -60,15 +60,15 @@ .\$(Configuration)\ $(OutDir)$(TargetName).pdb true - .\;..\include;..\..\..\;@LIBXML2_INC@@OPENSSL_INC@@READLINE_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\isccfg\include;..\..\..\lib\dns\include;..\..\..\lib\bind9\include;..\..\..\lib\lwres\win32\include;..\..\..\lib\lwres\include;%(AdditionalIncludeDirectories) + .\;..\include;..\..\..\;@LIBXML2_INC@@OPENSSL_INC@@READLINE_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\isccfg\include;..\..\..\lib\irs\include;..\..\..\lib\irs\win32\include;..\..\..\lib\dns\include;..\..\..\lib\bind9\include;%(AdditionalIncludeDirectories) CompileAsC Console true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) - ..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);..\..\..\lib\lwres\win32\$(Configuration);%(AdditionalLibraryDirectories) - @READLINE_LIBD@@IDN_LIB@libisc.lib;libisccfg.lib;libdns.lib;libbind9.lib;liblwres.lib;ws2_32.lib;%(AdditionalDependencies) + ..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\irs\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);%(AdditionalLibraryDirectories) + @READLINE_LIBD@@IDN_LIB@libisc.lib;libisccfg.lib;libirs.lib;libdns.lib;libbind9.lib;ws2_32.lib;%(AdditionalDependencies) @@ -87,7 +87,7 @@ .\$(Configuration)\ .\$(Configuration)\ $(OutDir)$(TargetName).pdb - .\;..\include;..\..\..\;@LIBXML2_INC@@OPENSSL_INC@@READLINE_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\isccfg\include;..\..\..\lib\dns\include;..\..\..\lib\bind9\include;..\..\..\lib\lwres\win32\include;..\..\..\lib\lwres\include;%(AdditionalIncludeDirectories) + .\;..\include;..\..\..\;@LIBXML2_INC@@OPENSSL_INC@@READLINE_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\isccfg\include;..\..\..\lib\irs\include;..\..\..\lib\irs\win32\include;..\..\..\lib\dns\include;..\..\..\lib\bind9\include;%(AdditionalIncludeDirectories) CompileAsC @@ -97,8 +97,8 @@ true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) Default - ..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);..\..\..\lib\lwres\win32\$(Configuration);%(AdditionalLibraryDirectories) - @READLINE_LIB@@IDN_LIB@libisc.lib;libisccfg.lib;libdns.lib;libbind9.lib;liblwres.lib;ws2_32.lib;%(AdditionalDependencies) + ..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\irs\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);%(AdditionalLibraryDirectories) + @READLINE_LIB@@IDN_LIB@libisc.lib;libisccfg.lib;libirs.lib;libdns.lib;libbind9.lib;ws2_32.lib;%(AdditionalDependencies) diff --git a/bin/dnssec/win32/dnssectool.dsp.in b/bin/dnssec/win32/dnssectool.dsp.in deleted file mode 100644 index 66cc4e116b..0000000000 --- a/bin/dnssec/win32/dnssectool.dsp.in +++ /dev/null @@ -1,113 +0,0 @@ -# Microsoft Developer Studio Project File - Name="dnssectool" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Static-Link Library" 0x0104 - -CFG=dnssectool - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "dnssectool.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "dnssectool.mak" CFG="dnssectool - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "dnssectool - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Static-Link Library") -!MESSAGE "dnssectool - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Static-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "dnssectool - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" @CRYPTO@ /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" @COPTY@ /FD /c /Fddnssectool -# SUBTRACT CPP /X -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 -# ADD LINK32 /out:"Release/dnssectool.lib" - -!ELSEIF "$(CFG)" == "dnssectool - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" @CRYPTO@ /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /FR @COPTY@ /FD /GZ /c /Fddnssectool -# SUBTRACT CPP /X -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 -# ADD LINK32 /debug out:"Debug/dnssectool.lib" - -!ENDIF - -# Begin Target - -# Name "dnssectool - @PLATFORM@ Release" -# Name "dnssectool - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# Begin Group "Main Dns Lib" - -# PROP Default_Filter "c" -# Begin Source File - -SOURCE=..\dnssectool.c -# End Source File -# End Group -# End Target -# End Project diff --git a/bin/dnssec/win32/dnssectool.dsw b/bin/dnssec/win32/dnssectool.dsw deleted file mode 100644 index 703c508201..0000000000 --- a/bin/dnssec/win32/dnssectool.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "dnssectool"=".\dnssectool.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/bin/dnssec/win32/dsfromkey.dsp.in b/bin/dnssec/win32/dsfromkey.dsp.in deleted file mode 100644 index 69673043aa..0000000000 --- a/bin/dnssec/win32/dsfromkey.dsp.in +++ /dev/null @@ -1,103 +0,0 @@ -# Microsoft Developer Studio Project File - Name="dsfromkey" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103 - -CFG=dsfromkey - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "dsfromkey.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "dsfromkey.mak" CFG="dsfromkey - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "dsfromkey - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "dsfromkey - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "dsfromkey - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" @CRYPTO@ /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console @MACHINE@ -# ADD LINK32 user32.lib advapi32.lib Release/dnssectool.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ws2_32.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/dnssec-dsfromkey.exe" - -!ELSEIF "$(CFG)" == "dsfromkey - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" @CRYPTO@ /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c -# SUBTRACT CPP /X @COPTY@ -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console /debug @MACHINE@ /pdbtype:sept -# ADD LINK32 user32.lib advapi32.lib Debug/dnssectool.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ws2_32.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/dnssec-dsfromkey.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "dsfromkey - @PLATFORM@ Release" -# Name "dsfromkey - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE="..\dnssec-dsfromkey.c" -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/bin/dnssec/win32/dsfromkey.dsw b/bin/dnssec/win32/dsfromkey.dsw deleted file mode 100644 index 06461aa18d..0000000000 --- a/bin/dnssec/win32/dsfromkey.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "dsfromkey"=".\dsfromkey.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/bin/dnssec/win32/dsfromkey.mak.in b/bin/dnssec/win32/dsfromkey.mak.in deleted file mode 100644 index f5d6ec6cc5..0000000000 --- a/bin/dnssec/win32/dsfromkey.mak.in +++ /dev/null @@ -1,324 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on dsfromkey.dsp -!IF "$(CFG)" == "" -CFG=dsfromkey - @PLATFORM@ Debug -!MESSAGE No configuration specified. Defaulting to dsfromkey - @PLATFORM@ Debug. -!ENDIF - -!IF "$(CFG)" != "dsfromkey - @PLATFORM@ Release" && "$(CFG)" != "dsfromkey - @PLATFORM@ Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "dsfromkey.mak" CFG="dsfromkey - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "dsfromkey - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "dsfromkey - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -!IF "$(CFG)" == "dsfromkey - @PLATFORM@ 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)" == "dsfromkey - @PLATFORM@ Release" - -OUTDIR=.\Release -INTDIR=.\Release - -ALL : "..\..\..\Build\Release\dnssec-dsfromkey.exe" - - -CLEAN : - -@erase "$(INTDIR)\dnssec-dsfromkey.obj" - -@erase "$(INTDIR)\dnssectool.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "..\..\..\Build\Release\dnssec-dsfromkey.exe" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" @CRYPTO@ /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\dsfromkey.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\dsfromkey.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ws2_32.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\dnssec-dsfromkey.pdb" @MACHINE@ /out:"../../../Build/Release/dnssec-dsfromkey.exe" -LINK32_OBJS= \ - "$(INTDIR)\dnssec-dsfromkey.obj" \ - "$(INTDIR)\dnssectool.obj" - -"..\..\..\Build\Release\dnssec-dsfromkey.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ELSEIF "$(CFG)" == "dsfromkey - @PLATFORM@ Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -ALL : "..\..\..\Build\Debug\dnssec-dsfromkey.exe" "$(OUTDIR)\dsfromkey.bsc" - - -CLEAN : - -@erase "$(INTDIR)\dnssec-dsfromkey.obj" - -@erase "$(INTDIR)\dnssec-dsfromkey.sbr" - -@erase "$(INTDIR)\dnssectool.obj" - -@erase "$(INTDIR)\dnssectool.sbr" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\dnssec-dsfromkey.pdb" - -@erase "$(OUTDIR)\dsfromkey.bsc" - -@erase "..\..\..\Build\Debug\dnssec-dsfromkey.exe" - -@erase "..\..\..\Build\Debug\dnssec-dsfromkey.ilk" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" @CRYPTO@ /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\dsfromkey.bsc" -BSC32_SBRS= \ - "$(INTDIR)\dnssec-dsfromkey.sbr" \ - "$(INTDIR)\dnssectool.sbr" - -"$(OUTDIR)\dsfromkey.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ws2_32.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\dnssec-dsfromkey.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/dnssec-dsfromkey.exe" /pdbtype:sept -LINK32_OBJS= \ - "$(INTDIR)\dnssec-dsfromkey.obj" \ - "$(INTDIR)\dnssectool.obj" - -"..\..\..\Build\Debug\dnssec-dsfromkey.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ENDIF - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("dsfromkey.dep") -!INCLUDE "dsfromkey.dep" -!ELSE -!MESSAGE Warning: cannot find "dsfromkey.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "dsfromkey - @PLATFORM@ Release" || "$(CFG)" == "dsfromkey - @PLATFORM@ Debug" -SOURCE="..\dnssec-dsfromkey.c" - -!IF "$(CFG)" == "dsfromkey - @PLATFORM@ Release" - - -"$(INTDIR)\dnssec-dsfromkey.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "dsfromkey - @PLATFORM@ Debug" - - -"$(INTDIR)\dnssec-dsfromkey.obj" "$(INTDIR)\dnssec-dsfromkey.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=..\dnssectool.c - -!IF "$(CFG)" == "dsfromkey - @PLATFORM@ Release" - - -"$(INTDIR)\dnssectool.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "dsfromkey - @PLATFORM@ Debug" - - -"$(INTDIR)\dnssectool.obj" "$(INTDIR)\dnssectool.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - - -!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 -1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest" -<< KEEP - -$(_VC_MANIFEST_BASENAME).auto.manifest : - type <<$@ - - - -<< KEEP diff --git a/bin/dnssec/win32/importkey.dsp.in b/bin/dnssec/win32/importkey.dsp.in deleted file mode 100644 index cb6ba983c3..0000000000 --- a/bin/dnssec/win32/importkey.dsp.in +++ /dev/null @@ -1,103 +0,0 @@ -# Microsoft Developer Studio Project File - Name="importkey" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103 - -CFG=importkey - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "importkey.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "importkey.mak" CFG="importkey - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "importkey - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "importkey - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "importkey - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" @CRYPTO@ /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console @MACHINE@ -# ADD LINK32 user32.lib advapi32.lib Release/dnssectool.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ws2_32.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/dnssec-importkey.exe" - -!ELSEIF "$(CFG)" == "importkey - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" @CRYPTO@ /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c -# SUBTRACT CPP /X @COPTY@ -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console /debug @MACHINE@ /pdbtype:sept -# ADD LINK32 user32.lib advapi32.lib Debug/dnssectool.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ws2_32.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/dnssec-importkey.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "importkey - @PLATFORM@ Release" -# Name "importkey - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE="..\dnssec-importkey.c" -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/bin/dnssec/win32/importkey.dsw b/bin/dnssec/win32/importkey.dsw deleted file mode 100644 index 28f2ee685d..0000000000 --- a/bin/dnssec/win32/importkey.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "importkey"=".\importkey.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/bin/dnssec/win32/importkey.mak.in b/bin/dnssec/win32/importkey.mak.in deleted file mode 100644 index 53d42af1fb..0000000000 --- a/bin/dnssec/win32/importkey.mak.in +++ /dev/null @@ -1,324 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on importkey.dsp -!IF "$(CFG)" == "" -CFG=importkey - @PLATFORM@ Debug -!MESSAGE No configuration specified. Defaulting to importkey - @PLATFORM@ Debug. -!ENDIF - -!IF "$(CFG)" != "importkey - @PLATFORM@ Release" && "$(CFG)" != "importkey - @PLATFORM@ Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "importkey.mak" CFG="importkey - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "importkey - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "importkey - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -!IF "$(CFG)" == "importkey - @PLATFORM@ 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)" == "importkey - @PLATFORM@ Release" - -OUTDIR=.\Release -INTDIR=.\Release - -ALL : "..\..\..\Build\Release\dnssec-importkey.exe" - - -CLEAN : - -@erase "$(INTDIR)\dnssec-importkey.obj" - -@erase "$(INTDIR)\dnssectool.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "..\..\..\Build\Release\dnssec-importkey.exe" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" @CRYPTO@ /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\importkey.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\importkey.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ws2_32.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\dnssec-importkey.pdb" @MACHINE@ /out:"../../../Build/Release/dnssec-importkey.exe" -LINK32_OBJS= \ - "$(INTDIR)\dnssec-importkey.obj" \ - "$(INTDIR)\dnssectool.obj" - -"..\..\..\Build\Release\dnssec-importkey.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ELSEIF "$(CFG)" == "importkey - @PLATFORM@ Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -ALL : "..\..\..\Build\Debug\dnssec-importkey.exe" "$(OUTDIR)\importkey.bsc" - - -CLEAN : - -@erase "$(INTDIR)\dnssec-importkey.obj" - -@erase "$(INTDIR)\dnssec-importkey.sbr" - -@erase "$(INTDIR)\dnssectool.obj" - -@erase "$(INTDIR)\dnssectool.sbr" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\dnssec-importkey.pdb" - -@erase "$(OUTDIR)\importkey.bsc" - -@erase "..\..\..\Build\Debug\dnssec-importkey.exe" - -@erase "..\..\..\Build\Debug\dnssec-importkey.ilk" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" @CRYPTO@ /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\importkey.bsc" -BSC32_SBRS= \ - "$(INTDIR)\dnssec-importkey.sbr" \ - "$(INTDIR)\dnssectool.sbr" - -"$(OUTDIR)\importkey.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ws2_32.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\dnssec-importkey.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/dnssec-importkey.exe" /pdbtype:sept -LINK32_OBJS= \ - "$(INTDIR)\dnssec-importkey.obj" \ - "$(INTDIR)\dnssectool.obj" - -"..\..\..\Build\Debug\dnssec-importkey.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ENDIF - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("importkey.dep") -!INCLUDE "importkey.dep" -!ELSE -!MESSAGE Warning: cannot find "importkey.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "importkey - @PLATFORM@ Release" || "$(CFG)" == "importkey - @PLATFORM@ Debug" -SOURCE="..\dnssec-importkey.c" - -!IF "$(CFG)" == "importkey - @PLATFORM@ Release" - - -"$(INTDIR)\dnssec-importkey.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "importkey - @PLATFORM@ Debug" - - -"$(INTDIR)\dnssec-importkey.obj" "$(INTDIR)\dnssec-importkey.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=..\dnssectool.c - -!IF "$(CFG)" == "importkey - @PLATFORM@ Release" - - -"$(INTDIR)\dnssectool.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "importkey - @PLATFORM@ Debug" - - -"$(INTDIR)\dnssectool.obj" "$(INTDIR)\dnssectool.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - - -!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 -1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest" -<< KEEP - -$(_VC_MANIFEST_BASENAME).auto.manifest : - type <<$@ - - - -<< KEEP diff --git a/bin/dnssec/win32/keyfromlabel.dsp.in b/bin/dnssec/win32/keyfromlabel.dsp.in deleted file mode 100644 index 1739e9fed4..0000000000 --- a/bin/dnssec/win32/keyfromlabel.dsp.in +++ /dev/null @@ -1,103 +0,0 @@ -# Microsoft Developer Studio Project File - Name="keyfromlabel" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103 - -CFG=keyfromlabel - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "keyfromlabel.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "keyfromlabel.mak" CFG="keyfromlabel - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "keyfromlabel - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "keyfromlabel - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "keyfromlabel - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" @CRYPTO@ /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console @MACHINE@ -# ADD LINK32 user32.lib advapi32.lib Release/dnssectool.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ws2_32.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/dnssec-keyfromlabel.exe" - -!ELSEIF "$(CFG)" == "keyfromlabel - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" @CRYPTO@ /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c -# SUBTRACT CPP /X @COPTY@ -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console /debug @MACHINE@ /pdbtype:sept -# ADD LINK32 user32.lib advapi32.lib Debug/dnssectool.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ws2_32.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/dnssec-keyfromlabel.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "keyfromlabel - @PLATFORM@ Release" -# Name "keyfromlabel - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE="..\dnssec-keyfromlabel.c" -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/bin/dnssec/win32/keyfromlabel.dsw b/bin/dnssec/win32/keyfromlabel.dsw deleted file mode 100644 index 499e9a5ba4..0000000000 --- a/bin/dnssec/win32/keyfromlabel.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "keyfromlabel"=".\keyfromlabel.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/bin/dnssec/win32/keyfromlabel.mak.in b/bin/dnssec/win32/keyfromlabel.mak.in deleted file mode 100644 index 2a58a968ff..0000000000 --- a/bin/dnssec/win32/keyfromlabel.mak.in +++ /dev/null @@ -1,324 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on keyfromlabel.dsp -!IF "$(CFG)" == "" -CFG=keyfromlabel - @PLATFORM@ Debug -!MESSAGE No configuration specified. Defaulting to keyfromlabel - @PLATFORM@ Debug. -!ENDIF - -!IF "$(CFG)" != "keyfromlabel - @PLATFORM@ Release" && "$(CFG)" != "keyfromlabel - @PLATFORM@ Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "keyfromlabel.mak" CFG="keyfromlabel - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "keyfromlabel - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "keyfromlabel - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -!IF "$(CFG)" == "keyfromlabel - @PLATFORM@ 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)" == "keyfromlabel - @PLATFORM@ Release" - -OUTDIR=.\Release -INTDIR=.\Release - -ALL : "..\..\..\Build\Release\dnssec-keyfromlabel.exe" - - -CLEAN : - -@erase "$(INTDIR)\dnssec-keyfromlabel.obj" - -@erase "$(INTDIR)\dnssectool.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "..\..\..\Build\Release\dnssec-keyfromlabel.exe" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" @CRYPTO@ /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\keyfromlabel.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\keyfromlabel.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ws2_32.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\dnssec-keyfromlabel.pdb" @MACHINE@ /out:"../../../Build/Release/dnssec-keyfromlabel.exe" -LINK32_OBJS= \ - "$(INTDIR)\dnssec-keyfromlabel.obj" \ - "$(INTDIR)\dnssectool.obj" - -"..\..\..\Build\Release\dnssec-keyfromlabel.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ELSEIF "$(CFG)" == "keyfromlabel - @PLATFORM@ Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -ALL : "..\..\..\Build\Debug\dnssec-keyfromlabel.exe" "$(OUTDIR)\keyfromlabel.bsc" - - -CLEAN : - -@erase "$(INTDIR)\dnssec-keyfromlabel.obj" - -@erase "$(INTDIR)\dnssec-keyfromlabel.sbr" - -@erase "$(INTDIR)\dnssectool.obj" - -@erase "$(INTDIR)\dnssectool.sbr" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\dnssec-keyfromlabel.pdb" - -@erase "$(OUTDIR)\keyfromlabel.bsc" - -@erase "..\..\..\Build\Debug\dnssec-keyfromlabel.exe" - -@erase "..\..\..\Build\Debug\dnssec-keyfromlabel.ilk" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" @CRYPTO@ /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\keyfromlabel.bsc" -BSC32_SBRS= \ - "$(INTDIR)\dnssec-keyfromlabel.sbr" \ - "$(INTDIR)\dnssectool.sbr" - -"$(OUTDIR)\keyfromlabel.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ws2_32.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\dnssec-keyfromlabel.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/dnssec-keyfromlabel.exe" /pdbtype:sept -LINK32_OBJS= \ - "$(INTDIR)\dnssec-keyfromlabel.obj" \ - "$(INTDIR)\dnssectool.obj" - -"..\..\..\Build\Debug\dnssec-keyfromlabel.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ENDIF - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("keyfromlabel.dep") -!INCLUDE "keyfromlabel.dep" -!ELSE -!MESSAGE Warning: cannot find "keyfromlabel.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "keyfromlabel - @PLATFORM@ Release" || "$(CFG)" == "keyfromlabel - @PLATFORM@ Debug" -SOURCE="..\dnssec-keyfromlabel.c" - -!IF "$(CFG)" == "keyfromlabel - @PLATFORM@ Release" - - -"$(INTDIR)\dnssec-keyfromlabel.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "keyfromlabel - @PLATFORM@ Debug" - - -"$(INTDIR)\dnssec-keyfromlabel.obj" "$(INTDIR)\dnssec-keyfromlabel.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=..\dnssectool.c - -!IF "$(CFG)" == "keyfromlabel - @PLATFORM@ Release" - - -"$(INTDIR)\dnssectool.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "keyfromlabel - @PLATFORM@ Debug" - - -"$(INTDIR)\dnssectool.obj" "$(INTDIR)\dnssectool.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - - -!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 -1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest" -<< KEEP - -$(_VC_MANIFEST_BASENAME).auto.manifest : - type <<$@ - - - -<< KEEP diff --git a/bin/dnssec/win32/keygen.dsp.in b/bin/dnssec/win32/keygen.dsp.in deleted file mode 100644 index 6b135bf6df..0000000000 --- a/bin/dnssec/win32/keygen.dsp.in +++ /dev/null @@ -1,103 +0,0 @@ -# Microsoft Developer Studio Project File - Name="keygen" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103 - -CFG=keygen - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "keygen.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "keygen.mak" CFG="keygen - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "keygen - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "keygen - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "keygen - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" @CRYPTO@ /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console @MACHINE@ -# ADD LINK32 user32.lib advapi32.lib Release/dnssectool.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ws2_32.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/dnssec-keygen.exe" - -!ELSEIF "$(CFG)" == "keygen - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" @CRYPTO@ /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c -# SUBTRACT CPP /X @COPTY@ -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console /debug @MACHINE@ /pdbtype:sept -# ADD LINK32 user32.lib advapi32.lib Debug/dnssectool.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ws2_32.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/dnssec-keygen.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "keygen - @PLATFORM@ Release" -# Name "keygen - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE="..\dnssec-keygen.c" -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/bin/dnssec/win32/keygen.dsw b/bin/dnssec/win32/keygen.dsw deleted file mode 100644 index bdd633e4e9..0000000000 --- a/bin/dnssec/win32/keygen.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "keygen"=".\keygen.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/bin/dnssec/win32/keygen.mak.in b/bin/dnssec/win32/keygen.mak.in deleted file mode 100644 index b29d11de5a..0000000000 --- a/bin/dnssec/win32/keygen.mak.in +++ /dev/null @@ -1,324 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on keygen.dsp -!IF "$(CFG)" == "" -CFG=keygen - @PLATFORM@ Debug -!MESSAGE No configuration specified. Defaulting to keygen - @PLATFORM@ Debug. -!ENDIF - -!IF "$(CFG)" != "keygen - @PLATFORM@ Release" && "$(CFG)" != "keygen - @PLATFORM@ Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "keygen.mak" CFG="keygen - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "keygen - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "keygen - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -!IF "$(CFG)" == "keygen - @PLATFORM@ 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)" == "keygen - @PLATFORM@ Release" - -OUTDIR=.\Release -INTDIR=.\Release - -ALL : "..\..\..\Build\Release\dnssec-keygen.exe" - - -CLEAN : - -@erase "$(INTDIR)\dnssec-keygen.obj" - -@erase "$(INTDIR)\dnssectool.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "..\..\..\Build\Release\dnssec-keygen.exe" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" @CRYPTO@ /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\keygen.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\keygen.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ws2_32.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\dnssec-keygen.pdb" @MACHINE@ /out:"../../../Build/Release/dnssec-keygen.exe" -LINK32_OBJS= \ - "$(INTDIR)\dnssec-keygen.obj" \ - "$(INTDIR)\dnssectool.obj" - -"..\..\..\Build\Release\dnssec-keygen.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ELSEIF "$(CFG)" == "keygen - @PLATFORM@ Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -ALL : "..\..\..\Build\Debug\dnssec-keygen.exe" "$(OUTDIR)\keygen.bsc" - - -CLEAN : - -@erase "$(INTDIR)\dnssec-keygen.obj" - -@erase "$(INTDIR)\dnssec-keygen.sbr" - -@erase "$(INTDIR)\dnssectool.obj" - -@erase "$(INTDIR)\dnssectool.sbr" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\dnssec-keygen.pdb" - -@erase "$(OUTDIR)\keygen.bsc" - -@erase "..\..\..\Build\Debug\dnssec-keygen.exe" - -@erase "..\..\..\Build\Debug\dnssec-keygen.ilk" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" @CRYPTO@ /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\keygen.bsc" -BSC32_SBRS= \ - "$(INTDIR)\dnssec-keygen.sbr" \ - "$(INTDIR)\dnssectool.sbr" - -"$(OUTDIR)\keygen.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ws2_32.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\dnssec-keygen.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/dnssec-keygen.exe" /pdbtype:sept -LINK32_OBJS= \ - "$(INTDIR)\dnssec-keygen.obj" \ - "$(INTDIR)\dnssectool.obj" - -"..\..\..\Build\Debug\dnssec-keygen.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ENDIF - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("keygen.dep") -!INCLUDE "keygen.dep" -!ELSE -!MESSAGE Warning: cannot find "keygen.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "keygen - @PLATFORM@ Release" || "$(CFG)" == "keygen - @PLATFORM@ Debug" -SOURCE="..\dnssec-keygen.c" - -!IF "$(CFG)" == "keygen - @PLATFORM@ Release" - - -"$(INTDIR)\dnssec-keygen.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "keygen - @PLATFORM@ Debug" - - -"$(INTDIR)\dnssec-keygen.obj" "$(INTDIR)\dnssec-keygen.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=..\dnssectool.c - -!IF "$(CFG)" == "keygen - @PLATFORM@ Release" - - -"$(INTDIR)\dnssectool.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "keygen - @PLATFORM@ Debug" - - -"$(INTDIR)\dnssectool.obj" "$(INTDIR)\dnssectool.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - - -!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 -1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest" -<< KEEP - -$(_VC_MANIFEST_BASENAME).auto.manifest : - type <<$@ - - - -<< KEEP diff --git a/bin/dnssec/win32/revoke.dsp.in b/bin/dnssec/win32/revoke.dsp.in deleted file mode 100644 index 521028d100..0000000000 --- a/bin/dnssec/win32/revoke.dsp.in +++ /dev/null @@ -1,103 +0,0 @@ -# Microsoft Developer Studio Project File - Name="revoke" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103 - -CFG=revoke - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "revoke.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "revoke.mak" CFG="revoke - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "revoke - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "revoke - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "revoke - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" @CRYPTO@ /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console @MACHINE@ -# ADD LINK32 user32.lib advapi32.lib Release/dnssectool.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ws2_32.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/dnssec-revoke.exe" - -!ELSEIF "$(CFG)" == "revoke - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" @CRYPTO@ /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c -# SUBTRACT CPP /X @COPTY@ -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console /debug @MACHINE@ /pdbtype:sept -# ADD LINK32 user32.lib advapi32.lib Debug/dnssectool.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ws2_32.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/dnssec-revoke.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "revoke - @PLATFORM@ Release" -# Name "revoke - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE="..\dnssec-revoke.c" -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/bin/dnssec/win32/revoke.dsw b/bin/dnssec/win32/revoke.dsw deleted file mode 100644 index f588e21df5..0000000000 --- a/bin/dnssec/win32/revoke.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "revoke"=".\revoke.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/bin/dnssec/win32/revoke.mak.in b/bin/dnssec/win32/revoke.mak.in deleted file mode 100644 index 03632ef731..0000000000 --- a/bin/dnssec/win32/revoke.mak.in +++ /dev/null @@ -1,324 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on revoke.dsp -!IF "$(CFG)" == "" -CFG=revoke - @PLATFORM@ Debug -!MESSAGE No configuration specified. Defaulting to revoke - @PLATFORM@ Debug. -!ENDIF - -!IF "$(CFG)" != "revoke - @PLATFORM@ Release" && "$(CFG)" != "revoke - @PLATFORM@ Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "revoke.mak" CFG="revoke - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "revoke - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "revoke - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -!IF "$(CFG)" == "revoke - @PLATFORM@ 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)" == "revoke - @PLATFORM@ Release" - -OUTDIR=.\Release -INTDIR=.\Release - -ALL : "..\..\..\Build\Release\dnssec-revoke.exe" - - -CLEAN : - -@erase "$(INTDIR)\dnssec-revoke.obj" - -@erase "$(INTDIR)\dnssectool.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "..\..\..\Build\Release\dnssec-revoke.exe" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" @CRYPTO@ /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\revoke.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\revoke.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ws2_32.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\dnssec-revoke.pdb" @MACHINE@ /out:"../../../Build/Release/dnssec-revoke.exe" -LINK32_OBJS= \ - "$(INTDIR)\dnssec-revoke.obj" \ - "$(INTDIR)\dnssectool.obj" - -"..\..\..\Build\Release\dnssec-revoke.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ELSEIF "$(CFG)" == "revoke - @PLATFORM@ Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -ALL : "..\..\..\Build\Debug\dnssec-revoke.exe" "$(OUTDIR)\revoke.bsc" - - -CLEAN : - -@erase "$(INTDIR)\dnssec-revoke.obj" - -@erase "$(INTDIR)\dnssec-revoke.sbr" - -@erase "$(INTDIR)\dnssectool.obj" - -@erase "$(INTDIR)\dnssectool.sbr" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\dnssec-revoke.pdb" - -@erase "$(OUTDIR)\revoke.bsc" - -@erase "..\..\..\Build\Debug\dnssec-revoke.exe" - -@erase "..\..\..\Build\Debug\dnssec-revoke.ilk" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" @CRYPTO@ /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\revoke.bsc" -BSC32_SBRS= \ - "$(INTDIR)\dnssec-revoke.sbr" \ - "$(INTDIR)\dnssectool.sbr" - -"$(OUTDIR)\revoke.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ws2_32.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\dnssec-revoke.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/dnssec-revoke.exe" /pdbtype:sept -LINK32_OBJS= \ - "$(INTDIR)\dnssec-revoke.obj" \ - "$(INTDIR)\dnssectool.obj" - -"..\..\..\Build\Debug\dnssec-revoke.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ENDIF - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("revoke.dep") -!INCLUDE "revoke.dep" -!ELSE -!MESSAGE Warning: cannot find "revoke.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "revoke - @PLATFORM@ Release" || "$(CFG)" == "revoke - @PLATFORM@ Debug" -SOURCE="..\dnssec-revoke.c" - -!IF "$(CFG)" == "revoke - @PLATFORM@ Release" - - -"$(INTDIR)\dnssec-revoke.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "revoke - @PLATFORM@ Debug" - - -"$(INTDIR)\dnssec-revoke.obj" "$(INTDIR)\dnssec-revoke.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=..\dnssectool.c - -!IF "$(CFG)" == "revoke - @PLATFORM@ Release" - - -"$(INTDIR)\dnssectool.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "revoke - @PLATFORM@ Debug" - - -"$(INTDIR)\dnssectool.obj" "$(INTDIR)\dnssectool.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - - -!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 -1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest" -<< KEEP - -$(_VC_MANIFEST_BASENAME).auto.manifest : - type <<$@ - - - -<< KEEP diff --git a/bin/dnssec/win32/settime.dsp.in b/bin/dnssec/win32/settime.dsp.in deleted file mode 100644 index d71a3a9daf..0000000000 --- a/bin/dnssec/win32/settime.dsp.in +++ /dev/null @@ -1,103 +0,0 @@ -# Microsoft Developer Studio Project File - Name="settime" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103 - -CFG=settime - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "settime.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "settime.mak" CFG="settime - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "settime - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "settime - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "settime - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" @CRYPTO@ /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console @MACHINE@ -# ADD LINK32 user32.lib advapi32.lib Release/dnssectool.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ws2_32.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/dnssec-settime.exe" - -!ELSEIF "$(CFG)" == "settime - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" @CRYPTO@ /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c -# SUBTRACT CPP /X @COPTY@ -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console /debug @MACHINE@ /pdbtype:sept -# ADD LINK32 user32.lib advapi32.lib Debug/dnssectool.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ws2_32.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/dnssec-settime.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "settime - @PLATFORM@ Release" -# Name "settime - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE="..\dnssec-settime.c" -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/bin/dnssec/win32/settime.dsw b/bin/dnssec/win32/settime.dsw deleted file mode 100644 index fc4dca8fcc..0000000000 --- a/bin/dnssec/win32/settime.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "settime"=".\settime.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/bin/dnssec/win32/settime.mak.in b/bin/dnssec/win32/settime.mak.in deleted file mode 100644 index 1de3a84790..0000000000 --- a/bin/dnssec/win32/settime.mak.in +++ /dev/null @@ -1,324 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on settime.dsp -!IF "$(CFG)" == "" -CFG=settime - @PLATFORM@ Debug -!MESSAGE No configuration specified. Defaulting to settime - @PLATFORM@ Debug. -!ENDIF - -!IF "$(CFG)" != "settime - @PLATFORM@ Release" && "$(CFG)" != "settime - @PLATFORM@ Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "settime.mak" CFG="settime - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "settime - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "settime - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -!IF "$(CFG)" == "settime - @PLATFORM@ 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)" == "settime - @PLATFORM@ Release" - -OUTDIR=.\Release -INTDIR=.\Release - -ALL : "..\..\..\Build\Release\dnssec-settime.exe" - - -CLEAN : - -@erase "$(INTDIR)\dnssec-settime.obj" - -@erase "$(INTDIR)\dnssectool.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "..\..\..\Build\Release\dnssec-settime.exe" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" @CRYPTO@ /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\settime.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\settime.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ws2_32.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\dnssec-settime.pdb" @MACHINE@ /out:"../../../Build/Release/dnssec-settime.exe" -LINK32_OBJS= \ - "$(INTDIR)\dnssec-settime.obj" \ - "$(INTDIR)\dnssectool.obj" - -"..\..\..\Build\Release\dnssec-settime.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ELSEIF "$(CFG)" == "settime - @PLATFORM@ Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -ALL : "..\..\..\Build\Debug\dnssec-settime.exe" "$(OUTDIR)\settime.bsc" - - -CLEAN : - -@erase "$(INTDIR)\dnssec-settime.obj" - -@erase "$(INTDIR)\dnssec-settime.sbr" - -@erase "$(INTDIR)\dnssectool.obj" - -@erase "$(INTDIR)\dnssectool.sbr" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\dnssec-settime.pdb" - -@erase "$(OUTDIR)\settime.bsc" - -@erase "..\..\..\Build\Debug\dnssec-settime.exe" - -@erase "..\..\..\Build\Debug\dnssec-settime.ilk" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" @CRYPTO@ /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\settime.bsc" -BSC32_SBRS= \ - "$(INTDIR)\dnssec-settime.sbr" \ - "$(INTDIR)\dnssectool.sbr" - -"$(OUTDIR)\settime.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ws2_32.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\dnssec-settime.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/dnssec-settime.exe" /pdbtype:sept -LINK32_OBJS= \ - "$(INTDIR)\dnssec-settime.obj" \ - "$(INTDIR)\dnssectool.obj" - -"..\..\..\Build\Debug\dnssec-settime.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ENDIF - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("settime.dep") -!INCLUDE "settime.dep" -!ELSE -!MESSAGE Warning: cannot find "settime.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "settime - @PLATFORM@ Release" || "$(CFG)" == "settime - @PLATFORM@ Debug" -SOURCE="..\dnssec-settime.c" - -!IF "$(CFG)" == "settime - @PLATFORM@ Release" - - -"$(INTDIR)\dnssec-settime.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "settime - @PLATFORM@ Debug" - - -"$(INTDIR)\dnssec-settime.obj" "$(INTDIR)\dnssec-settime.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=..\dnssectool.c - -!IF "$(CFG)" == "settime - @PLATFORM@ Release" - - -"$(INTDIR)\dnssectool.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "settime - @PLATFORM@ Debug" - - -"$(INTDIR)\dnssectool.obj" "$(INTDIR)\dnssectool.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - - -!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 -1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest" -<< KEEP - -$(_VC_MANIFEST_BASENAME).auto.manifest : - type <<$@ - - - -<< KEEP diff --git a/bin/dnssec/win32/signzone.dsp.in b/bin/dnssec/win32/signzone.dsp.in deleted file mode 100644 index ee45ec9c46..0000000000 --- a/bin/dnssec/win32/signzone.dsp.in +++ /dev/null @@ -1,103 +0,0 @@ -# Microsoft Developer Studio Project File - Name="signzone" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103 - -CFG=signzone - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "signzone.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "signzone.mak" CFG="signzone - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "signzone - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "signzone - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "signzone - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" @CRYPTO@ /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console @MACHINE@ -# ADD LINK32 user32.lib advapi32.lib Release/dnssectool.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ws2_32.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/dnssec-signzone.exe" - -!ELSEIF "$(CFG)" == "signzone - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" @CRYPTO@ /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c -# SUBTRACT CPP /X @COPTY@ -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console /debug @MACHINE@ /pdbtype:sept -# ADD LINK32 user32.lib advapi32.lib Debug/dnssectool.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ws2_32.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/dnssec-signzone.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "signzone - @PLATFORM@ Release" -# Name "signzone - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE="..\dnssec-signzone.c" -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/bin/dnssec/win32/signzone.dsw b/bin/dnssec/win32/signzone.dsw deleted file mode 100644 index 67f5647f2e..0000000000 --- a/bin/dnssec/win32/signzone.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "signzone"=".\signzone.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/bin/dnssec/win32/signzone.mak.in b/bin/dnssec/win32/signzone.mak.in deleted file mode 100644 index a106465887..0000000000 --- a/bin/dnssec/win32/signzone.mak.in +++ /dev/null @@ -1,324 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on signzone.dsp -!IF "$(CFG)" == "" -CFG=signzone - @PLATFORM@ Debug -!MESSAGE No configuration specified. Defaulting to signzone - @PLATFORM@ Debug. -!ENDIF - -!IF "$(CFG)" != "signzone - @PLATFORM@ Release" && "$(CFG)" != "signzone - @PLATFORM@ Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "signzone.mak" CFG="signzone - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "signzone - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "signzone - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -!IF "$(CFG)" == "signzone - @PLATFORM@ 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)" == "signzone - @PLATFORM@ Release" - -OUTDIR=.\Release -INTDIR=.\Release - -ALL : "..\..\..\Build\Release\dnssec-signzone.exe" - - -CLEAN : - -@erase "$(INTDIR)\dnssec-signzone.obj" - -@erase "$(INTDIR)\dnssectool.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "..\..\..\Build\Release\dnssec-signzone.exe" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" @CRYPTO@ /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\signzone.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\signzone.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ws2_32.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\dnssec-signzone.pdb" @MACHINE@ /out:"../../../Build/Release/dnssec-signzone.exe" -LINK32_OBJS= \ - "$(INTDIR)\dnssec-signzone.obj" \ - "$(INTDIR)\dnssectool.obj" - -"..\..\..\Build\Release\dnssec-signzone.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ELSEIF "$(CFG)" == "signzone - @PLATFORM@ Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -ALL : "..\..\..\Build\Debug\dnssec-signzone.exe" "$(OUTDIR)\signzone.bsc" - - -CLEAN : - -@erase "$(INTDIR)\dnssec-signzone.obj" - -@erase "$(INTDIR)\dnssec-signzone.sbr" - -@erase "$(INTDIR)\dnssectool.obj" - -@erase "$(INTDIR)\dnssectool.sbr" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\dnssec-signzone.pdb" - -@erase "$(OUTDIR)\signzone.bsc" - -@erase "..\..\..\Build\Debug\dnssec-signzone.exe" - -@erase "..\..\..\Build\Debug\dnssec-signzone.ilk" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" @CRYPTO@ /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\signzone.bsc" -BSC32_SBRS= \ - "$(INTDIR)\dnssec-signzone.sbr" \ - "$(INTDIR)\dnssectool.sbr" - -"$(OUTDIR)\signzone.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ws2_32.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\dnssec-signzone.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/dnssec-signzone.exe" /pdbtype:sept -LINK32_OBJS= \ - "$(INTDIR)\dnssec-signzone.obj" \ - "$(INTDIR)\dnssectool.obj" - -"..\..\..\Build\Debug\dnssec-signzone.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ENDIF - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("signzone.dep") -!INCLUDE "signzone.dep" -!ELSE -!MESSAGE Warning: cannot find "signzone.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "signzone - @PLATFORM@ Release" || "$(CFG)" == "signzone - @PLATFORM@ Debug" -SOURCE="..\dnssec-signzone.c" - -!IF "$(CFG)" == "signzone - @PLATFORM@ Release" - - -"$(INTDIR)\dnssec-signzone.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "signzone - @PLATFORM@ Debug" - - -"$(INTDIR)\dnssec-signzone.obj" "$(INTDIR)\dnssec-signzone.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=..\dnssectool.c - -!IF "$(CFG)" == "signzone - @PLATFORM@ Release" - - -"$(INTDIR)\dnssectool.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "signzone - @PLATFORM@ Debug" - - -"$(INTDIR)\dnssectool.obj" "$(INTDIR)\dnssectool.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - - -!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 -1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest" -<< KEEP - -$(_VC_MANIFEST_BASENAME).auto.manifest : - type <<$@ - - - -<< KEEP diff --git a/bin/dnssec/win32/verify.dsp.in b/bin/dnssec/win32/verify.dsp.in deleted file mode 100644 index 3c76ecd3af..0000000000 --- a/bin/dnssec/win32/verify.dsp.in +++ /dev/null @@ -1,103 +0,0 @@ -# Microsoft Developer Studio Project File - Name="verify" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103 - -CFG=verify - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "verify.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "verify.mak" CFG="verify - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "verify - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "verify - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "verify - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" @CRYPTO@ /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console @MACHINE@ -# ADD LINK32 user32.lib advapi32.lib Release/dnssectool.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ws2_32.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/dnssec-verify.exe" - -!ELSEIF "$(CFG)" == "verify - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" @CRYPTO@ /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c -# SUBTRACT CPP /X @COPTY@ -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console /debug @MACHINE@ /pdbtype:sept -# ADD LINK32 user32.lib advapi32.lib Debug/dnssectool.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ws2_32.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/dnssec-verify.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "verify - @PLATFORM@ Release" -# Name "verify - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE="..\dnssec-verify.c" -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/bin/dnssec/win32/verify.dsw b/bin/dnssec/win32/verify.dsw deleted file mode 100644 index 4553264149..0000000000 --- a/bin/dnssec/win32/verify.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "verify"=".\verify.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/bin/dnssec/win32/verify.mak.in b/bin/dnssec/win32/verify.mak.in deleted file mode 100644 index a858a8b20d..0000000000 --- a/bin/dnssec/win32/verify.mak.in +++ /dev/null @@ -1,324 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on verify.dsp -!IF "$(CFG)" == "" -CFG=verify - @PLATFORM@ Debug -!MESSAGE No configuration specified. Defaulting to verify - @PLATFORM@ Debug. -!ENDIF - -!IF "$(CFG)" != "verify - @PLATFORM@ Release" && "$(CFG)" != "verify - @PLATFORM@ Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "verify.mak" CFG="verify - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "verify - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "verify - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -!IF "$(CFG)" == "verify - @PLATFORM@ 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)" == "verify - @PLATFORM@ Release" - -OUTDIR=.\Release -INTDIR=.\Release - -ALL : "..\..\..\Build\Release\dnssec-verify.exe" - - -CLEAN : - -@erase "$(INTDIR)\dnssec-verify.obj" - -@erase "$(INTDIR)\dnssectool.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "..\..\..\Build\Release\dnssec-verify.exe" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" @CRYPTO@ /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\verify.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\verify.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ws2_32.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\dnssec-verify.pdb" @MACHINE@ /out:"../../../Build/Release/dnssec-verify.exe" -LINK32_OBJS= \ - "$(INTDIR)\dnssec-verify.obj" \ - "$(INTDIR)\dnssectool.obj" - -"..\..\..\Build\Release\dnssec-verify.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ELSEIF "$(CFG)" == "verify - @PLATFORM@ Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -ALL : "..\..\..\Build\Debug\dnssec-verify.exe" "$(OUTDIR)\verify.bsc" - - -CLEAN : - -@erase "$(INTDIR)\dnssec-verify.obj" - -@erase "$(INTDIR)\dnssec-verify.sbr" - -@erase "$(INTDIR)\dnssectool.obj" - -@erase "$(INTDIR)\dnssectool.sbr" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\dnssec-verify.pdb" - -@erase "$(OUTDIR)\verify.bsc" - -@erase "..\..\..\Build\Debug\dnssec-verify.exe" - -@erase "..\..\..\Build\Debug\dnssec-verify.ilk" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" @CRYPTO@ /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\verify.bsc" -BSC32_SBRS= \ - "$(INTDIR)\dnssec-verify.sbr" \ - "$(INTDIR)\dnssectool.sbr" - -"$(OUTDIR)\verify.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ws2_32.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\dnssec-verify.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/dnssec-verify.exe" /pdbtype:sept -LINK32_OBJS= \ - "$(INTDIR)\dnssec-verify.obj" \ - "$(INTDIR)\dnssectool.obj" - -"..\..\..\Build\Debug\dnssec-verify.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ENDIF - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("verify.dep") -!INCLUDE "verify.dep" -!ELSE -!MESSAGE Warning: cannot find "verify.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "verify - @PLATFORM@ Release" || "$(CFG)" == "verify - @PLATFORM@ Debug" -SOURCE="..\dnssec-verify.c" - -!IF "$(CFG)" == "verify - @PLATFORM@ Release" - - -"$(INTDIR)\dnssec-verify.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "verify - @PLATFORM@ Debug" - - -"$(INTDIR)\dnssec-verify.obj" "$(INTDIR)\dnssec-verify.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=..\dnssectool.c - -!IF "$(CFG)" == "verify - @PLATFORM@ Release" - - -"$(INTDIR)\dnssectool.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "verify - @PLATFORM@ Debug" - - -"$(INTDIR)\dnssectool.obj" "$(INTDIR)\dnssectool.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - - -!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 -1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest" -<< KEEP - -$(_VC_MANIFEST_BASENAME).auto.manifest : - type <<$@ - - - -<< KEEP diff --git a/bin/named/.gitignore b/bin/named/.gitignore index efa677a1a1..f522c74834 100644 --- a/bin/named/.gitignore +++ b/bin/named/.gitignore @@ -1,4 +1,3 @@ .libs /named -/lwresd named-symtbl.c diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in index 3a11bf5d10..4541ab60ad 100644 --- a/bin/named/Makefile.in +++ b/bin/named/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2002, 2004-2016 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 1998-2002, 2004-2017 Internet Systems Consortium, Inc. ("ISC") # # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this @@ -36,9 +36,10 @@ DLZDRIVER_INCLUDES = @DLZ_DRIVER_INCLUDES@ DLZDRIVER_LIBS = @DLZ_DRIVER_LIBS@ CINCLUDES = -I${srcdir}/include -I${srcdir}/unix/include -I. \ - ${LWRES_INCLUDES} ${DNS_INCLUDES} ${BIND9_INCLUDES} \ - ${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} ${ISC_INCLUDES} \ - ${DLZDRIVER_INCLUDES} ${DBDRIVER_INCLUDES} @DST_OPENSSL_INC@ + ${NS_INCLUDES} ${DNS_INCLUDES} \ + ${BIND9_INCLUDES} ${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} \ + ${ISC_INCLUDES} ${DLZDRIVER_INCLUDES} \ + ${DBDRIVER_INCLUDES} @DST_OPENSSL_INC@ CDEFINES = @CONTRIB_DLZ@ @USE_PKCS11@ @PKCS11_ENGINE@ @CRYPTO@ @@ -49,41 +50,38 @@ ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@ ISCCCLIBS = ../../lib/isccc/libisccc.@A@ ISCLIBS = ../../lib/isc/libisc.@A@ ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ -LWRESLIBS = ../../lib/lwres/liblwres.@A@ BIND9LIBS = ../../lib/bind9/libbind9.@A@ +NSLIBS = ../../lib/ns/libns.@A@ DNSDEPLIBS = ../../lib/dns/libdns.@A@ ISCCFGDEPLIBS = ../../lib/isccfg/libisccfg.@A@ ISCCCDEPLIBS = ../../lib/isccc/libisccc.@A@ ISCDEPLIBS = ../../lib/isc/libisc.@A@ -LWRESDEPLIBS = ../../lib/lwres/liblwres.@A@ BIND9DEPLIBS = ../../lib/bind9/libbind9.@A@ +NSDEPLIBS = ../../lib/ns/libns.@A@ -DEPLIBS = ${LWRESDEPLIBS} ${DNSDEPLIBS} ${BIND9DEPLIBS} \ +DEPLIBS = ${NSDEPLIBS} ${DNSDEPLIBS} ${BIND9DEPLIBS} \ ${ISCCFGDEPLIBS} ${ISCCCDEPLIBS} ${ISCDEPLIBS} -LIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \ +LIBS = ${NSLIBS} ${DNSLIBS} ${BIND9LIBS} \ ${ISCCFGLIBS} ${ISCCCLIBS} ${ISCLIBS} \ ${DLZDRIVER_LIBS} ${DBDRIVER_LIBS} @LIBS@ -NOSYMLIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \ +NOSYMLIBS = ${NSLIBS} ${DNSLIBS} ${BIND9LIBS} \ ${ISCCFGLIBS} ${ISCCCLIBS} ${ISCNOSYMLIBS} \ ${DLZDRIVER_LIBS} ${DBDRIVER_LIBS} @LIBS@ SUBDIRS = unix -TARGETS = named@EXEEXT@ lwresd@EXEEXT@ +TARGETS = named@EXEEXT@ GEOIPLINKOBJS = geoip.@O@ -OBJS = builtin.@O@ client.@O@ config.@O@ control.@O@ \ - controlconf.@O@ fuzz.@O@ @GEOIPLINKOBJS@ interfacemgr.@O@ \ - listenlist.@O@ log.@O@ logconf.@O@ main.@O@ notify.@O@ \ - query.@O@ server.@O@ sortlist.@O@ statschannel.@O@ \ - tkeyconf.@O@ tsigconf.@O@ update.@O@ xfrout.@O@ \ - zoneconf.@O@ \ - lwaddr.@O@ lwresd.@O@ lwdclient.@O@ lwderror.@O@ lwdgabn.@O@ \ - lwdgnba.@O@ lwdgrbn.@O@ lwdnoop.@O@ lwsearch.@O@ \ +OBJS = builtin.@O@ config.@O@ control.@O@ \ + controlconf.@O@ fuzz.@O@ @GEOIPLINKOBJS@ \ + log.@O@ logconf.@O@ main.@O@ \ + server.@O@ statschannel.@O@ \ + tkeyconf.@O@ tsigconf.@O@ zoneconf.@O@ \ ${DLZDRIVER_OBJS} ${DBDRIVER_OBJS} UOBJS = unix/os.@O@ unix/dlz_dlopen_driver.@O@ @@ -92,19 +90,16 @@ SYMOBJS = symtbl.@O@ GEOIPLINKSRCS = geoip.c -SRCS = builtin.c client.c config.c control.c \ - controlconf.c fuzz.c @GEOIPLINKSRCS@ interfacemgr.c \ - listenlist.c log.c logconf.c main.c notify.c \ - query.c server.c sortlist.c statschannel.c \ - tkeyconf.c tsigconf.c update.c xfrout.c \ - zoneconf.c \ - lwaddr.c lwresd.c lwdclient.c lwderror.c lwdgabn.c \ - lwdgnba.c lwdgrbn.c lwdnoop.c lwsearch.c \ +SRCS = builtin.c config.c control.c \ + controlconf.c fuzz.c @GEOIPLINKSRCS@ \ + log.c logconf.c main.c \ + server.c statschannel.c \ + tkeyconf.c tsigconf.c zoneconf.c \ ${DLZDRIVER_SRCS} ${DBDRIVER_SRCS} -MANPAGES = named.8 lwresd.8 named.conf.5 +MANPAGES = named.8 named.conf.5 -HTMLPAGES = named.html lwresd.html named.conf.html +HTMLPAGES = named.html named.conf.html MANOBJS = ${MANPAGES} ${HTMLPAGES} @@ -118,16 +113,16 @@ main.@O@: main.c -DSRCID=\"${SRCID}\" \ -DCONFIGARGS="\"${CONFIGARGS}\"" \ -DBUILDER="\"make\"" \ - -DNS_LOCALSTATEDIR=\"${localstatedir}\" \ - -DNS_SYSCONFDIR=\"${sysconfdir}\" -c ${srcdir}/main.c + -DNAMED_LOCALSTATEDIR=\"${localstatedir}\" \ + -DNAMED_SYSCONFDIR=\"${sysconfdir}\" -c ${srcdir}/main.c config.@O@: config.c ${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \ -DVERSION=\"${VERSION}\" \ -DSRCID=\"${SRCID}\" \ -DDYNDB_LIBDIR=\"@libdir@/bind\" \ - -DNS_LOCALSTATEDIR=\"${localstatedir}\" \ - -DNS_SYSCONFDIR=\"${sysconfdir}\" \ + -DNAMED_LOCALSTATEDIR=\"${localstatedir}\" \ + -DNAMED_SYSCONFDIR=\"${sysconfdir}\" \ -c ${srcdir}/config.c server.@O@: server.c @@ -140,10 +135,6 @@ named@EXEEXT@: ${OBJS} ${UOBJS} ${DEPLIBS} export BASEOBJS="${OBJS} ${UOBJS}"; \ ${FINALBUILDCMD} -lwresd@EXEEXT@: named@EXEEXT@ - rm -f lwresd@EXEEXT@ - @LN@ named@EXEEXT@ lwresd@EXEEXT@ - doc man:: ${MANOBJS} docclean manclean maintainer-clean:: @@ -165,18 +156,14 @@ installdirs: $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man5 $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8 -install:: named@EXEEXT@ lwresd@EXEEXT@ installdirs +install:: named@EXEEXT@ installdirs ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named@EXEEXT@ ${DESTDIR}${sbindir} - (cd ${DESTDIR}${sbindir}; rm -f lwresd@EXEEXT@; @LN@ named@EXEEXT@ lwresd@EXEEXT@) ${INSTALL_DATA} ${srcdir}/named.8 ${DESTDIR}${mandir}/man8 - ${INSTALL_DATA} ${srcdir}/lwresd.8 ${DESTDIR}${mandir}/man8 ${INSTALL_DATA} ${srcdir}/named.conf.5 ${DESTDIR}${mandir}/man5 uninstall:: rm -f ${DESTDIR}${mandir}/man5/named.conf.5 - rm -f ${DESTDIR}${mandir}/man8/lwresd.8 rm -f ${DESTDIR}${mandir}/man8/named.8 - rm -f ${DESTDIR}${sbindir}/lwresd@EXEEXT@ ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${sbindir}/named@EXEEXT@ @DLZ_DRIVER_RULES@ diff --git a/bin/named/builtin.c b/bin/named/builtin.c index 9613bc80d2..f8969a9684 100644 --- a/bin/named/builtin.c +++ b/bin/named/builtin.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005, 2007, 2009-2016 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2001-2005, 2007, 2009-2017 Internet Systems Consortium, Inc. ("ISC") * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -317,26 +317,26 @@ put_txt(dns_sdblookup_t *lookup, const char *text) { static isc_result_t do_version_lookup(dns_sdblookup_t *lookup) { - if (ns_g_server->version_set) { - if (ns_g_server->version == NULL) + if (named_g_server->version_set) { + if (named_g_server->version == NULL) return (ISC_R_SUCCESS); else - return (put_txt(lookup, ns_g_server->version)); + return (put_txt(lookup, named_g_server->version)); } else { - return (put_txt(lookup, ns_g_version)); + return (put_txt(lookup, named_g_version)); } } static isc_result_t do_hostname_lookup(dns_sdblookup_t *lookup) { - if (ns_g_server->hostname_set) { - if (ns_g_server->hostname == NULL) + if (named_g_server->hostname_set) { + if (named_g_server->hostname == NULL) return (ISC_R_SUCCESS); else - return (put_txt(lookup, ns_g_server->hostname)); + return (put_txt(lookup, named_g_server->hostname)); } else { char buf[256]; - isc_result_t result = ns_os_gethostname(buf, sizeof(buf)); + isc_result_t result = named_os_gethostname(buf, sizeof(buf)); if (result != ISC_R_SUCCESS) return (result); return (put_txt(lookup, buf)); @@ -374,7 +374,7 @@ do_authors_lookup(dns_sdblookup_t *lookup) { /* * If a version string is specified, disable the authors.bind zone. */ - if (ns_g_server->version_set) + if (named_g_server->version_set) return (ISC_R_SUCCESS); for (p = authors; *p != NULL; p++) { @@ -387,19 +387,18 @@ do_authors_lookup(dns_sdblookup_t *lookup) { static isc_result_t do_id_lookup(dns_sdblookup_t *lookup) { - - if (ns_g_server->server_usehostname) { + if (named_g_server->sctx->gethostname != NULL) { char buf[256]; - isc_result_t result = ns_os_gethostname(buf, sizeof(buf)); + isc_result_t result; + + result = named_g_server->sctx->gethostname(buf, sizeof(buf)); if (result != ISC_R_SUCCESS) return (result); return (put_txt(lookup, buf)); - } - - if (ns_g_server->server_id == NULL) - return (ISC_R_SUCCESS); + } else if (named_g_server->sctx->server_id != NULL) + return (put_txt(lookup, named_g_server->sctx->server_id)); else - return (put_txt(lookup, ns_g_server->server_id)); + return (ISC_R_SUCCESS); } static isc_result_t @@ -478,20 +477,21 @@ builtin_create(const char *zone, int argc, char **argv, * We don't want built-in zones to fail. Fallback to * the static configuration if memory allocation fails. */ - empty = isc_mem_get(ns_g_mctx, sizeof(*empty)); - server = isc_mem_strdup(ns_g_mctx, argv[1]); - contact = isc_mem_strdup(ns_g_mctx, argv[2]); + empty = isc_mem_get(named_g_mctx, sizeof(*empty)); + server = isc_mem_strdup(named_g_mctx, argv[1]); + contact = isc_mem_strdup(named_g_mctx, argv[2]); if (empty == NULL || server == NULL || contact == NULL) { if (strcmp(argv[0], "empty") == 0) *dbdata = &empty_builtin; else *dbdata = &dns64_builtin; if (server != NULL) - isc_mem_free(ns_g_mctx, server); + isc_mem_free(named_g_mctx, server); if (contact != NULL) - isc_mem_free(ns_g_mctx, contact); + isc_mem_free(named_g_mctx, contact); if (empty != NULL) - isc_mem_put(ns_g_mctx, empty, sizeof (*empty)); + isc_mem_put(named_g_mctx, empty, + sizeof (*empty)); } else { if (strcmp(argv[0], "empty") == 0) memmove(empty, &empty_builtin, @@ -523,9 +523,9 @@ builtin_destroy(const char *zone, void *driverdata, void **dbdata) { *dbdata == &empty_builtin || *dbdata == &dns64_builtin) return; - isc_mem_free(ns_g_mctx, b->server); - isc_mem_free(ns_g_mctx, b->contact); - isc_mem_put(ns_g_mctx, b, sizeof (*b)); + isc_mem_free(named_g_mctx, b->server); + isc_mem_free(named_g_mctx, b->contact); + isc_mem_put(named_g_mctx, b, sizeof (*b)); } static dns_sdbmethods_t builtin_methods = { @@ -547,23 +547,23 @@ static dns_sdbmethods_t dns64_methods = { }; isc_result_t -ns_builtin_init(void) { +named_builtin_init(void) { RUNTIME_CHECK(dns_sdb_register("_builtin", &builtin_methods, NULL, DNS_SDBFLAG_RELATIVEOWNER | DNS_SDBFLAG_RELATIVERDATA, - ns_g_mctx, &builtin_impl) + named_g_mctx, &builtin_impl) == ISC_R_SUCCESS); RUNTIME_CHECK(dns_sdb_register("_dns64", &dns64_methods, NULL, DNS_SDBFLAG_RELATIVEOWNER | DNS_SDBFLAG_RELATIVERDATA | DNS_SDBFLAG_DNS64, - ns_g_mctx, &dns64_impl) + named_g_mctx, &dns64_impl) == ISC_R_SUCCESS); return (ISC_R_SUCCESS); } void -ns_builtin_deinit(void) { +named_builtin_deinit(void) { dns_sdb_unregister(&builtin_impl); dns_sdb_unregister(&dns64_impl); } diff --git a/bin/named/config.c b/bin/named/config.c index fcb88c06ad..89202d56e8 100644 --- a/bin/named/config.c +++ b/bin/named/config.c @@ -44,7 +44,7 @@ static char defaultconf[] = "\ options {\n\ automatic-interface-scan yes;\n\ - bindkeys-file \"" NS_SYSCONFDIR "/bind.keys\";\n\ + bindkeys-file \"" NAMED_SYSCONFDIR "/bind.keys\";\n\ # blackhole {none;};\n" #if defined(HAVE_OPENSSL_AES) || defined(HAVE_OPENSSL_EVP_AES) " cookie-algorithm aes;\n" @@ -72,7 +72,7 @@ options {\n\ # keep-response-order {none;};\n\ listen-on {any;};\n\ listen-on-v6 {any;};\n\ -# lock-file \"" NS_LOCALSTATEDIR "/run/named/named.lock\";\n\ +# lock-file \"" NAMED_LOCALSTATEDIR "/run/named/named.lock\";\n\ match-mapped-addresses no;\n\ max-rsa-exponent-size 0; /* no limit */\n\ max-udp-size 4096;\n\ @@ -83,7 +83,7 @@ options {\n\ notify-rate 20;\n\ nta-lifetime 3600;\n\ nta-recheck 300;\n\ -# pid-file \"" NS_LOCALSTATEDIR "/run/named/named.pid\"; /* or /lwresd.pid */\n\ +# pid-file \"" NAMED_LOCALSTATEDIR "/run/named/named.pid\"; \n\ port 53;\n\ prefetch 2 9;\n" #ifdef PATH_RANDOMDEV @@ -100,7 +100,7 @@ options {\n\ serial-query-rate 20;\n\ server-id none;\n\ session-keyalg hmac-sha256;\n\ -# session-keyfile \"" NS_LOCALSTATEDIR "/run/named/session.key\";\n\ +# session-keyfile \"" NAMED_LOCALSTATEDIR "/run/named/session.key\";\n\ session-keyname local-ddns;\n" #ifndef WIN32 " stacksize default;\n" @@ -306,7 +306,7 @@ MANAGED_KEYS "; isc_result_t -ns_config_parsedefaults(cfg_parser_t *parser, cfg_obj_t **conf) { +named_config_parsedefaults(cfg_parser_t *parser, cfg_obj_t **conf) { isc_buffer_t b; isc_buffer_init(&b, defaultconf, sizeof(defaultconf) - 1); @@ -316,8 +316,8 @@ ns_config_parsedefaults(cfg_parser_t *parser, cfg_obj_t **conf) { } isc_result_t -ns_config_get(cfg_obj_t const * const *maps, const char *name, - const cfg_obj_t **obj) +named_config_get(cfg_obj_t const * const *maps, const char *name, + const cfg_obj_t **obj) { int i; @@ -330,8 +330,8 @@ ns_config_get(cfg_obj_t const * const *maps, const char *name, } isc_result_t -ns_checknames_get(const cfg_obj_t **maps, const char *which, - const cfg_obj_t **obj) +named_checknames_get(const cfg_obj_t **maps, const char *which, + const cfg_obj_t **obj) { const cfg_listelt_t *element; const cfg_obj_t *checknames; @@ -369,7 +369,7 @@ ns_checknames_get(const cfg_obj_t **maps, const char *which, } int -ns_config_listcount(const cfg_obj_t *list) { +named_config_listcount(const cfg_obj_t *list) { const cfg_listelt_t *e; int i = 0; @@ -380,8 +380,9 @@ ns_config_listcount(const cfg_obj_t *list) { } isc_result_t -ns_config_getclass(const cfg_obj_t *classobj, dns_rdataclass_t defclass, - dns_rdataclass_t *classp) { +named_config_getclass(const cfg_obj_t *classobj, dns_rdataclass_t defclass, + dns_rdataclass_t *classp) +{ isc_textregion_t r; isc_result_t result; @@ -393,14 +394,15 @@ ns_config_getclass(const cfg_obj_t *classobj, dns_rdataclass_t defclass, r.length = strlen(r.base); result = dns_rdataclass_fromtext(classp, &r); if (result != ISC_R_SUCCESS) - cfg_obj_log(classobj, ns_g_lctx, ISC_LOG_ERROR, + cfg_obj_log(classobj, named_g_lctx, ISC_LOG_ERROR, "unknown class '%s'", r.base); return (result); } isc_result_t -ns_config_gettype(const cfg_obj_t *typeobj, dns_rdatatype_t deftype, - dns_rdatatype_t *typep) { +named_config_gettype(const cfg_obj_t *typeobj, dns_rdatatype_t deftype, + dns_rdatatype_t *typep) +{ isc_textregion_t r; isc_result_t result; @@ -412,13 +414,13 @@ ns_config_gettype(const cfg_obj_t *typeobj, dns_rdatatype_t deftype, r.length = strlen(r.base); result = dns_rdatatype_fromtext(typep, &r); if (result != ISC_R_SUCCESS) - cfg_obj_log(typeobj, ns_g_lctx, ISC_LOG_ERROR, + cfg_obj_log(typeobj, named_g_lctx, ISC_LOG_ERROR, "unknown type '%s'", r.base); return (result); } dns_zonetype_t -ns_config_getzonetype(const cfg_obj_t *zonetypeobj) { +named_config_getzonetype(const cfg_obj_t *zonetypeobj) { dns_zonetype_t ztype = dns_zone_none; const char *str; @@ -439,7 +441,7 @@ ns_config_getzonetype(const cfg_obj_t *zonetypeobj) { } isc_result_t -ns_config_getiplist(const cfg_obj_t *config, const cfg_obj_t *list, +named_config_getiplist(const cfg_obj_t *config, const cfg_obj_t *list, in_port_t defport, isc_mem_t *mctx, isc_sockaddr_t **addrsp, isc_dscp_t **dscpsp, isc_uint32_t *countp) @@ -458,13 +460,13 @@ ns_config_getiplist(const cfg_obj_t *config, const cfg_obj_t *list, INSIST(countp != NULL); addrlist = cfg_tuple_get(list, "addresses"); - count = ns_config_listcount(addrlist); + count = named_config_listcount(addrlist); portobj = cfg_tuple_get(list, "port"); if (cfg_obj_isuint32(portobj)) { isc_uint32_t val = cfg_obj_asuint32(portobj); if (val > ISC_UINT16_MAX) { - cfg_obj_log(portobj, ns_g_lctx, ISC_LOG_ERROR, + cfg_obj_log(portobj, named_g_lctx, ISC_LOG_ERROR, "port '%u' out of range", val); return (ISC_R_RANGE); } @@ -472,7 +474,7 @@ ns_config_getiplist(const cfg_obj_t *config, const cfg_obj_t *list, } else if (defport != 0) port = defport; else { - result = ns_config_getport(config, &port); + result = named_config_getport(config, &port); if (result != ISC_R_SUCCESS) return (result); } @@ -481,7 +483,8 @@ ns_config_getiplist(const cfg_obj_t *config, const cfg_obj_t *list, dscpobj = cfg_tuple_get(list, "dscp"); if (dscpobj != NULL && cfg_obj_isuint32(dscpobj)) { if (cfg_obj_asuint32(dscpobj) > 63) { - cfg_obj_log(dscpobj, ns_g_lctx, ISC_LOG_ERROR, + cfg_obj_log(dscpobj, named_g_lctx, + ISC_LOG_ERROR, "dscp value '%u' is out of range", cfg_obj_asuint32(dscpobj)); return (ISC_R_RANGE); @@ -531,8 +534,8 @@ ns_config_getiplist(const cfg_obj_t *config, const cfg_obj_t *list, } void -ns_config_putiplist(isc_mem_t *mctx, isc_sockaddr_t **addrsp, - isc_dscp_t **dscpsp, isc_uint32_t count) +named_config_putiplist(isc_mem_t *mctx, isc_sockaddr_t **addrsp, + isc_dscp_t **dscpsp, isc_uint32_t count) { INSIST(addrsp != NULL && *addrsp != NULL); INSIST(dscpsp == NULL || *dscpsp != NULL); @@ -575,7 +578,7 @@ get_masters_def(const cfg_obj_t *cctx, const char *name, } isc_result_t -ns_config_getipandkeylist(const cfg_obj_t *config, const cfg_obj_t *list, +named_config_getipandkeylist(const cfg_obj_t *config, const cfg_obj_t *list, isc_mem_t *mctx, dns_ipkeylist_t *ipkl) { isc_uint32_t addrcount = 0, dscpcount = 0, keycount = 0, i = 0; @@ -610,11 +613,11 @@ ns_config_getipandkeylist(const cfg_obj_t *config, const cfg_obj_t *list, /* * Get system defaults. */ - result = ns_config_getport(config, &port); + result = named_config_getport(config, &port); if (result != ISC_R_SUCCESS) goto cleanup; - result = ns_config_getdscp(config, &dscp); + result = named_config_getdscp(config, &dscp); if (result != ISC_R_SUCCESS) goto cleanup; @@ -626,7 +629,7 @@ ns_config_getipandkeylist(const cfg_obj_t *config, const cfg_obj_t *list, if (cfg_obj_isuint32(portobj)) { isc_uint32_t val = cfg_obj_asuint32(portobj); if (val > ISC_UINT16_MAX) { - cfg_obj_log(portobj, ns_g_lctx, ISC_LOG_ERROR, + cfg_obj_log(portobj, named_g_lctx, ISC_LOG_ERROR, "port '%u' out of range", val); result = ISC_R_RANGE; goto cleanup; @@ -636,7 +639,7 @@ ns_config_getipandkeylist(const cfg_obj_t *config, const cfg_obj_t *list, if (dscpobj != NULL && cfg_obj_isuint32(dscpobj)) { if (cfg_obj_asuint32(dscpobj) > 63) { - cfg_obj_log(dscpobj, ns_g_lctx, ISC_LOG_ERROR, + cfg_obj_log(dscpobj, named_g_lctx, ISC_LOG_ERROR, "dscp value '%u' is out of range", cfg_obj_asuint32(dscpobj)); result = ISC_R_RANGE; @@ -692,7 +695,7 @@ ns_config_getipandkeylist(const cfg_obj_t *config, const cfg_obj_t *list, continue; tresult = get_masters_def(config, listname, &list); if (tresult == ISC_R_NOTFOUND) { - cfg_obj_log(addr, ns_g_lctx, ISC_LOG_ERROR, + cfg_obj_log(addr, named_g_lctx, ISC_LOG_ERROR, "masters \"%s\" not found", listname); result = tresult; @@ -889,7 +892,7 @@ ns_config_getipandkeylist(const cfg_obj_t *config, const cfg_obj_t *list, } isc_result_t -ns_config_getport(const cfg_obj_t *config, in_port_t *portp) { +named_config_getport(const cfg_obj_t *config, in_port_t *portp) { const cfg_obj_t *maps[3]; const cfg_obj_t *options = NULL; const cfg_obj_t *portobj = NULL; @@ -900,13 +903,13 @@ ns_config_getport(const cfg_obj_t *config, in_port_t *portp) { i = 0; if (options != NULL) maps[i++] = options; - maps[i++] = ns_g_defaults; + maps[i++] = named_g_defaults; maps[i] = NULL; - result = ns_config_get(maps, "port", &portobj); + result = named_config_get(maps, "port", &portobj); INSIST(result == ISC_R_SUCCESS); if (cfg_obj_asuint32(portobj) >= ISC_UINT16_MAX) { - cfg_obj_log(portobj, ns_g_lctx, ISC_LOG_ERROR, + cfg_obj_log(portobj, named_g_lctx, ISC_LOG_ERROR, "port '%u' out of range", cfg_obj_asuint32(portobj)); return (ISC_R_RANGE); @@ -916,7 +919,7 @@ ns_config_getport(const cfg_obj_t *config, in_port_t *portp) { } isc_result_t -ns_config_getdscp(const cfg_obj_t *config, isc_dscp_t *dscpp) { +named_config_getdscp(const cfg_obj_t *config, isc_dscp_t *dscpp) { const cfg_obj_t *options = NULL; const cfg_obj_t *dscpobj = NULL; isc_result_t result; @@ -931,7 +934,7 @@ ns_config_getdscp(const cfg_obj_t *config, isc_dscp_t *dscpp) { return (ISC_R_SUCCESS); } if (cfg_obj_asuint32(dscpobj) >= 64) { - cfg_obj_log(dscpobj, ns_g_lctx, ISC_LOG_ERROR, + cfg_obj_log(dscpobj, named_g_lctx, ISC_LOG_ERROR, "dscp '%u' out of range", cfg_obj_asuint32(dscpobj)); return (ISC_R_RANGE); @@ -961,15 +964,15 @@ struct keyalgorithms { }; isc_result_t -ns_config_getkeyalgorithm(const char *str, const dns_name_t **name, - isc_uint16_t *digestbits) +named_config_getkeyalgorithm(const char *str, const dns_name_t **name, + isc_uint16_t *digestbits) { - return (ns_config_getkeyalgorithm2(str, name, NULL, digestbits)); + return (named_config_getkeyalgorithm2(str, name, NULL, digestbits)); } isc_result_t -ns_config_getkeyalgorithm2(const char *str, const dns_name_t **name, - unsigned int *typep, isc_uint16_t *digestbits) +named_config_getkeyalgorithm2(const char *str, const dns_name_t **name, + unsigned int *typep, isc_uint16_t *digestbits) { int i; size_t len = 0; diff --git a/bin/named/control.c b/bin/named/control.c index e02bdfb813..60f130bbc9 100644 --- a/bin/named/control.c +++ b/bin/named/control.c @@ -33,7 +33,7 @@ #include #include #ifdef HAVE_LIBSCF -#include +#include #endif static isc_result_t @@ -67,8 +67,8 @@ command_compare(const char *str, const char *command) { * when a control channel message is received. */ isc_result_t -ns_control_docommand(isccc_sexpr_t *message, isc_boolean_t readonly, - isc_buffer_t **text) +named_control_docommand(isccc_sexpr_t *message, isc_boolean_t readonly, + isc_buffer_t **text) { isccc_sexpr_t *data; char *cmdline = NULL; @@ -78,7 +78,7 @@ ns_control_docommand(isccc_sexpr_t *message, isc_boolean_t readonly, isc_buffer_t src; isc_lex_t *lex = NULL; #ifdef HAVE_LIBSCF - ns_smf_want_disable = 0; + named_smf_want_disable = 0; #endif data = isccc_alist_lookup(message, "_data"); @@ -97,7 +97,7 @@ ns_control_docommand(isccc_sexpr_t *message, isc_boolean_t readonly, return (result); } - result = isc_lex_create(ns_g_mctx, strlen(cmdline), &lex); + result = isc_lex_create(named_g_mctx, strlen(cmdline), &lex); if (result != ISC_R_SUCCESS) return (result); @@ -114,8 +114,8 @@ ns_control_docommand(isccc_sexpr_t *message, isc_boolean_t readonly, /* * Compare the 'command' parameter against all known control commands. */ - if (command_compare(command, NS_COMMAND_NULL) || - command_compare(command, NS_COMMAND_STATUS)) + if (command_compare(command, NAMED_COMMAND_NULL) || + command_compare(command, NAMED_COMMAND_STATUS)) { log_level = ISC_LOG_DEBUG(1); } else { @@ -128,160 +128,160 @@ ns_control_docommand(isccc_sexpr_t *message, isc_boolean_t readonly, * below. */ if (readonly && - !command_compare(command, NS_COMMAND_NTA) && - !command_compare(command, NS_COMMAND_NULL) && - !command_compare(command, NS_COMMAND_STATUS) && - !command_compare(command, NS_COMMAND_SHOWZONE) && - !command_compare(command, NS_COMMAND_TESTGEN) && - !command_compare(command, NS_COMMAND_ZONESTATUS)) + !command_compare(command, NAMED_COMMAND_NTA) && + !command_compare(command, NAMED_COMMAND_NULL) && + !command_compare(command, NAMED_COMMAND_STATUS) && + !command_compare(command, NAMED_COMMAND_SHOWZONE) && + !command_compare(command, NAMED_COMMAND_TESTGEN) && + !command_compare(command, NAMED_COMMAND_ZONESTATUS)) { - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_CONTROL, log_level, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_CONTROL, log_level, "rejecting restricted control channel " "command '%s'", cmdline); result = ISC_R_FAILURE; goto cleanup; } - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_CONTROL, log_level, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_CONTROL, log_level, "received control channel command '%s'", cmdline); - if (command_compare(command, NS_COMMAND_RELOAD)) { - result = ns_server_reloadcommand(ns_g_server, lex, text); - } else if (command_compare(command, NS_COMMAND_RECONFIG)) { - result = ns_server_reconfigcommand(ns_g_server); - } else if (command_compare(command, NS_COMMAND_REFRESH)) { - result = ns_server_refreshcommand(ns_g_server, lex, text); - } else if (command_compare(command, NS_COMMAND_RETRANSFER)) { - result = ns_server_retransfercommand(ns_g_server, - lex, text); - } else if (command_compare(command, NS_COMMAND_HALT)) { + if (command_compare(command, NAMED_COMMAND_RELOAD)) { + result = named_server_reloadcommand(named_g_server, lex, text); + } else if (command_compare(command, NAMED_COMMAND_RECONFIG)) { + result = named_server_reconfigcommand(named_g_server); + } else if (command_compare(command, NAMED_COMMAND_REFRESH)) { + result = named_server_refreshcommand(named_g_server, lex, text); + } else if (command_compare(command, NAMED_COMMAND_RETRANSFER)) { + result = named_server_retransfercommand(named_g_server, + lex, text); + } else if (command_compare(command, NAMED_COMMAND_HALT)) { #ifdef HAVE_LIBSCF /* * If we are managed by smf(5), AND in chroot, then * we cannot connect to the smf repository, so just * return with an appropriate message back to rndc. */ - if (ns_smf_got_instance == 1 && ns_smf_chroot == 1) { - result = ns_smf_add_message(text); + if (named_smf_got_instance == 1 && named_smf_chroot == 1) { + result = named_smf_add_message(text); goto cleanup; } /* * If we are managed by smf(5) but not in chroot, * try to disable ourselves the smf way. */ - if (ns_smf_got_instance == 1 && ns_smf_chroot == 0) - ns_smf_want_disable = 1; + if (named_smf_got_instance == 1 && named_smf_chroot == 0) + named_smf_want_disable = 1; /* - * If ns_smf_got_instance = 0, ns_smf_chroot + * If named_smf_got_instance = 0, named_smf_chroot * is not relevant and we fall through to * isc_app_shutdown below. */ #endif /* Do not flush master files */ - ns_server_flushonshutdown(ns_g_server, ISC_FALSE); - ns_os_shutdownmsg(cmdline, *text); + named_server_flushonshutdown(named_g_server, ISC_FALSE); + named_os_shutdownmsg(cmdline, *text); isc_app_shutdown(); result = ISC_R_SUCCESS; - } else if (command_compare(command, NS_COMMAND_STOP)) { + } else if (command_compare(command, NAMED_COMMAND_STOP)) { /* * "stop" is the same as "halt" except it does * flush master files. */ #ifdef HAVE_LIBSCF - if (ns_smf_got_instance == 1 && ns_smf_chroot == 1) { - result = ns_smf_add_message(text); + if (named_smf_got_instance == 1 && named_smf_chroot == 1) { + result = named_smf_add_message(text); goto cleanup; } - if (ns_smf_got_instance == 1 && ns_smf_chroot == 0) - ns_smf_want_disable = 1; + if (named_smf_got_instance == 1 && named_smf_chroot == 0) + named_smf_want_disable = 1; #endif - ns_server_flushonshutdown(ns_g_server, ISC_TRUE); - ns_os_shutdownmsg(cmdline, *text); + named_server_flushonshutdown(named_g_server, ISC_TRUE); + named_os_shutdownmsg(cmdline, *text); isc_app_shutdown(); result = ISC_R_SUCCESS; - } else if (command_compare(command, NS_COMMAND_DUMPSTATS)) { - result = ns_server_dumpstats(ns_g_server); - } else if (command_compare(command, NS_COMMAND_QUERYLOG)) { - result = ns_server_togglequerylog(ns_g_server, lex); - } else if (command_compare(command, NS_COMMAND_DUMPDB)) { - ns_server_dumpdb(ns_g_server, lex, text); + } else if (command_compare(command, NAMED_COMMAND_DUMPSTATS)) { + result = named_server_dumpstats(named_g_server); + } else if (command_compare(command, NAMED_COMMAND_QUERYLOG)) { + result = named_server_togglequerylog(named_g_server, lex); + } else if (command_compare(command, NAMED_COMMAND_DUMPDB)) { + named_server_dumpdb(named_g_server, lex, text); result = ISC_R_SUCCESS; - } else if (command_compare(command, NS_COMMAND_SECROOTS)) { - result = ns_server_dumpsecroots(ns_g_server, lex, text); - } else if (command_compare(command, NS_COMMAND_TRACE)) { - result = ns_server_setdebuglevel(ns_g_server, lex); - } else if (command_compare(command, NS_COMMAND_NOTRACE)) { - ns_g_debuglevel = 0; - isc_log_setdebuglevel(ns_g_lctx, ns_g_debuglevel); + } else if (command_compare(command, NAMED_COMMAND_SECROOTS)) { + result = named_server_dumpsecroots(named_g_server, lex, text); + } else if (command_compare(command, NAMED_COMMAND_TRACE)) { + result = named_server_setdebuglevel(named_g_server, lex); + } else if (command_compare(command, NAMED_COMMAND_NOTRACE)) { + named_g_debuglevel = 0; + isc_log_setdebuglevel(named_g_lctx, named_g_debuglevel); result = ISC_R_SUCCESS; - } else if (command_compare(command, NS_COMMAND_FLUSH)) { - result = ns_server_flushcache(ns_g_server, lex); - } else if (command_compare(command, NS_COMMAND_FLUSHNAME)) { - result = ns_server_flushnode(ns_g_server, lex, ISC_FALSE); - } else if (command_compare(command, NS_COMMAND_FLUSHTREE)) { - result = ns_server_flushnode(ns_g_server, lex, ISC_TRUE); - } else if (command_compare(command, NS_COMMAND_STATUS)) { - result = ns_server_status(ns_g_server, text); - } else if (command_compare(command, NS_COMMAND_TSIGLIST)) { - result = ns_server_tsiglist(ns_g_server, text); - } else if (command_compare(command, NS_COMMAND_TSIGDELETE)) { - result = ns_server_tsigdelete(ns_g_server, lex, text); - } else if (command_compare(command, NS_COMMAND_FREEZE)) { - result = ns_server_freeze(ns_g_server, ISC_TRUE, lex, - text); - } else if (command_compare(command, NS_COMMAND_UNFREEZE) || - command_compare(command, NS_COMMAND_THAW)) { - result = ns_server_freeze(ns_g_server, ISC_FALSE, lex, - text); - } else if (command_compare(command, NS_COMMAND_SCAN)) { + } else if (command_compare(command, NAMED_COMMAND_FLUSH)) { + result = named_server_flushcache(named_g_server, lex); + } else if (command_compare(command, NAMED_COMMAND_FLUSHNAME)) { + result = named_server_flushnode(named_g_server, lex, ISC_FALSE); + } else if (command_compare(command, NAMED_COMMAND_FLUSHTREE)) { + result = named_server_flushnode(named_g_server, lex, ISC_TRUE); + } else if (command_compare(command, NAMED_COMMAND_STATUS)) { + result = named_server_status(named_g_server, text); + } else if (command_compare(command, NAMED_COMMAND_TSIGLIST)) { + result = named_server_tsiglist(named_g_server, text); + } else if (command_compare(command, NAMED_COMMAND_TSIGDELETE)) { + result = named_server_tsigdelete(named_g_server, lex, text); + } else if (command_compare(command, NAMED_COMMAND_FREEZE)) { + result = named_server_freeze(named_g_server, ISC_TRUE, lex, + text); + } else if (command_compare(command, NAMED_COMMAND_UNFREEZE) || + command_compare(command, NAMED_COMMAND_THAW)) { + result = named_server_freeze(named_g_server, ISC_FALSE, lex, + text); + } else if (command_compare(command, NAMED_COMMAND_SCAN)) { result = ISC_R_SUCCESS; - ns_server_scan_interfaces(ns_g_server); - } else if (command_compare(command, NS_COMMAND_SYNC)) { - result = ns_server_sync(ns_g_server, lex, text); - } else if (command_compare(command, NS_COMMAND_RECURSING)) { - result = ns_server_dumprecursing(ns_g_server); - } else if (command_compare(command, NS_COMMAND_TIMERPOKE)) { + named_server_scan_interfaces(named_g_server); + } else if (command_compare(command, NAMED_COMMAND_SYNC)) { + result = named_server_sync(named_g_server, lex, text); + } else if (command_compare(command, NAMED_COMMAND_RECURSING)) { + result = named_server_dumprecursing(named_g_server); + } else if (command_compare(command, NAMED_COMMAND_TIMERPOKE)) { result = ISC_R_SUCCESS; - isc_timermgr_poke(ns_g_timermgr); - } else if (command_compare(command, NS_COMMAND_NULL)) { + isc_timermgr_poke(named_g_timermgr); + } else if (command_compare(command, NAMED_COMMAND_NULL)) { result = ISC_R_SUCCESS; - } else if (command_compare(command, NS_COMMAND_NOTIFY)) { - result = ns_server_notifycommand(ns_g_server, lex, text); - } else if (command_compare(command, NS_COMMAND_VALIDATION)) { - result = ns_server_validation(ns_g_server, lex, text); - } else if (command_compare(command, NS_COMMAND_SIGN) || - command_compare(command, NS_COMMAND_LOADKEYS)) { - result = ns_server_rekey(ns_g_server, lex, text); - } else if (command_compare(command, NS_COMMAND_ADDZONE) || - command_compare(command, NS_COMMAND_MODZONE)) { - result = ns_server_changezone(ns_g_server, cmdline, text); - } else if (command_compare(command, NS_COMMAND_DELZONE)) { - result = ns_server_delzone(ns_g_server, lex, text); - } else if (command_compare(command, NS_COMMAND_SHOWZONE)) { - result = ns_server_showzone(ns_g_server, lex, text); - } else if (command_compare(command, NS_COMMAND_SIGNING)) { - result = ns_server_signing(ns_g_server, lex, text); - } else if (command_compare(command, NS_COMMAND_ZONESTATUS)) { - result = ns_server_zonestatus(ns_g_server, lex, text); - } else if (command_compare(command, NS_COMMAND_NTA)) { - result = ns_server_nta(ns_g_server, lex, readonly, text); - } else if (command_compare(command, NS_COMMAND_TESTGEN)) { - result = ns_server_testgen(lex, text); - } else if (command_compare(command, NS_COMMAND_MKEYS)) { - result = ns_server_mkeys(ns_g_server, lex, text); - } else if (command_compare(command, NS_COMMAND_DNSTAP) || - command_compare(command, NS_COMMAND_DNSTAPREOPEN)) { - result = ns_server_dnstap(ns_g_server, lex, text); - } else if (command_compare(command, NS_COMMAND_TCPTIMEOUTS)) { - result = ns_server_tcptimeouts(lex, text); - } else if (command_compare(command, NS_COMMAND_SERVESTALE)) { - result = ns_server_servestale(ns_g_server, lex, text); + } else if (command_compare(command, NAMED_COMMAND_NOTIFY)) { + result = named_server_notifycommand(named_g_server, lex, text); + } else if (command_compare(command, NAMED_COMMAND_VALIDATION)) { + result = named_server_validation(named_g_server, lex, text); + } else if (command_compare(command, NAMED_COMMAND_SIGN) || + command_compare(command, NAMED_COMMAND_LOADKEYS)) { + result = named_server_rekey(named_g_server, lex, text); + } else if (command_compare(command, NAMED_COMMAND_ADDZONE) || + command_compare(command, NAMED_COMMAND_MODZONE)) { + result = named_server_changezone(named_g_server, cmdline, text); + } else if (command_compare(command, NAMED_COMMAND_DELZONE)) { + result = named_server_delzone(named_g_server, lex, text); + } else if (command_compare(command, NAMED_COMMAND_SHOWZONE)) { + result = named_server_showzone(named_g_server, lex, text); + } else if (command_compare(command, NAMED_COMMAND_SIGNING)) { + result = named_server_signing(named_g_server, lex, text); + } else if (command_compare(command, NAMED_COMMAND_ZONESTATUS)) { + result = named_server_zonestatus(named_g_server, lex, text); + } else if (command_compare(command, NAMED_COMMAND_NTA)) { + result = named_server_nta(named_g_server, lex, readonly, text); + } else if (command_compare(command, NAMED_COMMAND_TESTGEN)) { + result = named_server_testgen(lex, text); + } else if (command_compare(command, NAMED_COMMAND_MKEYS)) { + result = named_server_mkeys(named_g_server, lex, text); + } else if (command_compare(command, NAMED_COMMAND_DNSTAP) || + command_compare(command, NAMED_COMMAND_DNSTAPREOPEN)) { + result = named_server_dnstap(named_g_server, lex, text); + } else if (command_compare(command, NAMED_COMMAND_TCPTIMEOUTS)) { + result = named_server_tcptimeouts(lex, text); + } else if (command_compare(command, NAMED_COMMAND_SERVESTALE)) { + result = named_server_servestale(named_g_server, lex, text); } else { - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_CONTROL, ISC_LOG_WARNING, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_CONTROL, ISC_LOG_WARNING, "unknown control channel command '%s'", command); result = DNS_R_UNKNOWNCOMMAND; diff --git a/bin/named/controlconf.c b/bin/named/controlconf.c index 041293f1f1..ed99ade75b 100644 --- a/bin/named/controlconf.c +++ b/bin/named/controlconf.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2008, 2011-2016 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2001-2008, 2011-2017 Internet Systems Consortium, Inc. ("ISC") * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -79,7 +79,7 @@ struct controlconnection { }; struct controllistener { - ns_controls_t * controls; + named_controls_t * controls; isc_mem_t * mctx; isc_task_t * task; isc_sockaddr_t address; @@ -97,8 +97,8 @@ struct controllistener { ISC_LINK(controllistener_t) link; }; -struct ns_controls { - ns_server_t *server; +struct named_controls { + named_server_t *server; controllistenerlist_t listeners; isc_boolean_t shuttingdown; isccc_symtab_t *symtab; @@ -175,7 +175,7 @@ maybe_free_connection(controlconnection_t *conn) { ISC_LIST_UNLINK(listener->connections, conn, link); #ifdef ENABLE_AFL - if (ns_g_fuzz_type == ns_fuzz_rndc) { + if (named_g_fuzz_type == isc_fuzz_rndc) { named_fuzz_notify(); } #endif @@ -194,8 +194,8 @@ shutdown_listener(controllistener_t *listener) { isc_sockaddr_format(&listener->address, socktext, sizeof(socktext)); - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_CONTROL, ISC_LOG_NOTICE, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_CONTROL, ISC_LOG_NOTICE, "stopping command channel on %s", socktext); if (listener->type == isc_sockettype_unix) isc_socket_cleanunix(&listener->address, ISC_TRUE); @@ -219,14 +219,15 @@ shutdown_listener(controllistener_t *listener) { static isc_boolean_t address_ok(isc_sockaddr_t *sockaddr, dns_acl_t *acl) { + dns_aclenv_t *env = + ns_interfacemgr_getaclenv(named_g_server->interfacemgr); isc_netaddr_t netaddr; isc_result_t result; int match; isc_netaddr_fromsockaddr(&netaddr, sockaddr); - result = dns_acl_match(&netaddr, NULL, acl, - &ns_g_server->aclenv, &match, NULL); + result = dns_acl_match(&netaddr, NULL, acl, env, &match, NULL); if (result != ISC_R_SUCCESS || match <= 0) return (ISC_FALSE); @@ -288,8 +289,8 @@ control_senddone(isc_task_t *task, isc_event_t *event) { (void)isc_socket_getpeername(sock, &peeraddr); isc_sockaddr_format(&peeraddr, socktext, sizeof(socktext)); - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_CONTROL, ISC_LOG_WARNING, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_CONTROL, ISC_LOG_WARNING, "error sending command response to %s: %s", socktext, isc_result_totext(sevent->result)); } @@ -311,8 +312,8 @@ log_invalid(isccc_ccmsg_t *ccmsg, isc_result_t result) { (void)isc_socket_getpeername(ccmsg->sock, &peeraddr); isc_sockaddr_format(&peeraddr, socktext, sizeof(socktext)); - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_CONTROL, ISC_LOG_ERROR, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_CONTROL, ISC_LOG_ERROR, "invalid command from %s: %s", socktext, isc_result_totext(result)); } @@ -456,7 +457,8 @@ control_recvmessage(isc_task_t *task, isc_event_t *event) { isc_random_get(&conn->nonce); eresult = ISC_R_SUCCESS; } else - eresult = ns_control_docommand(request, listener->readonly, &text); + eresult = named_control_docommand(request, listener->readonly, + &text); result = isccc_cc_createresponse(request, now, now + 60, &response); if (result != ISC_R_SUCCESS) @@ -571,7 +573,7 @@ newconnection(controllistener_t *listener, isc_socket_t *sock) { conn->buffer = NULL; conn->timer = NULL; isc_interval_set(&interval, 60, 0); - result = isc_timer_create(ns_g_timermgr, isc_timertype_once, + result = isc_timer_create(named_g_timermgr, isc_timertype_once, NULL, &interval, listener->task, control_timeout, conn, &conn->timer); if (result != ISC_R_SUCCESS) @@ -597,7 +599,7 @@ newconnection(controllistener_t *listener, isc_socket_t *sock) { isc_timer_detach(&conn->timer); isc_mem_put(listener->mctx, conn, sizeof(*conn)); #ifdef ENABLE_AFL - if (ns_g_fuzz_type == ns_fuzz_rndc) { + if (named_g_fuzz_type == isc_fuzz_rndc) { named_fuzz_notify(); } #endif @@ -631,8 +633,8 @@ control_newconn(isc_task_t *task, isc_event_t *event) { !address_ok(&peeraddr, listener->acl)) { char socktext[ISC_SOCKADDR_FORMATSIZE]; isc_sockaddr_format(&peeraddr, socktext, sizeof(socktext)); - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_CONTROL, ISC_LOG_WARNING, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_CONTROL, ISC_LOG_WARNING, "rejected command channel message from %s", socktext); isc_socket_detach(&sock); @@ -643,8 +645,8 @@ control_newconn(isc_task_t *task, isc_event_t *event) { if (result != ISC_R_SUCCESS) { char socktext[ISC_SOCKADDR_FORMATSIZE]; isc_sockaddr_format(&peeraddr, socktext, sizeof(socktext)); - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_CONTROL, ISC_LOG_WARNING, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_CONTROL, ISC_LOG_WARNING, "dropped command channel from %s: %s", socktext, isc_result_totext(result)); isc_socket_detach(&sock); @@ -658,7 +660,7 @@ control_newconn(isc_task_t *task, isc_event_t *event) { } static void -controls_shutdown(ns_controls_t *controls) { +controls_shutdown(named_controls_t *controls) { controllistener_t *listener; controllistener_t *next; @@ -676,7 +678,7 @@ controls_shutdown(ns_controls_t *controls) { } void -ns_controls_shutdown(ns_controls_t *controls) { +named_controls_shutdown(named_controls_t *controls) { controls_shutdown(controls); controls->shuttingdown = ISC_TRUE; } @@ -762,7 +764,7 @@ register_keys(const cfg_obj_t *control, const cfg_obj_t *keylist, result = cfgkeylist_find(keylist, keyid->keyname, &keydef); if (result != ISC_R_SUCCESS) { - cfg_obj_log(control, ns_g_lctx, ISC_LOG_WARNING, + cfg_obj_log(control, named_g_lctx, ISC_LOG_WARNING, "couldn't find key '%s' for use with " "command channel %s", keyid->keyname, socktext); @@ -782,10 +784,10 @@ register_keys(const cfg_obj_t *control, const cfg_obj_t *keylist, algstr = cfg_obj_asstring(algobj); secretstr = cfg_obj_asstring(secretobj); - if (ns_config_getkeyalgorithm2(algstr, NULL, - &algtype, NULL) != ISC_R_SUCCESS) + if (named_config_getkeyalgorithm2(algstr, NULL, + &algtype, NULL) != ISC_R_SUCCESS) { - cfg_obj_log(control, ns_g_lctx, + cfg_obj_log(control, named_g_lctx, ISC_LOG_WARNING, "unsupported algorithm '%s' in " "key '%s' for use with command " @@ -801,7 +803,8 @@ register_keys(const cfg_obj_t *control, const cfg_obj_t *keylist, result = isc_base64_decodestring(secretstr, &b); if (result != ISC_R_SUCCESS) { - cfg_obj_log(keydef, ns_g_lctx, ISC_LOG_WARNING, + cfg_obj_log(keydef, named_g_lctx, + ISC_LOG_WARNING, "secret for key '%s' on " "command channel %s: %s", keyid->keyname, socktext, @@ -815,7 +818,8 @@ register_keys(const cfg_obj_t *control, const cfg_obj_t *keylist, keyid->secret.base = isc_mem_get(mctx, keyid->secret.length); if (keyid->secret.base == NULL) { - cfg_obj_log(keydef, ns_g_lctx, ISC_LOG_WARNING, + cfg_obj_log(keydef, named_g_lctx, + ISC_LOG_WARNING, "couldn't register key '%s': " "out of memory", keyid->keyname); ISC_LIST_UNLINK(*keyids, keyid, link); @@ -850,15 +854,15 @@ get_rndckey(isc_mem_t *mctx, controlkeylist_t *keyids) { unsigned int algtype; isc_buffer_t b; - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_CONTROL, ISC_LOG_INFO, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_CONTROL, ISC_LOG_INFO, "configuring command channel from '%s'", - ns_g_keyfile); - if (! isc_file_exists(ns_g_keyfile)) + named_g_keyfile); + if (! isc_file_exists(named_g_keyfile)) return (ISC_R_FILENOTFOUND); - CHECK(cfg_parser_create(mctx, ns_g_lctx, &pctx)); - CHECK(cfg_parse_file(pctx, ns_g_keyfile, &cfg_type_rndckey, &config)); + CHECK(cfg_parser_create(mctx, named_g_lctx, &pctx)); + CHECK(cfg_parse_file(pctx, named_g_keyfile, &cfg_type_rndckey, &config)); CHECK(cfg_map_get(config, "key", &key)); keyid = isc_mem_get(mctx, sizeof(*keyid)); @@ -873,7 +877,7 @@ get_rndckey(isc_mem_t *mctx, controlkeylist_t *keyids) { if (keyid->keyname == NULL) CHECK(ISC_R_NOMEMORY); - CHECK(bind9_check_key(key, ns_g_lctx)); + CHECK(bind9_check_key(key, named_g_lctx)); (void)cfg_map_get(key, "algorithm", &algobj); (void)cfg_map_get(key, "secret", &secretobj); @@ -882,9 +886,9 @@ get_rndckey(isc_mem_t *mctx, controlkeylist_t *keyids) { algstr = cfg_obj_asstring(algobj); secretstr = cfg_obj_asstring(secretobj); - if (ns_config_getkeyalgorithm2(algstr, NULL, - &algtype, NULL) != ISC_R_SUCCESS) { - cfg_obj_log(key, ns_g_lctx, + if (named_config_getkeyalgorithm2(algstr, NULL, + &algtype, NULL) != ISC_R_SUCCESS) { + cfg_obj_log(key, named_g_lctx, ISC_LOG_WARNING, "unsupported algorithm '%s' in " "key '%s' for use with command " @@ -898,7 +902,7 @@ get_rndckey(isc_mem_t *mctx, controlkeylist_t *keyids) { result = isc_base64_decodestring(secretstr, &b); if (result != ISC_R_SUCCESS) { - cfg_obj_log(key, ns_g_lctx, ISC_LOG_WARNING, + cfg_obj_log(key, named_g_lctx, ISC_LOG_WARNING, "secret for key '%s' on command channel: %s", keyid->keyname, isc_result_totext(result)); goto cleanup; @@ -908,7 +912,7 @@ get_rndckey(isc_mem_t *mctx, controlkeylist_t *keyids) { keyid->secret.base = isc_mem_get(mctx, keyid->secret.length); if (keyid->secret.base == NULL) { - cfg_obj_log(key, ns_g_lctx, ISC_LOG_WARNING, + cfg_obj_log(key, named_g_lctx, ISC_LOG_WARNING, "couldn't register key '%s': " "out of memory", keyid->keyname); CHECK(ISC_R_NOMEMORY); @@ -959,7 +963,7 @@ get_key_info(const cfg_obj_t *config, const cfg_obj_t *control, } static void -update_listener(ns_controls_t *cp, controllistener_t **listenerp, +update_listener(named_controls_t *cp, controllistener_t **listenerp, const cfg_obj_t *control, const cfg_obj_t *config, isc_sockaddr_t *addr, cfg_aclconfctx_t *aclconfctx, const char *socktext, isc_sockettype_t type) @@ -1032,13 +1036,13 @@ update_listener(ns_controls_t *cp, controllistener_t **listenerp, * sake of avoiding this message would be too much trouble. */ if (control != NULL) - cfg_obj_log(control, ns_g_lctx, ISC_LOG_WARNING, + cfg_obj_log(control, named_g_lctx, ISC_LOG_WARNING, "couldn't install new keys for " "command channel %s: %s", socktext, isc_result_totext(result)); else - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_CONTROL, ISC_LOG_WARNING, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_CONTROL, ISC_LOG_WARNING, "couldn't install new keys for " "command channel %s: %s", socktext, isc_result_totext(result)); @@ -1049,7 +1053,7 @@ update_listener(ns_controls_t *cp, controllistener_t **listenerp, */ if (control != NULL && type == isc_sockettype_tcp) { allow = cfg_tuple_get(control, "allow"); - result = cfg_acl_fromconfig(allow, config, ns_g_lctx, + result = cfg_acl_fromconfig(allow, config, named_g_lctx, aclconfctx, listener->mctx, 0, &new_acl); } else { @@ -1070,13 +1074,13 @@ update_listener(ns_controls_t *cp, controllistener_t **listenerp, dns_acl_detach(&new_acl); /* XXXDCL say the old acl is still used? */ } else if (control != NULL) - cfg_obj_log(control, ns_g_lctx, ISC_LOG_WARNING, + cfg_obj_log(control, named_g_lctx, ISC_LOG_WARNING, "couldn't install new acl for " "command channel %s: %s", socktext, isc_result_totext(result)); else - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_CONTROL, ISC_LOG_WARNING, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_CONTROL, ISC_LOG_WARNING, "couldn't install new acl for " "command channel %s: %s", socktext, isc_result_totext(result)); @@ -1096,7 +1100,7 @@ update_listener(ns_controls_t *cp, controllistener_t **listenerp, listener->owner = owner; listener->group = group; } else if (control != NULL) - cfg_obj_log(control, ns_g_lctx, ISC_LOG_WARNING, + cfg_obj_log(control, named_g_lctx, ISC_LOG_WARNING, "couldn't update ownership/permission for " "command channel %s", socktext); } @@ -1105,7 +1109,7 @@ update_listener(ns_controls_t *cp, controllistener_t **listenerp, } static void -add_listener(ns_controls_t *cp, controllistener_t **listenerp, +add_listener(named_controls_t *cp, controllistener_t **listenerp, const cfg_obj_t *control, const cfg_obj_t *config, isc_sockaddr_t *addr, cfg_aclconfctx_t *aclconfctx, const char *socktext, isc_sockettype_t type) @@ -1146,7 +1150,7 @@ add_listener(ns_controls_t *cp, controllistener_t **listenerp, */ if (control != NULL && type == isc_sockettype_tcp) { allow = cfg_tuple_get(control, "allow"); - result = cfg_acl_fromconfig(allow, config, ns_g_lctx, + result = cfg_acl_fromconfig(allow, config, named_g_lctx, aclconfctx, mctx, 0, &new_acl); } else { @@ -1182,7 +1186,7 @@ add_listener(ns_controls_t *cp, controllistener_t **listenerp, result = get_rndckey(mctx, &listener->keys); if (result != ISC_R_SUCCESS && control != NULL) - cfg_obj_log(control, ns_g_lctx, ISC_LOG_WARNING, + cfg_obj_log(control, named_g_lctx, ISC_LOG_WARNING, "couldn't install keys for " "command channel %s: %s", socktext, isc_result_totext(result)); @@ -1202,7 +1206,7 @@ add_listener(ns_controls_t *cp, controllistener_t **listenerp, isc_socket_cleanunix(&listener->address, ISC_FALSE); if (result == ISC_R_SUCCESS) - result = isc_socket_create(ns_g_socketmgr, + result = isc_socket_create(named_g_socketmgr, isc_sockaddr_pf(&listener->address), type, &listener->sock); if (result == ISC_R_SUCCESS) @@ -1234,8 +1238,8 @@ add_listener(ns_controls_t *cp, controllistener_t **listenerp, result = control_accept(listener); if (result == ISC_R_SUCCESS) { - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_CONTROL, ISC_LOG_NOTICE, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_CONTROL, ISC_LOG_NOTICE, "command channel listening on %s", socktext); *listenerp = listener; @@ -1246,12 +1250,12 @@ add_listener(ns_controls_t *cp, controllistener_t **listenerp, } if (control != NULL) - cfg_obj_log(control, ns_g_lctx, ISC_LOG_WARNING, + cfg_obj_log(control, named_g_lctx, ISC_LOG_WARNING, "couldn't add command channel %s: %s", socktext, isc_result_totext(result)); else - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_CONTROL, ISC_LOG_NOTICE, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_CONTROL, ISC_LOG_NOTICE, "couldn't add command channel %s: %s", socktext, isc_result_totext(result)); @@ -1262,8 +1266,8 @@ add_listener(ns_controls_t *cp, controllistener_t **listenerp, } isc_result_t -ns_controls_configure(ns_controls_t *cp, const cfg_obj_t *config, - cfg_aclconfctx_t *aclconfctx) +named_controls_configure(named_controls_t *cp, const cfg_obj_t *config, + cfg_aclconfctx_t *aclconfctx) { controllistener_t *listener; controllistenerlist_t new_listeners; @@ -1316,14 +1320,14 @@ ns_controls_configure(ns_controls_t *cp, const cfg_obj_t *config, addr = *cfg_obj_assockaddr(obj); if (isc_sockaddr_getport(&addr) == 0) isc_sockaddr_setport(&addr, - NS_CONTROL_PORT); + NAMED_CONTROL_PORT); isc_sockaddr_format(&addr, socktext, sizeof(socktext)); - isc_log_write(ns_g_lctx, - NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_CONTROL, + isc_log_write(named_g_lctx, + NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_CONTROL, ISC_LOG_DEBUG(9), "processing control channel %s", socktext); @@ -1383,9 +1387,9 @@ ns_controls_configure(ns_controls_t *cp, const cfg_obj_t *config, result = isc_sockaddr_frompath(&addr, cfg_obj_asstring(path)); if (result != ISC_R_SUCCESS) { - isc_log_write(ns_g_lctx, - NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_CONTROL, + isc_log_write(named_g_lctx, + NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_CONTROL, ISC_LOG_DEBUG(9), "control channel '%s': %s", cfg_obj_asstring(path), @@ -1393,9 +1397,9 @@ ns_controls_configure(ns_controls_t *cp, const cfg_obj_t *config, continue; } - isc_log_write(ns_g_lctx, - NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_CONTROL, + isc_log_write(named_g_lctx, + NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_CONTROL, ISC_LOG_DEBUG(9), "processing control channel '%s'", cfg_obj_asstring(path)); @@ -1445,7 +1449,7 @@ ns_controls_configure(ns_controls_t *cp, const cfg_obj_t *config, isc_sockaddr_fromin6(&addr, &in6addr_loopback, 0); } - isc_sockaddr_setport(&addr, NS_CONTROL_PORT); + isc_sockaddr_setport(&addr, NAMED_CONTROL_PORT); isc_sockaddr_format(&addr, socktext, sizeof(socktext)); @@ -1475,7 +1479,7 @@ ns_controls_configure(ns_controls_t *cp, const cfg_obj_t *config, } /* - * ns_control_shutdown() will stop whatever is on the global + * named_control_shutdown() will stop whatever is on the global * listeners list, which currently only has whatever sockaddrs * were in the previous configuration (if any) that do not * remain in the current configuration. @@ -1492,10 +1496,10 @@ ns_controls_configure(ns_controls_t *cp, const cfg_obj_t *config, } isc_result_t -ns_controls_create(ns_server_t *server, ns_controls_t **ctrlsp) { +named_controls_create(named_server_t *server, named_controls_t **ctrlsp) { isc_mem_t *mctx = server->mctx; isc_result_t result; - ns_controls_t *controls = isc_mem_get(mctx, sizeof(*controls)); + named_controls_t *controls = isc_mem_get(mctx, sizeof(*controls)); if (controls == NULL) return (ISC_R_NOMEMORY); @@ -1513,8 +1517,8 @@ ns_controls_create(ns_server_t *server, ns_controls_t **ctrlsp) { } void -ns_controls_destroy(ns_controls_t **ctrlsp) { - ns_controls_t *controls = *ctrlsp; +named_controls_destroy(named_controls_t **ctrlsp) { + named_controls_t *controls = *ctrlsp; REQUIRE(ISC_LIST_EMPTY(controls->listeners)); diff --git a/bin/named/fuzz.c b/bin/named/fuzz.c index dbb4ed6026..fe269dd236 100644 --- a/bin/named/fuzz.c +++ b/bin/named/fuzz.c @@ -64,7 +64,7 @@ fuzz_thread_client(void *arg) { * Parse named -A argument in the "address:port" syntax. Due to * the syntax used, this only supports IPv4 addresses. */ - host = strdup(ns_g_fuzz_named_addr); + host = strdup(named_g_fuzz_named_addr); RUNTIME_CHECK(host != NULL); port = strchr(host, ':'); @@ -83,7 +83,7 @@ fuzz_thread_client(void *arg) { * Wait for named to start. This is set in run_server() in the * named thread. */ - while (!ns_g_run_done) { + while (!named_g_run_done) { usleep(10000); } @@ -118,8 +118,8 @@ fuzz_thread_client(void *arg) { if (getenv("AFL_CMIN")) { free(buf); close(sockfd); - ns_server_flushonshutdown(ns_g_server, - ISC_FALSE); + named_server_flushonshutdown(named_g_server, + ISC_FALSE); isc_app_shutdown(); return (NULL); } @@ -150,7 +150,7 @@ fuzz_thread_client(void *arg) { free(buf); close(sockfd); - ns_server_flushonshutdown(ns_g_server, ISC_FALSE); + named_server_flushonshutdown(named_g_server, ISC_FALSE); isc_app_shutdown(); return (NULL); @@ -197,7 +197,7 @@ fuzz_thread_resolver(void *arg) { * have to be updated. 0x8d, 0xf6 at the start is the ID field * which will be made to match the query. */ - const isc_uint8_t dnskey_wireformat[] = { + const isc_uint8_t dnskey_wf[] = { 0x8d, 0xf6, 0x84, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x07, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x00, 0x00, 0x30, 0x00, @@ -292,7 +292,7 @@ fuzz_thread_resolver(void *arg) { * Parse named -A argument in the "qtype:saddress:sport:raddress:rport" * syntax. Due to the syntax used, this only supports IPv4 addresses. */ - sqtype = strdup(ns_g_fuzz_named_addr); + sqtype = strdup(named_g_fuzz_named_addr); RUNTIME_CHECK(sqtype != NULL); shost = strchr(sqtype, ':'); @@ -338,7 +338,7 @@ fuzz_thread_resolver(void *arg) { * Wait for named to start. This is set in run_server() in the * named thread. */ - while (!ns_g_run_done) { + while (!named_g_run_done) { usleep(10000); } @@ -381,8 +381,8 @@ fuzz_thread_resolver(void *arg) { free(rbuf); close(sockfd); close(listenfd); - ns_server_flushonshutdown(ns_g_server, - ISC_FALSE); + named_server_flushonshutdown(named_g_server, + ISC_FALSE); isc_app_shutdown(); return (NULL); } @@ -552,9 +552,9 @@ fuzz_thread_resolver(void *arg) { qtype = (hb << 8) | lb; if (qtype == 48) { - memmove(buf + 2, dnskey_wireformat + 2, - sizeof (dnskey_wireformat) - 2); - length = sizeof (dnskey_wireformat); + memmove(buf + 2, dnskey_wf + 2, + sizeof (dnskey_wf) - 2); + length = sizeof (dnskey_wf); } } } @@ -576,7 +576,7 @@ fuzz_thread_resolver(void *arg) { free(buf); close(sockfd); close(listenfd); - ns_server_flushonshutdown(ns_g_server, ISC_FALSE); + named_server_flushonshutdown(named_g_server, ISC_FALSE); isc_app_shutdown(); /* @@ -614,7 +614,7 @@ fuzz_thread_tcp(void *arg) { * Parse named -A argument in the "address:port" syntax. Due to * the syntax used, this only supports IPv4 addresses. */ - host = strdup(ns_g_fuzz_named_addr); + host = strdup(named_g_fuzz_named_addr); RUNTIME_CHECK(host != NULL); port = strchr(host, ':'); @@ -633,7 +633,7 @@ fuzz_thread_tcp(void *arg) { * Wait for named to start. This is set in run_server() in the * named thread. */ - while (!ns_g_run_done) { + while (!named_g_run_done) { usleep(10000); } @@ -650,7 +650,7 @@ fuzz_thread_tcp(void *arg) { int yes; int r; - if (ns_g_fuzz_type == ns_fuzz_tcpclient) { + if (named_g_fuzz_type == isc_fuzz_tcpclient) { /* * To fuzz DNS TCP client we have to put 16-bit * message length preceding the start of packet. @@ -669,7 +669,7 @@ fuzz_thread_tcp(void *arg) { usleep(1000000); continue; } - if (ns_g_fuzz_type == ns_fuzz_http) { + if (named_g_fuzz_type == isc_fuzz_http) { /* * This guarantees that the request will be * processed. @@ -714,7 +714,7 @@ fuzz_thread_tcp(void *arg) { free(buf); close(sockfd); - ns_server_flushonshutdown(ns_g_server, ISC_FALSE); + named_server_flushonshutdown(named_g_server, ISC_FALSE); isc_app_shutdown(); return (NULL); @@ -731,7 +731,7 @@ void named_fuzz_notify(void) { #ifdef ENABLE_AFL if (getenv("AFL_CMIN")) { - ns_server_flushonshutdown(ns_g_server, ISC_FALSE); + named_server_flushonshutdown(named_g_server, ISC_FALSE); isc_app_shutdown(); return; } @@ -754,18 +754,18 @@ named_fuzz_setup(void) { pthread_t thread; void *(fn) = NULL; - switch (ns_g_fuzz_type) { - case ns_fuzz_client: + switch (named_g_fuzz_type) { + case isc_fuzz_client: fn = fuzz_thread_client; break; - case ns_fuzz_http: - case ns_fuzz_tcpclient: - case ns_fuzz_rndc: + case isc_fuzz_http: + case isc_fuzz_tcpclient: + case isc_fuzz_rndc: fn = fuzz_thread_tcp; break; - case ns_fuzz_resolver: + case isc_fuzz_resolver: fn = fuzz_thread_resolver; break; diff --git a/bin/named/geoip.c b/bin/named/geoip.c index 9c0b25a774..3f3703229d 100644 --- a/bin/named/geoip.c +++ b/bin/named/geoip.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013, 2014, 2016 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2013, 2014, 2016, 2017 Internet Systems Consortium, Inc. ("ISC") * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -39,20 +39,20 @@ init_geoip_db(GeoIP **dbp, GeoIPDBTypes edition, GeoIPDBTypes fallback, } if (! GeoIP_db_avail(edition)) { - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_INFO, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_INFO, "GeoIP %s (type %d) DB not available", name, edition); goto fail; } - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_INFO, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_INFO, "initializing GeoIP %s (type %d) DB", name, edition); db = GeoIP_open_type(edition, method); if (db == NULL) { - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_ERROR, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "failed to initialize GeoIP %s (type %d) DB%s", name, edition, fallback == 0 ? "geoip matches using this database will fail" : ""); @@ -61,8 +61,8 @@ init_geoip_db(GeoIP **dbp, GeoIPDBTypes edition, GeoIPDBTypes fallback, info = GeoIP_database_info(db); if (info != NULL) { - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_INFO, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_INFO, "%s", info); free(info); } @@ -77,18 +77,18 @@ init_geoip_db(GeoIP **dbp, GeoIPDBTypes edition, GeoIPDBTypes fallback, #endif /* HAVE_GEOIP */ void -ns_geoip_init(void) { +named_geoip_init(void) { #ifndef HAVE_GEOIP return; #else GeoIP_cleanup(); - if (ns_g_geoip == NULL) - ns_g_geoip = &geoip_table; + if (named_g_geoip == NULL) + named_g_geoip = &geoip_table; #endif } void -ns_geoip_load(char *dir) { +named_geoip_load(char *dir) { #ifndef HAVE_GEOIP UNUSED(dir); @@ -103,40 +103,40 @@ ns_geoip_load(char *dir) { method = GEOIP_MMAP_CACHE; #endif - ns_geoip_init(); + named_geoip_init(); if (dir != NULL) { - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_INFO, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_INFO, "using \"%s\" as GeoIP directory", dir); GeoIP_setup_custom_directory(dir); } - init_geoip_db(&ns_g_geoip->country_v4, GEOIP_COUNTRY_EDITION, 0, + init_geoip_db(&named_g_geoip->country_v4, GEOIP_COUNTRY_EDITION, 0, method, "Country (IPv4)"); #ifdef HAVE_GEOIP_V6 - init_geoip_db(&ns_g_geoip->country_v6, GEOIP_COUNTRY_EDITION_V6, 0, + init_geoip_db(&named_g_geoip->country_v6, GEOIP_COUNTRY_EDITION_V6, 0, method, "Country (IPv6)"); #endif - init_geoip_db(&ns_g_geoip->city_v4, GEOIP_CITY_EDITION_REV1, + init_geoip_db(&named_g_geoip->city_v4, GEOIP_CITY_EDITION_REV1, GEOIP_CITY_EDITION_REV0, method, "City (IPv4)"); #if defined(HAVE_GEOIP_V6) && defined(HAVE_GEOIP_CITY_V6) - init_geoip_db(&ns_g_geoip->city_v6, GEOIP_CITY_EDITION_REV1_V6, + init_geoip_db(&named_g_geoip->city_v6, GEOIP_CITY_EDITION_REV1_V6, GEOIP_CITY_EDITION_REV0_V6, method, "City (IPv6)"); #endif - init_geoip_db(&ns_g_geoip->region, GEOIP_REGION_EDITION_REV1, + init_geoip_db(&named_g_geoip->region, GEOIP_REGION_EDITION_REV1, GEOIP_REGION_EDITION_REV0, method, "Region"); - init_geoip_db(&ns_g_geoip->isp, GEOIP_ISP_EDITION, 0, + init_geoip_db(&named_g_geoip->isp, GEOIP_ISP_EDITION, 0, method, "ISP"); - init_geoip_db(&ns_g_geoip->org, GEOIP_ORG_EDITION, 0, + init_geoip_db(&named_g_geoip->org, GEOIP_ORG_EDITION, 0, method, "Org"); - init_geoip_db(&ns_g_geoip->as, GEOIP_ASNUM_EDITION, 0, + init_geoip_db(&named_g_geoip->as, GEOIP_ASNUM_EDITION, 0, method, "AS"); - init_geoip_db(&ns_g_geoip->domain, GEOIP_DOMAIN_EDITION, 0, + init_geoip_db(&named_g_geoip->domain, GEOIP_DOMAIN_EDITION, 0, method, "Domain"); - init_geoip_db(&ns_g_geoip->netspeed, GEOIP_NETSPEED_EDITION, 0, + init_geoip_db(&named_g_geoip->netspeed, GEOIP_NETSPEED_EDITION, 0, method, "NetSpeed"); #endif /* HAVE_GEOIP */ } diff --git a/bin/named/include/named/builtin.h b/bin/named/include/named/builtin.h index 9cab902f9b..762f471825 100644 --- a/bin/named/include/named/builtin.h +++ b/bin/named/include/named/builtin.h @@ -1,13 +1,11 @@ /* - * Copyright (C) 2001, 2004, 2005, 2007, 2016 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2001, 2004, 2005, 2007, 2016, 2017 Internet Systems Consortium, Inc. ("ISC") * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -/* $Id: builtin.h,v 1.6 2007/06/19 23:46:59 tbox Exp $ */ - #ifndef NAMED_BUILTIN_H #define NAMED_BUILTIN_H 1 @@ -15,8 +13,8 @@ #include -isc_result_t ns_builtin_init(void); +isc_result_t named_builtin_init(void); -void ns_builtin_deinit(void); +void named_builtin_deinit(void); #endif /* NAMED_BUILTIN_H */ diff --git a/bin/named/include/named/config.h b/bin/named/include/named/config.h index 1561720012..ba384d5c4c 100644 --- a/bin/named/include/named/config.h +++ b/bin/named/include/named/config.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001, 2002, 2004-2007, 2009, 2013, 2016 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2001, 2002, 2004-2007, 2009, 2013, 2016, 2017 Internet Systems Consortium, Inc. ("ISC") * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -19,55 +19,55 @@ #include isc_result_t -ns_config_parsedefaults(cfg_parser_t *parser, cfg_obj_t **conf); +named_config_parsedefaults(cfg_parser_t *parser, cfg_obj_t **conf); isc_result_t -ns_config_get(cfg_obj_t const * const *maps, const char *name, +named_config_get(cfg_obj_t const * const *maps, const char *name, const cfg_obj_t **obj); isc_result_t -ns_checknames_get(const cfg_obj_t **maps, const char *name, +named_checknames_get(const cfg_obj_t **maps, const char *name, const cfg_obj_t **obj); int -ns_config_listcount(const cfg_obj_t *list); +named_config_listcount(const cfg_obj_t *list); isc_result_t -ns_config_getclass(const cfg_obj_t *classobj, dns_rdataclass_t defclass, +named_config_getclass(const cfg_obj_t *classobj, dns_rdataclass_t defclass, dns_rdataclass_t *classp); isc_result_t -ns_config_gettype(const cfg_obj_t *typeobj, dns_rdatatype_t deftype, +named_config_gettype(const cfg_obj_t *typeobj, dns_rdatatype_t deftype, dns_rdatatype_t *typep); dns_zonetype_t -ns_config_getzonetype(const cfg_obj_t *zonetypeobj); +named_config_getzonetype(const cfg_obj_t *zonetypeobj); isc_result_t -ns_config_getiplist(const cfg_obj_t *config, const cfg_obj_t *list, +named_config_getiplist(const cfg_obj_t *config, const cfg_obj_t *list, in_port_t defport, isc_mem_t *mctx, isc_sockaddr_t **addrsp, isc_dscp_t **dscpsp, isc_uint32_t *countp); void -ns_config_putiplist(isc_mem_t *mctx, isc_sockaddr_t **addrsp, +named_config_putiplist(isc_mem_t *mctx, isc_sockaddr_t **addrsp, isc_dscp_t **dscpsp, isc_uint32_t count); isc_result_t -ns_config_getipandkeylist(const cfg_obj_t *config, const cfg_obj_t *list, +named_config_getipandkeylist(const cfg_obj_t *config, const cfg_obj_t *list, isc_mem_t *mctx, dns_ipkeylist_t *ipkl); isc_result_t -ns_config_getport(const cfg_obj_t *config, in_port_t *portp); +named_config_getport(const cfg_obj_t *config, in_port_t *portp); isc_result_t -ns_config_getkeyalgorithm(const char *str, const dns_name_t **name, +named_config_getkeyalgorithm(const char *str, const dns_name_t **name, isc_uint16_t *digestbits); isc_result_t -ns_config_getkeyalgorithm2(const char *str, const dns_name_t **name, +named_config_getkeyalgorithm2(const char *str, const dns_name_t **name, unsigned int *typep, isc_uint16_t *digestbits); isc_result_t -ns_config_getdscp(const cfg_obj_t *config, isc_dscp_t *dscpp); +named_config_getdscp(const cfg_obj_t *config, isc_dscp_t *dscpp); #endif /* NAMED_CONFIG_H */ diff --git a/bin/named/include/named/control.h b/bin/named/include/named/control.h index 586bec0cde..c05ec531bd 100644 --- a/bin/named/include/named/control.h +++ b/bin/named/include/named/control.h @@ -6,8 +6,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -/* $Id: control.h,v 1.38 2012/01/31 23:47:31 tbox Exp $ */ - #ifndef NAMED_CONTROL_H #define NAMED_CONTROL_H 1 @@ -22,60 +20,60 @@ #include -#define NS_CONTROL_PORT 953 +#define NAMED_CONTROL_PORT 953 -#define NS_COMMAND_STOP "stop" -#define NS_COMMAND_HALT "halt" -#define NS_COMMAND_RELOAD "reload" -#define NS_COMMAND_RECONFIG "reconfig" -#define NS_COMMAND_REFRESH "refresh" -#define NS_COMMAND_RETRANSFER "retransfer" -#define NS_COMMAND_DUMPSTATS "stats" -#define NS_COMMAND_QUERYLOG "querylog" -#define NS_COMMAND_DUMPDB "dumpdb" -#define NS_COMMAND_SECROOTS "secroots" -#define NS_COMMAND_TRACE "trace" -#define NS_COMMAND_NOTRACE "notrace" -#define NS_COMMAND_FLUSH "flush" -#define NS_COMMAND_FLUSHNAME "flushname" -#define NS_COMMAND_FLUSHTREE "flushtree" -#define NS_COMMAND_STATUS "status" -#define NS_COMMAND_TSIGLIST "tsig-list" -#define NS_COMMAND_TSIGDELETE "tsig-delete" -#define NS_COMMAND_FREEZE "freeze" -#define NS_COMMAND_UNFREEZE "unfreeze" -#define NS_COMMAND_THAW "thaw" -#define NS_COMMAND_TIMERPOKE "timerpoke" -#define NS_COMMAND_RECURSING "recursing" -#define NS_COMMAND_NULL "null" -#define NS_COMMAND_NOTIFY "notify" -#define NS_COMMAND_VALIDATION "validation" -#define NS_COMMAND_SCAN "scan" -#define NS_COMMAND_SIGN "sign" -#define NS_COMMAND_LOADKEYS "loadkeys" -#define NS_COMMAND_ADDZONE "addzone" -#define NS_COMMAND_MODZONE "modzone" -#define NS_COMMAND_DELZONE "delzone" -#define NS_COMMAND_SHOWZONE "showzone" -#define NS_COMMAND_SYNC "sync" -#define NS_COMMAND_SIGNING "signing" -#define NS_COMMAND_ZONESTATUS "zonestatus" -#define NS_COMMAND_NTA "nta" -#define NS_COMMAND_TESTGEN "testgen" -#define NS_COMMAND_MKEYS "managed-keys" -#define NS_COMMAND_DNSTAPREOPEN "dnstap-reopen" -#define NS_COMMAND_DNSTAP "dnstap" -#define NS_COMMAND_TCPTIMEOUTS "tcp-timeouts" -#define NS_COMMAND_SERVESTALE "serve-stale" +#define NAMED_COMMAND_STOP "stop" +#define NAMED_COMMAND_HALT "halt" +#define NAMED_COMMAND_RELOAD "reload" +#define NAMED_COMMAND_RECONFIG "reconfig" +#define NAMED_COMMAND_REFRESH "refresh" +#define NAMED_COMMAND_RETRANSFER "retransfer" +#define NAMED_COMMAND_DUMPSTATS "stats" +#define NAMED_COMMAND_QUERYLOG "querylog" +#define NAMED_COMMAND_DUMPDB "dumpdb" +#define NAMED_COMMAND_SECROOTS "secroots" +#define NAMED_COMMAND_TRACE "trace" +#define NAMED_COMMAND_NOTRACE "notrace" +#define NAMED_COMMAND_FLUSH "flush" +#define NAMED_COMMAND_FLUSHNAME "flushname" +#define NAMED_COMMAND_FLUSHTREE "flushtree" +#define NAMED_COMMAND_STATUS "status" +#define NAMED_COMMAND_TSIGLIST "tsig-list" +#define NAMED_COMMAND_TSIGDELETE "tsig-delete" +#define NAMED_COMMAND_FREEZE "freeze" +#define NAMED_COMMAND_UNFREEZE "unfreeze" +#define NAMED_COMMAND_THAW "thaw" +#define NAMED_COMMAND_TIMERPOKE "timerpoke" +#define NAMED_COMMAND_RECURSING "recursing" +#define NAMED_COMMAND_NULL "null" +#define NAMED_COMMAND_NOTIFY "notify" +#define NAMED_COMMAND_VALIDATION "validation" +#define NAMED_COMMAND_SCAN "scan" +#define NAMED_COMMAND_SIGN "sign" +#define NAMED_COMMAND_LOADKEYS "loadkeys" +#define NAMED_COMMAND_ADDZONE "addzone" +#define NAMED_COMMAND_MODZONE "modzone" +#define NAMED_COMMAND_DELZONE "delzone" +#define NAMED_COMMAND_SHOWZONE "showzone" +#define NAMED_COMMAND_SYNC "sync" +#define NAMED_COMMAND_SIGNING "signing" +#define NAMED_COMMAND_ZONESTATUS "zonestatus" +#define NAMED_COMMAND_NTA "nta" +#define NAMED_COMMAND_TESTGEN "testgen" +#define NAMED_COMMAND_MKEYS "managed-keys" +#define NAMED_COMMAND_DNSTAPREOPEN "dnstap-reopen" +#define NAMED_COMMAND_DNSTAP "dnstap" +#define NAMED_COMMAND_TCPTIMEOUTS "tcp-timeouts" +#define NAMED_COMMAND_SERVESTALE "serve-stale" isc_result_t -ns_controls_create(ns_server_t *server, ns_controls_t **ctrlsp); +named_controls_create(named_server_t *server, named_controls_t **ctrlsp); /*%< * Create an initial, empty set of command channels for 'server'. */ void -ns_controls_destroy(ns_controls_t **ctrlsp); +named_controls_destroy(named_controls_t **ctrlsp); /*%< * Destroy a set of command channels. * @@ -84,8 +82,8 @@ ns_controls_destroy(ns_controls_t **ctrlsp); */ isc_result_t -ns_controls_configure(ns_controls_t *controls, const cfg_obj_t *config, - cfg_aclconfctx_t *aclconfctx); +named_controls_configure(named_controls_t *controls, const cfg_obj_t *config, + cfg_aclconfctx_t *aclconfctx); /*%< * Configure zero or more command channels into 'controls' * as defined in the configuration parse tree 'config'. @@ -94,13 +92,13 @@ ns_controls_configure(ns_controls_t *controls, const cfg_obj_t *config, */ void -ns_controls_shutdown(ns_controls_t *controls); +named_controls_shutdown(named_controls_t *controls); /*%< * Initiate shutdown of all the command channels in 'controls'. */ isc_result_t -ns_control_docommand(isccc_sexpr_t *message, isc_boolean_t readonly, - isc_buffer_t **text); +named_control_docommand(isccc_sexpr_t *message, isc_boolean_t readonly, + isc_buffer_t **text); #endif /* NAMED_CONTROL_H */ diff --git a/bin/named/include/named/fuzz.h b/bin/named/include/named/fuzz.h index 4439007136..80af281932 100644 --- a/bin/named/include/named/fuzz.h +++ b/bin/named/include/named/fuzz.h @@ -1,11 +1,13 @@ /* - * Copyright (C) 2016 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2016, 2017 Internet Systems Consortium, Inc. ("ISC") * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include + #ifndef NAMED_FUZZ_H #define NAMED_FUZZ_H @@ -15,13 +17,4 @@ named_fuzz_notify(void); void named_fuzz_setup(void); -typedef enum { - ns_fuzz_none, - ns_fuzz_client, - ns_fuzz_tcpclient, - ns_fuzz_resolver, - ns_fuzz_http, - ns_fuzz_rndc -} ns_fuzz_t; - #endif /* NAMED_FUZZ_H */ diff --git a/bin/named/include/named/geoip.h b/bin/named/include/named/geoip.h index 94926c2c63..1b3624c381 100644 --- a/bin/named/include/named/geoip.h +++ b/bin/named/include/named/geoip.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013, 2016 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2013, 2016, 2017 Internet Systems Consortium, Inc. ("ISC") * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -14,10 +14,10 @@ #include #endif /* HAVE_GEOIP */ -void ns_geoip_init(void); -void ns_geoip_load(char *dir); +void named_geoip_init(void); +void named_geoip_load(char *dir); #ifdef HAVE_GEOIP -extern dns_geoip_databases_t *ns_g_geoip; +extern dns_geoip_databases_t *named_g_geoip; #endif /* HAVE_GEOIP */ #endif diff --git a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h index 6c7ddb61d5..388dc9766d 100644 --- a/bin/named/include/named/globals.h +++ b/bin/named/include/named/globals.h @@ -28,7 +28,7 @@ #undef EXTERN #undef INIT -#ifdef NS_MAIN +#ifdef NAMED_MAIN #define EXTERN #define INIT(v) = (v) #else @@ -36,162 +36,132 @@ #define INIT(v) #endif -#ifndef NS_RUN_PID_DIR -#define NS_RUN_PID_DIR 1 +#ifndef NAMED_RUN_PID_DIR +#define NAMED_RUN_PID_DIR 1 #endif -EXTERN isc_mem_t * ns_g_mctx INIT(NULL); -EXTERN unsigned int ns_g_cpus INIT(0); -EXTERN unsigned int ns_g_udpdisp INIT(0); -EXTERN isc_taskmgr_t * ns_g_taskmgr INIT(NULL); -EXTERN dns_dispatchmgr_t * ns_g_dispatchmgr INIT(NULL); -EXTERN isc_entropy_t * ns_g_entropy INIT(NULL); -EXTERN isc_entropy_t * ns_g_fallbackentropy INIT(NULL); -EXTERN unsigned int ns_g_cpus_detected INIT(1); +EXTERN isc_mem_t * named_g_mctx INIT(NULL); +EXTERN unsigned int named_g_cpus INIT(0); +EXTERN unsigned int named_g_udpdisp INIT(0); +EXTERN isc_taskmgr_t * named_g_taskmgr INIT(NULL); +EXTERN dns_dispatchmgr_t * named_g_dispatchmgr INIT(NULL); +EXTERN isc_entropy_t * named_g_entropy INIT(NULL); +EXTERN isc_entropy_t * named_g_fallbackentropy INIT(NULL); +EXTERN unsigned int named_g_cpus_detected INIT(1); #ifdef ENABLE_AFL -EXTERN isc_boolean_t ns_g_run_done INIT(ISC_FALSE); +EXTERN isc_boolean_t named_g_run_done INIT(ISC_FALSE); #endif /* * XXXRTH We're going to want multiple timer managers eventually. One * for really short timers, another for client timers, and one * for zone timers. */ -EXTERN isc_timermgr_t * ns_g_timermgr INIT(NULL); -EXTERN isc_socketmgr_t * ns_g_socketmgr INIT(NULL); -EXTERN cfg_parser_t * ns_g_parser INIT(NULL); -EXTERN cfg_parser_t * ns_g_addparser INIT(NULL); -EXTERN const char * ns_g_version INIT(VERSION); -EXTERN const char * ns_g_product INIT(PRODUCT); -EXTERN const char * ns_g_description INIT(DESCRIPTION); -EXTERN const char * ns_g_srcid INIT(SRCID); -EXTERN const char * ns_g_configargs INIT(CONFIGARGS); -EXTERN const char * ns_g_builder INIT(BUILDER); -EXTERN in_port_t ns_g_port INIT(0); -EXTERN isc_dscp_t ns_g_dscp INIT(-1); -EXTERN in_port_t lwresd_g_listenport INIT(0); +EXTERN isc_timermgr_t * named_g_timermgr INIT(NULL); +EXTERN isc_socketmgr_t * named_g_socketmgr INIT(NULL); +EXTERN cfg_parser_t * named_g_parser INIT(NULL); +EXTERN cfg_parser_t * named_g_addparser INIT(NULL); +EXTERN const char * named_g_version INIT(VERSION); +EXTERN const char * named_g_product INIT(PRODUCT); +EXTERN const char * named_g_description INIT(DESCRIPTION); +EXTERN const char * named_g_srcid INIT(SRCID); +EXTERN const char * named_g_configargs INIT(CONFIGARGS); +EXTERN const char * named_g_builder INIT(BUILDER); +EXTERN in_port_t named_g_port INIT(0); +EXTERN isc_dscp_t named_g_dscp INIT(-1); -EXTERN ns_server_t * ns_g_server INIT(NULL); - -EXTERN isc_boolean_t ns_g_lwresdonly INIT(ISC_FALSE); +EXTERN named_server_t * named_g_server INIT(NULL); /* * Logging. */ -EXTERN isc_log_t * ns_g_lctx INIT(NULL); -EXTERN isc_logcategory_t * ns_g_categories INIT(NULL); -EXTERN isc_logmodule_t * ns_g_modules INIT(NULL); -EXTERN unsigned int ns_g_debuglevel INIT(0); +EXTERN isc_log_t * named_g_lctx INIT(NULL); +EXTERN isc_logcategory_t * named_g_categories INIT(NULL); +EXTERN isc_logmodule_t * named_g_modules INIT(NULL); +EXTERN unsigned int named_g_debuglevel INIT(0); /* * Current configuration information. */ -EXTERN cfg_obj_t * ns_g_config INIT(NULL); -EXTERN const cfg_obj_t * ns_g_defaults INIT(NULL); -EXTERN const char * ns_g_conffile INIT(NS_SYSCONFDIR +EXTERN cfg_obj_t * named_g_config INIT(NULL); +EXTERN const cfg_obj_t * named_g_defaults INIT(NULL); +EXTERN const char * named_g_conffile INIT(NAMED_SYSCONFDIR "/named.conf"); -EXTERN cfg_obj_t * ns_g_bindkeys INIT(NULL); -EXTERN const char * ns_g_keyfile INIT(NS_SYSCONFDIR +EXTERN cfg_obj_t * named_g_bindkeys INIT(NULL); +EXTERN const char * named_g_keyfile INIT(NAMED_SYSCONFDIR "/rndc.key"); -EXTERN dns_tsigkey_t * ns_g_sessionkey INIT(NULL); -EXTERN dns_name_t ns_g_sessionkeyname; - -EXTERN const char * lwresd_g_conffile INIT(NS_SYSCONFDIR - "/lwresd.conf"); -EXTERN const char * lwresd_g_resolvconffile INIT("/etc" - "/resolv.conf"); -EXTERN isc_boolean_t ns_g_conffileset INIT(ISC_FALSE); -EXTERN isc_boolean_t lwresd_g_useresolvconf INIT(ISC_FALSE); -EXTERN isc_uint16_t ns_g_udpsize INIT(4096); -EXTERN cfg_aclconfctx_t * ns_g_aclconfctx INIT(NULL); +EXTERN dns_tsigkey_t * named_g_sessionkey INIT(NULL); +EXTERN dns_name_t named_g_sessionkeyname; +EXTERN isc_boolean_t named_g_conffileset INIT(ISC_FALSE); +EXTERN cfg_aclconfctx_t * named_g_aclconfctx INIT(NULL); /* * Initial resource limits. */ -EXTERN isc_resourcevalue_t ns_g_initstacksize INIT(0); -EXTERN isc_resourcevalue_t ns_g_initdatasize INIT(0); -EXTERN isc_resourcevalue_t ns_g_initcoresize INIT(0); -EXTERN isc_resourcevalue_t ns_g_initopenfiles INIT(0); +EXTERN isc_resourcevalue_t named_g_initstacksize INIT(0); +EXTERN isc_resourcevalue_t named_g_initdatasize INIT(0); +EXTERN isc_resourcevalue_t named_g_initcoresize INIT(0); +EXTERN isc_resourcevalue_t named_g_initopenfiles INIT(0); /* * Misc. */ -EXTERN isc_boolean_t ns_g_coreok INIT(ISC_TRUE); -EXTERN const char * ns_g_chrootdir INIT(NULL); -EXTERN isc_boolean_t ns_g_foreground INIT(ISC_FALSE); -EXTERN isc_boolean_t ns_g_logstderr INIT(ISC_FALSE); -EXTERN isc_boolean_t ns_g_nosyslog INIT(ISC_FALSE); -EXTERN const char * ns_g_logfile INIT(NULL); +EXTERN isc_boolean_t named_g_coreok INIT(ISC_TRUE); +EXTERN const char * named_g_chrootdir INIT(NULL); +EXTERN isc_boolean_t named_g_foreground INIT(ISC_FALSE); +EXTERN isc_boolean_t named_g_logstderr INIT(ISC_FALSE); +EXTERN isc_boolean_t named_g_nosyslog INIT(ISC_FALSE); +EXTERN const char * named_g_logfile INIT(NULL); -EXTERN const char * ns_g_defaultsessionkeyfile - INIT(NS_LOCALSTATEDIR "/run/named/" +EXTERN const char * named_g_defaultsessionkeyfile + INIT(NAMED_LOCALSTATEDIR "/run/named/" "session.key"); -EXTERN const char * ns_g_defaultlockfile INIT(NS_LOCALSTATEDIR +EXTERN const char * named_g_defaultlockfile INIT(NAMED_LOCALSTATEDIR "/run/named/" "named.lock"); -EXTERN isc_boolean_t ns_g_forcelock INIT(ISC_FALSE); +EXTERN isc_boolean_t named_g_forcelock INIT(ISC_FALSE); -#if NS_RUN_PID_DIR -EXTERN const char * ns_g_defaultpidfile INIT(NS_LOCALSTATEDIR +#if NAMED_RUN_PID_DIR +EXTERN const char * named_g_defaultpidfile INIT(NAMED_LOCALSTATEDIR "/run/named/" "named.pid"); -EXTERN const char * lwresd_g_defaultpidfile INIT(NS_LOCALSTATEDIR - "/run/lwresd/" - "lwresd.pid"); #else -EXTERN const char * ns_g_defaultpidfile INIT(NS_LOCALSTATEDIR +EXTERN const char * named_g_defaultpidfile INIT(NAMED_LOCALSTATEDIR "/run/named.pid"); -EXTERN const char * lwresd_g_defaultpidfile INIT(NS_LOCALSTATEDIR - "/run/lwresd.pid"); #endif #ifdef HAVE_DNSTAP -EXTERN const char * ns_g_defaultdnstap - INIT(NS_LOCALSTATEDIR "/run/named/" +EXTERN const char * named_g_defaultdnstap + INIT(NAMED_LOCALSTATEDIR "/run/named/" "dnstap.sock"); #else -EXTERN const char * ns_g_defaultdnstap INIT(NULL); +EXTERN const char * named_g_defaultdnstap INIT(NULL); #endif /* HAVE_DNSTAP */ -EXTERN const char * ns_g_username INIT(NULL); +EXTERN const char * named_g_username INIT(NULL); #if defined(USE_PKCS11) -EXTERN const char * ns_g_engine INIT(PKCS11_ENGINE); +EXTERN const char * named_g_engine INIT(PKCS11_ENGINE); #else -EXTERN const char * ns_g_engine INIT(NULL); +EXTERN const char * named_g_engine INIT(NULL); #endif -EXTERN int ns_g_listen INIT(3); -EXTERN isc_time_t ns_g_boottime; -EXTERN isc_time_t ns_g_configtime; -EXTERN isc_boolean_t ns_g_memstatistics INIT(ISC_FALSE); -EXTERN isc_boolean_t ns_g_clienttest INIT(ISC_FALSE); -EXTERN isc_boolean_t ns_g_dropedns INIT(ISC_FALSE); -EXTERN isc_boolean_t ns_g_noedns INIT(ISC_FALSE); -EXTERN isc_boolean_t ns_g_nosoa INIT(ISC_FALSE); -EXTERN isc_boolean_t ns_g_noaa INIT(ISC_FALSE); -EXTERN isc_boolean_t ns_g_keepstderr INIT(ISC_FALSE); -EXTERN unsigned int ns_g_delay INIT(0); -EXTERN isc_boolean_t ns_g_nonearest INIT(ISC_FALSE); -EXTERN isc_boolean_t ns_g_notcp INIT(ISC_FALSE); -EXTERN isc_boolean_t ns_g_disable6 INIT(ISC_FALSE); -EXTERN isc_boolean_t ns_g_disable4 INIT(ISC_FALSE); -EXTERN unsigned int ns_g_tat_interval INIT(24*3600); +EXTERN isc_time_t named_g_boottime; +EXTERN isc_time_t named_g_configtime; +EXTERN isc_boolean_t named_g_memstatistics INIT(ISC_FALSE); +EXTERN isc_boolean_t named_g_keepstderr INIT(ISC_FALSE); -EXTERN unsigned int ns_g_initialtimo INIT(300); -EXTERN unsigned int ns_g_idletimo INIT(300); -EXTERN unsigned int ns_g_keepalivetimo INIT(300); -EXTERN unsigned int ns_g_advertisedtimo INIT(300); +EXTERN unsigned int named_g_tat_interval INIT(24*3600); #ifdef HAVE_GEOIP -EXTERN dns_geoip_databases_t *ns_g_geoip INIT(NULL); +EXTERN dns_geoip_databases_t *named_g_geoip INIT(NULL); #endif -EXTERN const char * ns_g_fuzz_named_addr INIT(NULL); -EXTERN ns_fuzz_t ns_g_fuzz_type INIT(ns_fuzz_none); +EXTERN const char * named_g_fuzz_addr INIT(NULL); +EXTERN isc_fuzztype_t named_g_fuzz_type INIT(isc_fuzz_none); -EXTERN dns_acl_t * ns_g_mapped INIT(NULL); +EXTERN dns_acl_t * named_g_mapped INIT(NULL); #undef EXTERN #undef INIT diff --git a/bin/named/include/named/log.h b/bin/named/include/named/log.h index e95bb038f7..3492f824a7 100644 --- a/bin/named/include/named/log.h +++ b/bin/named/include/named/log.h @@ -1,13 +1,11 @@ /* - * Copyright (C) 1999-2002, 2004, 2005, 2007, 2009, 2015, 2016 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 1999-2002, 2004, 2005, 2007, 2009, 2015-2017 Internet Systems Consortium, Inc. ("ISC") * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -/* $Id: log.h,v 1.27 2009/01/07 23:47:46 tbox Exp $ */ - #ifndef NAMED_LOG_H #define NAMED_LOG_H 1 @@ -18,36 +16,22 @@ #include -#include /* Required for ns_g_(categories|modules). */ +#include /* Required for named_g_(categories|modules). */ /* Unused slot 0. */ -#define NS_LOGCATEGORY_CLIENT (&ns_g_categories[1]) -#define NS_LOGCATEGORY_NETWORK (&ns_g_categories[2]) -#define NS_LOGCATEGORY_UPDATE (&ns_g_categories[3]) -#define NS_LOGCATEGORY_QUERIES (&ns_g_categories[4]) -#define NS_LOGCATEGORY_UNMATCHED (&ns_g_categories[5]) -#define NS_LOGCATEGORY_UPDATE_SECURITY (&ns_g_categories[6]) -#define NS_LOGCATEGORY_QUERY_ERRORS (&ns_g_categories[7]) +#define NAMED_LOGCATEGORY_UNMATCHED (&named_g_categories[1]) /* * Backwards compatibility. */ -#define NS_LOGCATEGORY_GENERAL ISC_LOGCATEGORY_GENERAL +#define NAMED_LOGCATEGORY_GENERAL ISC_LOGCATEGORY_GENERAL -#define NS_LOGMODULE_MAIN (&ns_g_modules[0]) -#define NS_LOGMODULE_CLIENT (&ns_g_modules[1]) -#define NS_LOGMODULE_SERVER (&ns_g_modules[2]) -#define NS_LOGMODULE_QUERY (&ns_g_modules[3]) -#define NS_LOGMODULE_INTERFACEMGR (&ns_g_modules[4]) -#define NS_LOGMODULE_UPDATE (&ns_g_modules[5]) -#define NS_LOGMODULE_XFER_IN (&ns_g_modules[6]) -#define NS_LOGMODULE_XFER_OUT (&ns_g_modules[7]) -#define NS_LOGMODULE_NOTIFY (&ns_g_modules[8]) -#define NS_LOGMODULE_CONTROL (&ns_g_modules[9]) -#define NS_LOGMODULE_LWRESD (&ns_g_modules[10]) +#define NAMED_LOGMODULE_MAIN (&named_g_modules[0]) +#define NAMED_LOGMODULE_SERVER (&named_g_modules[1]) +#define NAMED_LOGMODULE_CONTROL (&named_g_modules[2]) isc_result_t -ns_log_init(isc_boolean_t safe); +named_log_init(isc_boolean_t safe); /*% * Initialize the logging system and set up an initial default * logging default configuration that will be used until the @@ -59,7 +43,7 @@ ns_log_init(isc_boolean_t safe); */ isc_result_t -ns_log_setdefaultchannels(isc_logconfig_t *lcfg); +named_log_setdefaultchannels(isc_logconfig_t *lcfg); /*% * Set up logging channels according to the named defaults, which * may differ from the logging library defaults. Currently, @@ -67,24 +51,24 @@ ns_log_setdefaultchannels(isc_logconfig_t *lcfg); */ isc_result_t -ns_log_setsafechannels(isc_logconfig_t *lcfg); +named_log_setsafechannels(isc_logconfig_t *lcfg); /*% - * Like ns_log_setdefaultchannels(), but omits any logging to files. + * Like named_log_setdefaultchannels(), but omits any logging to files. */ isc_result_t -ns_log_setdefaultcategory(isc_logconfig_t *lcfg); +named_log_setdefaultcategory(isc_logconfig_t *lcfg); /*% * Set up "category default" to go to the right places. */ isc_result_t -ns_log_setunmatchedcategory(isc_logconfig_t *lcfg); +named_log_setunmatchedcategory(isc_logconfig_t *lcfg); /*% * Set up "category unmatched" to go to the right places. */ void -ns_log_shutdown(void); +named_log_shutdown(void); #endif /* NAMED_LOG_H */ diff --git a/bin/named/include/named/logconf.h b/bin/named/include/named/logconf.h index 02552c6cd6..63090a7243 100644 --- a/bin/named/include/named/logconf.h +++ b/bin/named/include/named/logconf.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999-2001, 2004-2007, 2016 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 1999-2001, 2004-2007, 2016, 2017 Internet Systems Consortium, Inc. ("ISC") * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -16,7 +16,7 @@ #include isc_result_t -ns_log_configure(isc_logconfig_t *logconf, const cfg_obj_t *logstmt); +named_logconfig(isc_logconfig_t *logconf, const cfg_obj_t *logstmt); /*%< * Set up the logging configuration in '*logconf' according to * the named.conf data in 'logstmt'. diff --git a/bin/named/include/named/lwaddr.h b/bin/named/include/named/lwaddr.h deleted file mode 100644 index ba31463d21..0000000000 --- a/bin/named/include/named/lwaddr.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (C) 2000, 2001, 2004, 2005, 2007, 2016 Internet Systems Consortium, Inc. ("ISC") - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -/* $Id: lwaddr.h,v 1.8 2007/06/19 23:46:59 tbox Exp $ */ - -/*! \file */ - -#include -#include - -isc_result_t -lwaddr_netaddr_fromlwresaddr(isc_netaddr_t *na, lwres_addr_t *la); - -isc_result_t -lwaddr_sockaddr_fromlwresaddr(isc_sockaddr_t *sa, lwres_addr_t *la, - in_port_t port); - -isc_result_t -lwaddr_lwresaddr_fromnetaddr(lwres_addr_t *la, isc_netaddr_t *na); - -isc_result_t -lwaddr_lwresaddr_fromsockaddr(lwres_addr_t *la, isc_sockaddr_t *sa); diff --git a/bin/named/include/named/lwdclient.h b/bin/named/include/named/lwdclient.h deleted file mode 100644 index e264d7d236..0000000000 --- a/bin/named/include/named/lwdclient.h +++ /dev/null @@ -1,226 +0,0 @@ -/* - * Copyright (C) 2000, 2001, 2004, 2005, 2007, 2009, 2015, 2016 Internet Systems Consortium, Inc. ("ISC") - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -/* $Id: lwdclient.h,v 1.20 2009/01/17 23:47:42 tbox Exp $ */ - -#ifndef NAMED_LWDCLIENT_H -#define NAMED_LWDCLIENT_H 1 - -/*! \file */ - -#include -#include -#include -#include -#include - -#include -#include - -#include - -#include - -#define LWRD_EVENTCLASS ISC_EVENTCLASS(4242) - -#define LWRD_SHUTDOWN (LWRD_EVENTCLASS + 0x0001) - -/*% Lightweight Resolver Daemon Client */ -struct ns_lwdclient { - isc_sockaddr_t address; /*%< where to reply */ - struct in6_pktinfo pktinfo; - isc_boolean_t pktinfo_valid; - ns_lwdclientmgr_t *clientmgr; /*%< our parent */ - ISC_LINK(ns_lwdclient_t) link; - unsigned int state; - void *arg; /*%< packet processing state */ - - /* - * Received data info. - */ - unsigned char buffer[LWRES_RECVLENGTH]; /*%< receive buffer */ - isc_uint32_t recvlength; /*%< length recv'd */ - lwres_lwpacket_t pkt; - - /*% - * Send data state. If sendbuf != buffer (that is, the send buffer - * isn't our receive buffer) it will be freed to the lwres_context_t. - */ - unsigned char *sendbuf; - isc_uint32_t sendlength; - isc_buffer_t recv_buffer; - - /*% - * gabn (get address by name) state info. - */ - dns_adbfind_t *find; - dns_adbfind_t *v4find; - dns_adbfind_t *v6find; - unsigned int find_wanted; /*%< Addresses we want */ - dns_fixedname_t query_name; - dns_fixedname_t target_name; - ns_lwsearchctx_t searchctx; - lwres_gabnresponse_t gabn; - - /*% - * gnba (get name by address) state info. - */ - lwres_gnbaresponse_t gnba; - dns_byaddr_t *byaddr; - unsigned int options; - isc_netaddr_t na; - - /*% - * grbn (get rrset by name) state info. - * - * Note: this also uses target_name and searchctx. - */ - lwres_grbnresponse_t grbn; - dns_lookup_t *lookup; - dns_rdatatype_t rdtype; - - /*% - * Alias and address info. This is copied up to the gabn/gnba - * structures eventually. - * - * XXXMLG We can keep all of this in a client since we only service - * three packet types right now. If we started handling more, - * we'd need to use "arg" above and allocate/destroy things. - */ - char *aliases[LWRES_MAX_ALIASES]; - isc_uint16_t aliaslen[LWRES_MAX_ALIASES]; - lwres_addr_t addrs[LWRES_MAX_ADDRS]; -}; - -/*% - * Client states. - * - * _IDLE The client is not doing anything at all. - * - * _RECV The client is waiting for data after issuing a socket recv(). - * - * _RECVDONE Data has been received, and is being processed. - * - * _FINDWAIT An adb (or other) request was made that cannot be satisfied - * immediately. An event will wake the client up. - * - * _SEND All data for a response has completed, and a reply was - * sent via a socket send() call. - * - * Badly formatted state table: - * - * IDLE -> RECV when client has a recv() queued. - * - * RECV -> RECVDONE when recvdone event received. - * - * RECVDONE -> SEND if the data for a reply is at hand. - * RECVDONE -> FINDWAIT if more searching is needed, and events will - * eventually wake us up again. - * - * FINDWAIT -> SEND when enough data was received to reply. - * - * SEND -> IDLE when a senddone event was received. - * - * At any time -> IDLE on error. Sometimes this will be -> SEND - * instead, if enough data is on hand to reply with a meaningful - * error. - * - * Packets which are badly formatted may or may not get error returns. - */ -#define NS_LWDCLIENT_STATEIDLE 1 -#define NS_LWDCLIENT_STATERECV 2 -#define NS_LWDCLIENT_STATERECVDONE 3 -#define NS_LWDCLIENT_STATEFINDWAIT 4 -#define NS_LWDCLIENT_STATESEND 5 -#define NS_LWDCLIENT_STATESENDDONE 6 - -#define NS_LWDCLIENT_ISIDLE(c) \ - ((c)->state == NS_LWDCLIENT_STATEIDLE) -#define NS_LWDCLIENT_ISRECV(c) \ - ((c)->state == NS_LWDCLIENT_STATERECV) -#define NS_LWDCLIENT_ISRECVDONE(c) \ - ((c)->state == NS_LWDCLIENT_STATERECVDONE) -#define NS_LWDCLIENT_ISFINDWAIT(c) \ - ((c)->state == NS_LWDCLIENT_STATEFINDWAIT) -#define NS_LWDCLIENT_ISSEND(c) \ - ((c)->state == NS_LWDCLIENT_STATESEND) - -/*% - * Overall magic test that means we're not idle. - */ -#define NS_LWDCLIENT_ISRUNNING(c) (!NS_LWDCLIENT_ISIDLE(c)) - -#define NS_LWDCLIENT_SETIDLE(c) \ - ((c)->state = NS_LWDCLIENT_STATEIDLE) -#define NS_LWDCLIENT_SETRECV(c) \ - ((c)->state = NS_LWDCLIENT_STATERECV) -#define NS_LWDCLIENT_SETRECVDONE(c) \ - ((c)->state = NS_LWDCLIENT_STATERECVDONE) -#define NS_LWDCLIENT_SETFINDWAIT(c) \ - ((c)->state = NS_LWDCLIENT_STATEFINDWAIT) -#define NS_LWDCLIENT_SETSEND(c) \ - ((c)->state = NS_LWDCLIENT_STATESEND) -#define NS_LWDCLIENT_SETSENDDONE(c) \ - ((c)->state = NS_LWDCLIENT_STATESENDDONE) - -/*% lightweight daemon client manager */ -struct ns_lwdclientmgr { - ns_lwreslistener_t *listener; - isc_mem_t *mctx; - isc_socket_t *sock; /*%< socket to use */ - dns_view_t *view; - lwres_context_t *lwctx; /*%< lightweight proto context */ - isc_task_t *task; /*%< owning task */ - unsigned int flags; - isc_mutex_t lock; - ISC_LINK(ns_lwdclientmgr_t) link; - ISC_LIST(ns_lwdclient_t) idle; /*%< idle client slots */ - ISC_LIST(ns_lwdclient_t) running; /*%< running clients */ -}; - -#define NS_LWDCLIENTMGR_FLAGRECVPENDING 0x00000001 -#define NS_LWDCLIENTMGR_FLAGSHUTTINGDOWN 0x00000002 - -isc_result_t -ns_lwdclientmgr_create(ns_lwreslistener_t *, unsigned int, isc_taskmgr_t *); - -void -ns_lwdclient_initialize(ns_lwdclient_t *, ns_lwdclientmgr_t *); - -isc_result_t -ns_lwdclient_startrecv(ns_lwdclientmgr_t *); - -void -ns_lwdclient_stateidle(ns_lwdclient_t *); - -void -ns_lwdclient_recv(isc_task_t *, isc_event_t *); - -void -ns_lwdclient_shutdown(isc_task_t *, isc_event_t *); - -void -ns_lwdclient_send(isc_task_t *, isc_event_t *); - -isc_result_t -ns_lwdclient_sendreply(ns_lwdclient_t *client, isc_region_t *r); - -/* - * Processing functions of various types. - */ -void ns_lwdclient_processgabn(ns_lwdclient_t *, lwres_buffer_t *); -void ns_lwdclient_processgnba(ns_lwdclient_t *, lwres_buffer_t *); -void ns_lwdclient_processgrbn(ns_lwdclient_t *, lwres_buffer_t *); -void ns_lwdclient_processnoop(ns_lwdclient_t *, lwres_buffer_t *); - -void ns_lwdclient_errorpktsend(ns_lwdclient_t *, isc_uint32_t); - -void ns_lwdclient_log(int level, const char *format, ...) - ISC_FORMAT_PRINTF(2, 3); - -#endif /* NAMED_LWDCLIENT_H */ diff --git a/bin/named/include/named/lwresd.h b/bin/named/include/named/lwresd.h deleted file mode 100644 index fda19ea555..0000000000 --- a/bin/named/include/named/lwresd.h +++ /dev/null @@ -1,114 +0,0 @@ -/* - * Copyright (C) 2000, 2001, 2004-2007, 2014, 2016 Internet Systems Consortium, Inc. ("ISC") - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -/* $Id: lwresd.h,v 1.19 2007/06/19 23:46:59 tbox Exp $ */ - -#ifndef NAMED_LWRESD_H -#define NAMED_LWRESD_H 1 - -/*! \file */ - -#include -#include - -#include - -#include - -struct ns_lwresd { - unsigned int magic; - - isc_mutex_t lock; - dns_view_t *view; - ns_lwsearchlist_t *search; - unsigned int ndots; - unsigned int ntasks; - unsigned int nclients; - isc_mem_t *mctx; - isc_boolean_t shutting_down; - unsigned int refs; -}; - -struct ns_lwreslistener { - unsigned int magic; - - isc_mutex_t lock; - isc_mem_t *mctx; - isc_sockaddr_t address; - ns_lwresd_t *manager; - isc_socket_t *sock; - unsigned int refs; - ISC_LIST(ns_lwdclientmgr_t) cmgrs; - ISC_LINK(ns_lwreslistener_t) link; -}; - -/*% - * Configure lwresd. - */ -isc_result_t -ns_lwresd_configure(isc_mem_t *mctx, const cfg_obj_t *config); - -isc_result_t -ns_lwresd_parseeresolvconf(isc_mem_t *mctx, cfg_parser_t *pctx, - cfg_obj_t **configp); - -/*% - * Trigger shutdown. - */ -void -ns_lwresd_shutdown(void); - -/* - * Manager functions - */ -/*% create manager */ -isc_result_t -ns_lwdmanager_create(isc_mem_t *mctx, const cfg_obj_t *lwres, - ns_lwresd_t **lwresdp); - -/*% attach to manager */ -void -ns_lwdmanager_attach(ns_lwresd_t *source, ns_lwresd_t **targetp); - -/*% detach from manager */ -void -ns_lwdmanager_detach(ns_lwresd_t **lwresdp); - -/* - * Listener functions - */ -/*% attach to listener */ -void -ns_lwreslistener_attach(ns_lwreslistener_t *source, - ns_lwreslistener_t **targetp); - -/*% detach from lister */ -void -ns_lwreslistener_detach(ns_lwreslistener_t **listenerp); - -/*% link client manager */ -void -ns_lwreslistener_unlinkcm(ns_lwreslistener_t *listener, ns_lwdclientmgr_t *cm); - -/*% unlink client manager */ -void -ns_lwreslistener_linkcm(ns_lwreslistener_t *listener, ns_lwdclientmgr_t *cm); - - - - -/* - * INTERNAL FUNCTIONS. - */ -void * -ns__lwresd_memalloc(void *arg, size_t size); - -void -ns__lwresd_memfree(void *arg, void *mem, size_t size); - -#endif /* NAMED_LWRESD_H */ diff --git a/bin/named/include/named/lwsearch.h b/bin/named/include/named/lwsearch.h deleted file mode 100644 index 0a7439106f..0000000000 --- a/bin/named/include/named/lwsearch.h +++ /dev/null @@ -1,103 +0,0 @@ -/* - * Copyright (C) 2000, 2001, 2004, 2005, 2007, 2016 Internet Systems Consortium, Inc. ("ISC") - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -/* $Id: lwsearch.h,v 1.9 2007/06/19 23:46:59 tbox Exp $ */ - -#ifndef NAMED_LWSEARCH_H -#define NAMED_LWSEARCH_H 1 - -#include -#include -#include - -#include - -#include - -/*! \file - * \brief - * Lightweight resolver search list types and routines. - * - * An ns_lwsearchlist_t holds a list of search path elements. - * - * An ns_lwsearchctx stores the state of search list during a lookup - * operation. - */ - -/*% An ns_lwsearchlist_t holds a list of search path elements. */ -struct ns_lwsearchlist { - unsigned int magic; - - isc_mutex_t lock; - isc_mem_t *mctx; - unsigned int refs; - dns_namelist_t names; -}; -/*% An ns_lwsearchctx stores the state of search list during a lookup operation. */ -struct ns_lwsearchctx { - dns_name_t *relname; - dns_name_t *searchname; - unsigned int ndots; - ns_lwsearchlist_t *list; - isc_boolean_t doneexact; - isc_boolean_t exactfirst; -}; - -isc_result_t -ns_lwsearchlist_create(isc_mem_t *mctx, ns_lwsearchlist_t **listp); -/*%< - * Create an empty search list object. - */ - -void -ns_lwsearchlist_attach(ns_lwsearchlist_t *source, ns_lwsearchlist_t **target); -/*%< - * Attach to a search list object. - */ - -void -ns_lwsearchlist_detach(ns_lwsearchlist_t **listp); -/*%< - * Detach from a search list object. - */ - -isc_result_t -ns_lwsearchlist_append(ns_lwsearchlist_t *list, dns_name_t *name); -/*%< - * Append an element to a search list. This creates a copy of the name. - */ - -void -ns_lwsearchctx_init(ns_lwsearchctx_t *sctx, ns_lwsearchlist_t *list, - dns_name_t *name, unsigned int ndots); -/*%< - * Creates a search list context structure. - */ - -void -ns_lwsearchctx_first(ns_lwsearchctx_t *sctx); -/*%< - * Moves the search list context iterator to the first element, which - * is usually the exact name. - */ - -isc_result_t -ns_lwsearchctx_next(ns_lwsearchctx_t *sctx); -/*%< - * Moves the search list context iterator to the next element. - */ - -isc_result_t -ns_lwsearchctx_current(ns_lwsearchctx_t *sctx, dns_name_t *absname); -/*%< - * Obtains the current name to be looked up. This involves either - * concatenating the name with a search path element, making an - * exact name absolute, or doing nothing. - */ - -#endif /* NAMED_LWSEARCH_H */ diff --git a/bin/named/include/named/main.h b/bin/named/include/named/main.h index ebb4c175f6..c20348db04 100644 --- a/bin/named/include/named/main.h +++ b/bin/named/include/named/main.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999-2002, 2004, 2005, 2007, 2009, 2013, 2015, 2016 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 1999-2002, 2004, 2005, 2007, 2009, 2013, 2015-2017 Internet Systems Consortium, Inc. ("ISC") * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -18,16 +18,16 @@ /* * Commandline arguments for named; also referenced in win32/ntservice.c */ -#define NS_MAIN_ARGS "46A:c:C:d:D:E:fFgi:lL:M:m:n:N:p:P:sS:t:T:U:u:vVx:X:" +#define NAMED_MAIN_ARGS "46A:c:d:D:E:fFgL:M:m:n:N:p:sS:t:T:U:u:vVx:X:" ISC_PLATFORM_NORETURN_PRE void -ns_main_earlyfatal(const char *format, ...) +named_main_earlyfatal(const char *format, ...) ISC_FORMAT_PRINTF(1, 2) ISC_PLATFORM_NORETURN_POST; void -ns_main_earlywarning(const char *format, ...) ISC_FORMAT_PRINTF(1, 2); +named_main_earlywarning(const char *format, ...) ISC_FORMAT_PRINTF(1, 2); void -ns_main_setmemstats(const char *); +named_main_setmemstats(const char *); #endif /* NAMED_MAIN_H */ diff --git a/bin/named/include/named/ns_smf_globals.h b/bin/named/include/named/ns_smf_globals.h deleted file mode 100644 index ebaaff983b..0000000000 --- a/bin/named/include/named/ns_smf_globals.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (C) 2005, 2007, 2014, 2016 Internet Systems Consortium, Inc. ("ISC") - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -/* $Id: ns_smf_globals.h,v 1.7 2007/06/19 23:46:59 tbox Exp $ */ - -#ifndef NS_SMF_GLOBALS_H -#define NS_SMF_GLOBALS_H 1 - -#include - -#undef EXTERN -#undef INIT -#ifdef NS_MAIN -#define EXTERN -#define INIT(v) = (v) -#else -#define EXTERN extern -#define INIT(v) -#endif - -EXTERN unsigned int ns_smf_got_instance INIT(0); -EXTERN unsigned int ns_smf_chroot INIT(0); -EXTERN unsigned int ns_smf_want_disable INIT(0); - -isc_result_t ns_smf_add_message(isc_buffer_t **text); -isc_result_t ns_smf_get_instance(char **name, int debug, isc_mem_t *mctx); - -#undef EXTERN -#undef INIT - -#endif /* NS_SMF_GLOBALS_H */ diff --git a/bin/named/include/named/server.h b/bin/named/include/named/server.h index ff728c6879..a73bf33edb 100644 --- a/bin/named/include/named/server.h +++ b/bin/named/include/named/server.h @@ -20,31 +20,31 @@ #include #include +#include #include +#include +#include +#include +#include + #include -#define NS_EVENTCLASS ISC_EVENTCLASS(0x4E43) -#define NS_EVENT_RELOAD (NS_EVENTCLASS + 0) -#define NS_EVENT_CLIENTCONTROL (NS_EVENTCLASS + 1) -#define NS_EVENT_DELZONE (NS_EVENTCLASS + 2) +#define NAMED_EVENTCLASS ISC_EVENTCLASS(0x4E43) +#define NAMED_EVENT_RELOAD (NAMED_EVENTCLASS + 0) +#define NAMED_EVENT_DELZONE (NAMED_EVENTCLASS + 1) /*% * Name server state. Better here than in lots of separate global variables. */ -struct ns_server { +struct named_server { unsigned int magic; isc_mem_t * mctx; + ns_server_t * sctx; + isc_task_t * task; - /* Configurable data. */ - isc_quota_t xfroutquota; - isc_quota_t tcpquota; - isc_quota_t recursionquota; - - dns_acl_t *blackholeacl; - dns_acl_t *keepresporder; char * statsfile; /*%< Statistics file name */ char * dumpfile; /*%< Dump file name */ char * secrootsfile; /*%< Secroots file name */ @@ -54,16 +54,6 @@ struct ns_server { char * version; /*%< User-specified version */ isc_boolean_t hostname_set; /*%< User has set hostname */ char * hostname; /*%< User-specified hostname */ - /*% Use hostname for server id */ - isc_boolean_t server_usehostname; - char * server_id; /*%< User-specified server id */ - - /*% - * Current ACL environment. This defines the - * current values of the localhost and localnets - * ACLs. - */ - dns_aclenv_t aclenv; /* Server data structures. */ dns_loadmgr_t * loadmgr; @@ -71,7 +61,6 @@ struct ns_server { dns_viewlist_t viewlist; ns_interfacemgr_t * interfacemgr; dns_db_t * in_roothints; - dns_tkeyctx_t * tkeyctx; isc_timer_t * interface_timer; isc_timer_t * heartbeat_timer; @@ -85,30 +74,17 @@ struct ns_server { isc_event_t * reload_event; isc_boolean_t flushonshutdown; - isc_boolean_t log_queries; /*%< For BIND 8 compatibility */ - ns_cachelist_t cachelist; /*%< Possibly shared caches */ - isc_stats_t * nsstats; /*%< Server stats */ - dns_stats_t * rcvquerystats; /*% Incoming query stats */ - dns_stats_t * opcodestats; /*%< Incoming message stats */ + named_cachelist_t cachelist; /*%< Possibly shared caches */ isc_stats_t * zonestats; /*% Zone management stats */ isc_stats_t * resolverstats; /*% Resolver stats */ isc_stats_t * sockstats; /*%< Socket stats */ - isc_stats_t * udpinstats4; /*%< Traffic size: UDPv4 in */ - isc_stats_t * udpoutstats4; /*%< Traffic size: UDPv4 out */ - isc_stats_t * udpinstats6; /*%< Traffic size: UDPv6 in */ - isc_stats_t * udpoutstats6; /*%< Traffic size: UDPv6 out */ - isc_stats_t * tcpinstats4; /*%< Traffic size: TCPv4 in */ - isc_stats_t * tcpoutstats4; /*%< Traffic size: TCPv4 out */ - isc_stats_t * tcpinstats6; /*%< Traffic size: TCPv6 in */ - isc_stats_t * tcpoutstats6; /*%< Traffic size: TCPv6 out */ - dns_stats_t * rcodestats; /*%< Sent Response code stats */ - ns_controls_t * controls; /*%< Control channels */ + named_controls_t * controls; /*%< Control channels */ unsigned int dispatchgen; - ns_dispatchlist_t dispatches; + named_dispatchlist_t dispatches; - ns_statschannellist_t statschannels; + named_statschannellist_t statschannels; dns_tsigkey_t *sessionkey; char *session_keyfile; @@ -117,401 +93,18 @@ struct ns_server { isc_uint16_t session_keybits; isc_boolean_t interface_auto; unsigned char secret[32]; /*%< Server Cookie Secret */ - ns_altsecretlist_t altsecrets; ns_cookiealg_t cookiealg; dns_dtenv_t *dtenv; /*%< Dnstap environment */ char * lockfile; - - isc_uint16_t transfer_tcp_message_size; }; -struct ns_altsecret { - ISC_LINK(ns_altsecret_t) link; - unsigned char secret[32]; -}; - -#define NS_SERVER_MAGIC ISC_MAGIC('S','V','E','R') -#define NS_SERVER_VALID(s) ISC_MAGIC_VALID(s, NS_SERVER_MAGIC) - -/*% - * Server statistics counters. Used as isc_statscounter_t values. - */ -enum { - dns_nsstatscounter_requestv4 = 0, - dns_nsstatscounter_requestv6 = 1, - dns_nsstatscounter_edns0in = 2, - dns_nsstatscounter_badednsver = 3, - dns_nsstatscounter_tsigin = 4, - dns_nsstatscounter_sig0in = 5, - dns_nsstatscounter_invalidsig = 6, - dns_nsstatscounter_requesttcp = 7, - - dns_nsstatscounter_authrej = 8, - dns_nsstatscounter_recurserej = 9, - dns_nsstatscounter_xfrrej = 10, - dns_nsstatscounter_updaterej = 11, - - dns_nsstatscounter_response = 12, - dns_nsstatscounter_truncatedresp = 13, - dns_nsstatscounter_edns0out = 14, - dns_nsstatscounter_tsigout = 15, - dns_nsstatscounter_sig0out = 16, - - dns_nsstatscounter_success = 17, - dns_nsstatscounter_authans = 18, - dns_nsstatscounter_nonauthans = 19, - dns_nsstatscounter_referral = 20, - dns_nsstatscounter_nxrrset = 21, - dns_nsstatscounter_servfail = 22, - dns_nsstatscounter_formerr = 23, - dns_nsstatscounter_nxdomain = 24, - dns_nsstatscounter_recursion = 25, - dns_nsstatscounter_duplicate = 26, - dns_nsstatscounter_dropped = 27, - dns_nsstatscounter_failure = 28, - - dns_nsstatscounter_xfrdone = 29, - - dns_nsstatscounter_updatereqfwd = 30, - dns_nsstatscounter_updaterespfwd = 31, - dns_nsstatscounter_updatefwdfail = 32, - dns_nsstatscounter_updatedone = 33, - dns_nsstatscounter_updatefail = 34, - dns_nsstatscounter_updatebadprereq = 35, - - dns_nsstatscounter_recursclients = 36, - - dns_nsstatscounter_dns64 = 37, - - dns_nsstatscounter_ratedropped = 38, - dns_nsstatscounter_rateslipped = 39, - - dns_nsstatscounter_rpz_rewrites = 40, - - dns_nsstatscounter_udp = 41, - dns_nsstatscounter_tcp = 42, - - dns_nsstatscounter_nsidopt = 43, - dns_nsstatscounter_expireopt = 44, - dns_nsstatscounter_otheropt = 45, - dns_nsstatscounter_ecsopt = 46, - dns_nsstatscounter_padopt = 47, - dns_nsstatscounter_keepaliveopt = 48, - - dns_nsstatscounter_nxdomainredirect = 49, - dns_nsstatscounter_nxdomainredirect_rlookup = 50, - - dns_nsstatscounter_cookiein = 51, - dns_nsstatscounter_cookiebadsize = 52, - dns_nsstatscounter_cookiebadtime = 53, - dns_nsstatscounter_cookienomatch = 54, - dns_nsstatscounter_cookiematch = 55, - dns_nsstatscounter_cookienew = 56, - dns_nsstatscounter_badcookie = 57, - - dns_nsstatscounter_nxdomainsynth = 58, - dns_nsstatscounter_nodatasynth = 59, - dns_nsstatscounter_wildcardsynth = 60, - - dns_nsstatscounter_trystale = 61, - dns_nsstatscounter_usedstale = 62, - - dns_nsstatscounter_max = 63 -}; - -/*% - * Traffic size statistics counters. Used as isc_statscounter_t values. - */ -enum { - dns_sizecounter_in_0 = 0, - dns_sizecounter_in_16 = 1, - dns_sizecounter_in_32 = 2, - dns_sizecounter_in_48 = 3, - dns_sizecounter_in_64 = 4, - dns_sizecounter_in_80 = 5, - dns_sizecounter_in_96 = 6, - dns_sizecounter_in_112 = 7, - dns_sizecounter_in_128 = 8, - dns_sizecounter_in_144 = 9, - dns_sizecounter_in_160 = 10, - dns_sizecounter_in_176 = 11, - dns_sizecounter_in_192 = 12, - dns_sizecounter_in_208 = 13, - dns_sizecounter_in_224 = 14, - dns_sizecounter_in_240 = 15, - dns_sizecounter_in_256 = 16, - dns_sizecounter_in_272 = 17, - dns_sizecounter_in_288 = 18, - - dns_sizecounter_in_max = 19, -}; - -enum { - dns_sizecounter_out_0 = 0, - dns_sizecounter_out_16 = 1, - dns_sizecounter_out_32 = 2, - dns_sizecounter_out_48 = 3, - dns_sizecounter_out_64 = 4, - dns_sizecounter_out_80 = 5, - dns_sizecounter_out_96 = 6, - dns_sizecounter_out_112 = 7, - dns_sizecounter_out_128 = 8, - dns_sizecounter_out_144 = 9, - dns_sizecounter_out_160 = 10, - dns_sizecounter_out_176 = 11, - dns_sizecounter_out_192 = 12, - dns_sizecounter_out_208 = 13, - dns_sizecounter_out_224 = 14, - dns_sizecounter_out_240 = 15, - dns_sizecounter_out_256 = 16, - dns_sizecounter_out_272 = 17, - dns_sizecounter_out_288 = 18, - dns_sizecounter_out_304 = 19, - dns_sizecounter_out_320 = 20, - dns_sizecounter_out_336 = 21, - dns_sizecounter_out_352 = 22, - dns_sizecounter_out_368 = 23, - dns_sizecounter_out_384 = 24, - dns_sizecounter_out_400 = 25, - dns_sizecounter_out_416 = 26, - dns_sizecounter_out_432 = 27, - dns_sizecounter_out_448 = 28, - dns_sizecounter_out_464 = 29, - dns_sizecounter_out_480 = 30, - dns_sizecounter_out_496 = 31, - dns_sizecounter_out_512 = 32, - dns_sizecounter_out_528 = 33, - dns_sizecounter_out_544 = 34, - dns_sizecounter_out_560 = 35, - dns_sizecounter_out_576 = 36, - dns_sizecounter_out_592 = 37, - dns_sizecounter_out_608 = 38, - dns_sizecounter_out_624 = 39, - dns_sizecounter_out_640 = 40, - dns_sizecounter_out_656 = 41, - dns_sizecounter_out_672 = 42, - dns_sizecounter_out_688 = 43, - dns_sizecounter_out_704 = 44, - dns_sizecounter_out_720 = 45, - dns_sizecounter_out_736 = 46, - dns_sizecounter_out_752 = 47, - dns_sizecounter_out_768 = 48, - dns_sizecounter_out_784 = 49, - dns_sizecounter_out_800 = 50, - dns_sizecounter_out_816 = 51, - dns_sizecounter_out_832 = 52, - dns_sizecounter_out_848 = 53, - dns_sizecounter_out_864 = 54, - dns_sizecounter_out_880 = 55, - dns_sizecounter_out_896 = 56, - dns_sizecounter_out_912 = 57, - dns_sizecounter_out_928 = 58, - dns_sizecounter_out_944 = 59, - dns_sizecounter_out_960 = 60, - dns_sizecounter_out_976 = 61, - dns_sizecounter_out_992 = 62, - dns_sizecounter_out_1008 = 63, - dns_sizecounter_out_1024 = 64, - dns_sizecounter_out_1040 = 65, - dns_sizecounter_out_1056 = 66, - dns_sizecounter_out_1072 = 67, - dns_sizecounter_out_1088 = 68, - dns_sizecounter_out_1104 = 69, - dns_sizecounter_out_1120 = 70, - dns_sizecounter_out_1136 = 71, - dns_sizecounter_out_1152 = 72, - dns_sizecounter_out_1168 = 73, - dns_sizecounter_out_1184 = 74, - dns_sizecounter_out_1200 = 75, - dns_sizecounter_out_1216 = 76, - dns_sizecounter_out_1232 = 77, - dns_sizecounter_out_1248 = 78, - dns_sizecounter_out_1264 = 79, - dns_sizecounter_out_1280 = 80, - dns_sizecounter_out_1296 = 81, - dns_sizecounter_out_1312 = 82, - dns_sizecounter_out_1328 = 83, - dns_sizecounter_out_1344 = 84, - dns_sizecounter_out_1360 = 85, - dns_sizecounter_out_1376 = 86, - dns_sizecounter_out_1392 = 87, - dns_sizecounter_out_1408 = 88, - dns_sizecounter_out_1424 = 89, - dns_sizecounter_out_1440 = 90, - dns_sizecounter_out_1456 = 91, - dns_sizecounter_out_1472 = 92, - dns_sizecounter_out_1488 = 93, - dns_sizecounter_out_1504 = 94, - dns_sizecounter_out_1520 = 95, - dns_sizecounter_out_1536 = 96, - dns_sizecounter_out_1552 = 97, - dns_sizecounter_out_1568 = 98, - dns_sizecounter_out_1584 = 99, - dns_sizecounter_out_1600 = 100, - dns_sizecounter_out_1616 = 101, - dns_sizecounter_out_1632 = 102, - dns_sizecounter_out_1648 = 103, - dns_sizecounter_out_1664 = 104, - dns_sizecounter_out_1680 = 105, - dns_sizecounter_out_1696 = 106, - dns_sizecounter_out_1712 = 107, - dns_sizecounter_out_1728 = 108, - dns_sizecounter_out_1744 = 109, - dns_sizecounter_out_1760 = 110, - dns_sizecounter_out_1776 = 111, - dns_sizecounter_out_1792 = 112, - dns_sizecounter_out_1808 = 113, - dns_sizecounter_out_1824 = 114, - dns_sizecounter_out_1840 = 115, - dns_sizecounter_out_1856 = 116, - dns_sizecounter_out_1872 = 117, - dns_sizecounter_out_1888 = 118, - dns_sizecounter_out_1904 = 119, - dns_sizecounter_out_1920 = 120, - dns_sizecounter_out_1936 = 121, - dns_sizecounter_out_1952 = 122, - dns_sizecounter_out_1968 = 123, - dns_sizecounter_out_1984 = 124, - dns_sizecounter_out_2000 = 125, - dns_sizecounter_out_2016 = 126, - dns_sizecounter_out_2032 = 127, - dns_sizecounter_out_2048 = 128, - dns_sizecounter_out_2064 = 129, - dns_sizecounter_out_2080 = 130, - dns_sizecounter_out_2096 = 131, - dns_sizecounter_out_2112 = 132, - dns_sizecounter_out_2128 = 133, - dns_sizecounter_out_2144 = 134, - dns_sizecounter_out_2160 = 135, - dns_sizecounter_out_2176 = 136, - dns_sizecounter_out_2192 = 137, - dns_sizecounter_out_2208 = 138, - dns_sizecounter_out_2224 = 139, - dns_sizecounter_out_2240 = 140, - dns_sizecounter_out_2256 = 141, - dns_sizecounter_out_2272 = 142, - dns_sizecounter_out_2288 = 143, - dns_sizecounter_out_2304 = 144, - dns_sizecounter_out_2320 = 145, - dns_sizecounter_out_2336 = 146, - dns_sizecounter_out_2352 = 147, - dns_sizecounter_out_2368 = 148, - dns_sizecounter_out_2384 = 149, - dns_sizecounter_out_2400 = 150, - dns_sizecounter_out_2416 = 151, - dns_sizecounter_out_2432 = 152, - dns_sizecounter_out_2448 = 153, - dns_sizecounter_out_2464 = 154, - dns_sizecounter_out_2480 = 155, - dns_sizecounter_out_2496 = 156, - dns_sizecounter_out_2512 = 157, - dns_sizecounter_out_2528 = 158, - dns_sizecounter_out_2544 = 159, - dns_sizecounter_out_2560 = 160, - dns_sizecounter_out_2576 = 161, - dns_sizecounter_out_2592 = 162, - dns_sizecounter_out_2608 = 163, - dns_sizecounter_out_2624 = 164, - dns_sizecounter_out_2640 = 165, - dns_sizecounter_out_2656 = 166, - dns_sizecounter_out_2672 = 167, - dns_sizecounter_out_2688 = 168, - dns_sizecounter_out_2704 = 169, - dns_sizecounter_out_2720 = 170, - dns_sizecounter_out_2736 = 171, - dns_sizecounter_out_2752 = 172, - dns_sizecounter_out_2768 = 173, - dns_sizecounter_out_2784 = 174, - dns_sizecounter_out_2800 = 175, - dns_sizecounter_out_2816 = 176, - dns_sizecounter_out_2832 = 177, - dns_sizecounter_out_2848 = 178, - dns_sizecounter_out_2864 = 179, - dns_sizecounter_out_2880 = 180, - dns_sizecounter_out_2896 = 181, - dns_sizecounter_out_2912 = 182, - dns_sizecounter_out_2928 = 183, - dns_sizecounter_out_2944 = 184, - dns_sizecounter_out_2960 = 185, - dns_sizecounter_out_2976 = 186, - dns_sizecounter_out_2992 = 187, - dns_sizecounter_out_3008 = 188, - dns_sizecounter_out_3024 = 189, - dns_sizecounter_out_3040 = 190, - dns_sizecounter_out_3056 = 191, - dns_sizecounter_out_3072 = 192, - dns_sizecounter_out_3088 = 193, - dns_sizecounter_out_3104 = 194, - dns_sizecounter_out_3120 = 195, - dns_sizecounter_out_3136 = 196, - dns_sizecounter_out_3152 = 197, - dns_sizecounter_out_3168 = 198, - dns_sizecounter_out_3184 = 199, - dns_sizecounter_out_3200 = 200, - dns_sizecounter_out_3216 = 201, - dns_sizecounter_out_3232 = 202, - dns_sizecounter_out_3248 = 203, - dns_sizecounter_out_3264 = 204, - dns_sizecounter_out_3280 = 205, - dns_sizecounter_out_3296 = 206, - dns_sizecounter_out_3312 = 207, - dns_sizecounter_out_3328 = 208, - dns_sizecounter_out_3344 = 209, - dns_sizecounter_out_3360 = 210, - dns_sizecounter_out_3376 = 211, - dns_sizecounter_out_3392 = 212, - dns_sizecounter_out_3408 = 213, - dns_sizecounter_out_3424 = 214, - dns_sizecounter_out_3440 = 215, - dns_sizecounter_out_3456 = 216, - dns_sizecounter_out_3472 = 217, - dns_sizecounter_out_3488 = 218, - dns_sizecounter_out_3504 = 219, - dns_sizecounter_out_3520 = 220, - dns_sizecounter_out_3536 = 221, - dns_sizecounter_out_3552 = 222, - dns_sizecounter_out_3568 = 223, - dns_sizecounter_out_3584 = 224, - dns_sizecounter_out_3600 = 225, - dns_sizecounter_out_3616 = 226, - dns_sizecounter_out_3632 = 227, - dns_sizecounter_out_3648 = 228, - dns_sizecounter_out_3664 = 229, - dns_sizecounter_out_3680 = 230, - dns_sizecounter_out_3696 = 231, - dns_sizecounter_out_3712 = 232, - dns_sizecounter_out_3728 = 233, - dns_sizecounter_out_3744 = 234, - dns_sizecounter_out_3760 = 235, - dns_sizecounter_out_3776 = 236, - dns_sizecounter_out_3792 = 237, - dns_sizecounter_out_3808 = 238, - dns_sizecounter_out_3824 = 239, - dns_sizecounter_out_3840 = 240, - dns_sizecounter_out_3856 = 241, - dns_sizecounter_out_3872 = 242, - dns_sizecounter_out_3888 = 243, - dns_sizecounter_out_3904 = 244, - dns_sizecounter_out_3920 = 245, - dns_sizecounter_out_3936 = 246, - dns_sizecounter_out_3952 = 247, - dns_sizecounter_out_3968 = 248, - dns_sizecounter_out_3984 = 249, - dns_sizecounter_out_4000 = 250, - dns_sizecounter_out_4016 = 251, - dns_sizecounter_out_4032 = 252, - dns_sizecounter_out_4048 = 253, - dns_sizecounter_out_4064 = 254, - dns_sizecounter_out_4080 = 255, - dns_sizecounter_out_4096 = 256, - - dns_sizecounter_out_max = 257 -}; +#define NAMED_SERVER_MAGIC ISC_MAGIC('S','V','E','R') +#define NAMED_SERVER_VALID(s) ISC_MAGIC_VALID(s, NAMED_SERVER_MAGIC) void -ns_server_create(isc_mem_t *mctx, ns_server_t **serverp); +named_server_create(isc_mem_t *mctx, named_server_t **serverp); /*%< * Create a server object with default settings. * This function either succeeds or causes the program to exit @@ -519,13 +112,13 @@ ns_server_create(isc_mem_t *mctx, ns_server_t **serverp); */ void -ns_server_destroy(ns_server_t **serverp); +named_server_destroy(named_server_t **serverp); /*%< * Destroy a server object, freeing its memory. */ void -ns_server_reloadwanted(ns_server_t *server); +named_server_reloadwanted(named_server_t *server); /*%< * Inform a server that a reload is wanted. This function * may be called asynchronously, from outside the server's task. @@ -534,54 +127,54 @@ ns_server_reloadwanted(ns_server_t *server); */ void -ns_server_scan_interfaces(ns_server_t *server); +named_server_scan_interfaces(named_server_t *server); /*%< * Trigger a interface scan. * Must only be called when running under server->task. */ void -ns_server_flushonshutdown(ns_server_t *server, isc_boolean_t flush); +named_server_flushonshutdown(named_server_t *server, isc_boolean_t flush); /*%< * Inform the server that the zones should be flushed to disk on shutdown. */ isc_result_t -ns_server_reloadcommand(ns_server_t *server, isc_lex_t *lex, +named_server_reloadcommand(named_server_t *server, isc_lex_t *lex, isc_buffer_t **text); /*%< * Act on a "reload" command from the command channel. */ isc_result_t -ns_server_reconfigcommand(ns_server_t *server); +named_server_reconfigcommand(named_server_t *server); /*%< * Act on a "reconfig" command from the command channel. */ isc_result_t -ns_server_notifycommand(ns_server_t *server, isc_lex_t *lex, +named_server_notifycommand(named_server_t *server, isc_lex_t *lex, isc_buffer_t **text); /*%< * Act on a "notify" command from the command channel. */ isc_result_t -ns_server_refreshcommand(ns_server_t *server, isc_lex_t *lex, +named_server_refreshcommand(named_server_t *server, isc_lex_t *lex, isc_buffer_t **text); /*%< * Act on a "refresh" command from the command channel. */ isc_result_t -ns_server_retransfercommand(ns_server_t *server, isc_lex_t *lex, +named_server_retransfercommand(named_server_t *server, isc_lex_t *lex, isc_buffer_t **text); /*%< * Act on a "retransfer" command from the command channel. */ isc_result_t -ns_server_togglequerylog(ns_server_t *server, isc_lex_t *lex); +named_server_togglequerylog(named_server_t *server, isc_lex_t *lex); /*%< * Enable/disable logging of queries. (Takes "yes" or "no" argument, * but can also be used as a toggle for backward comptibility.) @@ -591,44 +184,45 @@ ns_server_togglequerylog(ns_server_t *server, isc_lex_t *lex); * Save the current NTAs for all views to files. */ isc_result_t -ns_server_saventa(ns_server_t *server); +named_server_saventa(named_server_t *server); /*% * Load NTAs for all views from files. */ isc_result_t -ns_server_loadnta(ns_server_t *server); +named_server_loadnta(named_server_t *server); /*% * Dump the current statistics to the statistics file. */ isc_result_t -ns_server_dumpstats(ns_server_t *server); +named_server_dumpstats(named_server_t *server); /*% * Dump the current cache to the dump file. */ isc_result_t -ns_server_dumpdb(ns_server_t *server, isc_lex_t *lex, isc_buffer_t **text); +named_server_dumpdb(named_server_t *server, isc_lex_t *lex, + isc_buffer_t **text); /*% * Dump the current security roots to the secroots file. */ isc_result_t -ns_server_dumpsecroots(ns_server_t *server, isc_lex_t *lex, +named_server_dumpsecroots(named_server_t *server, isc_lex_t *lex, isc_buffer_t **text); /*% * Change or increment the server debug level. */ isc_result_t -ns_server_setdebuglevel(ns_server_t *server, isc_lex_t *lex); +named_server_setdebuglevel(named_server_t *server, isc_lex_t *lex); /*% * Flush the server's cache(s) */ isc_result_t -ns_server_flushcache(ns_server_t *server, isc_lex_t *lex); +named_server_flushcache(named_server_t *server, isc_lex_t *lex); /*% * Flush a particular name from the server's cache. If 'tree' is false, @@ -636,40 +230,40 @@ ns_server_flushcache(ns_server_t *server, isc_lex_t *lex); * flush all the names under the specified name. */ isc_result_t -ns_server_flushnode(ns_server_t *server, isc_lex_t *lex, +named_server_flushnode(named_server_t *server, isc_lex_t *lex, isc_boolean_t tree); /*% * Report the server's status. */ isc_result_t -ns_server_status(ns_server_t *server, isc_buffer_t **text); +named_server_status(named_server_t *server, isc_buffer_t **text); /*% * Report a list of dynamic and static tsig keys, per view. */ isc_result_t -ns_server_tsiglist(ns_server_t *server, isc_buffer_t **text); +named_server_tsiglist(named_server_t *server, isc_buffer_t **text); /*% * Delete a specific key (with optional view). */ isc_result_t -ns_server_tsigdelete(ns_server_t *server, isc_lex_t *lex, +named_server_tsigdelete(named_server_t *server, isc_lex_t *lex, isc_buffer_t **text); /*% * Enable or disable updates for a zone. */ isc_result_t -ns_server_freeze(ns_server_t *server, isc_boolean_t freeze, +named_server_freeze(named_server_t *server, isc_boolean_t freeze, isc_lex_t *lex, isc_buffer_t **text); /*% * Dump zone updates to disk, optionally removing the journal file */ isc_result_t -ns_server_sync(ns_server_t *server, isc_lex_t *lex, isc_buffer_t **text); +named_server_sync(named_server_t *server, isc_lex_t *lex, isc_buffer_t **text); /*% * Update a zone's DNSKEY set from the key repository. If @@ -679,96 +273,103 @@ ns_server_sync(ns_server_t *server, isc_lex_t *lex, isc_buffer_t **text); * take place incrementally. */ isc_result_t -ns_server_rekey(ns_server_t *server, isc_lex_t *lex, isc_buffer_t **text); +named_server_rekey(named_server_t *server, isc_lex_t *lex, isc_buffer_t **text); /*% * Dump the current recursive queries. */ isc_result_t -ns_server_dumprecursing(ns_server_t *server); +named_server_dumprecursing(named_server_t *server); /*% * Maintain a list of dispatches that require reserved ports. */ void -ns_add_reserved_dispatch(ns_server_t *server, const isc_sockaddr_t *addr); +named_add_reserved_dispatch(named_server_t *server, const isc_sockaddr_t *addr); /*% * Enable or disable dnssec validation. */ isc_result_t -ns_server_validation(ns_server_t *server, isc_lex_t *lex, isc_buffer_t **text); +named_server_validation(named_server_t *server, isc_lex_t *lex, + isc_buffer_t **text); /*% * Add a zone to a running process, or modify an existing zone */ isc_result_t -ns_server_changezone(ns_server_t *server, char *command, isc_buffer_t **text); +named_server_changezone(named_server_t *server, char *command, + isc_buffer_t **text); /*% * Deletes a zone from a running process */ isc_result_t -ns_server_delzone(ns_server_t *server, isc_lex_t *lex, isc_buffer_t **text); +named_server_delzone(named_server_t *server, isc_lex_t *lex, + isc_buffer_t **text); /*% * Show current configuration for a given zone */ isc_result_t -ns_server_showzone(ns_server_t *server, isc_lex_t *lex, isc_buffer_t **text); +named_server_showzone(named_server_t *server, isc_lex_t *lex, + isc_buffer_t **text); /*% * Lists the status of the signing records for a given zone. */ isc_result_t -ns_server_signing(ns_server_t *server, isc_lex_t *lex, isc_buffer_t **text); +named_server_signing(named_server_t *server, isc_lex_t *lex, + isc_buffer_t **text); /*% * Lists status information for a given zone (e.g., name, type, files, * load time, expiry, etc). */ isc_result_t -ns_server_zonestatus(ns_server_t *server, isc_lex_t *lex, isc_buffer_t **text); +named_server_zonestatus(named_server_t *server, isc_lex_t *lex, + isc_buffer_t **text); /*% * Adds/updates a Negative Trust Anchor (NTA) for a specified name and * duration, in a particular view if specified, or in all views. */ isc_result_t -ns_server_nta(ns_server_t *server, isc_lex_t *lex, isc_boolean_t readonly, - isc_buffer_t **text); +named_server_nta(named_server_t *server, isc_lex_t *lex, + isc_boolean_t readonly, isc_buffer_t **text); /*% * Generates a test sequence that is only for use in system tests. The * argument is the size of required output in bytes. */ isc_result_t -ns_server_testgen(isc_lex_t *lex, isc_buffer_t **text); +named_server_testgen(isc_lex_t *lex, isc_buffer_t **text); /*% * Force fefresh or print status for managed keys zones. */ isc_result_t -ns_server_mkeys(ns_server_t *server, isc_lex_t *lex, isc_buffer_t **text); +named_server_mkeys(named_server_t *server, isc_lex_t *lex, isc_buffer_t **text); /*% * Close and reopen DNSTAP output file. */ isc_result_t -ns_server_dnstap(ns_server_t *server, isc_lex_t *lex, isc_buffer_t **text); +named_server_dnstap(named_server_t *server, isc_lex_t *lex, + isc_buffer_t **text); /*% * Display or update tcp-{initial,idle,keepalive,advertised}-timeout options. */ isc_result_t -ns_server_tcptimeouts(isc_lex_t *lex, isc_buffer_t **text); +named_server_tcptimeouts(isc_lex_t *lex, isc_buffer_t **text); /*% * Control whether stale answers are served or not when configured in * named.conf. */ isc_result_t -ns_server_servestale(ns_server_t *server, isc_lex_t *lex, - isc_buffer_t **text); +named_server_servestale(named_server_t *server, isc_lex_t *lex, + isc_buffer_t **text); #endif /* NAMED_SERVER_H */ diff --git a/bin/named/include/named/smf_globals.h b/bin/named/include/named/smf_globals.h new file mode 100644 index 0000000000..c5285c9727 --- /dev/null +++ b/bin/named/include/named/smf_globals.h @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2017 Internet Systems Consortium, Inc. ("ISC") + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#ifndef NAMED_SMF_GLOBALS_H +#define NAMED_SMF_GLOBALS_H 1 + +#include + +#undef EXTERN +#undef INIT +#ifdef NAMED_MAIN +#define EXTERN +#define INIT(v) = (v) +#else +#define EXTERN extern +#define INIT(v) +#endif + +EXTERN unsigned int named_smf_got_instance INIT(0); +EXTERN unsigned int named_smf_chroot INIT(0); +EXTERN unsigned int named_smf_want_disable INIT(0); + +isc_result_t named_smf_add_message(isc_buffer_t **text); +isc_result_t named_smf_get_instance(char **name, int debug, isc_mem_t *mctx); + +#undef EXTERN +#undef INIT + +#endif /* NAMED_SMF_GLOBALS_H */ diff --git a/bin/named/include/named/statschannel.h b/bin/named/include/named/statschannel.h index bac484e4f2..31788da07b 100644 --- a/bin/named/include/named/statschannel.h +++ b/bin/named/include/named/statschannel.h @@ -1,13 +1,11 @@ /* - * Copyright (C) 2008, 2016 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2008, 2016, 2017 Internet Systems Consortium, Inc. ("ISC") * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -/* $Id: statschannel.h,v 1.3 2008/04/03 05:55:51 marka Exp $ */ - #ifndef NAMED_STATSCHANNEL_H #define NAMED_STATSCHANNEL_H 1 @@ -22,11 +20,11 @@ #include -#define NS_STATSCHANNEL_HTTPPORT 80 +#define NAMED_STATSCHANNEL_HTTPPORT 80 isc_result_t -ns_statschannels_configure(ns_server_t *server, const cfg_obj_t *config, - cfg_aclconfctx_t *aclconfctx); +named_statschannels_configure(named_server_t *server, const cfg_obj_t *config, + cfg_aclconfctx_t *aclconfctx); /*%< * [Re]configure the statistics channels. * @@ -39,13 +37,13 @@ ns_statschannels_configure(ns_server_t *server, const cfg_obj_t *config, void -ns_statschannels_shutdown(ns_server_t *server); +named_statschannels_shutdown(named_server_t *server); /*%< * Initiate shutdown of all the statistics channel listeners. */ isc_result_t -ns_stats_dump(ns_server_t *server, FILE *fp); +named_stats_dump(named_server_t *server, FILE *fp); /*%< * Dump statistics counters managed by the server to the file fp. */ diff --git a/bin/named/include/named/tkeyconf.h b/bin/named/include/named/tkeyconf.h index 5f6f8eda5e..992a9c8fcc 100644 --- a/bin/named/include/named/tkeyconf.h +++ b/bin/named/include/named/tkeyconf.h @@ -1,15 +1,13 @@ /* - * Copyright (C) 1999-2001, 2004-2007, 2016 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 1999-2001, 2004-2007, 2016, 2017 Internet Systems Consortium, Inc. ("ISC") * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -/* $Id: tkeyconf.h,v 1.16 2007/06/19 23:46:59 tbox Exp $ */ - -#ifndef NS_TKEYCONF_H -#define NS_TKEYCONF_H 1 +#ifndef NAMED_TKEYCONF_H +#define NAMED_TKEYCONF_H 1 /*! \file */ @@ -21,8 +19,8 @@ ISC_LANG_BEGINDECLS isc_result_t -ns_tkeyctx_fromconfig(const cfg_obj_t *options, isc_mem_t *mctx, - isc_entropy_t *ectx, dns_tkeyctx_t **tctxp); +named_tkeyctx_fromconfig(const cfg_obj_t *options, isc_mem_t *mctx, + isc_entropy_t *ectx, dns_tkeyctx_t **tctxp); /*%< * Create a TKEY context and configure it, including the default DH key * and default domain, according to 'options'. @@ -41,4 +39,4 @@ ns_tkeyctx_fromconfig(const cfg_obj_t *options, isc_mem_t *mctx, ISC_LANG_ENDDECLS -#endif /* NS_TKEYCONF_H */ +#endif /* NAMED_TKEYCONF_H */ diff --git a/bin/named/include/named/tsigconf.h b/bin/named/include/named/tsigconf.h index 067ae656b9..efa3139140 100644 --- a/bin/named/include/named/tsigconf.h +++ b/bin/named/include/named/tsigconf.h @@ -1,15 +1,13 @@ /* - * Copyright (C) 1999-2001, 2004-2007, 2009, 2016 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 1999-2001, 2004-2007, 2009, 2016, 2017 Internet Systems Consortium, Inc. ("ISC") * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -/* $Id: tsigconf.h,v 1.18 2009/06/11 23:47:55 tbox Exp $ */ - -#ifndef NS_TSIGCONF_H -#define NS_TSIGCONF_H 1 +#ifndef NAMED_TSIGCONF_H +#define NAMED_TSIGCONF_H 1 /*! \file */ @@ -19,8 +17,8 @@ ISC_LANG_BEGINDECLS isc_result_t -ns_tsigkeyring_fromconfig(const cfg_obj_t *config, const cfg_obj_t *vconfig, - isc_mem_t *mctx, dns_tsig_keyring_t **ringp); +named_tsigkeyring_fromconfig(const cfg_obj_t *config, const cfg_obj_t *vconfig, + isc_mem_t *mctx, dns_tsig_keyring_t **ringp); /*%< * Create a TSIG key ring and configure it according to the 'key' * statements in the global and view configuration objects. @@ -38,4 +36,4 @@ ns_tsigkeyring_fromconfig(const cfg_obj_t *config, const cfg_obj_t *vconfig, ISC_LANG_ENDDECLS -#endif /* NS_TSIGCONF_H */ +#endif /* NAMED_TSIGCONF_H */ diff --git a/bin/named/include/named/types.h b/bin/named/include/named/types.h index dd6828e58b..20701b3576 100644 --- a/bin/named/include/named/types.h +++ b/bin/named/include/named/types.h @@ -6,8 +6,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -/* $Id: types.h,v 1.31 2009/01/09 23:47:45 tbox Exp $ */ - #ifndef NAMED_TYPES_H #define NAMED_TYPES_H 1 @@ -15,34 +13,15 @@ #include -typedef struct ns_cache ns_cache_t; -typedef ISC_LIST(ns_cache_t) ns_cachelist_t; -typedef struct ns_client ns_client_t; -typedef struct ns_clientmgr ns_clientmgr_t; -typedef struct ns_query ns_query_t; -typedef struct ns_server ns_server_t; -typedef struct ns_xmld ns_xmld_t; -typedef struct ns_xmldmgr ns_xmldmgr_t; -typedef struct ns_interface ns_interface_t; -typedef struct ns_interfacemgr ns_interfacemgr_t; -typedef struct ns_lwresd ns_lwresd_t; -typedef struct ns_lwreslistener ns_lwreslistener_t; -typedef struct ns_lwdclient ns_lwdclient_t; -typedef struct ns_lwdclientmgr ns_lwdclientmgr_t; -typedef struct ns_lwsearchlist ns_lwsearchlist_t; -typedef struct ns_lwsearchctx ns_lwsearchctx_t; -typedef struct ns_controls ns_controls_t; -typedef struct ns_dispatch ns_dispatch_t; -typedef ISC_LIST(ns_dispatch_t) ns_dispatchlist_t; -typedef struct ns_statschannel ns_statschannel_t; -typedef ISC_LIST(ns_statschannel_t) ns_statschannellist_t; -typedef struct ns_altsecret ns_altsecret_t; -typedef ISC_LIST(ns_altsecret_t) ns_altsecretlist_t; - -typedef enum { - ns_cookiealg_aes, - ns_cookiealg_sha1, - ns_cookiealg_sha256 -} ns_cookiealg_t; +typedef struct named_cache named_cache_t; +typedef ISC_LIST(named_cache_t) named_cachelist_t; +typedef struct named_server named_server_t; +typedef struct named_xmld named_xmld_t; +typedef struct named_xmldmgr named_xmldmgr_t; +typedef struct named_controls named_controls_t; +typedef struct named_dispatch named_dispatch_t; +typedef ISC_LIST(named_dispatch_t) named_dispatchlist_t; +typedef struct named_statschannel named_statschannel_t; +typedef ISC_LIST(named_statschannel_t) named_statschannellist_t; #endif /* NAMED_TYPES_H */ diff --git a/bin/named/include/named/zoneconf.h b/bin/named/include/named/zoneconf.h index 702ac702b3..e9d1e873c7 100644 --- a/bin/named/include/named/zoneconf.h +++ b/bin/named/include/named/zoneconf.h @@ -1,15 +1,13 @@ /* - * Copyright (C) 1999-2002, 2004-2007, 2010, 2011, 2015, 2016 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 1999-2002, 2004-2007, 2010, 2011, 2015-2017 Internet Systems Consortium, Inc. ("ISC") * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -/* $Id: zoneconf.h,v 1.30 2011/08/30 23:46:51 tbox Exp $ */ - -#ifndef NS_ZONECONF_H -#define NS_ZONECONF_H 1 +#ifndef NAMED_ZONECONF_H +#define NAMED_ZONECONF_H 1 /*! \file */ @@ -22,9 +20,9 @@ ISC_LANG_BEGINDECLS isc_result_t -ns_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig, - const cfg_obj_t *zconfig, cfg_aclconfctx_t *ac, - dns_zone_t *zone, dns_zone_t *raw); +named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig, + const cfg_obj_t *zconfig, cfg_aclconfctx_t *ac, + dns_zone_t *zone, dns_zone_t *raw); /*%< * Configure or reconfigure a zone according to the named.conf * data in 'cctx' and 'czone'. @@ -35,13 +33,13 @@ ns_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig, * Require: * \li 'lctx' to be initialized or NULL. * \li 'cctx' to be initialized or NULL. - * \li 'ac' to point to an initialized ns_aclconfctx_t. + * \li 'ac' to point to an initialized cfg_aclconfctx_t. * \li 'czone' to be initialized. * \li 'zone' to be initialized. */ isc_boolean_t -ns_zone_reusable(dns_zone_t *zone, const cfg_obj_t *zconfig); +named_zone_reusable(dns_zone_t *zone, const cfg_obj_t *zconfig); /*%< * If 'zone' can be safely reconfigured according to the configuration * data in 'zconfig', return ISC_TRUE. If the configuration data is so @@ -50,8 +48,10 @@ ns_zone_reusable(dns_zone_t *zone, const cfg_obj_t *zconfig); */ isc_result_t -ns_zone_configure_writeable_dlz(dns_dlzdb_t *dlzdatabase, dns_zone_t *zone, - dns_rdataclass_t rdclass, dns_name_t *name); +named_zone_configure_writeable_dlz(dns_dlzdb_t *dlzdatabase, + dns_zone_t *zone, + dns_rdataclass_t rdclass, + dns_name_t *name); /*%> * configure a DLZ zone, setting up the database methods and calling * postload to load the origin values @@ -65,4 +65,4 @@ ns_zone_configure_writeable_dlz(dns_dlzdb_t *dlzdatabase, dns_zone_t *zone, ISC_LANG_ENDDECLS -#endif /* NS_ZONECONF_H */ +#endif /* NAMED_ZONECONF_H */ diff --git a/bin/named/log.c b/bin/named/log.c index 7c5d7eee44..a61b598fcf 100644 --- a/bin/named/log.c +++ b/bin/named/log.c @@ -1,19 +1,21 @@ /* - * Copyright (C) 1999-2002, 2004-2007, 2009, 2013, 2014, 2016 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 1999-2002, 2004-2007, 2009, 2013, 2014, 2016, 2017 Internet Systems Consortium, Inc. ("ISC") * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -/* $Id: log.c,v 1.49 2009/01/07 01:46:40 jinmei Exp $ */ - /*! \file */ #include #include +#include + +#include + #include #include @@ -29,13 +31,7 @@ */ static isc_logcategory_t categories[] = { { "", 0 }, - { "client", 0 }, - { "network", 0 }, - { "update", 0 }, - { "queries", 0 }, { "unmatched", 0 }, - { "update-security", 0 }, - { "query-errors", 0 }, { NULL, 0 } }; @@ -45,59 +41,53 @@ static isc_logcategory_t categories[] = { */ static isc_logmodule_t modules[] = { { "main", 0 }, - { "client", 0 }, { "server", 0 }, - { "query", 0 }, - { "interfacemgr", 0 }, - { "update", 0 }, - { "xfer-in", 0 }, - { "xfer-out", 0 }, - { "notify", 0 }, { "control", 0 }, - { "lwresd", 0 }, { NULL, 0 } }; isc_result_t -ns_log_init(isc_boolean_t safe) { +named_log_init(isc_boolean_t safe) { isc_result_t result; isc_logconfig_t *lcfg = NULL; - ns_g_categories = categories; - ns_g_modules = modules; + named_g_categories = categories; + named_g_modules = modules; /* * Setup a logging context. */ - result = isc_log_create(ns_g_mctx, &ns_g_lctx, &lcfg); + result = isc_log_create(named_g_mctx, &named_g_lctx, &lcfg); if (result != ISC_R_SUCCESS) return (result); /* * named-checktool.c:setup_logging() needs to be kept in sync. */ - isc_log_registercategories(ns_g_lctx, ns_g_categories); - isc_log_registermodules(ns_g_lctx, ns_g_modules); - isc_log_setcontext(ns_g_lctx); - dns_log_init(ns_g_lctx); - dns_log_setcontext(ns_g_lctx); - cfg_log_init(ns_g_lctx); + isc_log_registercategories(named_g_lctx, named_g_categories); + isc_log_registermodules(named_g_lctx, named_g_modules); + isc_log_setcontext(named_g_lctx); + dns_log_init(named_g_lctx); + dns_log_setcontext(named_g_lctx); + cfg_log_init(named_g_lctx); + ns_log_init(named_g_lctx); + ns_log_setcontext(named_g_lctx); if (safe) - result = ns_log_setsafechannels(lcfg); + result = named_log_setsafechannels(lcfg); else - result = ns_log_setdefaultchannels(lcfg); + result = named_log_setdefaultchannels(lcfg); if (result != ISC_R_SUCCESS) goto cleanup; - result = ns_log_setdefaultcategory(lcfg); + result = named_log_setdefaultcategory(lcfg); if (result != ISC_R_SUCCESS) goto cleanup; return (ISC_R_SUCCESS); cleanup: - isc_log_destroy(&ns_g_lctx); + isc_log_destroy(&named_g_lctx); isc_log_setcontext(NULL); dns_log_setcontext(NULL); @@ -105,7 +95,7 @@ ns_log_init(isc_boolean_t safe) { } isc_result_t -ns_log_setdefaultchannels(isc_logconfig_t *lcfg) { +named_log_setdefaultchannels(isc_logconfig_t *lcfg) { isc_result_t result; isc_logdestination_t destination; @@ -114,7 +104,7 @@ ns_log_setdefaultchannels(isc_logconfig_t *lcfg) { * stderr. In BIND, we want to override this and log to named.run * instead, unless the -g option was given. */ - if (! ns_g_logstderr) { + if (! named_g_logstderr) { destination.file.stream = NULL; destination.file.name = "named.run"; destination.file.versions = ISC_LOG_ROLLNEVER; @@ -129,9 +119,9 @@ ns_log_setdefaultchannels(isc_logconfig_t *lcfg) { goto cleanup; } - if (ns_g_logfile != NULL) { + if (named_g_logfile != NULL) { destination.file.stream = NULL; - destination.file.name = ns_g_logfile; + destination.file.name = named_g_logfile; destination.file.versions = ISC_LOG_ROLLNEVER; destination.file.maximum_size = 0; result = isc_log_createchannel(lcfg, "default_logfile", @@ -157,7 +147,7 @@ ns_log_setdefaultchannels(isc_logconfig_t *lcfg) { /* * Set the initial debug level. */ - isc_log_setdebuglevel(ns_g_lctx, ns_g_debuglevel); + isc_log_setdebuglevel(named_g_lctx, named_g_debuglevel); result = ISC_R_SUCCESS; @@ -166,11 +156,11 @@ ns_log_setdefaultchannels(isc_logconfig_t *lcfg) { } isc_result_t -ns_log_setsafechannels(isc_logconfig_t *lcfg) { +named_log_setsafechannels(isc_logconfig_t *lcfg) { isc_result_t result; isc_logdestination_t destination; - if (! ns_g_logstderr) { + if (! named_g_logstderr) { result = isc_log_createchannel(lcfg, "default_debug", ISC_LOG_TONULL, ISC_LOG_DYNAMIC, @@ -182,14 +172,14 @@ ns_log_setsafechannels(isc_logconfig_t *lcfg) { * Setting the debug level to zero should get the output * discarded a bit faster. */ - isc_log_setdebuglevel(ns_g_lctx, 0); + isc_log_setdebuglevel(named_g_lctx, 0); } else { - isc_log_setdebuglevel(ns_g_lctx, ns_g_debuglevel); + isc_log_setdebuglevel(named_g_lctx, named_g_debuglevel); } - if (ns_g_logfile != NULL) { + if (named_g_logfile != NULL) { destination.file.stream = NULL; - destination.file.name = ns_g_logfile; + destination.file.name = named_g_logfile; destination.file.versions = ISC_LOG_ROLLNEVER; destination.file.maximum_size = 0; result = isc_log_createchannel(lcfg, "default_logfile", @@ -219,7 +209,7 @@ ns_log_setsafechannels(isc_logconfig_t *lcfg) { } isc_result_t -ns_log_setdefaultcategory(isc_logconfig_t *lcfg) { +named_log_setdefaultcategory(isc_logconfig_t *lcfg) { isc_result_t result = ISC_R_SUCCESS; result = isc_log_usechannel(lcfg, "default_debug", @@ -227,12 +217,12 @@ ns_log_setdefaultcategory(isc_logconfig_t *lcfg) { if (result != ISC_R_SUCCESS) goto cleanup; - if (! ns_g_logstderr) { - if (ns_g_logfile != NULL) + if (! named_g_logstderr) { + if (named_g_logfile != NULL) result = isc_log_usechannel(lcfg, "default_logfile", ISC_LOGCATEGORY_DEFAULT, NULL); - else if (! ns_g_nosyslog) + else if (! named_g_nosyslog) result = isc_log_usechannel(lcfg, "default_syslog", ISC_LOGCATEGORY_DEFAULT, NULL); @@ -243,17 +233,17 @@ ns_log_setdefaultcategory(isc_logconfig_t *lcfg) { } isc_result_t -ns_log_setunmatchedcategory(isc_logconfig_t *lcfg) { +named_log_setunmatchedcategory(isc_logconfig_t *lcfg) { isc_result_t result; result = isc_log_usechannel(lcfg, "null", - NS_LOGCATEGORY_UNMATCHED, NULL); + NAMED_LOGCATEGORY_UNMATCHED, NULL); return (result); } void -ns_log_shutdown(void) { - isc_log_destroy(&ns_g_lctx); +named_log_shutdown(void) { + isc_log_destroy(&named_g_lctx); isc_log_setcontext(NULL); dns_log_setcontext(NULL); } diff --git a/bin/named/logconf.c b/bin/named/logconf.c index 6d27d930db..c573bf8e31 100644 --- a/bin/named/logconf.c +++ b/bin/named/logconf.c @@ -6,8 +6,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -/* $Id: logconf.c,v 1.45 2011/03/05 23:52:29 tbox Exp $ */ - /*! \file */ #include @@ -45,9 +43,9 @@ category_fromconf(const cfg_obj_t *ccat, isc_logconfig_t *logconfig) { const cfg_listelt_t *element = NULL; catname = cfg_obj_asstring(cfg_tuple_get(ccat, "name")); - category = isc_log_categorybyname(ns_g_lctx, catname); + category = isc_log_categorybyname(named_g_lctx, catname); if (category == NULL) { - cfg_obj_log(ccat, ns_g_lctx, ISC_LOG_ERROR, + cfg_obj_log(ccat, named_g_lctx, ISC_LOG_ERROR, "unknown logging category '%s' ignored", catname); /* @@ -72,8 +70,8 @@ category_fromconf(const cfg_obj_t *ccat, isc_logconfig_t *logconfig) { result = isc_log_usechannel(logconfig, channelname, category, module); if (result != ISC_R_SUCCESS) { - isc_log_write(ns_g_lctx, CFG_LOGCATEGORY_CONFIG, - NS_LOGMODULE_SERVER, ISC_LOG_ERROR, + isc_log_write(named_g_lctx, CFG_LOGCATEGORY_CONFIG, + NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "logging channel '%s': %s", channelname, isc_result_totext(result)); return (result); @@ -119,7 +117,7 @@ channel_fromconf(const cfg_obj_t *channel, isc_logconfig_t *logconfig) { i++; if (i != 1) { - cfg_obj_log(channel, ns_g_lctx, ISC_LOG_ERROR, + cfg_obj_log(channel, named_g_lctx, ISC_LOG_ERROR, "channel '%s': exactly one of file, syslog, " "null, and stderr must be present", channelname); return (ISC_R_FAILURE); @@ -270,7 +268,7 @@ channel_fromconf(const cfg_obj_t *channel, isc_logconfig_t *logconfig) { */ result = isc_stdio_open(dest.file.name, "a", &fp); if (result != ISC_R_SUCCESS) { - if (logconfig != NULL && !ns_g_nosyslog) + if (logconfig != NULL && !named_g_nosyslog) syslog(LOG_ERR, "isc_stdio_open '%s' failed: " "%s", dest.file.name, @@ -283,7 +281,7 @@ channel_fromconf(const cfg_obj_t *channel, isc_logconfig_t *logconfig) { (void)isc_stdio_close(fp); goto done; } - if (logconfig != NULL && !ns_g_nosyslog) + if (logconfig != NULL && !named_g_nosyslog) syslog(LOG_ERR, "isc_file_isplainfile '%s' failed: %s", dest.file.name, isc_result_totext(result)); fprintf(stderr, "isc_file_isplainfile '%s' failed: %s\n", @@ -295,7 +293,7 @@ channel_fromconf(const cfg_obj_t *channel, isc_logconfig_t *logconfig) { } isc_result_t -ns_log_configure(isc_logconfig_t *logconfig, const cfg_obj_t *logstmt) { +named_logconfig(isc_logconfig_t *logconfig, const cfg_obj_t *logstmt) { isc_result_t result; const cfg_obj_t *channels = NULL; const cfg_obj_t *categories = NULL; @@ -305,7 +303,7 @@ ns_log_configure(isc_logconfig_t *logconfig, const cfg_obj_t *logstmt) { const cfg_obj_t *catname; if (logconfig != NULL) - CHECK(ns_log_setdefaultchannels(logconfig)); + CHECK(named_log_setdefaultchannels(logconfig)); (void)cfg_map_get(logstmt, "channel", &channels); for (element = cfg_list_first(channels); @@ -336,10 +334,10 @@ ns_log_configure(isc_logconfig_t *logconfig, const cfg_obj_t *logstmt) { } if (logconfig != NULL && !default_set) - CHECK(ns_log_setdefaultcategory(logconfig)); + CHECK(named_log_setdefaultcategory(logconfig)); if (logconfig != NULL && !unmatched_set) - CHECK(ns_log_setunmatchedcategory(logconfig)); + CHECK(named_log_setunmatchedcategory(logconfig)); return (ISC_R_SUCCESS); diff --git a/bin/named/lwaddr.c b/bin/named/lwaddr.c deleted file mode 100644 index 53fe957de2..0000000000 --- a/bin/named/lwaddr.c +++ /dev/null @@ -1,85 +0,0 @@ -/* - * Copyright (C) 2000, 2001, 2004, 2005, 2007, 2008, 2014, 2016 Internet Systems Consortium, Inc. ("ISC") - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -/* $Id: lwaddr.c,v 1.10 2008/01/11 23:46:56 tbox Exp $ */ - -/*! \file */ - -#include - -#include - -#include -#include -#include - -#include - -#include - -/*% - * Convert addresses from lwres to isc format. - */ -isc_result_t -lwaddr_netaddr_fromlwresaddr(isc_netaddr_t *na, lwres_addr_t *la) { - if (la->family != LWRES_ADDRTYPE_V4 && la->family != LWRES_ADDRTYPE_V6) - return (ISC_R_FAMILYNOSUPPORT); - - if (la->family == LWRES_ADDRTYPE_V4) { - struct in_addr ina; - memmove(&ina.s_addr, la->address, 4); - isc_netaddr_fromin(na, &ina); - } else { - struct in6_addr ina6; - memmove(&ina6.s6_addr, la->address, 16); - isc_netaddr_fromin6(na, &ina6); - } - return (ISC_R_SUCCESS); -} - -isc_result_t -lwaddr_sockaddr_fromlwresaddr(isc_sockaddr_t *sa, lwres_addr_t *la, - in_port_t port) -{ - isc_netaddr_t na; - isc_result_t result; - - result = lwaddr_netaddr_fromlwresaddr(&na, la); - if (result != ISC_R_SUCCESS) - return (result); - isc_sockaddr_fromnetaddr(sa, &na, port); - return (ISC_R_SUCCESS); -} - -/*% - * Convert addresses from isc to lwres format. - */ - -isc_result_t -lwaddr_lwresaddr_fromnetaddr(lwres_addr_t *la, isc_netaddr_t *na) { - if (na->family != AF_INET && na->family != AF_INET6) - return (ISC_R_FAMILYNOSUPPORT); - - if (na->family == AF_INET) { - la->family = LWRES_ADDRTYPE_V4; - la->length = 4; - memmove(la->address, &na->type.in, 4); - } else { - la->family = LWRES_ADDRTYPE_V6; - la->length = 16; - memmove(la->address, &na->type.in6, 16); - } - return (ISC_R_SUCCESS); -} - -isc_result_t -lwaddr_lwresaddr_fromsockaddr(lwres_addr_t *la, isc_sockaddr_t *sa) { - isc_netaddr_t na; - isc_netaddr_fromsockaddr(&na, sa); - return (lwaddr_lwresaddr_fromnetaddr(la, &na)); -} diff --git a/bin/named/lwdclient.c b/bin/named/lwdclient.c deleted file mode 100644 index 5ccee798d5..0000000000 --- a/bin/named/lwdclient.c +++ /dev/null @@ -1,507 +0,0 @@ -/* - * Copyright (C) 2000, 2001, 2004, 2005, 2007, 2015, 2016 Internet Systems Consortium, Inc. ("ISC") - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -/* $Id: lwdclient.c,v 1.22 2007/06/18 23:47:18 tbox Exp $ */ - -/*! \file */ - -#include - -#include -#include -#include -#include - -#include -#include -#include - -#include -#include -#include -#include - -#define SHUTTINGDOWN(cm) ((cm->flags & NS_LWDCLIENTMGR_FLAGSHUTTINGDOWN) != 0) - -static void -lwdclientmgr_shutdown_callback(isc_task_t *task, isc_event_t *ev); - -void -ns_lwdclient_log(int level, const char *format, ...) { - va_list args; - - va_start(args, format); - isc_log_vwrite(dns_lctx, - DNS_LOGCATEGORY_DATABASE, DNS_LOGMODULE_ADB, - ISC_LOG_DEBUG(level), format, args); - va_end(args); -} - -isc_result_t -ns_lwdclientmgr_create(ns_lwreslistener_t *listener, unsigned int nclients, - isc_taskmgr_t *taskmgr) -{ - ns_lwresd_t *lwresd = listener->manager; - ns_lwdclientmgr_t *cm; - ns_lwdclient_t *client; - unsigned int i; - isc_result_t result; - - cm = isc_mem_get(lwresd->mctx, sizeof(ns_lwdclientmgr_t)); - if (cm == NULL) - return (ISC_R_NOMEMORY); - - result = isc_mutex_init(&cm->lock); - if (result != ISC_R_SUCCESS) - goto freecm; - - cm->listener = NULL; - ns_lwreslistener_attach(listener, &cm->listener); - cm->mctx = lwresd->mctx; - cm->sock = NULL; - isc_socket_attach(listener->sock, &cm->sock); - cm->view = lwresd->view; - cm->lwctx = NULL; - cm->task = NULL; - cm->flags = 0; - ISC_LINK_INIT(cm, link); - ISC_LIST_INIT(cm->idle); - ISC_LIST_INIT(cm->running); - - result = lwres_context_create(&cm->lwctx, cm->mctx, - ns__lwresd_memalloc, ns__lwresd_memfree, - LWRES_CONTEXT_SERVERMODE); - if (result != ISC_R_SUCCESS) - goto errout; - - for (i = 0; i < nclients; i++) { - client = isc_mem_get(lwresd->mctx, sizeof(ns_lwdclient_t)); - if (client != NULL) { - ns_lwdclient_log(50, "created client %p, manager %p", - client, cm); - ns_lwdclient_initialize(client, cm); - } - } - - /* - * If we could create no clients, clean up and return. - */ - if (ISC_LIST_EMPTY(cm->idle)) { - result = ISC_R_NOMEMORY; - goto errout; - } - - result = isc_task_create(taskmgr, 0, &cm->task); - if (result != ISC_R_SUCCESS) - goto errout; - isc_task_setname(cm->task, "lwdclient", NULL); - - /* - * This MUST be last, since there is no way to cancel an onshutdown... - */ - result = isc_task_onshutdown(cm->task, lwdclientmgr_shutdown_callback, - cm); - if (result != ISC_R_SUCCESS) - goto errout; - - ns_lwreslistener_linkcm(listener, cm); - - return (ISC_R_SUCCESS); - - errout: - client = ISC_LIST_HEAD(cm->idle); - while (client != NULL) { - ISC_LIST_UNLINK(cm->idle, client, link); - isc_mem_put(lwresd->mctx, client, sizeof(*client)); - client = ISC_LIST_HEAD(cm->idle); - } - - if (cm->task != NULL) - isc_task_detach(&cm->task); - - if (cm->lwctx != NULL) - lwres_context_destroy(&cm->lwctx); - - DESTROYLOCK(&cm->lock); - - freecm: - isc_mem_put(lwresd->mctx, cm, sizeof(*cm)); - return (result); -} - -static void -lwdclientmgr_destroy(ns_lwdclientmgr_t *cm) { - ns_lwdclient_t *client; - ns_lwreslistener_t *listener; - - LOCK(&cm->lock); - if (!SHUTTINGDOWN(cm)) { - UNLOCK(&cm->lock); - return; - } - - /* - * Run through the idle list and free the clients there. Idle - * clients do not have a recv running nor do they have any finds - * or similar running. - */ - client = ISC_LIST_HEAD(cm->idle); - while (client != NULL) { - ns_lwdclient_log(50, "destroying client %p, manager %p", - client, cm); - ISC_LIST_UNLINK(cm->idle, client, link); - isc_mem_put(cm->mctx, client, sizeof(*client)); - client = ISC_LIST_HEAD(cm->idle); - } - - if (!ISC_LIST_EMPTY(cm->running)) { - UNLOCK(&cm->lock); - return; - } - - UNLOCK(&cm->lock); - - lwres_context_destroy(&cm->lwctx); - cm->view = NULL; - isc_socket_detach(&cm->sock); - isc_task_detach(&cm->task); - - DESTROYLOCK(&cm->lock); - - listener = cm->listener; - ns_lwreslistener_unlinkcm(listener, cm); - ns_lwdclient_log(50, "destroying manager %p", cm); - isc_mem_put(cm->mctx, cm, sizeof(*cm)); - ns_lwreslistener_detach(&listener); -} - -static void -process_request(ns_lwdclient_t *client) { - lwres_buffer_t b; - isc_result_t result; - - lwres_buffer_init(&b, client->buffer, client->recvlength); - lwres_buffer_add(&b, client->recvlength); - - result = lwres_lwpacket_parseheader(&b, &client->pkt); - if (result != ISC_R_SUCCESS) { - ns_lwdclient_log(50, "invalid packet header received"); - goto restart; - } - - ns_lwdclient_log(50, "opcode %08x", client->pkt.opcode); - - switch (client->pkt.opcode) { - case LWRES_OPCODE_GETADDRSBYNAME: - ns_lwdclient_processgabn(client, &b); - return; - case LWRES_OPCODE_GETNAMEBYADDR: - ns_lwdclient_processgnba(client, &b); - return; - case LWRES_OPCODE_GETRDATABYNAME: - ns_lwdclient_processgrbn(client, &b); - return; - case LWRES_OPCODE_NOOP: - ns_lwdclient_processnoop(client, &b); - return; - default: - ns_lwdclient_log(50, "unknown opcode %08x", client->pkt.opcode); - goto restart; - } - - /* - * Drop the packet. - */ - restart: - ns_lwdclient_log(50, "restarting client %p...", client); - ns_lwdclient_stateidle(client); -} - -void -ns_lwdclient_recv(isc_task_t *task, isc_event_t *ev) { - isc_result_t result; - ns_lwdclient_t *client = ev->ev_arg; - ns_lwdclientmgr_t *cm = client->clientmgr; - isc_socketevent_t *dev = (isc_socketevent_t *)ev; - - INSIST(dev->region.base == client->buffer); - INSIST(NS_LWDCLIENT_ISRECV(client)); - - NS_LWDCLIENT_SETRECVDONE(client); - - LOCK(&cm->lock); - INSIST((cm->flags & NS_LWDCLIENTMGR_FLAGRECVPENDING) != 0); - cm->flags &= ~NS_LWDCLIENTMGR_FLAGRECVPENDING; - UNLOCK(&cm->lock); - - ns_lwdclient_log(50, - "event received: task %p, length %u, result %u (%s)", - task, dev->n, dev->result, - isc_result_totext(dev->result)); - - if (dev->result != ISC_R_SUCCESS) { - isc_event_free(&ev); - dev = NULL; - - /* - * Go idle. - */ - ns_lwdclient_stateidle(client); - - return; - } - - client->recvlength = dev->n; - client->address = dev->address; - if ((dev->attributes & ISC_SOCKEVENTATTR_PKTINFO) != 0) { - client->pktinfo = dev->pktinfo; - client->pktinfo_valid = ISC_TRUE; - } else - client->pktinfo_valid = ISC_FALSE; - isc_event_free(&ev); - dev = NULL; - - result = ns_lwdclient_startrecv(cm); - if (result != ISC_R_SUCCESS) - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_LWRESD, ISC_LOG_ERROR, - "could not start lwres " - "client handler: %s", - isc_result_totext(result)); - - process_request(client); -} - -/* - * This function will start a new recv() on a socket for this client manager. - */ -isc_result_t -ns_lwdclient_startrecv(ns_lwdclientmgr_t *cm) { - ns_lwdclient_t *client; - isc_result_t result; - isc_region_t r; - isc_boolean_t destroy = ISC_FALSE; - - - LOCK(&cm->lock); - if (SHUTTINGDOWN(cm)) { - destroy = ISC_TRUE; - result = ISC_R_SUCCESS; - goto unlock; - } - - /* - * If a recv is already running, don't bother. - */ - if ((cm->flags & NS_LWDCLIENTMGR_FLAGRECVPENDING) != 0) { - result = ISC_R_SUCCESS; - goto unlock; - } - - /* - * If we have no idle slots, just return success. - */ - client = ISC_LIST_HEAD(cm->idle); - if (client == NULL) { - result = ISC_R_SUCCESS; - goto unlock; - } - - INSIST(NS_LWDCLIENT_ISIDLE(client)); - - /* - * Set the flag to say there is a recv pending. If isc_socket_recv - * fails we will clear the flag otherwise it will be cleared by - * ns_lwdclient_recv. - */ - cm->flags |= NS_LWDCLIENTMGR_FLAGRECVPENDING; - - /* - * Issue the recv. If it fails, return that it did. - */ - r.base = client->buffer; - r.length = LWRES_RECVLENGTH; - result = isc_socket_recv(cm->sock, &r, 0, cm->task, ns_lwdclient_recv, - client); - if (result != ISC_R_SUCCESS) { - cm->flags &= ~NS_LWDCLIENTMGR_FLAGRECVPENDING; - goto unlock; - } - - /* - * Remove the client from the idle list, and put it on the running - * list. - */ - NS_LWDCLIENT_SETRECV(client); - ISC_LIST_UNLINK(cm->idle, client, link); - ISC_LIST_APPEND(cm->running, client, link); - - unlock: - UNLOCK(&cm->lock); - - if (destroy) - lwdclientmgr_destroy(cm); - - return (result); -} - -static void -lwdclientmgr_shutdown_callback(isc_task_t *task, isc_event_t *ev) { - ns_lwdclientmgr_t *cm = ev->ev_arg; - ns_lwdclient_t *client; - - REQUIRE(!SHUTTINGDOWN(cm)); - - ns_lwdclient_log(50, "got shutdown event, task %p, lwdclientmgr %p", - task, cm); - - /* - * run through the idle list and free the clients there. Idle - * clients do not have a recv running nor do they have any finds - * or similar running. - */ - LOCK(&cm->lock); - client = ISC_LIST_HEAD(cm->idle); - while (client != NULL) { - ns_lwdclient_log(50, "destroying client %p, manager %p", - client, cm); - ISC_LIST_UNLINK(cm->idle, client, link); - isc_mem_put(cm->mctx, client, sizeof(*client)); - client = ISC_LIST_HEAD(cm->idle); - } - UNLOCK(&cm->lock); - - /* - * Cancel any pending I/O. - */ - isc_socket_cancel(cm->sock, task, ISC_SOCKCANCEL_ALL); - - /* - * Run through the running client list and kill off any finds - * in progress. - */ - LOCK(&cm->lock); - client = ISC_LIST_HEAD(cm->running); - while (client != NULL) { - if (client->find != client->v4find - && client->find != client->v6find) - dns_adb_cancelfind(client->find); - if (client->v4find != NULL) - dns_adb_cancelfind(client->v4find); - if (client->v6find != NULL) - dns_adb_cancelfind(client->v6find); - client = ISC_LIST_NEXT(client, link); - } - - cm->flags |= NS_LWDCLIENTMGR_FLAGSHUTTINGDOWN; - - UNLOCK(&cm->lock); - - isc_event_free(&ev); -} - -/* - * Do all the crap needed to move a client from the run queue to the idle - * queue. - */ -void -ns_lwdclient_stateidle(ns_lwdclient_t *client) { - ns_lwdclientmgr_t *cm; - isc_result_t result; - - cm = client->clientmgr; - - INSIST(client->sendbuf == NULL); - INSIST(client->sendlength == 0); - INSIST(client->arg == NULL); - INSIST(client->v4find == NULL); - INSIST(client->v6find == NULL); - - LOCK(&cm->lock); - ISC_LIST_UNLINK(cm->running, client, link); - ISC_LIST_PREPEND(cm->idle, client, link); - UNLOCK(&cm->lock); - - NS_LWDCLIENT_SETIDLE(client); - - result = ns_lwdclient_startrecv(cm); - if (result != ISC_R_SUCCESS) - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_LWRESD, ISC_LOG_ERROR, - "could not start lwres " - "client handler: %s", - isc_result_totext(result)); -} - -void -ns_lwdclient_send(isc_task_t *task, isc_event_t *ev) { - ns_lwdclient_t *client = ev->ev_arg; - ns_lwdclientmgr_t *cm = client->clientmgr; - isc_socketevent_t *dev = (isc_socketevent_t *)ev; - - UNUSED(task); - UNUSED(dev); - - INSIST(NS_LWDCLIENT_ISSEND(client)); - INSIST(client->sendbuf == dev->region.base); - - ns_lwdclient_log(50, "task %p for client %p got send-done event", - task, client); - - if (client->sendbuf != client->buffer) - lwres_context_freemem(cm->lwctx, client->sendbuf, - client->sendlength); - client->sendbuf = NULL; - client->sendlength = 0; - - ns_lwdclient_stateidle(client); - - isc_event_free(&ev); -} - -isc_result_t -ns_lwdclient_sendreply(ns_lwdclient_t *client, isc_region_t *r) { - struct in6_pktinfo *pktinfo; - ns_lwdclientmgr_t *cm = client->clientmgr; - - if (client->pktinfo_valid) - pktinfo = &client->pktinfo; - else - pktinfo = NULL; - return (isc_socket_sendto(cm->sock, r, cm->task, ns_lwdclient_send, - client, &client->address, pktinfo)); -} - -void -ns_lwdclient_initialize(ns_lwdclient_t *client, ns_lwdclientmgr_t *cmgr) { - client->clientmgr = cmgr; - ISC_LINK_INIT(client, link); - NS_LWDCLIENT_SETIDLE(client); - client->arg = NULL; - - client->recvlength = 0; - - client->sendbuf = NULL; - client->sendlength = 0; - - client->find = NULL; - client->v4find = NULL; - client->v6find = NULL; - client->find_wanted = 0; - - client->options = 0; - client->byaddr = NULL; - - client->lookup = NULL; - - client->pktinfo_valid = ISC_FALSE; - - LOCK(&cmgr->lock); - ISC_LIST_APPEND(cmgr->idle, client, link); - UNLOCK(&cmgr->lock); -} diff --git a/bin/named/lwderror.c b/bin/named/lwderror.c deleted file mode 100644 index bb9330077c..0000000000 --- a/bin/named/lwderror.c +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright (C) 2000, 2001, 2004, 2005, 2007, 2016 Internet Systems Consortium, Inc. ("ISC") - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -/* $Id: lwderror.c,v 1.12 2007/06/19 23:46:59 tbox Exp $ */ - -/*! \file */ - -#include - -#include -#include - -#include -#include - -/*% - * Generate an error packet for the client, schedule a send, and put us in - * the SEND state. - * - * The client->pkt structure will be modified to form an error return. - * The receiver needs to verify that it is in fact an error, and do the - * right thing with it. The opcode will be unchanged. The result needs - * to be set before calling this function. - * - * The only change this code makes is to set the receive buffer size to the - * size we use, set the reply bit, and recompute any security information. - */ -void -ns_lwdclient_errorpktsend(ns_lwdclient_t *client, isc_uint32_t _result) { - isc_result_t result; - int lwres; - isc_region_t r; - lwres_buffer_t b; - - REQUIRE(NS_LWDCLIENT_ISRUNNING(client)); - - /* - * Since we are only sending the packet header, we can safely toss - * the receive buffer. This means we won't need to allocate space - * for sending an error reply. This is a Good Thing. - */ - client->pkt.length = LWRES_LWPACKET_LENGTH; - client->pkt.pktflags |= LWRES_LWPACKETFLAG_RESPONSE; - client->pkt.recvlength = LWRES_RECVLENGTH; - client->pkt.authtype = 0; /* XXXMLG */ - client->pkt.authlength = 0; - client->pkt.result = _result; - - lwres_buffer_init(&b, client->buffer, LWRES_RECVLENGTH); - lwres = lwres_lwpacket_renderheader(&b, &client->pkt); - if (lwres != LWRES_R_SUCCESS) { - ns_lwdclient_stateidle(client); - return; - } - - r.base = client->buffer; - r.length = b.used; - client->sendbuf = client->buffer; - result = ns_lwdclient_sendreply(client, &r); - if (result != ISC_R_SUCCESS) { - ns_lwdclient_stateidle(client); - return; - } - - NS_LWDCLIENT_SETSEND(client); -} diff --git a/bin/named/lwdgabn.c b/bin/named/lwdgabn.c deleted file mode 100644 index c3a749ee84..0000000000 --- a/bin/named/lwdgabn.c +++ /dev/null @@ -1,648 +0,0 @@ -/* - * Copyright (C) 2000, 2001, 2004-2007, 2009, 2016 Internet Systems Consortium, Inc. ("ISC") - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -/* $Id: lwdgabn.c,v 1.24 2009/09/02 23:48:01 tbox Exp $ */ - -/*! \file */ - -#include - -#include - -#include -#include -#include -#include /* Required for HP/UX (and others?) */ -#include - -#include -#include -#include - -#include -#include -#include -#include -#include -#include - -#define NEED_V4(c) ((((c)->find_wanted & LWRES_ADDRTYPE_V4) != 0) \ - && ((c)->v4find == NULL)) -#define NEED_V6(c) ((((c)->find_wanted & LWRES_ADDRTYPE_V6) != 0) \ - && ((c)->v6find == NULL)) - -static isc_result_t start_find(ns_lwdclient_t *); -static void restart_find(ns_lwdclient_t *); -static void init_gabn(ns_lwdclient_t *); - -/*% - * Destroy any finds. This can be used to "start over from scratch" and - * should only be called when events are _not_ being generated by the finds. - */ -static void -cleanup_gabn(ns_lwdclient_t *client) { - ns_lwdclient_log(50, "cleaning up client %p", client); - - if (client->v6find != NULL) { - if (client->v6find == client->v4find) - client->v6find = NULL; - else - dns_adb_destroyfind(&client->v6find); - } - if (client->v4find != NULL) - dns_adb_destroyfind(&client->v4find); -} - -static void -setup_addresses(ns_lwdclient_t *client, dns_adbfind_t *find, unsigned int at) { - dns_adbaddrinfo_t *ai; - lwres_addr_t *addr; - int af; - const struct sockaddr *sa; - isc_result_t result; - - if (at == DNS_ADBFIND_INET) - af = AF_INET; - else - af = AF_INET6; - - ai = ISC_LIST_HEAD(find->list); - while (ai != NULL && client->gabn.naddrs < LWRES_MAX_ADDRS) { - sa = &ai->sockaddr.type.sa; - if (sa->sa_family != af) - goto next; - - addr = &client->addrs[client->gabn.naddrs]; - - result = lwaddr_lwresaddr_fromsockaddr(addr, &ai->sockaddr); - if (result != ISC_R_SUCCESS) - goto next; - - ns_lwdclient_log(50, "adding address %p, family %d, length %d", - addr->address, addr->family, addr->length); - - client->gabn.naddrs++; - REQUIRE(!LWRES_LINK_LINKED(addr, link)); - LWRES_LIST_APPEND(client->gabn.addrs, addr, link); - - next: - ai = ISC_LIST_NEXT(ai, publink); - } -} - -typedef struct { - isc_netaddr_t address; - int rank; -} rankedaddress; - -static int -addr_compare(const void *av, const void *bv) { - const rankedaddress *a = (const rankedaddress *) av; - const rankedaddress *b = (const rankedaddress *) bv; - return (a->rank - b->rank); -} - -static void -sort_addresses(ns_lwdclient_t *client) { - unsigned int naddrs; - rankedaddress *addrs; - isc_netaddr_t remote; - dns_addressorderfunc_t order; - const void *arg; - ns_lwresd_t *lwresd = client->clientmgr->listener->manager; - unsigned int i; - isc_result_t result; - - naddrs = client->gabn.naddrs; - - if (naddrs <= 1 || lwresd->view->sortlist == NULL) - return; - - addrs = isc_mem_get(lwresd->mctx, sizeof(rankedaddress) * naddrs); - if (addrs == NULL) - return; - - isc_netaddr_fromsockaddr(&remote, &client->address); - ns_sortlist_byaddrsetup(lwresd->view->sortlist, - &remote, &order, &arg); - if (order == NULL) { - isc_mem_put(lwresd->mctx, addrs, - sizeof(rankedaddress) * naddrs); - return; - } - for (i = 0; i < naddrs; i++) { - result = lwaddr_netaddr_fromlwresaddr(&addrs[i].address, - &client->addrs[i]); - INSIST(result == ISC_R_SUCCESS); - addrs[i].rank = (*order)(&addrs[i].address, arg); - } - qsort(addrs, naddrs, sizeof(rankedaddress), addr_compare); - for (i = 0; i < naddrs; i++) { - result = lwaddr_lwresaddr_fromnetaddr(&client->addrs[i], - &addrs[i].address); - INSIST(result == ISC_R_SUCCESS); - } - - isc_mem_put(lwresd->mctx, addrs, sizeof(rankedaddress) * naddrs); -} - -static void -generate_reply(ns_lwdclient_t *client) { - isc_result_t result; - int lwres; - isc_region_t r; - lwres_buffer_t lwb; - ns_lwdclientmgr_t *cm; - - cm = client->clientmgr; - lwb.base = NULL; - - ns_lwdclient_log(50, "generating gabn reply for client %p", client); - - /* - * We must make certain the client->find is not still active. - * If it is either the v4 or v6 answer, just set it to NULL and - * let the cleanup code destroy it. Otherwise, destroy it now. - */ - if (client->find == client->v4find || client->find == client->v6find) - client->find = NULL; - else - if (client->find != NULL) - dns_adb_destroyfind(&client->find); - - /* - * perhaps there are some here? - */ - if (NEED_V6(client) && client->v4find != NULL) - client->v6find = client->v4find; - - /* - * Run through the finds we have and wire them up to the gabn - * structure. - */ - LWRES_LIST_INIT(client->gabn.addrs); - if (client->v4find != NULL) - setup_addresses(client, client->v4find, DNS_ADBFIND_INET); - if (client->v6find != NULL) - setup_addresses(client, client->v6find, DNS_ADBFIND_INET6); - - /* - * If there are no addresses, try the next element in the search - * path, if there are any more. Otherwise, fall through into - * the error handling code below. - */ - if (client->gabn.naddrs == 0) { - do { - result = ns_lwsearchctx_next(&client->searchctx); - if (result == ISC_R_SUCCESS) { - cleanup_gabn(client); - result = start_find(client); - if (result == ISC_R_SUCCESS) - return; - } - } while (result == ISC_R_SUCCESS); - } - - /* - * Render the packet. - */ - client->pkt.recvlength = LWRES_RECVLENGTH; - client->pkt.authtype = 0; /* XXXMLG */ - client->pkt.authlength = 0; - - /* - * If there are no addresses, return failure. - */ - if (client->gabn.naddrs != 0) - client->pkt.result = LWRES_R_SUCCESS; - else - client->pkt.result = LWRES_R_NOTFOUND; - - sort_addresses(client); - - lwres = lwres_gabnresponse_render(cm->lwctx, &client->gabn, - &client->pkt, &lwb); - if (lwres != LWRES_R_SUCCESS) - goto out; - - r.base = lwb.base; - r.length = lwb.used; - client->sendbuf = r.base; - client->sendlength = r.length; - result = ns_lwdclient_sendreply(client, &r); - if (result != ISC_R_SUCCESS) - goto out; - - NS_LWDCLIENT_SETSEND(client); - - /* - * All done! - */ - cleanup_gabn(client); - - return; - - out: - cleanup_gabn(client); - - if (lwb.base != NULL) - lwres_context_freemem(client->clientmgr->lwctx, - lwb.base, lwb.length); - - ns_lwdclient_errorpktsend(client, LWRES_R_FAILURE); -} - -/* - * Take the current real name, move it to an alias slot (if any are - * open) then put this new name in as the real name for the target. - * - * Return success if it can be rendered, otherwise failure. Note that - * not having enough alias slots open is NOT a failure. - */ -static isc_result_t -add_alias(ns_lwdclient_t *client) { - isc_buffer_t b; - isc_result_t result; - isc_uint16_t naliases; - - b = client->recv_buffer; - - /* - * Render the new name to the buffer. - */ - result = dns_name_totext(dns_fixedname_name(&client->target_name), - ISC_TRUE, &client->recv_buffer); - if (result != ISC_R_SUCCESS) - return (result); - - /* - * Are there any open slots? - */ - naliases = client->gabn.naliases; - if (naliases < LWRES_MAX_ALIASES) { - client->gabn.aliases[naliases] = client->gabn.realname; - client->gabn.aliaslen[naliases] = client->gabn.realnamelen; - client->gabn.naliases++; - } - - /* - * Save this name away as the current real name. - */ - client->gabn.realname = (char *)(b.base) + b.used; - client->gabn.realnamelen = client->recv_buffer.used - b.used; - - return (ISC_R_SUCCESS); -} - -static isc_result_t -store_realname(ns_lwdclient_t *client) { - isc_buffer_t b; - isc_result_t result; - dns_name_t *tname; - - b = client->recv_buffer; - - tname = dns_fixedname_name(&client->target_name); - result = ns_lwsearchctx_current(&client->searchctx, tname); - if (result != ISC_R_SUCCESS) - return (result); - - /* - * Render the new name to the buffer. - */ - result = dns_name_totext(tname, ISC_TRUE, &client->recv_buffer); - if (result != ISC_R_SUCCESS) - return (result); - - /* - * Save this name away as the current real name. - */ - client->gabn.realname = (char *) b.base + b.used; - client->gabn.realnamelen = client->recv_buffer.used - b.used; - - return (ISC_R_SUCCESS); -} - -static void -process_gabn_finddone(isc_task_t *task, isc_event_t *ev) { - ns_lwdclient_t *client = ev->ev_arg; - isc_eventtype_t evtype; - isc_boolean_t claimed; - - ns_lwdclient_log(50, "find done for task %p, client %p", task, client); - - evtype = ev->ev_type; - isc_event_free(&ev); - - /* - * No more info to be had? If so, we have all the good stuff - * right now, so we can render things. - */ - claimed = ISC_FALSE; - if (evtype == DNS_EVENT_ADBNOMOREADDRESSES) { - if (NEED_V4(client)) { - client->v4find = client->find; - claimed = ISC_TRUE; - } - if (NEED_V6(client)) { - client->v6find = client->find; - claimed = ISC_TRUE; - } - if (client->find != NULL) { - if (claimed) - client->find = NULL; - else - dns_adb_destroyfind(&client->find); - - } - generate_reply(client); - return; - } - - /* - * We probably don't need this find anymore. We're either going to - * reissue it, or an error occurred. Either way, we're done with - * it. - */ - if ((client->find != client->v4find) - && (client->find != client->v6find)) { - dns_adb_destroyfind(&client->find); - } else { - client->find = NULL; - } - - /* - * We have some new information we can gather. Run off and fetch - * it. - */ - if (evtype == DNS_EVENT_ADBMOREADDRESSES) { - restart_find(client); - return; - } - - /* - * An error or other strangeness happened. Drop this query. - */ - cleanup_gabn(client); - ns_lwdclient_errorpktsend(client, LWRES_R_FAILURE); -} - -static void -restart_find(ns_lwdclient_t *client) { - unsigned int options; - isc_result_t result; - isc_boolean_t claimed; - - ns_lwdclient_log(50, "starting find for client %p", client); - - /* - * Issue a find for the name contained in the request. We won't - * set the bit that says "anything is good enough" -- we want it - * all. - */ - options = 0; - options |= DNS_ADBFIND_WANTEVENT; - options |= DNS_ADBFIND_RETURNLAME; - - /* - * Set the bits up here to mark that we want this address family - * and that we do not currently have a find pending. We will - * set that bit again below if it turns out we will get an event. - */ - if (NEED_V4(client)) - options |= DNS_ADBFIND_INET; - if (NEED_V6(client)) - options |= DNS_ADBFIND_INET6; - - find_again: - INSIST(client->find == NULL); - result = dns_adb_createfind(client->clientmgr->view->adb, - client->clientmgr->task, - process_gabn_finddone, client, - dns_fixedname_name(&client->target_name), - dns_rootname, 0, options, 0, - dns_fixedname_name(&client->target_name), - client->clientmgr->view->dstport, - &client->find); - - /* - * Did we get an alias? If so, save it and re-issue the query. - */ - if (result == DNS_R_ALIAS) { - ns_lwdclient_log(50, "found alias, restarting query"); - dns_adb_destroyfind(&client->find); - cleanup_gabn(client); - result = add_alias(client); - if (result != ISC_R_SUCCESS) { - ns_lwdclient_log(50, - "out of buffer space adding alias"); - ns_lwdclient_errorpktsend(client, LWRES_R_FAILURE); - return; - } - goto find_again; - } - - ns_lwdclient_log(50, "find returned %d (%s)", result, - isc_result_totext(result)); - - /* - * Did we get an error? - */ - if (result != ISC_R_SUCCESS) { - if (client->find != NULL) - dns_adb_destroyfind(&client->find); - cleanup_gabn(client); - ns_lwdclient_errorpktsend(client, LWRES_R_FAILURE); - return; - } - - claimed = ISC_FALSE; - - /* - * Did we get our answer to V4 addresses? - */ - if (NEED_V4(client) - && ((client->find->query_pending & DNS_ADBFIND_INET) == 0)) { - ns_lwdclient_log(50, "client %p ipv4 satisfied by find %p", - client, client->find); - claimed = ISC_TRUE; - client->v4find = client->find; - } - - /* - * Did we get our answer to V6 addresses? - */ - if (NEED_V6(client) - && ((client->find->query_pending & DNS_ADBFIND_INET6) == 0)) { - ns_lwdclient_log(50, "client %p ipv6 satisfied by find %p", - client, client->find); - claimed = ISC_TRUE; - client->v6find = client->find; - } - - /* - * If we're going to get an event, set our internal pending flag - * and return. When we get an event back we'll do the right - * thing, basically by calling this function again, perhaps with a - * new target name. - * - * If we have both v4 and v6, and we are still getting an event, - * we have a programming error, so die hard. - */ - if ((client->find->options & DNS_ADBFIND_WANTEVENT) != 0) { - ns_lwdclient_log(50, "event will be sent"); - INSIST(client->v4find == NULL || client->v6find == NULL); - return; - } - ns_lwdclient_log(50, "no event will be sent"); - if (claimed) - client->find = NULL; - else - dns_adb_destroyfind(&client->find); - - /* - * We seem to have everything we asked for, or at least we are - * able to respond with things we've learned. - */ - - generate_reply(client); -} - -static isc_result_t -start_find(ns_lwdclient_t *client) { - isc_result_t result; - - /* - * Initialize the real name and alias arrays in the reply we're - * going to build up. - */ - init_gabn(client); - - result = store_realname(client); - if (result != ISC_R_SUCCESS) - return (result); - restart_find(client); - return (ISC_R_SUCCESS); - -} - -static void -init_gabn(ns_lwdclient_t *client) { - int i; - - /* - * Initialize the real name and alias arrays in the reply we're - * going to build up. - */ - for (i = 0; i < LWRES_MAX_ALIASES; i++) { - client->aliases[i] = NULL; - client->aliaslen[i] = 0; - } - for (i = 0; i < LWRES_MAX_ADDRS; i++) { - client->addrs[i].family = 0; - client->addrs[i].length = 0; - memset(client->addrs[i].address, 0, LWRES_ADDR_MAXLEN); - LWRES_LINK_INIT(&client->addrs[i], link); - } - - client->gabn.naliases = 0; - client->gabn.naddrs = 0; - client->gabn.realname = NULL; - client->gabn.aliases = client->aliases; - client->gabn.realnamelen = 0; - client->gabn.aliaslen = client->aliaslen; - LWRES_LIST_INIT(client->gabn.addrs); - client->gabn.base = NULL; - client->gabn.baselen = 0; - - /* - * Set up the internal buffer to point to the receive region. - */ - isc_buffer_init(&client->recv_buffer, client->buffer, LWRES_RECVLENGTH); -} - -/* - * When we are called, we can be assured that: - * - * client->sockaddr contains the address we need to reply to, - * - * client->pkt contains the packet header data, - * - * the packet "checks out" overall -- any MD5 hashes or crypto - * bits have been verified, - * - * "b" points to the remaining data after the packet header - * was parsed off. - * - * We are in a the RECVDONE state. - * - * From this state we will enter the SEND state if we happen to have - * everything we need or we need to return an error packet, or to the - * FINDWAIT state if we need to look things up. - */ -void -ns_lwdclient_processgabn(ns_lwdclient_t *client, lwres_buffer_t *b) { - isc_result_t result; - lwres_gabnrequest_t *req; - ns_lwdclientmgr_t *cm; - isc_buffer_t namebuf; - - REQUIRE(NS_LWDCLIENT_ISRECVDONE(client)); - - cm = client->clientmgr; - req = NULL; - - result = lwres_gabnrequest_parse(client->clientmgr->lwctx, - b, &client->pkt, &req); - if (result != LWRES_R_SUCCESS) - goto out; - if (req->name == NULL) - goto out; - - isc_buffer_init(&namebuf, req->name, req->namelen); - isc_buffer_add(&namebuf, req->namelen); - - dns_fixedname_init(&client->target_name); - dns_fixedname_init(&client->query_name); - result = dns_name_fromtext(dns_fixedname_name(&client->query_name), - &namebuf, NULL, 0, NULL); - if (result != ISC_R_SUCCESS) - goto out; - ns_lwsearchctx_init(&client->searchctx, - cm->listener->manager->search, - dns_fixedname_name(&client->query_name), - cm->listener->manager->ndots); - ns_lwsearchctx_first(&client->searchctx); - - client->find_wanted = req->addrtypes; - ns_lwdclient_log(50, "client %p looking for addrtypes %08x", - client, client->find_wanted); - - /* - * We no longer need to keep this around. - */ - lwres_gabnrequest_free(client->clientmgr->lwctx, &req); - - /* - * Start the find. - */ - result = start_find(client); - if (result != ISC_R_SUCCESS) - goto out; - - return; - - /* - * We're screwed. Return an error packet to our caller. - */ - out: - if (req != NULL) - lwres_gabnrequest_free(client->clientmgr->lwctx, &req); - - ns_lwdclient_errorpktsend(client, LWRES_R_FAILURE); -} diff --git a/bin/named/lwdgnba.c b/bin/named/lwdgnba.c deleted file mode 100644 index 89e94380be..0000000000 --- a/bin/named/lwdgnba.c +++ /dev/null @@ -1,261 +0,0 @@ -/* - * Copyright (C) 2000-2002, 2004, 2005, 2007, 2008, 2014, 2016 Internet Systems Consortium, Inc. ("ISC") - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -/* $Id: lwdgnba.c,v 1.22 2008/01/14 23:46:56 tbox Exp $ */ - -/*! \file */ - -#include - -#include -#include /* Required for HP/UX (and others?) */ -#include - -#include -#include -#include - -#include -#include - -static void start_byaddr(ns_lwdclient_t *); - -static void -byaddr_done(isc_task_t *task, isc_event_t *event) { - ns_lwdclient_t *client; - ns_lwdclientmgr_t *cm; - dns_byaddrevent_t *bevent; - int lwres; - lwres_buffer_t lwb; - dns_name_t *name; - isc_result_t result; - lwres_result_t lwresult; - isc_region_t r; - isc_buffer_t b; - lwres_gnbaresponse_t *gnba; - isc_uint16_t naliases; - - UNUSED(task); - - lwb.base = NULL; - client = event->ev_arg; - cm = client->clientmgr; - INSIST(client->byaddr == (dns_byaddr_t *)event->ev_sender); - - bevent = (dns_byaddrevent_t *)event; - gnba = &client->gnba; - - ns_lwdclient_log(50, "byaddr event result = %s", - isc_result_totext(bevent->result)); - - result = bevent->result; - if (result != ISC_R_SUCCESS) { - dns_byaddr_destroy(&client->byaddr); - isc_event_free(&event); - bevent = NULL; - - if (client->na.family != AF_INET6 || - (client->options & DNS_BYADDROPT_IPV6INT) != 0) { - if (result == DNS_R_NCACHENXDOMAIN || - result == DNS_R_NCACHENXRRSET || - result == DNS_R_NXDOMAIN || - result == DNS_R_NXRRSET) - lwresult = LWRES_R_NOTFOUND; - else - lwresult = LWRES_R_FAILURE; - ns_lwdclient_errorpktsend(client, lwresult); - return; - } - - /* - * Fall back to ip6.int reverse if the default ip6.arpa - * fails. - */ - client->options |= DNS_BYADDROPT_IPV6INT; - - start_byaddr(client); - return; - } - - for (name = ISC_LIST_HEAD(bevent->names); - name != NULL; - name = ISC_LIST_NEXT(name, link)) - { - b = client->recv_buffer; - - result = dns_name_totext(name, ISC_TRUE, &client->recv_buffer); - if (result != ISC_R_SUCCESS) - goto out; - ns_lwdclient_log(50, "found name '%.*s'", - (int)(client->recv_buffer.used - b.used), - (char *)(b.base) + b.used); - if (gnba->realname == NULL) { - gnba->realname = (char *)(b.base) + b.used; - gnba->realnamelen = client->recv_buffer.used - b.used; - } else { - naliases = gnba->naliases; - if (naliases >= LWRES_MAX_ALIASES) - break; - gnba->aliases[naliases] = (char *)(b.base) + b.used; - gnba->aliaslen[naliases] = - client->recv_buffer.used - b.used; - gnba->naliases++; - } - } - - dns_byaddr_destroy(&client->byaddr); - isc_event_free(&event); - - /* - * Render the packet. - */ - client->pkt.recvlength = LWRES_RECVLENGTH; - client->pkt.authtype = 0; /* XXXMLG */ - client->pkt.authlength = 0; - client->pkt.result = LWRES_R_SUCCESS; - - lwres = lwres_gnbaresponse_render(cm->lwctx, - gnba, &client->pkt, &lwb); - if (lwres != LWRES_R_SUCCESS) - goto out; - - r.base = lwb.base; - r.length = lwb.used; - client->sendbuf = r.base; - client->sendlength = r.length; - result = ns_lwdclient_sendreply(client, &r); - if (result != ISC_R_SUCCESS) - goto out; - - NS_LWDCLIENT_SETSEND(client); - - return; - - out: - if (client->byaddr != NULL) - dns_byaddr_destroy(&client->byaddr); - if (lwb.base != NULL) - lwres_context_freemem(cm->lwctx, - lwb.base, lwb.length); - - if (event != NULL) - isc_event_free(&event); -} - -static void -start_byaddr(ns_lwdclient_t *client) { - isc_result_t result; - ns_lwdclientmgr_t *cm; - - cm = client->clientmgr; - - INSIST(client->byaddr == NULL); - - result = dns_byaddr_create(cm->mctx, &client->na, cm->view, - client->options, cm->task, byaddr_done, - client, &client->byaddr); - if (result != ISC_R_SUCCESS) { - ns_lwdclient_errorpktsend(client, LWRES_R_FAILURE); - return; - } -} - -static void -init_gnba(ns_lwdclient_t *client) { - int i; - - /* - * Initialize the real name and alias arrays in the reply we're - * going to build up. - */ - for (i = 0; i < LWRES_MAX_ALIASES; i++) { - client->aliases[i] = NULL; - client->aliaslen[i] = 0; - } - for (i = 0; i < LWRES_MAX_ADDRS; i++) { - client->addrs[i].family = 0; - client->addrs[i].length = 0; - memset(client->addrs[i].address, 0, LWRES_ADDR_MAXLEN); - LWRES_LINK_INIT(&client->addrs[i], link); - } - - client->gnba.naliases = 0; - client->gnba.realname = NULL; - client->gnba.aliases = client->aliases; - client->gnba.realnamelen = 0; - client->gnba.aliaslen = client->aliaslen; - client->gnba.base = NULL; - client->gnba.baselen = 0; - isc_buffer_init(&client->recv_buffer, client->buffer, LWRES_RECVLENGTH); -} - -void -ns_lwdclient_processgnba(ns_lwdclient_t *client, lwres_buffer_t *b) { - lwres_gnbarequest_t *req; - isc_result_t result; - isc_sockaddr_t sa; - ns_lwdclientmgr_t *cm; - - REQUIRE(NS_LWDCLIENT_ISRECVDONE(client)); - INSIST(client->byaddr == NULL); - - cm = client->clientmgr; - req = NULL; - - result = lwres_gnbarequest_parse(cm->lwctx, - b, &client->pkt, &req); - if (result != LWRES_R_SUCCESS) - goto out; - - client->options = 0; - if (req->addr.family == LWRES_ADDRTYPE_V4) { - client->na.family = AF_INET; - if (req->addr.length != 4) - goto out; - memmove(&client->na.type.in, req->addr.address, 4); - } else if (req->addr.family == LWRES_ADDRTYPE_V6) { - client->na.family = AF_INET6; - if (req->addr.length != 16) - goto out; - memmove(&client->na.type.in6, req->addr.address, 16); - } else { - goto out; - } - isc_sockaddr_fromnetaddr(&sa, &client->na, 53); - - ns_lwdclient_log(50, "client %p looking for addrtype %08x", - client, req->addr.family); - - /* - * We no longer need to keep this around. - */ - lwres_gnbarequest_free(cm->lwctx, &req); - - /* - * Initialize the real name and alias arrays in the reply we're - * going to build up. - */ - init_gnba(client); - client->options = 0; - - /* - * Start the find. - */ - start_byaddr(client); - - return; - - /* - * We're screwed. Return an error packet to our caller. - */ - out: - if (req != NULL) - lwres_gnbarequest_free(cm->lwctx, &req); - - ns_lwdclient_errorpktsend(client, LWRES_R_FAILURE); -} diff --git a/bin/named/lwdgrbn.c b/bin/named/lwdgrbn.c deleted file mode 100644 index d0d8ec70d7..0000000000 --- a/bin/named/lwdgrbn.c +++ /dev/null @@ -1,509 +0,0 @@ -/* - * Copyright (C) 2000, 2001, 2003-2007, 2009, 2013-2016 Internet Systems Consortium, Inc. ("ISC") - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -/* $Id: lwdgrbn.c,v 1.22 2009/09/02 23:48:01 tbox Exp $ */ - -/*! \file */ - -#include - -#include -#include -#include /* Required for HP/UX (and others?) */ -#include - -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include - -static void start_lookup(ns_lwdclient_t *); - -static isc_result_t -fill_array(int *pos, dns_rdataset_t *rdataset, - int size, unsigned char **rdatas, lwres_uint16_t *rdatalen) -{ - dns_rdata_t rdata; - isc_result_t result; - isc_region_t r; - - UNUSED(size); - - dns_rdata_init(&rdata); - for (result = dns_rdataset_first(rdataset); - result == ISC_R_SUCCESS; - result = dns_rdataset_next(rdataset)) - { - INSIST(*pos < size); - dns_rdataset_current(rdataset, &rdata); - dns_rdata_toregion(&rdata, &r); - rdatas[*pos] = r.base; - rdatalen[*pos] = r.length; - dns_rdata_reset(&rdata); - (*pos)++; - } - if (result == ISC_R_NOMORE) - result = ISC_R_SUCCESS; - return (result); -} - -static isc_result_t -iterate_node(lwres_grbnresponse_t *grbn, dns_db_t *db, dns_dbnode_t *node, - isc_mem_t *mctx) -{ - int used = 0, count; - int size = 8, oldsize = 0; - unsigned char **rdatas = NULL, **oldrdatas = NULL, **newrdatas = NULL; - lwres_uint16_t *lens = NULL, *oldlens = NULL, *newlens = NULL; - dns_rdatasetiter_t *iter = NULL; - dns_rdataset_t set; - dns_ttl_t ttl = ISC_INT32_MAX; - lwres_uint32_t flags = LWRDATA_VALIDATED; - isc_result_t result = ISC_R_NOMEMORY; - - result = dns_db_allrdatasets(db, node, NULL, 0, &iter); - if (result != ISC_R_SUCCESS) - goto out; - - rdatas = isc_mem_get(mctx, size * sizeof(*rdatas)); - if (rdatas == NULL) - goto out; - lens = isc_mem_get(mctx, size * sizeof(*lens)); - if (lens == NULL) - goto out; - - for (result = dns_rdatasetiter_first(iter); - result == ISC_R_SUCCESS; - result = dns_rdatasetiter_next(iter)) - { - result = ISC_R_NOMEMORY; - dns_rdataset_init(&set); - dns_rdatasetiter_current(iter, &set); - - if (set.type != dns_rdatatype_rrsig) { - dns_rdataset_disassociate(&set); - continue; - } - - count = dns_rdataset_count(&set); - if (used + count > size) { - /* copy & reallocate */ - oldsize = size; - oldrdatas = rdatas; - oldlens = lens; - rdatas = NULL; - lens = NULL; - - size *= 2; - - rdatas = isc_mem_get(mctx, size * sizeof(*rdatas)); - if (rdatas == NULL) - goto out; - lens = isc_mem_get(mctx, size * sizeof(*lens)); - if (lens == NULL) - goto out; - memmove(rdatas, oldrdatas, used * sizeof(*rdatas)); - memmove(lens, oldlens, used * sizeof(*lens)); - isc_mem_put(mctx, oldrdatas, - oldsize * sizeof(*oldrdatas)); - isc_mem_put(mctx, oldlens, oldsize * sizeof(*oldlens)); - oldrdatas = NULL; - oldlens = NULL; - } - if (set.ttl < ttl) - ttl = set.ttl; - if (set.trust != dns_trust_secure) - flags &= (~LWRDATA_VALIDATED); - result = fill_array(&used, &set, size, rdatas, lens); - dns_rdataset_disassociate(&set); - if (result != ISC_R_SUCCESS) - goto out; - } - if (result == ISC_R_NOMORE) - result = ISC_R_SUCCESS; - if (result != ISC_R_SUCCESS) - goto out; - dns_rdatasetiter_destroy(&iter); - - /* - * If necessary, shrink and copy the arrays. - */ - if (size != used) { - result = ISC_R_NOMEMORY; - newrdatas = isc_mem_get(mctx, used * sizeof(*rdatas)); - if (newrdatas == NULL) - goto out; - newlens = isc_mem_get(mctx, used * sizeof(*lens)); - if (newlens == NULL) - goto out; - memmove(newrdatas, rdatas, used * sizeof(*rdatas)); - memmove(newlens, lens, used * sizeof(*lens)); - isc_mem_put(mctx, rdatas, size * sizeof(*rdatas)); - isc_mem_put(mctx, lens, size * sizeof(*lens)); - grbn->rdatas = newrdatas; - grbn->rdatalen = newlens; - } else { - grbn->rdatas = rdatas; - grbn->rdatalen = lens; - } - grbn->nrdatas = used; - grbn->ttl = ttl; - grbn->flags = flags; - return (ISC_R_SUCCESS); - - out: - dns_rdatasetiter_destroy(&iter); - if (rdatas != NULL) - isc_mem_put(mctx, rdatas, size * sizeof(*rdatas)); - if (lens != NULL) - isc_mem_put(mctx, lens, size * sizeof(*lens)); - if (oldrdatas != NULL) - isc_mem_put(mctx, oldrdatas, oldsize * sizeof(*oldrdatas)); - if (oldlens != NULL) - isc_mem_put(mctx, oldlens, oldsize * sizeof(*oldlens)); - if (newrdatas != NULL) - isc_mem_put(mctx, newrdatas, used * sizeof(*newrdatas)); - return (result); -} - -static void -lookup_done(isc_task_t *task, isc_event_t *event) { - ns_lwdclient_t *client; - ns_lwdclientmgr_t *cm; - dns_lookupevent_t *levent; - lwres_buffer_t lwb; - dns_name_t *name; - dns_rdataset_t *rdataset; - dns_rdataset_t *sigrdataset; - isc_result_t result; - lwres_result_t lwresult; - isc_region_t r; - isc_buffer_t b; - lwres_grbnresponse_t *grbn; - int i; - - REQUIRE(event != NULL); - - UNUSED(task); - - lwb.base = NULL; - client = event->ev_arg; - cm = client->clientmgr; - INSIST(client->lookup == (dns_lookup_t *)event->ev_sender); - - levent = (dns_lookupevent_t *)event; - grbn = &client->grbn; - - ns_lwdclient_log(50, "lookup event result = %s", - isc_result_totext(levent->result)); - - result = levent->result; - if (result != ISC_R_SUCCESS) { - dns_lookup_destroy(&client->lookup); - isc_event_free(&event); - levent = NULL; - - switch (result) { - case DNS_R_NXDOMAIN: - case DNS_R_NCACHENXDOMAIN: - result = ns_lwsearchctx_next(&client->searchctx); - if (result != ISC_R_SUCCESS) - lwresult = LWRES_R_NOTFOUND; - else { - start_lookup(client); - return; - } - break; - case DNS_R_NXRRSET: - case DNS_R_NCACHENXRRSET: - lwresult = LWRES_R_TYPENOTFOUND; - break; - default: - lwresult = LWRES_R_FAILURE; - } - ns_lwdclient_errorpktsend(client, lwresult); - return; - } - - name = levent->name; - b = client->recv_buffer; - - grbn->flags = 0; - - grbn->nrdatas = 0; - grbn->rdatas = NULL; - grbn->rdatalen = NULL; - - grbn->nsigs = 0; - grbn->sigs = NULL; - grbn->siglen = NULL; - - result = dns_name_totext(name, ISC_TRUE, &client->recv_buffer); - if (result != ISC_R_SUCCESS) - goto out; - grbn->realname = (char *)isc_buffer_used(&b); - grbn->realnamelen = isc_buffer_usedlength(&client->recv_buffer) - - isc_buffer_usedlength(&b); - ns_lwdclient_log(50, "found name '%.*s'", grbn->realnamelen, - grbn->realname); - - grbn->rdclass = cm->view->rdclass; - grbn->rdtype = client->rdtype; - - rdataset = levent->rdataset; - if (rdataset != NULL) { - /* The normal case */ - grbn->nrdatas = dns_rdataset_count(rdataset); - grbn->rdatas = isc_mem_get(cm->mctx, grbn->nrdatas * - sizeof(unsigned char *)); - if (grbn->rdatas == NULL) - goto out; - grbn->rdatalen = isc_mem_get(cm->mctx, grbn->nrdatas * - sizeof(lwres_uint16_t)); - if (grbn->rdatalen == NULL) - goto out; - - i = 0; - result = fill_array(&i, rdataset, grbn->nrdatas, grbn->rdatas, - grbn->rdatalen); - if (result != ISC_R_SUCCESS) - goto out; - INSIST(i == grbn->nrdatas); - grbn->ttl = rdataset->ttl; - if (rdataset->trust == dns_trust_secure) - grbn->flags |= LWRDATA_VALIDATED; - } else { - /* The SIG query case */ - result = iterate_node(grbn, levent->db, levent->node, - cm->mctx); - if (result != ISC_R_SUCCESS) - goto out; - } - ns_lwdclient_log(50, "filled in %d rdata%s", grbn->nrdatas, - (grbn->nrdatas == 1) ? "" : "s"); - - sigrdataset = levent->sigrdataset; - if (sigrdataset != NULL) { - grbn->nsigs = dns_rdataset_count(sigrdataset); - grbn->sigs = isc_mem_get(cm->mctx, grbn->nsigs * - sizeof(unsigned char *)); - if (grbn->sigs == NULL) - goto out; - grbn->siglen = isc_mem_get(cm->mctx, grbn->nsigs * - sizeof(lwres_uint16_t)); - if (grbn->siglen == NULL) - goto out; - - i = 0; - result = fill_array(&i, sigrdataset, grbn->nsigs, grbn->sigs, - grbn->siglen); - if (result != ISC_R_SUCCESS) - goto out; - INSIST(i == grbn->nsigs); - ns_lwdclient_log(50, "filled in %d signature%s", grbn->nsigs, - (grbn->nsigs == 1) ? "" : "s"); - } - - /* - * Render the packet. - */ - client->pkt.recvlength = LWRES_RECVLENGTH; - client->pkt.authtype = 0; /* XXXMLG */ - client->pkt.authlength = 0; - client->pkt.result = LWRES_R_SUCCESS; - - lwresult = lwres_grbnresponse_render(cm->lwctx, - grbn, &client->pkt, &lwb); - if (lwresult != LWRES_R_SUCCESS) - goto out; - - isc_mem_put(cm->mctx, grbn->rdatas, - grbn->nrdatas * sizeof(unsigned char *)); - isc_mem_put(cm->mctx, grbn->rdatalen, - grbn->nrdatas * sizeof(lwres_uint16_t)); - - if (grbn->sigs != NULL) - isc_mem_put(cm->mctx, grbn->sigs, - grbn->nsigs * sizeof(unsigned char *)); - if (grbn->siglen != NULL) - isc_mem_put(cm->mctx, grbn->siglen, - grbn->nsigs * sizeof(lwres_uint16_t)); - - r.base = lwb.base; - r.length = lwb.used; - client->sendbuf = r.base; - client->sendlength = r.length; - result = ns_lwdclient_sendreply(client, &r); - if (result != ISC_R_SUCCESS) - goto out2; - - NS_LWDCLIENT_SETSEND(client); - - dns_lookup_destroy(&client->lookup); - isc_event_free(&event); - - return; - - out: - if (grbn->rdatas != NULL) - isc_mem_put(cm->mctx, grbn->rdatas, - grbn->nrdatas * sizeof(unsigned char *)); - if (grbn->rdatalen != NULL) - isc_mem_put(cm->mctx, grbn->rdatalen, - grbn->nrdatas * sizeof(lwres_uint16_t)); - - if (grbn->sigs != NULL) - isc_mem_put(cm->mctx, grbn->sigs, - grbn->nsigs * sizeof(unsigned char *)); - if (grbn->siglen != NULL) - isc_mem_put(cm->mctx, grbn->siglen, - grbn->nsigs * sizeof(lwres_uint16_t)); - out2: - if (client->lookup != NULL) - dns_lookup_destroy(&client->lookup); - if (lwb.base != NULL) - lwres_context_freemem(cm->lwctx, lwb.base, lwb.length); - - isc_event_free(&event); - - ns_lwdclient_log(50, "error constructing getrrsetbyname response"); - ns_lwdclient_errorpktsend(client, LWRES_R_FAILURE); -} - -static void -start_lookup(ns_lwdclient_t *client) { - isc_result_t result; - ns_lwdclientmgr_t *cm; - dns_fixedname_t absname; - - cm = client->clientmgr; - - INSIST(client->lookup == NULL); - - dns_fixedname_init(&absname); - - /* - * Perform search across all search domains until success - * is returned. Return in case of failure. - */ - while (ns_lwsearchctx_current(&client->searchctx, - dns_fixedname_name(&absname)) != ISC_R_SUCCESS) { - if (ns_lwsearchctx_next(&client->searchctx) != ISC_R_SUCCESS) { - ns_lwdclient_errorpktsend(client, LWRES_R_FAILURE); - return; - } - } - - result = dns_lookup_create(cm->mctx, - dns_fixedname_name(&absname), - client->rdtype, cm->view, - client->options, cm->task, lookup_done, - client, &client->lookup); - if (result != ISC_R_SUCCESS) { - ns_lwdclient_errorpktsend(client, LWRES_R_FAILURE); - return; - } -} - -static void -init_grbn(ns_lwdclient_t *client) { - client->grbn.rdclass = 0; - client->grbn.rdtype = 0; - client->grbn.ttl = 0; - client->grbn.nrdatas = 0; - client->grbn.realname = NULL; - client->grbn.realnamelen = 0; - client->grbn.rdatas = 0; - client->grbn.rdatalen = 0; - client->grbn.base = NULL; - client->grbn.baselen = 0; - isc_buffer_init(&client->recv_buffer, client->buffer, LWRES_RECVLENGTH); -} - -void -ns_lwdclient_processgrbn(ns_lwdclient_t *client, lwres_buffer_t *b) { - lwres_grbnrequest_t *req; - isc_result_t result; - ns_lwdclientmgr_t *cm; - isc_buffer_t namebuf; - - REQUIRE(NS_LWDCLIENT_ISRECVDONE(client)); - INSIST(client->byaddr == NULL); - - cm = client->clientmgr; - req = NULL; - - result = lwres_grbnrequest_parse(cm->lwctx, - b, &client->pkt, &req); - if (result != LWRES_R_SUCCESS) - goto out; - if (req->name == NULL) - goto out; - - client->options = 0; - if (req->rdclass != cm->view->rdclass) - goto out; - - if (req->rdclass == dns_rdataclass_any || - req->rdtype == dns_rdatatype_any) - goto out; - - client->rdtype = req->rdtype; - - isc_buffer_init(&namebuf, req->name, req->namelen); - isc_buffer_add(&namebuf, req->namelen); - - dns_fixedname_init(&client->query_name); - result = dns_name_fromtext(dns_fixedname_name(&client->query_name), - &namebuf, NULL, 0, NULL); - if (result != ISC_R_SUCCESS) - goto out; - ns_lwsearchctx_init(&client->searchctx, - cm->listener->manager->search, - dns_fixedname_name(&client->query_name), - cm->listener->manager->ndots); - ns_lwsearchctx_first(&client->searchctx); - - ns_lwdclient_log(50, "client %p looking for type %d", - client, client->rdtype); - - /* - * We no longer need to keep this around. - */ - lwres_grbnrequest_free(cm->lwctx, &req); - - /* - * Initialize the real name and alias arrays in the reply we're - * going to build up. - */ - init_grbn(client); - - /* - * Start the find. - */ - start_lookup(client); - - return; - - /* - * We're screwed. Return an error packet to our caller. - */ - out: - if (req != NULL) - lwres_grbnrequest_free(cm->lwctx, &req); - - ns_lwdclient_errorpktsend(client, LWRES_R_FAILURE); -} diff --git a/bin/named/lwdnoop.c b/bin/named/lwdnoop.c deleted file mode 100644 index 9d368449b5..0000000000 --- a/bin/named/lwdnoop.c +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright (C) 2000, 2001, 2004, 2005, 2007, 2008, 2016 Internet Systems Consortium, Inc. ("ISC") - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -/* $Id: lwdnoop.c,v 1.13 2008/01/22 23:28:04 tbox Exp $ */ - -/*! \file */ - -#include - -#include -#include - -#include -#include - -void -ns_lwdclient_processnoop(ns_lwdclient_t *client, lwres_buffer_t *b) { - lwres_nooprequest_t *req; - lwres_noopresponse_t resp; - isc_result_t result; - lwres_result_t lwres; - isc_region_t r; - lwres_buffer_t lwb; - - REQUIRE(NS_LWDCLIENT_ISRECVDONE(client)); - INSIST(client->byaddr == NULL); - - req = NULL; - - result = lwres_nooprequest_parse(client->clientmgr->lwctx, - b, &client->pkt, &req); - if (result != LWRES_R_SUCCESS) - goto send_error; - - client->pkt.recvlength = LWRES_RECVLENGTH; - client->pkt.authtype = 0; /* XXXMLG */ - client->pkt.authlength = 0; - client->pkt.result = LWRES_R_SUCCESS; - - resp.datalength = req->datalength; - resp.data = req->data; - - lwres = lwres_noopresponse_render(client->clientmgr->lwctx, &resp, - &client->pkt, &lwb); - if (lwres != LWRES_R_SUCCESS) - goto cleanup_req; - - r.base = lwb.base; - r.length = lwb.used; - client->sendbuf = r.base; - client->sendlength = r.length; - result = ns_lwdclient_sendreply(client, &r); - if (result != ISC_R_SUCCESS) - goto cleanup_lwb; - - /* - * We can now destroy request. - */ - lwres_nooprequest_free(client->clientmgr->lwctx, &req); - - NS_LWDCLIENT_SETSEND(client); - - return; - - cleanup_lwb: - lwres_context_freemem(client->clientmgr->lwctx, lwb.base, lwb.length); - - cleanup_req: - lwres_nooprequest_free(client->clientmgr->lwctx, &req); - - send_error: - ns_lwdclient_errorpktsend(client, LWRES_R_FAILURE); -} diff --git a/bin/named/lwresd.8 b/bin/named/lwresd.8 deleted file mode 100644 index a55e9d6baf..0000000000 --- a/bin/named/lwresd.8 +++ /dev/null @@ -1,250 +0,0 @@ -.\" Copyright (C) 2000, 2001, 2004, 2005, 2007-2009, 2014-2017 Internet Systems Consortium, Inc. ("ISC") -.\" -.\" This Source Code Form is subject to the terms of the Mozilla Public -.\" License, v. 2.0. If a copy of the MPL was not distributed with this -.\" file, You can obtain one at http://mozilla.org/MPL/2.0/. -.\" -.hy 0 -.ad l -'\" t -.\" Title: lwresd -.\" Author: -.\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 2009-01-20 -.\" Manual: BIND9 -.\" Source: ISC -.\" Language: English -.\" -.TH "LWRESD" "8" "2009\-01\-20" "ISC" "BIND9" -.\" ----------------------------------------------------------------- -.\" * Define some portability stuff -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" http://bugs.debian.org/507673 -.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.ie \n(.g .ds Aq \(aq -.el .ds Aq ' -.\" ----------------------------------------------------------------- -.\" * set default formatting -.\" ----------------------------------------------------------------- -.\" disable hyphenation -.nh -.\" disable justification (adjust text to left margin only) -.ad l -.\" ----------------------------------------------------------------- -.\" * MAIN CONTENT STARTS HERE * -.\" ----------------------------------------------------------------- -.SH "NAME" -lwresd \- lightweight resolver daemon -.SH "SYNOPSIS" -.HP \w'\fBlwresd\fR\ 'u -\fBlwresd\fR [\fB\-c\ \fR\fB\fIconfig\-file\fR\fR] [\fB\-C\ \fR\fB\fIconfig\-file\fR\fR] [\fB\-d\ \fR\fB\fIdebug\-level\fR\fR] [\fB\-f\fR] [\fB\-g\fR] [\fB\-i\ \fR\fB\fIpid\-file\fR\fR] [\fB\-m\ \fR\fB\fIflag\fR\fR] [\fB\-n\ \fR\fB\fI#cpus\fR\fR] [\fB\-P\ \fR\fB\fIport\fR\fR] [\fB\-p\ \fR\fB\fIport\fR\fR] [\fB\-s\fR] [\fB\-t\ \fR\fB\fIdirectory\fR\fR] [\fB\-u\ \fR\fB\fIuser\fR\fR] [\fB\-v\fR] [[\fB\-4\fR] | [\fB\-6\fR]] -.SH "DESCRIPTION" -.PP -\fBlwresd\fR -is the daemon providing name lookup services to clients that use the BIND 9 lightweight resolver library\&. It is essentially a stripped\-down, caching\-only name server that answers queries using the BIND 9 lightweight resolver protocol rather than the DNS protocol\&. -.PP -\fBlwresd\fR -listens for resolver queries on a UDP port on the IPv4 loopback interface, 127\&.0\&.0\&.1\&. This means that -\fBlwresd\fR -can only be used by processes running on the local machine\&. By default, UDP port number 921 is used for lightweight resolver requests and responses\&. -.PP -Incoming lightweight resolver requests are decoded by the server which then resolves them using the DNS protocol\&. When the DNS lookup completes, -\fBlwresd\fR -encodes the answers in the lightweight resolver format and returns them to the client that made the request\&. -.PP -If -/etc/resolv\&.conf -contains any -\fBnameserver\fR -entries, -\fBlwresd\fR -sends recursive DNS queries to those servers\&. This is similar to the use of forwarders in a caching name server\&. If no -\fBnameserver\fR -entries are present, or if forwarding fails, -\fBlwresd\fR -resolves the queries autonomously starting at the root name servers, using a built\-in list of root server hints\&. -.SH "OPTIONS" -.PP -\-4 -.RS 4 -Use IPv4 only even if the host machine is capable of IPv6\&. -\fB\-4\fR -and -\fB\-6\fR -are mutually exclusive\&. -.RE -.PP -\-6 -.RS 4 -Use IPv6 only even if the host machine is capable of IPv4\&. -\fB\-4\fR -and -\fB\-6\fR -are mutually exclusive\&. -.RE -.PP -\-c \fIconfig\-file\fR -.RS 4 -Use -\fIconfig\-file\fR -as the configuration file instead of the default, -/etc/lwresd\&.conf\&. -\fB\-c\fR -can not be used with -\fB\-C\fR\&. -.RE -.PP -\-C \fIconfig\-file\fR -.RS 4 -Use -\fIconfig\-file\fR -as the configuration file instead of the default, -/etc/resolv\&.conf\&. -\fB\-C\fR -can not be used with -\fB\-c\fR\&. -.RE -.PP -\-d \fIdebug\-level\fR -.RS 4 -Set the daemon\*(Aqs debug level to -\fIdebug\-level\fR\&. Debugging traces from -\fBlwresd\fR -become more verbose as the debug level increases\&. -.RE -.PP -\-f -.RS 4 -Run the server in the foreground (i\&.e\&. do not daemonize)\&. -.RE -.PP -\-g -.RS 4 -Run the server in the foreground and force all logging to -stderr\&. -.RE -.PP -\-i \fIpid\-file\fR -.RS 4 -Use -\fIpid\-file\fR -as the PID file instead of the default, -/var/run/lwresd/lwresd\&.pid\&. -.RE -.PP -\-m \fIflag\fR -.RS 4 -Turn on memory usage debugging flags\&. Possible flags are -\fIusage\fR, -\fItrace\fR, -\fIrecord\fR, -\fIsize\fR, and -\fImctx\fR\&. These correspond to the ISC_MEM_DEBUGXXXX flags described in -\&. -.RE -.PP -\-n \fI#cpus\fR -.RS 4 -Create -\fI#cpus\fR -worker threads to take advantage of multiple CPUs\&. If not specified, -\fBlwresd\fR -will try to determine the number of CPUs present and create one thread per CPU\&. If it is unable to determine the number of CPUs, a single worker thread will be created\&. -.RE -.PP -\-P \fIport\fR -.RS 4 -Listen for lightweight resolver queries on port -\fIport\fR\&. If not specified, the default is port 921\&. -.RE -.PP -\-p \fIport\fR -.RS 4 -Send DNS lookups to port -\fIport\fR\&. If not specified, the default is port 53\&. This provides a way of testing the lightweight resolver daemon with a name server that listens for queries on a non\-standard port number\&. -.RE -.PP -\-s -.RS 4 -Write memory usage statistics to -stdout -on exit\&. -.if n \{\ -.sp -.\} -.RS 4 -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.br -.ps +1 -\fBNote\fR -.ps -1 -.br -This option is mainly of interest to BIND 9 developers and may be removed or changed in a future release\&. -.sp .5v -.RE -.RE -.PP -\-t \fIdirectory\fR -.RS 4 -Chroot to -\fIdirectory\fR -after processing the command line arguments, but before reading the configuration file\&. -.if n \{\ -.sp -.\} -.RS 4 -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.br -.ps +1 -\fBWarning\fR -.ps -1 -.br -This option should be used in conjunction with the -\fB\-u\fR -option, as chrooting a process running as root doesn\*(Aqt enhance security on most systems; the way -\fBchroot(2)\fR -is defined allows a process with root privileges to escape a chroot jail\&. -.sp .5v -.RE -.RE -.PP -\-u \fIuser\fR -.RS 4 -Setuid to -\fIuser\fR -after completing privileged operations, such as creating sockets that listen on privileged ports\&. -.RE -.PP -\-v -.RS 4 -Report the version number and exit\&. -.RE -.SH "FILES" -.PP -/etc/resolv\&.conf -.RS 4 -The default configuration file\&. -.RE -.PP -/var/run/lwresd\&.pid -.RS 4 -The default process\-id file\&. -.RE -.SH "SEE ALSO" -.PP -\fBnamed\fR(8), -\fBlwres\fR(3), -\fBresolver\fR(5)\&. -.SH "AUTHOR" -.PP -\fBInternet Systems Consortium, Inc\&.\fR -.SH "COPYRIGHT" -.br -Copyright \(co 2000, 2001, 2004, 2005, 2007-2009, 2014-2017 Internet Systems Consortium, Inc. ("ISC") -.br diff --git a/bin/named/lwresd.c b/bin/named/lwresd.c deleted file mode 100644 index 4be78b84c8..0000000000 --- a/bin/named/lwresd.c +++ /dev/null @@ -1,889 +0,0 @@ -/* - * Copyright (C) 2000-2009, 2012-2016 Internet Systems Consortium, Inc. ("ISC") - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -/* $Id: lwresd.c,v 1.60 2009/09/02 23:48:01 tbox Exp $ */ - -/*! \file - * \brief - * Main program for the Lightweight Resolver Daemon. - * - * To paraphrase the old saying about X11, "It's not a lightweight deamon - * for resolvers, it's a deamon for lightweight resolvers". - */ - -#include - -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include - -#define LWRESD_MAGIC ISC_MAGIC('L', 'W', 'R', 'D') -#define VALID_LWRESD(l) ISC_MAGIC_VALID(l, LWRESD_MAGIC) - -#define LWRESLISTENER_MAGIC ISC_MAGIC('L', 'W', 'R', 'L') -#define VALID_LWRESLISTENER(l) ISC_MAGIC_VALID(l, LWRESLISTENER_MAGIC) - -#define LWRESD_NCLIENTS_MAX 32768 /*%< max clients per task */ - -typedef ISC_LIST(ns_lwreslistener_t) ns_lwreslistenerlist_t; - -static ns_lwreslistenerlist_t listeners; -static isc_mutex_t listeners_lock; -static isc_once_t once = ISC_ONCE_INIT; - - -static void -initialize_mutex(void) { - RUNTIME_CHECK(isc_mutex_init(&listeners_lock) == ISC_R_SUCCESS); -} - - -/*% - * Wrappers around our memory management stuff, for the lwres functions. - */ -void * -ns__lwresd_memalloc(void *arg, size_t size) { - return (isc_mem_get(arg, size)); -} - -void -ns__lwresd_memfree(void *arg, void *mem, size_t size) { - isc_mem_put(arg, mem, size); -} - - -#define CHECK(op) \ - do { result = (op); \ - if (result != ISC_R_SUCCESS) goto cleanup; \ - } while (0) - -static isc_result_t -buffer_putstr(isc_buffer_t *b, const char *s) { - unsigned int len = strlen(s); - if (isc_buffer_availablelength(b) <= len) - return (ISC_R_NOSPACE); - isc_buffer_putmem(b, (const unsigned char *)s, len); - return (ISC_R_SUCCESS); -} - -/* - * Convert a resolv.conf file into a config structure. - */ -isc_result_t -ns_lwresd_parseeresolvconf(isc_mem_t *mctx, cfg_parser_t *pctx, - cfg_obj_t **configp) -{ - char text[4096]; - char str[16]; - isc_buffer_t b; - lwres_context_t *lwctx = NULL; - lwres_conf_t *lwc = NULL; - isc_sockaddr_t sa; - isc_netaddr_t na; - int i; - isc_result_t result; - lwres_result_t lwresult; - - lwctx = NULL; - lwresult = lwres_context_create(&lwctx, mctx, ns__lwresd_memalloc, - ns__lwresd_memfree, - LWRES_CONTEXT_SERVERMODE); - if (lwresult != LWRES_R_SUCCESS) { - result = ISC_R_NOMEMORY; - goto cleanup; - } - - lwresult = lwres_conf_parse(lwctx, lwresd_g_resolvconffile); - if (lwresult != LWRES_R_SUCCESS) { - result = DNS_R_SYNTAX; - goto cleanup; - } - - lwc = lwres_conf_get(lwctx); - INSIST(lwc != NULL); - - isc_buffer_init(&b, text, sizeof(text)); - - CHECK(buffer_putstr(&b, "options {\n")); - - /* - * Build the list of forwarders. - */ - if (lwc->nsnext > 0) { - CHECK(buffer_putstr(&b, "\tforwarders {\n")); - - for (i = 0; i < lwc->nsnext; i++) { - CHECK(lwaddr_sockaddr_fromlwresaddr( - &sa, - &lwc->nameservers[i], - ns_g_port)); - isc_netaddr_fromsockaddr(&na, &sa); - CHECK(buffer_putstr(&b, "\t\t")); - CHECK(isc_netaddr_totext(&na, &b)); - CHECK(buffer_putstr(&b, ";\n")); - } - CHECK(buffer_putstr(&b, "\t};\n")); - } - - /* - * Build the sortlist - */ - if (lwc->sortlistnxt > 0) { - CHECK(buffer_putstr(&b, "\tsortlist {\n")); - CHECK(buffer_putstr(&b, "\t\t{\n")); - CHECK(buffer_putstr(&b, "\t\t\tany;\n")); - CHECK(buffer_putstr(&b, "\t\t\t{\n")); - for (i = 0; i < lwc->sortlistnxt; i++) { - lwres_addr_t *lwaddr = &lwc->sortlist[i].addr; - lwres_addr_t *lwmask = &lwc->sortlist[i].mask; - unsigned int mask; - - CHECK(lwaddr_sockaddr_fromlwresaddr(&sa, lwmask, 0)); - isc_netaddr_fromsockaddr(&na, &sa); - result = isc_netaddr_masktoprefixlen(&na, &mask); - if (result != ISC_R_SUCCESS) { - char addrtext[ISC_NETADDR_FORMATSIZE]; - isc_netaddr_format(&na, addrtext, - sizeof(addrtext)); - isc_log_write(ns_g_lctx, - NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_LWRESD, - ISC_LOG_ERROR, - "processing sortlist: '%s' is " - "not a valid netmask", - addrtext); - goto cleanup; - } - - CHECK(lwaddr_sockaddr_fromlwresaddr(&sa, lwaddr, 0)); - isc_netaddr_fromsockaddr(&na, &sa); - - CHECK(buffer_putstr(&b, "\t\t\t\t")); - CHECK(isc_netaddr_totext(&na, &b)); - snprintf(str, sizeof(str), "%u", mask); - CHECK(buffer_putstr(&b, "/")); - CHECK(buffer_putstr(&b, str)); - CHECK(buffer_putstr(&b, ";\n")); - } - CHECK(buffer_putstr(&b, "\t\t\t};\n")); - CHECK(buffer_putstr(&b, "\t\t};\n")); - CHECK(buffer_putstr(&b, "\t};\n")); - } - - CHECK(buffer_putstr(&b, "};\n\n")); - - CHECK(buffer_putstr(&b, "lwres {\n")); - - /* - * Build the search path - */ - if (lwc->searchnxt > 0) { - if (lwc->searchnxt > 0) { - CHECK(buffer_putstr(&b, "\tsearch {\n")); - for (i = 0; i < lwc->searchnxt; i++) { - CHECK(buffer_putstr(&b, "\t\t\"")); - CHECK(buffer_putstr(&b, lwc->search[i])); - CHECK(buffer_putstr(&b, "\";\n")); - } - CHECK(buffer_putstr(&b, "\t};\n")); - } - } - - /* - * Build the ndots line - */ - if (lwc->ndots != 1) { - CHECK(buffer_putstr(&b, "\tndots ")); - snprintf(str, sizeof(str), "%u", lwc->ndots); - CHECK(buffer_putstr(&b, str)); - CHECK(buffer_putstr(&b, ";\n")); - } - - /* - * Build the listen-on line - */ - if (lwc->lwnext > 0) { - CHECK(buffer_putstr(&b, "\tlisten-on {\n")); - - for (i = 0; i < lwc->lwnext; i++) { - CHECK(lwaddr_sockaddr_fromlwresaddr(&sa, - &lwc->lwservers[i], - 0)); - isc_netaddr_fromsockaddr(&na, &sa); - CHECK(buffer_putstr(&b, "\t\t")); - CHECK(isc_netaddr_totext(&na, &b)); - CHECK(buffer_putstr(&b, ";\n")); - } - CHECK(buffer_putstr(&b, "\t};\n")); - } - - CHECK(buffer_putstr(&b, "};\n")); - -#if 0 - printf("%.*s\n", - (int)isc_buffer_usedlength(&b), - (char *)isc_buffer_base(&b)); -#endif - - lwres_conf_clear(lwctx); - lwres_context_destroy(&lwctx); - - return (cfg_parse_buffer(pctx, &b, &cfg_type_namedconf, configp)); - - cleanup: - - if (lwctx != NULL) { - lwres_conf_clear(lwctx); - lwres_context_destroy(&lwctx); - } - - return (result); -} - - -/* - * Handle lwresd manager objects - */ -isc_result_t -ns_lwdmanager_create(isc_mem_t *mctx, const cfg_obj_t *lwres, - ns_lwresd_t **lwresdp) -{ - ns_lwresd_t *lwresd; - const char *vname; - dns_rdataclass_t vclass; - const cfg_obj_t *obj, *viewobj, *searchobj; - const cfg_listelt_t *element; - isc_result_t result; - - INSIST(lwresdp != NULL && *lwresdp == NULL); - - lwresd = isc_mem_get(mctx, sizeof(ns_lwresd_t)); - if (lwresd == NULL) - return (ISC_R_NOMEMORY); - - lwresd->mctx = NULL; - isc_mem_attach(mctx, &lwresd->mctx); - lwresd->view = NULL; - lwresd->search = NULL; - lwresd->refs = 1; - - obj = NULL; - (void)cfg_map_get(lwres, "ndots", &obj); - if (obj != NULL) - lwresd->ndots = cfg_obj_asuint32(obj); - else - lwresd->ndots = 1; - - RUNTIME_CHECK(isc_mutex_init(&lwresd->lock) == ISC_R_SUCCESS); - - lwresd->shutting_down = ISC_FALSE; - - viewobj = NULL; - (void)cfg_map_get(lwres, "view", &viewobj); - if (viewobj != NULL) { - vname = cfg_obj_asstring(cfg_tuple_get(viewobj, "name")); - obj = cfg_tuple_get(viewobj, "class"); - result = ns_config_getclass(obj, dns_rdataclass_in, &vclass); - if (result != ISC_R_SUCCESS) - goto fail; - } else { - vname = "_default"; - vclass = dns_rdataclass_in; - } - - result = dns_viewlist_find(&ns_g_server->viewlist, vname, vclass, - &lwresd->view); - if (result != ISC_R_SUCCESS) { - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_LWRESD, ISC_LOG_WARNING, - "couldn't find view %s", vname); - goto fail; - } - - searchobj = NULL; - (void)cfg_map_get(lwres, "search", &searchobj); - if (searchobj != NULL) { - lwresd->search = NULL; - result = ns_lwsearchlist_create(lwresd->mctx, - &lwresd->search); - if (result != ISC_R_SUCCESS) { - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_LWRESD, ISC_LOG_WARNING, - "couldn't create searchlist"); - goto fail; - } - for (element = cfg_list_first(searchobj); - element != NULL; - element = cfg_list_next(element)) - { - const cfg_obj_t *search; - const char *searchstr; - isc_buffer_t namebuf; - dns_fixedname_t fname; - dns_name_t *name; - - search = cfg_listelt_value(element); - searchstr = cfg_obj_asstring(search); - - dns_fixedname_init(&fname); - name = dns_fixedname_name(&fname); - isc_buffer_constinit(&namebuf, searchstr, - strlen(searchstr)); - isc_buffer_add(&namebuf, strlen(searchstr)); - result = dns_name_fromtext(name, &namebuf, - dns_rootname, 0, NULL); - if (result != ISC_R_SUCCESS) { - isc_log_write(ns_g_lctx, - NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_LWRESD, - ISC_LOG_WARNING, - "invalid name %s in searchlist", - searchstr); - continue; - } - - result = ns_lwsearchlist_append(lwresd->search, name); - if (result != ISC_R_SUCCESS) { - isc_log_write(ns_g_lctx, - NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_LWRESD, - ISC_LOG_WARNING, - "couldn't update searchlist"); - goto fail; - } - } - } - - obj = NULL; - (void)cfg_map_get(lwres, "lwres-tasks", &obj); - if (obj != NULL) - lwresd->ntasks = cfg_obj_asuint32(obj); - else - lwresd->ntasks = ns_g_cpus; - - if (lwresd->ntasks == 0) - lwresd->ntasks = 1; - - obj = NULL; - (void)cfg_map_get(lwres, "lwres-clients", &obj); - if (obj != NULL) { - lwresd->nclients = cfg_obj_asuint32(obj); - if (lwresd->nclients > LWRESD_NCLIENTS_MAX) - lwresd->nclients = LWRESD_NCLIENTS_MAX; - } else if (ns_g_lwresdonly) - lwresd->nclients = 1024; - else - lwresd->nclients = 256; - - lwresd->magic = LWRESD_MAGIC; - - *lwresdp = lwresd; - return (ISC_R_SUCCESS); - - fail: - if (lwresd->view != NULL) - dns_view_detach(&lwresd->view); - if (lwresd->search != NULL) - ns_lwsearchlist_detach(&lwresd->search); - if (lwresd->mctx != NULL) - isc_mem_detach(&lwresd->mctx); - isc_mem_put(mctx, lwresd, sizeof(ns_lwresd_t)); - return (result); -} - -void -ns_lwdmanager_attach(ns_lwresd_t *source, ns_lwresd_t **targetp) { - INSIST(VALID_LWRESD(source)); - INSIST(targetp != NULL && *targetp == NULL); - - LOCK(&source->lock); - source->refs++; - UNLOCK(&source->lock); - - *targetp = source; -} - -void -ns_lwdmanager_detach(ns_lwresd_t **lwresdp) { - ns_lwresd_t *lwresd; - isc_mem_t *mctx; - isc_boolean_t done = ISC_FALSE; - - INSIST(lwresdp != NULL && *lwresdp != NULL); - INSIST(VALID_LWRESD(*lwresdp)); - - lwresd = *lwresdp; - *lwresdp = NULL; - - LOCK(&lwresd->lock); - INSIST(lwresd->refs > 0); - lwresd->refs--; - if (lwresd->refs == 0) - done = ISC_TRUE; - UNLOCK(&lwresd->lock); - - if (!done) - return; - - dns_view_detach(&lwresd->view); - if (lwresd->search != NULL) - ns_lwsearchlist_detach(&lwresd->search); - mctx = lwresd->mctx; - lwresd->magic = 0; - isc_mem_put(mctx, lwresd, sizeof(*lwresd)); - isc_mem_detach(&mctx); -} - - -/* - * Handle listener objects - */ -void -ns_lwreslistener_attach(ns_lwreslistener_t *source, - ns_lwreslistener_t **targetp) -{ - INSIST(VALID_LWRESLISTENER(source)); - INSIST(targetp != NULL && *targetp == NULL); - - LOCK(&source->lock); - source->refs++; - UNLOCK(&source->lock); - - *targetp = source; -} - -void -ns_lwreslistener_detach(ns_lwreslistener_t **listenerp) { - ns_lwreslistener_t *listener; - isc_mem_t *mctx; - isc_boolean_t done = ISC_FALSE; - - INSIST(listenerp != NULL && *listenerp != NULL); - INSIST(VALID_LWRESLISTENER(*listenerp)); - - listener = *listenerp; - - LOCK(&listener->lock); - INSIST(listener->refs > 0); - listener->refs--; - if (listener->refs == 0) - done = ISC_TRUE; - UNLOCK(&listener->lock); - - if (!done) - return; - - if (listener->manager != NULL) - ns_lwdmanager_detach(&listener->manager); - - if (listener->sock != NULL) - isc_socket_detach(&listener->sock); - - listener->magic = 0; - mctx = listener->mctx; - isc_mem_put(mctx, listener, sizeof(*listener)); - isc_mem_detach(&mctx); - listenerp = NULL; -} - -static isc_result_t -listener_create(isc_mem_t *mctx, ns_lwresd_t *lwresd, - ns_lwreslistener_t **listenerp) -{ - ns_lwreslistener_t *listener; - isc_result_t result; - - REQUIRE(listenerp != NULL && *listenerp == NULL); - - listener = isc_mem_get(mctx, sizeof(ns_lwreslistener_t)); - if (listener == NULL) - return (ISC_R_NOMEMORY); - - result = isc_mutex_init(&listener->lock); - if (result != ISC_R_SUCCESS) { - isc_mem_put(mctx, listener, sizeof(ns_lwreslistener_t)); - return (result); - } - - listener->magic = LWRESLISTENER_MAGIC; - listener->refs = 1; - - listener->sock = NULL; - - listener->manager = NULL; - ns_lwdmanager_attach(lwresd, &listener->manager); - - listener->mctx = NULL; - isc_mem_attach(mctx, &listener->mctx); - - ISC_LINK_INIT(listener, link); - ISC_LIST_INIT(listener->cmgrs); - - *listenerp = listener; - return (ISC_R_SUCCESS); -} - -static isc_result_t -listener_bind(ns_lwreslistener_t *listener, isc_sockaddr_t *address) { - isc_socket_t *sock = NULL; - isc_result_t result = ISC_R_SUCCESS; - int pf; - - pf = isc_sockaddr_pf(address); - if ((pf == AF_INET && isc_net_probeipv4() != ISC_R_SUCCESS) || - (pf == AF_INET6 && isc_net_probeipv6() != ISC_R_SUCCESS)) - return (ISC_R_FAMILYNOSUPPORT); - - listener->address = *address; - - if (isc_sockaddr_getport(&listener->address) == 0) { - in_port_t port; - port = lwresd_g_listenport; - if (port == 0) - port = LWRES_UDP_PORT; - isc_sockaddr_setport(&listener->address, port); - } - - sock = NULL; - result = isc_socket_create(ns_g_socketmgr, pf, - isc_sockettype_udp, &sock); - if (result != ISC_R_SUCCESS) { - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_LWRESD, ISC_LOG_WARNING, - "failed to create lwres socket: %s", - isc_result_totext(result)); - return (result); - } - - result = isc_socket_bind(sock, &listener->address, - ISC_SOCKET_REUSEADDRESS); - if (result != ISC_R_SUCCESS) { - char socktext[ISC_SOCKADDR_FORMATSIZE]; - isc_sockaddr_format(&listener->address, socktext, - sizeof(socktext)); - isc_socket_detach(&sock); - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_LWRESD, ISC_LOG_WARNING, - "failed to add lwres socket: %s: %s", - socktext, isc_result_totext(result)); - return (result); - } - listener->sock = sock; - return (ISC_R_SUCCESS); -} - -static void -listener_copysock(ns_lwreslistener_t *oldlistener, - ns_lwreslistener_t *newlistener) -{ - newlistener->address = oldlistener->address; - isc_socket_attach(oldlistener->sock, &newlistener->sock); -} - -static isc_result_t -listener_startclients(ns_lwreslistener_t *listener) { - ns_lwdclientmgr_t *cm, *next; - unsigned int i; - isc_result_t result = ISC_R_SUCCESS; - - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_LWRESD, ISC_LOG_DEBUG(6), - "listener_startclients: creating %d " - "managers with %d clients each", - listener->manager->ntasks, listener->manager->nclients); - - /* - * Create the client managers. - */ - for (i = 0; i < listener->manager->ntasks; i++) { - result = ns_lwdclientmgr_create(listener, - listener->manager->nclients, - ns_g_taskmgr); - if (result != ISC_R_SUCCESS) - break; - } - - /* - * If the list is empty return now with the previous - * ns_lwdclientmgr_create() result. - */ - if (ISC_LIST_EMPTY(listener->cmgrs)) - return (result); - - /* - * Walk the list of clients and start each one up. - */ - LOCK(&listener->lock); - cm = ISC_LIST_HEAD(listener->cmgrs); - while (cm != NULL) { - next = ISC_LIST_NEXT(cm, link); - result = ns_lwdclient_startrecv(cm); - if (result != ISC_R_SUCCESS) - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_LWRESD, ISC_LOG_ERROR, - "could not start lwres " - "client handler: %s", - isc_result_totext(result)); - cm = next; - } - UNLOCK(&listener->lock); - - return (ISC_R_SUCCESS); -} - -static void -listener_shutdown(ns_lwreslistener_t *listener) { - ns_lwdclientmgr_t *cm; - - cm = ISC_LIST_HEAD(listener->cmgrs); - while (cm != NULL) { - isc_task_shutdown(cm->task); - cm = ISC_LIST_NEXT(cm, link); - } -} - -static isc_result_t -find_listener(isc_sockaddr_t *address, ns_lwreslistener_t **listenerp) { - ns_lwreslistener_t *listener; - - INSIST(listenerp != NULL && *listenerp == NULL); - - for (listener = ISC_LIST_HEAD(listeners); - listener != NULL; - listener = ISC_LIST_NEXT(listener, link)) - { - if (!isc_sockaddr_equal(address, &listener->address)) - continue; - *listenerp = listener; - return (ISC_R_SUCCESS); - } - return (ISC_R_NOTFOUND); -} - -void -ns_lwreslistener_unlinkcm(ns_lwreslistener_t *listener, ns_lwdclientmgr_t *cm) -{ - REQUIRE(VALID_LWRESLISTENER(listener)); - - LOCK(&listener->lock); - ISC_LIST_UNLINK(listener->cmgrs, cm, link); - UNLOCK(&listener->lock); -} - -void -ns_lwreslistener_linkcm(ns_lwreslistener_t *listener, ns_lwdclientmgr_t *cm) { - REQUIRE(VALID_LWRESLISTENER(listener)); - - /* - * This does no locking, since it's called early enough that locking - * isn't needed. - */ - ISC_LIST_APPEND(listener->cmgrs, cm, link); -} - -static isc_result_t -configure_listener(isc_sockaddr_t *address, ns_lwresd_t *lwresd, - isc_mem_t *mctx, ns_lwreslistenerlist_t *newlisteners) -{ - ns_lwreslistener_t *listener, *oldlistener = NULL; - char socktext[ISC_SOCKADDR_FORMATSIZE]; - isc_result_t result; - - (void)find_listener(address, &oldlistener); - listener = NULL; - result = listener_create(mctx, lwresd, &listener); - if (result != ISC_R_SUCCESS) { - isc_sockaddr_format(address, socktext, sizeof(socktext)); - isc_log_write(ns_g_lctx, ISC_LOGCATEGORY_GENERAL, - NS_LOGMODULE_LWRESD, ISC_LOG_WARNING, - "lwres failed to configure %s: %s", - socktext, isc_result_totext(result)); - return (result); - } - - /* - * If there's already a listener, don't rebind the socket. - */ - if (oldlistener == NULL) { - result = listener_bind(listener, address); - if (result != ISC_R_SUCCESS) { - ns_lwreslistener_detach(&listener); - return (ISC_R_SUCCESS); - } - } else - listener_copysock(oldlistener, listener); - - result = listener_startclients(listener); - if (result != ISC_R_SUCCESS) { - isc_sockaddr_format(address, socktext, sizeof(socktext)); - isc_log_write(ns_g_lctx, ISC_LOGCATEGORY_GENERAL, - NS_LOGMODULE_LWRESD, ISC_LOG_WARNING, - "lwres: failed to start %s: %s", socktext, - isc_result_totext(result)); - ns_lwreslistener_detach(&listener); - return (ISC_R_SUCCESS); - } - - if (oldlistener != NULL) { - /* - * Remove the old listener from the old list and shut it down. - */ - ISC_LIST_UNLINK(listeners, oldlistener, link); - listener_shutdown(oldlistener); - ns_lwreslistener_detach(&oldlistener); - } else { - isc_sockaddr_format(address, socktext, sizeof(socktext)); - isc_log_write(ns_g_lctx, ISC_LOGCATEGORY_GENERAL, - NS_LOGMODULE_LWRESD, ISC_LOG_NOTICE, - "lwres listening on %s", socktext); - } - - ISC_LIST_APPEND(*newlisteners, listener, link); - return (result); -} - -isc_result_t -ns_lwresd_configure(isc_mem_t *mctx, const cfg_obj_t *config) { - const cfg_obj_t *lwreslist = NULL; - const cfg_obj_t *lwres = NULL; - const cfg_obj_t *listenerslist = NULL; - const cfg_listelt_t *element = NULL; - ns_lwreslistener_t *listener; - ns_lwreslistenerlist_t newlisteners; - isc_result_t result; - char socktext[ISC_SOCKADDR_FORMATSIZE]; - isc_sockaddr_t *addrs = NULL; - ns_lwresd_t *lwresd = NULL; - isc_uint32_t count = 0; - - REQUIRE(mctx != NULL); - REQUIRE(config != NULL); - - RUNTIME_CHECK(isc_once_do(&once, initialize_mutex) == ISC_R_SUCCESS); - - ISC_LIST_INIT(newlisteners); - - result = cfg_map_get(config, "lwres", &lwreslist); - if (result != ISC_R_SUCCESS) - return (ISC_R_SUCCESS); - - LOCK(&listeners_lock); - /* - * Run through the new lwres address list, noting sockets that - * are already being listened on and moving them to the new list. - * - * Identifying duplicates addr/port combinations is left to either - * the underlying config code, or to the bind attempt getting an - * address-in-use error. - */ - for (element = cfg_list_first(lwreslist); - element != NULL; - element = cfg_list_next(element)) - { - in_port_t port; - - lwres = cfg_listelt_value(element); - CHECK(ns_lwdmanager_create(mctx, lwres, &lwresd)); - - port = lwresd_g_listenport; - if (port == 0) - port = LWRES_UDP_PORT; - - listenerslist = NULL; - (void)cfg_map_get(lwres, "listen-on", &listenerslist); - if (listenerslist == NULL) { - struct in_addr localhost; - isc_sockaddr_t address; - - localhost.s_addr = htonl(INADDR_LOOPBACK); - isc_sockaddr_fromin(&address, &localhost, port); - CHECK(configure_listener(&address, lwresd, mctx, - &newlisteners)); - } else { - isc_uint32_t i; - - CHECK(ns_config_getiplist(config, listenerslist, - port, mctx, &addrs, NULL, - &count)); - for (i = 0; i < count; i++) - CHECK(configure_listener(&addrs[i], lwresd, - mctx, &newlisteners)); - ns_config_putiplist(mctx, &addrs, NULL, count); - } - ns_lwdmanager_detach(&lwresd); - } - - /* - * Shutdown everything on the listeners list, and remove them from - * the list. Then put all of the new listeners on it. - */ - - while (!ISC_LIST_EMPTY(listeners)) { - listener = ISC_LIST_HEAD(listeners); - ISC_LIST_UNLINK(listeners, listener, link); - - isc_sockaddr_format(&listener->address, - socktext, sizeof(socktext)); - - listener_shutdown(listener); - ns_lwreslistener_detach(&listener); - - isc_log_write(ns_g_lctx, ISC_LOGCATEGORY_GENERAL, - NS_LOGMODULE_LWRESD, ISC_LOG_NOTICE, - "lwres no longer listening on %s", socktext); - } - - cleanup: - ISC_LIST_APPENDLIST(listeners, newlisteners, link); - - if (addrs != NULL) - ns_config_putiplist(mctx, &addrs, NULL, count); - - if (lwresd != NULL) - ns_lwdmanager_detach(&lwresd); - - UNLOCK(&listeners_lock); - - return (result); -} - -void -ns_lwresd_shutdown(void) { - ns_lwreslistener_t *listener; - - RUNTIME_CHECK(isc_once_do(&once, initialize_mutex) == ISC_R_SUCCESS); - - while (!ISC_LIST_EMPTY(listeners)) { - listener = ISC_LIST_HEAD(listeners); - ISC_LIST_UNLINK(listeners, listener, link); - ns_lwreslistener_detach(&listener); - } -} diff --git a/bin/named/lwresd.docbook b/bin/named/lwresd.docbook deleted file mode 100644 index 375375ad51..0000000000 --- a/bin/named/lwresd.docbook +++ /dev/null @@ -1,359 +0,0 @@ - - - - - - 2009-01-20 - - - ISC - Internet Systems Consortium, Inc. - - - - lwresd - 8 - BIND9 - - - - lwresd - lightweight resolver daemon - - - - - 2000 - 2001 - 2004 - 2005 - 2007 - 2008 - 2009 - 2014 - 2015 - 2016 - 2017 - Internet Systems Consortium, Inc. ("ISC") - - - - - - lwresd - - - - - - - - - - - - - - - - - - - - - - DESCRIPTION - - - lwresd - is the daemon providing name lookup - services to clients that use the BIND 9 lightweight resolver - library. It is essentially a stripped-down, caching-only name - server that answers queries using the BIND 9 lightweight - resolver protocol rather than the DNS protocol. - - - lwresd - listens for resolver queries on a - UDP port on the IPv4 loopback interface, 127.0.0.1. This - means that lwresd can only be used by - processes running on the local machine. By default, UDP port - number 921 is used for lightweight resolver requests and - responses. - - - Incoming lightweight resolver requests are decoded by the - server which then resolves them using the DNS protocol. When - the DNS lookup completes, lwresd encodes - the answers in the lightweight resolver format and returns - them to the client that made the request. - - - If /etc/resolv.conf contains any - entries, lwresd - sends recursive DNS queries to those servers. This is similar - to the use of forwarders in a caching name server. If no - entries are present, or if - forwarding fails, lwresd resolves the - queries autonomously starting at the root name servers, using - a built-in list of root server hints. - - - - OPTIONS - - - - - - -4 - - - Use IPv4 only even if the host machine is capable of IPv6. - and are mutually - exclusive. - - - - - - -6 - - - Use IPv6 only even if the host machine is capable of IPv4. - and are mutually - exclusive. - - - - - - - -c config-file - - - Use config-file as the - configuration file instead of the default, - /etc/lwresd.conf. - - can not be used with . - - - - - - -C config-file - - - Use config-file as the - configuration file instead of the default, - /etc/resolv.conf. - can not be used with . - - - - - - -d debug-level - - - Set the daemon's debug level to debug-level. - Debugging traces from lwresd become - more verbose as the debug level increases. - - - - - - -f - - - Run the server in the foreground (i.e. do not daemonize). - - - - - - -g - - - Run the server in the foreground and force all logging - to stderr. - - - - - - -i pid-file - - - Use pid-file as the - PID file instead of the default, - /var/run/lwresd/lwresd.pid. - - - - - - -m flag - - - Turn on memory usage debugging flags. Possible flags are - usage, - trace, - record, - size, and - mctx. - These correspond to the ISC_MEM_DEBUGXXXX flags described in - <isc/mem.h>. - - - - - - -n #cpus - - - Create #cpus worker threads - to take advantage of multiple CPUs. If not specified, - lwresd will try to determine the - number of CPUs present and create one thread per CPU. - If it is unable to determine the number of CPUs, a - single worker thread will be created. - - - - - - -P port - - - Listen for lightweight resolver queries on port - port. If - not specified, the default is port 921. - - - - - - -p port - - - Send DNS lookups to port port. If not - specified, the default is port 53. This provides a - way of testing the lightweight resolver daemon with a - name server that listens for queries on a non-standard - port number. - - - - - - -s - - - Write memory usage statistics to stdout - on exit. - - - - This option is mainly of interest to BIND 9 developers - and may be removed or changed in a future release. - - - - - - - -t directory - - Chroot - to directory after - processing the command line arguments, but before - reading the configuration file. - - - - This option should be used in conjunction with the - option, as chrooting a process - running as root doesn't enhance security on most - systems; the way chroot(2) is - defined allows a process with root privileges to - escape a chroot jail. - - - - - - - -u user - - Setuid - to user after completing - privileged operations, such as creating sockets that - listen on privileged ports. - - - - - - -v - - - Report the version number and exit. - - - - - - - - - FILES - - - - - - /etc/resolv.conf - - - The default configuration file. - - - - - - /var/run/lwresd.pid - - - The default process-id file. - - - - - - - - - SEE ALSO - - - named8 - , - - lwres3 - , - - resolver5 - . - - - - diff --git a/bin/named/lwresd.html b/bin/named/lwresd.html deleted file mode 100644 index 0924bf2664..0000000000 --- a/bin/named/lwresd.html +++ /dev/null @@ -1,295 +0,0 @@ - - - - - -lwresd - - -
-
- - - - - -
-

Name

-

- lwresd - — lightweight resolver daemon -

-
- - - -
-

Synopsis

-

- lwresd - [-c config-file] - [-C config-file] - [-d debug-level] - [-f] - [-g] - [-i pid-file] - [-m flag] - [-n #cpus] - [-P port] - [-p port] - [-s] - [-t directory] - [-u user] - [-v] - [ - [-4] - | [-6] - ] -

-
- -
-

DESCRIPTION

- - -

lwresd - is the daemon providing name lookup - services to clients that use the BIND 9 lightweight resolver - library. It is essentially a stripped-down, caching-only name - server that answers queries using the BIND 9 lightweight - resolver protocol rather than the DNS protocol. -

- -

lwresd - listens for resolver queries on a - UDP port on the IPv4 loopback interface, 127.0.0.1. This - means that lwresd can only be used by - processes running on the local machine. By default, UDP port - number 921 is used for lightweight resolver requests and - responses. -

-

- Incoming lightweight resolver requests are decoded by the - server which then resolves them using the DNS protocol. When - the DNS lookup completes, lwresd encodes - the answers in the lightweight resolver format and returns - them to the client that made the request. -

-

- If /etc/resolv.conf contains any - nameserver entries, lwresd - sends recursive DNS queries to those servers. This is similar - to the use of forwarders in a caching name server. If no - nameserver entries are present, or if - forwarding fails, lwresd resolves the - queries autonomously starting at the root name servers, using - a built-in list of root server hints. -

-
- -
-

OPTIONS

- - -
-
-4
-
-

- Use IPv4 only even if the host machine is capable of IPv6. - -4 and -6 are mutually - exclusive. -

-
-
-6
-
-

- Use IPv6 only even if the host machine is capable of IPv4. - -4 and -6 are mutually - exclusive. -

-
-
-c config-file
-
-

- Use config-file as the - configuration file instead of the default, - /etc/lwresd.conf. - - -c can not be used with -C. -

-
-
-C config-file
-
-

- Use config-file as the - configuration file instead of the default, - /etc/resolv.conf. - -C can not be used with -c. -

-
-
-d debug-level
-
-

- Set the daemon's debug level to debug-level. - Debugging traces from lwresd become - more verbose as the debug level increases. -

-
-
-f
-
-

- Run the server in the foreground (i.e. do not daemonize). -

-
-
-g
-
-

- Run the server in the foreground and force all logging - to stderr. -

-
-
-i pid-file
-
-

- Use pid-file as the - PID file instead of the default, - /var/run/lwresd/lwresd.pid. -

-
-
-m flag
-
-

- Turn on memory usage debugging flags. Possible flags are - usage, - trace, - record, - size, and - mctx. - These correspond to the ISC_MEM_DEBUGXXXX flags described in - <isc/mem.h>. -

-
-
-n #cpus
-
-

- Create #cpus worker threads - to take advantage of multiple CPUs. If not specified, - lwresd will try to determine the - number of CPUs present and create one thread per CPU. - If it is unable to determine the number of CPUs, a - single worker thread will be created. -

-
-
-P port
-
-

- Listen for lightweight resolver queries on port - port. If - not specified, the default is port 921. -

-
-
-p port
-
-

- Send DNS lookups to port port. If not - specified, the default is port 53. This provides a - way of testing the lightweight resolver daemon with a - name server that listens for queries on a non-standard - port number. -

-
-
-s
-
-

- Write memory usage statistics to stdout - on exit. -

-
-

Note

-

- This option is mainly of interest to BIND 9 developers - and may be removed or changed in a future release. -

-
-
-
-t directory
-
-

Chroot - to directory after - processing the command line arguments, but before - reading the configuration file. -

-
-

Warning

-

- This option should be used in conjunction with the - -u option, as chrooting a process - running as root doesn't enhance security on most - systems; the way chroot(2) is - defined allows a process with root privileges to - escape a chroot jail. -

-
-
-
-u user
-
-

Setuid - to user after completing - privileged operations, such as creating sockets that - listen on privileged ports. -

-
-
-v
-
-

- Report the version number and exit. -

-
-
- -
- -
-

FILES

- - -
-
/etc/resolv.conf
-
-

- The default configuration file. -

-
-
/var/run/lwresd.pid
-
-

- The default process-id file. -

-
-
- -
- -
-

SEE ALSO

- -

- named(8) - , - - lwres(3) - , - - resolver(5) - . -

-
- -
- diff --git a/bin/named/lwsearch.c b/bin/named/lwsearch.c deleted file mode 100644 index e92f6cb11f..0000000000 --- a/bin/named/lwsearch.c +++ /dev/null @@ -1,196 +0,0 @@ -/* - * Copyright (C) 2000, 2001, 2004, 2005, 2007, 2016 Internet Systems Consortium, Inc. ("ISC") - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -/* $Id: lwsearch.c,v 1.13 2007/06/19 23:46:59 tbox Exp $ */ - -/*! \file */ - -#include - -#include -#include -#include -#include -#include -#include - -#include -#include - -#include -#include - -#define LWSEARCHLIST_MAGIC ISC_MAGIC('L', 'W', 'S', 'L') -#define VALID_LWSEARCHLIST(l) ISC_MAGIC_VALID(l, LWSEARCHLIST_MAGIC) - -isc_result_t -ns_lwsearchlist_create(isc_mem_t *mctx, ns_lwsearchlist_t **listp) { - ns_lwsearchlist_t *list; - isc_result_t result; - - REQUIRE(mctx != NULL); - REQUIRE(listp != NULL && *listp == NULL); - - list = isc_mem_get(mctx, sizeof(ns_lwsearchlist_t)); - if (list == NULL) - return (ISC_R_NOMEMORY); - - result = isc_mutex_init(&list->lock); - if (result != ISC_R_SUCCESS) { - isc_mem_put(mctx, list, sizeof(ns_lwsearchlist_t)); - return (result); - } - list->mctx = NULL; - isc_mem_attach(mctx, &list->mctx); - list->refs = 1; - ISC_LIST_INIT(list->names); - list->magic = LWSEARCHLIST_MAGIC; - - *listp = list; - return (ISC_R_SUCCESS); -} - -void -ns_lwsearchlist_attach(ns_lwsearchlist_t *source, ns_lwsearchlist_t **target) { - REQUIRE(VALID_LWSEARCHLIST(source)); - REQUIRE(target != NULL && *target == NULL); - - LOCK(&source->lock); - INSIST(source->refs > 0); - source->refs++; - INSIST(source->refs != 0); - UNLOCK(&source->lock); - - *target = source; -} - -void -ns_lwsearchlist_detach(ns_lwsearchlist_t **listp) { - ns_lwsearchlist_t *list; - isc_mem_t *mctx; - - REQUIRE(listp != NULL); - list = *listp; - REQUIRE(VALID_LWSEARCHLIST(list)); - - LOCK(&list->lock); - INSIST(list->refs > 0); - list->refs--; - UNLOCK(&list->lock); - - *listp = NULL; - if (list->refs != 0) - return; - - mctx = list->mctx; - while (!ISC_LIST_EMPTY(list->names)) { - dns_name_t *name = ISC_LIST_HEAD(list->names); - ISC_LIST_UNLINK(list->names, name, link); - dns_name_free(name, list->mctx); - isc_mem_put(list->mctx, name, sizeof(dns_name_t)); - } - list->magic = 0; - isc_mem_put(mctx, list, sizeof(ns_lwsearchlist_t)); - isc_mem_detach(&mctx); -} - -isc_result_t -ns_lwsearchlist_append(ns_lwsearchlist_t *list, dns_name_t *name) { - dns_name_t *newname; - isc_result_t result; - - REQUIRE(VALID_LWSEARCHLIST(list)); - REQUIRE(name != NULL); - - newname = isc_mem_get(list->mctx, sizeof(dns_name_t)); - if (newname == NULL) - return (ISC_R_NOMEMORY); - dns_name_init(newname, NULL); - result = dns_name_dup(name, list->mctx, newname); - if (result != ISC_R_SUCCESS) { - isc_mem_put(list->mctx, newname, sizeof(dns_name_t)); - return (result); - } - ISC_LINK_INIT(newname, link); - ISC_LIST_APPEND(list->names, newname, link); - return (ISC_R_SUCCESS); -} - -void -ns_lwsearchctx_init(ns_lwsearchctx_t *sctx, ns_lwsearchlist_t *list, - dns_name_t *name, unsigned int ndots) -{ - INSIST(sctx != NULL); - sctx->relname = name; - sctx->searchname = NULL; - sctx->doneexact = ISC_FALSE; - sctx->exactfirst = ISC_FALSE; - sctx->ndots = ndots; - if (dns_name_isabsolute(name) || list == NULL) { - sctx->list = NULL; - return; - } - sctx->list = list; - sctx->searchname = ISC_LIST_HEAD(sctx->list->names); - if (dns_name_countlabels(name) > ndots) - sctx->exactfirst = ISC_TRUE; -} - -void -ns_lwsearchctx_first(ns_lwsearchctx_t *sctx) { - REQUIRE(sctx != NULL); - UNUSED(sctx); -} - -isc_result_t -ns_lwsearchctx_next(ns_lwsearchctx_t *sctx) { - REQUIRE(sctx != NULL); - - if (sctx->list == NULL) - return (ISC_R_NOMORE); - - if (sctx->searchname == NULL) { - if (sctx->exactfirst || sctx->doneexact) - return (ISC_R_NOMORE); - sctx->doneexact = ISC_TRUE; - } else { - if (sctx->exactfirst && !sctx->doneexact) - sctx->doneexact = ISC_TRUE; - else { - sctx->searchname = ISC_LIST_NEXT(sctx->searchname, - link); - if (sctx->searchname == NULL && sctx->doneexact) - return (ISC_R_NOMORE); - } - } - - return (ISC_R_SUCCESS); -} - -isc_result_t -ns_lwsearchctx_current(ns_lwsearchctx_t *sctx, dns_name_t *absname) { - const dns_name_t *tname; - isc_boolean_t useexact = ISC_FALSE; - - REQUIRE(sctx != NULL); - - if (sctx->list == NULL || - sctx->searchname == NULL || - (sctx->exactfirst && !sctx->doneexact)) - useexact = ISC_TRUE; - - if (useexact) { - if (dns_name_isabsolute(sctx->relname)) - tname = NULL; - else - tname = dns_rootname; - } else - tname = sctx->searchname; - - return (dns_name_concatenate(sctx->relname, tname, absname, NULL)); -} diff --git a/bin/named/main.c b/bin/named/main.c index 00002a9eea..1d05209e27 100644 --- a/bin/named/main.c +++ b/bin/named/main.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999-2016 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 1999-2017 Internet Systems Consortium, Inc. ("ISC") * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -54,24 +54,24 @@ /* - * Defining NS_MAIN provides storage declarations (rather than extern) + * Defining NAMED_MAIN provides storage declarations (rather than extern) * for variables in named/globals.h. */ -#define NS_MAIN 1 +#define NAMED_MAIN 1 + +#include #include #include #include #include /* Explicit, though named/log.h includes it. */ -#include #include #include #include -#include #include #include #ifdef HAVE_LIBSCF -#include +#include #endif #ifdef OPENSSL @@ -116,14 +116,32 @@ static char version[512]; static unsigned int maxsocks = 0; static int maxudp = 0; +/* + * -T options: + */ +static isc_boolean_t clienttest = ISC_FALSE; +static isc_boolean_t dropedns = ISC_FALSE; +static isc_boolean_t noedns = ISC_FALSE; +static isc_boolean_t nosoa = ISC_FALSE; +static isc_boolean_t noaa = ISC_FALSE; +static unsigned int delay = 0; +static isc_boolean_t nonearest = ISC_FALSE; +static isc_boolean_t notcp = ISC_FALSE; + +/* + * -4 and -6 + */ +static isc_boolean_t disable6 = ISC_FALSE; +static isc_boolean_t disable4 = ISC_FALSE; + void -ns_main_earlywarning(const char *format, ...) { +named_main_earlywarning(const char *format, ...) { va_list args; va_start(args, format); - if (ns_g_lctx != NULL) { - isc_log_vwrite(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_MAIN, ISC_LOG_WARNING, + if (named_g_lctx != NULL) { + isc_log_vwrite(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_MAIN, ISC_LOG_WARNING, format, args); } else { fprintf(stderr, "%s: ", program_name); @@ -135,16 +153,16 @@ ns_main_earlywarning(const char *format, ...) { } void -ns_main_earlyfatal(const char *format, ...) { +named_main_earlyfatal(const char *format, ...) { va_list args; va_start(args, format); - if (ns_g_lctx != NULL) { - isc_log_vwrite(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_MAIN, ISC_LOG_CRITICAL, + if (named_g_lctx != NULL) { + isc_log_vwrite(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_MAIN, ISC_LOG_CRITICAL, format, args); - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_MAIN, ISC_LOG_CRITICAL, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_MAIN, ISC_LOG_CRITICAL, "exiting (due to early fatal error)"); } else { fprintf(stderr, "%s: ", program_name); @@ -175,7 +193,7 @@ assertion_failed(const char *file, int line, isc_assertiontype_t type, * Handle assertion failures. */ - if (ns_g_lctx != NULL) { + if (named_g_lctx != NULL) { /* * Reset the assertion callback in case it is the log * routines causing the assertion. @@ -186,8 +204,8 @@ assertion_failed(const char *file, int line, isc_assertiontype_t type, &nframes); if (result == ISC_R_SUCCESS && nframes > 0) logsuffix = ", back trace"; - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_MAIN, ISC_LOG_CRITICAL, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_MAIN, ISC_LOG_CRITICAL, "%s:%d: %s(%s) failed%s", file, line, isc_assertion_typetotext(type), cond, logsuffix); if (result == ISC_R_SUCCESS) { @@ -199,25 +217,25 @@ assertion_failed(const char *file, int line, isc_assertiontype_t type, &fname, &offset); if (result == ISC_R_SUCCESS) { - isc_log_write(ns_g_lctx, - NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_MAIN, + isc_log_write(named_g_lctx, + NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_MAIN, ISC_LOG_CRITICAL, "#%d %p in %s()+0x%lx", i, tracebuf[i], fname, offset); } else { - isc_log_write(ns_g_lctx, - NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_MAIN, + isc_log_write(named_g_lctx, + NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_MAIN, ISC_LOG_CRITICAL, "#%d %p in ??", i, tracebuf[i]); } } } - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_MAIN, ISC_LOG_CRITICAL, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_MAIN, ISC_LOG_CRITICAL, "exiting (due to assertion failure)"); } else { fprintf(stderr, "%s:%d: %s(%s) failed\n", @@ -225,7 +243,7 @@ assertion_failed(const char *file, int line, isc_assertiontype_t type, fflush(stderr); } - if (ns_g_coreok) + if (named_g_coreok) abort(); exit(1); } @@ -243,21 +261,21 @@ library_fatal_error(const char *file, int line, const char *format, * Handle isc_error_fatal() calls from our libraries. */ - if (ns_g_lctx != NULL) { + if (named_g_lctx != NULL) { /* * Reset the error callback in case it is the log * routines causing the assertion. */ isc_error_setfatal(NULL); - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_MAIN, ISC_LOG_CRITICAL, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_MAIN, ISC_LOG_CRITICAL, "%s:%d: fatal error:", file, line); - isc_log_vwrite(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_MAIN, ISC_LOG_CRITICAL, + isc_log_vwrite(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_MAIN, ISC_LOG_CRITICAL, format, args); - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_MAIN, ISC_LOG_CRITICAL, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_MAIN, ISC_LOG_CRITICAL, "exiting (due to fatal error in library)"); } else { fprintf(stderr, "%s:%d: fatal error: ", file, line); @@ -266,7 +284,7 @@ library_fatal_error(const char *file, int line, const char *format, fflush(stderr); } - if (ns_g_coreok) + if (named_g_coreok) abort(); exit(1); } @@ -283,12 +301,12 @@ library_unexpected_error(const char *file, int line, const char *format, * Handle isc_error_unexpected() calls from our libraries. */ - if (ns_g_lctx != NULL) { - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_MAIN, ISC_LOG_ERROR, + if (named_g_lctx != NULL) { + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_MAIN, ISC_LOG_ERROR, "%s:%d: unexpected error:", file, line); - isc_log_vwrite(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_MAIN, ISC_LOG_ERROR, + isc_log_vwrite(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_MAIN, ISC_LOG_ERROR, format, args); } else { fprintf(stderr, "%s:%d: fatal error: ", file, line); @@ -298,25 +316,8 @@ library_unexpected_error(const char *file, int line, const char *format, } } -static void -lwresd_usage(void) { - fprintf(stderr, - "usage: lwresd [-4|-6] [-c conffile | -C resolvconffile] " - "[-d debuglevel] [-f|-g]\n" - " [-i pidfile] [-n number_of_cpus] " - "[-p port] [-P listen-port]\n" - " [-s] [-S sockets] [-t chrootdir] [-u username] " - "[-U listeners]\n" - " [-m {usage|trace|record|size|mctx}]\n" - "usage: lwresd [-v|-V]\n"); -} - static void usage(void) { - if (ns_g_lwresdonly) { - lwresd_usage(); - return; - } fprintf(stderr, "usage: named [-4|-6] [-c conffile] [-d debuglevel] " "[-E engine] [-f|-g]\n" @@ -379,9 +380,9 @@ parse_int(char *arg, const char *desc) { ltmp = strtol(arg, &endp, 10); tmp = (int) ltmp; if (*endp != '\0') - ns_main_earlyfatal("%s '%s' must be numeric", desc, arg); + named_main_earlyfatal("%s '%s' must be numeric", desc, arg); if (tmp < 0 || tmp != ltmp) - ns_main_earlyfatal("%s '%s' out of range", desc, arg); + named_main_earlyfatal("%s '%s' out of range", desc, arg); return (tmp); } @@ -418,7 +419,7 @@ set_flags(const char *arg, struct flag_def *defs, unsigned int *ret) { goto found; } } - ns_main_earlyfatal("unrecognized flag '%.*s'", arglen, arg); + named_main_earlyfatal("unrecognized flag '%.*s'", arglen, arg); found: if (clear || (*end == '\0')) break; @@ -432,22 +433,22 @@ set_flags(const char *arg, struct flag_def *defs, unsigned int *ret) { static void parse_fuzz_arg(void) { if (!strncmp(isc_commandline_argument, "client:", 7)) { - ns_g_fuzz_named_addr = isc_commandline_argument + 7; - ns_g_fuzz_type = ns_fuzz_client; + named_g_fuzz_addr = isc_commandline_argument + 7; + named_g_fuzz_type = isc_fuzz_client; } else if (!strncmp(isc_commandline_argument, "tcp:", 4)) { - ns_g_fuzz_named_addr = isc_commandline_argument + 4; - ns_g_fuzz_type = ns_fuzz_tcpclient; + named_g_fuzz_addr = isc_commandline_argument + 4; + named_g_fuzz_type = isc_fuzz_tcpclient; } else if (!strncmp(isc_commandline_argument, "resolver:", 9)) { - ns_g_fuzz_named_addr = isc_commandline_argument + 9; - ns_g_fuzz_type = ns_fuzz_resolver; + named_g_fuzz_addr = isc_commandline_argument + 9; + named_g_fuzz_type = isc_fuzz_resolver; } else if (!strncmp(isc_commandline_argument, "http:", 5)) { - ns_g_fuzz_named_addr = isc_commandline_argument + 5; - ns_g_fuzz_type = ns_fuzz_http; + named_g_fuzz_addr = isc_commandline_argument + 5; + named_g_fuzz_type = isc_fuzz_http; } else if (!strncmp(isc_commandline_argument, "rndc:", 5)) { - ns_g_fuzz_named_addr = isc_commandline_argument + 5; - ns_g_fuzz_type = ns_fuzz_rndc; + named_g_fuzz_addr = isc_commandline_argument + 5; + named_g_fuzz_type = isc_fuzz_rndc; } else { - ns_main_earlyfatal("unknown fuzzing type '%s'", + named_main_earlyfatal("unknown fuzzing type '%s'", isc_commandline_argument); } } @@ -461,70 +462,60 @@ parse_command_line(int argc, char *argv[]) { save_command_line(argc, argv); /* - * NS_MAIN_ARGS is defined in main.h, so that it can be used + * NAMED_MAIN_ARGS is defined in main.h, so that it can be used * both by named and by ntservice hooks. */ isc_commandline_errprint = ISC_FALSE; - while ((ch = isc_commandline_parse(argc, argv, NS_MAIN_ARGS)) != -1) { + while ((ch = isc_commandline_parse(argc, argv, + NAMED_MAIN_ARGS)) != -1) + { switch (ch) { case '4': - if (ns_g_disable4) - ns_main_earlyfatal("cannot specify -4 and -6"); + if (disable4) + named_main_earlyfatal("cannot specify " + "-4 and -6"); if (isc_net_probeipv4() != ISC_R_SUCCESS) - ns_main_earlyfatal("IPv4 not supported by OS"); + named_main_earlyfatal("IPv4 not supported " + "by OS"); isc_net_disableipv6(); - ns_g_disable6 = ISC_TRUE; + disable6 = ISC_TRUE; break; case '6': - if (ns_g_disable6) - ns_main_earlyfatal("cannot specify -4 and -6"); + if (disable6) + named_main_earlyfatal("cannot specify " + "-4 and -6"); if (isc_net_probeipv6() != ISC_R_SUCCESS) - ns_main_earlyfatal("IPv6 not supported by OS"); + named_main_earlyfatal("IPv6 not supported " + "by OS"); isc_net_disableipv4(); - ns_g_disable4 = ISC_TRUE; + disable4 = ISC_TRUE; break; case 'A': parse_fuzz_arg(); break; case 'c': - ns_g_conffile = isc_commandline_argument; - lwresd_g_conffile = isc_commandline_argument; - if (lwresd_g_useresolvconf) - ns_main_earlyfatal("cannot specify -c and -C"); - ns_g_conffileset = ISC_TRUE; - break; - case 'C': - lwresd_g_resolvconffile = isc_commandline_argument; - if (ns_g_conffileset) - ns_main_earlyfatal("cannot specify -c and -C"); - lwresd_g_useresolvconf = ISC_TRUE; + named_g_conffile = isc_commandline_argument; + named_g_conffileset = ISC_TRUE; break; case 'd': - ns_g_debuglevel = parse_int(isc_commandline_argument, - "debug level"); + named_g_debuglevel = parse_int(isc_commandline_argument, + "debug level"); break; case 'D': /* Descriptive comment for 'ps'. */ break; case 'E': - ns_g_engine = isc_commandline_argument; + named_g_engine = isc_commandline_argument; break; case 'f': - ns_g_foreground = ISC_TRUE; + named_g_foreground = ISC_TRUE; break; case 'g': - ns_g_foreground = ISC_TRUE; - ns_g_logstderr = ISC_TRUE; - break; - /* XXXBEW -i should be removed */ - case 'i': - lwresd_g_defaultpidfile = isc_commandline_argument; - break; - case 'l': - ns_g_lwresdonly = ISC_TRUE; + named_g_foreground = ISC_TRUE; + named_g_logstderr = ISC_TRUE; break; case 'L': - ns_g_logfile = isc_commandline_argument; + named_g_logfile = isc_commandline_argument; break; case 'M': if (strcmp(isc_commandline_argument, "external") == 0) @@ -536,25 +527,17 @@ parse_command_line(int argc, char *argv[]) { break; case 'N': /* Deprecated. */ case 'n': - ns_g_cpus = parse_int(isc_commandline_argument, + named_g_cpus = parse_int(isc_commandline_argument, "number of cpus"); - if (ns_g_cpus == 0) - ns_g_cpus = 1; + if (named_g_cpus == 0) + named_g_cpus = 1; break; case 'p': port = parse_int(isc_commandline_argument, "port"); if (port < 1 || port > 65535) - ns_main_earlyfatal("port '%s' out of range", + named_main_earlyfatal("port '%s' out of range", isc_commandline_argument); - ns_g_port = port; - break; - /* XXXBEW Should -P be removed? */ - case 'P': - port = parse_int(isc_commandline_argument, "port"); - if (port < 1 || port > 65535) - ns_main_earlyfatal("port '%s' out of range", - isc_commandline_argument); - lwresd_g_listenport = port; + named_g_port = port; break; case 's': /* XXXRTH temporary syntax */ @@ -566,7 +549,7 @@ parse_command_line(int argc, char *argv[]) { break; case 't': /* XXXJAB should we make a copy? */ - ns_g_chrootdir = isc_commandline_argument; + named_g_chrootdir = isc_commandline_argument; break; case 'T': /* NOT DOCUMENTED */ /* @@ -581,29 +564,31 @@ parse_command_line(int argc, char *argv[]) { * expected and assert otherwise. */ if (!strcmp(isc_commandline_argument, "clienttest")) - ns_g_clienttest = ISC_TRUE; + clienttest = ISC_TRUE; else if (!strcmp(isc_commandline_argument, "nosoa")) - ns_g_nosoa = ISC_TRUE; + nosoa = ISC_TRUE; else if (!strcmp(isc_commandline_argument, "noaa")) - ns_g_noaa = ISC_TRUE; - else if (!strcmp(isc_commandline_argument, "maxudp512")) + noaa = ISC_TRUE; + else if (!strcmp(isc_commandline_argument, + "maxudp512")) maxudp = 512; - else if (!strcmp(isc_commandline_argument, "maxudp1460")) + else if (!strcmp(isc_commandline_argument, + "maxudp1460")) maxudp = 1460; else if (!strcmp(isc_commandline_argument, "dropedns")) - ns_g_dropedns = ISC_TRUE; + dropedns = ISC_TRUE; else if (!strcmp(isc_commandline_argument, "noedns")) - ns_g_noedns = ISC_TRUE; + noedns = ISC_TRUE; else if (!strncmp(isc_commandline_argument, "maxudp=", 7)) maxudp = atoi(isc_commandline_argument + 7); else if (!strncmp(isc_commandline_argument, "delay=", 6)) - ns_g_delay = atoi(isc_commandline_argument + 6); + delay = atoi(isc_commandline_argument + 6); else if (!strcmp(isc_commandline_argument, "nosyslog")) - ns_g_nosyslog = ISC_TRUE; + named_g_nosyslog = ISC_TRUE; else if (!strcmp(isc_commandline_argument, "nonearest")) - ns_g_nonearest = ISC_TRUE; + nonearest = ISC_TRUE; else if (!strncmp(isc_commandline_argument, "dscp=", 5)) isc_dscp_check_value = atoi(isc_commandline_argument + 5); @@ -612,10 +597,10 @@ parse_command_line(int argc, char *argv[]) { { p = strtok(isc_commandline_argument + 11, "/"); if (p == NULL) - ns_main_earlyfatal("bad mkeytimer"); + named_main_earlyfatal("bad mkeytimer"); dns_zone_mkey_hour = atoi(p); if (dns_zone_mkey_hour == 0) - ns_main_earlyfatal("bad mkeytimer"); + named_main_earlyfatal("bad mkeytimer"); p = strtok(NULL, "/"); if (p == NULL) { @@ -627,7 +612,7 @@ parse_command_line(int argc, char *argv[]) { } dns_zone_mkey_day = atoi(p); if (dns_zone_mkey_day < dns_zone_mkey_hour) - ns_main_earlyfatal("bad mkeytimer"); + named_main_earlyfatal("bad mkeytimer"); p = strtok(NULL, "/"); if (p == NULL) { @@ -637,40 +622,41 @@ parse_command_line(int argc, char *argv[]) { } dns_zone_mkey_month = atoi(p); if (dns_zone_mkey_month < dns_zone_mkey_day) - ns_main_earlyfatal("bad mkeytimer"); + named_main_earlyfatal("bad mkeytimer"); } else if (!strcmp(isc_commandline_argument, "notcp")) - ns_g_notcp = ISC_TRUE; + notcp = ISC_TRUE; else if (!strncmp(isc_commandline_argument, "tat=", 4)) - ns_g_tat_interval = + named_g_tat_interval = atoi(isc_commandline_argument + 4); else if (!strcmp(isc_commandline_argument, "keepstderr")) - ns_g_keepstderr = ISC_TRUE; + named_g_keepstderr = ISC_TRUE; else fprintf(stderr, "unknown -T flag '%s\n", isc_commandline_argument); break; case 'U': - ns_g_udpdisp = parse_int(isc_commandline_argument, - "number of UDP listeners " - "per interface"); + named_g_udpdisp = parse_int(isc_commandline_argument, + "number of UDP listeners " + "per interface"); break; case 'u': - ns_g_username = isc_commandline_argument; + named_g_username = isc_commandline_argument; break; case 'v': printf("%s %s%s%s \n", - ns_g_product, ns_g_version, - (*ns_g_description != '\0') ? " " : "", - ns_g_description, ns_g_srcid); + named_g_product, named_g_version, + (*named_g_description != '\0') ? " " : "", + named_g_description, named_g_srcid); exit(0); case 'V': - printf("%s %s%s%s \n", ns_g_product, ns_g_version, - (*ns_g_description != '\0') ? " " : "", - ns_g_description, ns_g_srcid); - printf("running on %s\n", ns_os_uname()); + printf("%s %s%s%s \n", + named_g_product, named_g_version, + (*named_g_description != '\0') ? " " : "", + named_g_description, named_g_srcid); + printf("running on %s\n", named_os_uname()); printf("built by %s with %s\n", - ns_g_builder, ns_g_configargs); + named_g_builder, named_g_configargs); #ifdef __clang__ printf("compiled by CLANG %s\n", __VERSION__); #else @@ -729,11 +715,12 @@ parse_command_line(int argc, char *argv[]) { /* Obsolete. No longer in use. Ignore. */ break; case 'X': - ns_g_forcelock = ISC_TRUE; + named_g_forcelock = ISC_TRUE; if (strcasecmp(isc_commandline_argument, "none") != 0) - ns_g_defaultlockfile = isc_commandline_argument; + named_g_defaultlockfile = + isc_commandline_argument; else - ns_g_defaultlockfile = NULL; + named_g_defaultlockfile = NULL; break; case 'F': /* Reserved for FIPS mode */ @@ -742,17 +729,18 @@ parse_command_line(int argc, char *argv[]) { usage(); if (isc_commandline_option == '?') exit(0); - p = strchr(NS_MAIN_ARGS, isc_commandline_option); + p = strchr(NAMED_MAIN_ARGS, isc_commandline_option); if (p == NULL || *++p != ':') - ns_main_earlyfatal("unknown option '-%c'", + named_main_earlyfatal("unknown option '-%c'", isc_commandline_option); else - ns_main_earlyfatal("option '-%c' requires " + named_main_earlyfatal("option '-%c' requires " "an argument", isc_commandline_option); /* FALLTHROUGH */ default: - ns_main_earlyfatal("parsing options returned %d", ch); + named_main_earlyfatal("parsing options returned %d", + ch); } } @@ -762,7 +750,7 @@ parse_command_line(int argc, char *argv[]) { if (argc > 0) { usage(); - ns_main_earlyfatal("extra command line arguments"); + named_main_earlyfatal("extra command line arguments"); } } @@ -771,37 +759,41 @@ create_managers(void) { isc_result_t result; unsigned int socks; - INSIST(ns_g_cpus_detected > 0); + INSIST(named_g_cpus_detected > 0); #ifdef ISC_PLATFORM_USETHREADS - if (ns_g_cpus == 0) - ns_g_cpus = ns_g_cpus_detected; - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_SERVER, - ISC_LOG_INFO, "found %u CPU%s, using %u worker thread%s", - ns_g_cpus_detected, ns_g_cpus_detected == 1 ? "" : "s", - ns_g_cpus, ns_g_cpus == 1 ? "" : "s"); + if (named_g_cpus == 0) + named_g_cpus = named_g_cpus_detected; + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_INFO, + "found %u CPU%s, using %u worker thread%s", + named_g_cpus_detected, + named_g_cpus_detected == 1 ? "" : "s", + named_g_cpus, named_g_cpus == 1 ? "" : "s"); #else - ns_g_cpus = 1; + named_g_cpus = 1; #endif #ifdef WIN32 - ns_g_udpdisp = 1; + named_g_udpdisp = 1; #else - if (ns_g_udpdisp == 0) { - if (ns_g_cpus_detected == 1) - ns_g_udpdisp = 1; + if (named_g_udpdisp == 0) { + if (named_g_cpus_detected == 1) + named_g_udpdisp = 1; else - ns_g_udpdisp = ns_g_cpus_detected - 1; + named_g_udpdisp = named_g_cpus_detected - 1; } - if (ns_g_udpdisp > ns_g_cpus) - ns_g_udpdisp = ns_g_cpus; + if (named_g_udpdisp > named_g_cpus) + named_g_udpdisp = named_g_cpus; #endif #ifdef ISC_PLATFORM_USETHREADS - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_SERVER, - ISC_LOG_INFO, "using %u UDP listener%s per interface", - ns_g_udpdisp, ns_g_udpdisp == 1 ? "" : "s"); + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_INFO, + "using %u UDP listener%s per interface", + named_g_udpdisp, named_g_udpdisp == 1 ? "" : "s"); #endif - result = isc_taskmgr_create(ns_g_mctx, ns_g_cpus, 0, &ns_g_taskmgr); + result = isc_taskmgr_create(named_g_mctx, named_g_cpus, 0, + &named_g_taskmgr); if (result != ISC_R_SUCCESS) { UNEXPECTED_ERROR(__FILE__, __LINE__, "isc_taskmgr_create() failed: %s", @@ -809,7 +801,7 @@ create_managers(void) { return (ISC_R_UNEXPECTED); } - result = isc_timermgr_create(ns_g_mctx, &ns_g_timermgr); + result = isc_timermgr_create(named_g_mctx, &named_g_timermgr); if (result != ISC_R_SUCCESS) { UNEXPECTED_ERROR(__FILE__, __LINE__, "isc_timermgr_create() failed: %s", @@ -817,22 +809,23 @@ create_managers(void) { return (ISC_R_UNEXPECTED); } - result = isc_socketmgr_create2(ns_g_mctx, &ns_g_socketmgr, maxsocks); + result = isc_socketmgr_create2(named_g_mctx, &named_g_socketmgr, + maxsocks); if (result != ISC_R_SUCCESS) { UNEXPECTED_ERROR(__FILE__, __LINE__, "isc_socketmgr_create() failed: %s", isc_result_totext(result)); return (ISC_R_UNEXPECTED); } - isc__socketmgr_maxudp(ns_g_socketmgr, maxudp); - result = isc_socketmgr_getmaxsockets(ns_g_socketmgr, &socks); + isc__socketmgr_maxudp(named_g_socketmgr, maxudp); + result = isc_socketmgr_getmaxsockets(named_g_socketmgr, &socks); if (result == ISC_R_SUCCESS) { - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_INFO, "using up to %u sockets", socks); } - result = isc_entropy_create(ns_g_mctx, &ns_g_entropy); + result = isc_entropy_create(named_g_mctx, &named_g_entropy); if (result != ISC_R_SUCCESS) { UNEXPECTED_ERROR(__FILE__, __LINE__, "isc_entropy_create() failed: %s", @@ -840,7 +833,8 @@ create_managers(void) { return (ISC_R_UNEXPECTED); } - result = isc_hash_create(ns_g_mctx, ns_g_entropy, DNS_NAME_MAXWIRE); + result = isc_hash_create(named_g_mctx, named_g_entropy, + DNS_NAME_MAXWIRE); if (result != ISC_R_SUCCESS) { UNEXPECTED_ERROR(__FILE__, __LINE__, "isc_hash_create() failed: %s", @@ -853,14 +847,12 @@ create_managers(void) { static void destroy_managers(void) { - ns_lwresd_shutdown(); - /* * isc_taskmgr_destroy() will block until all tasks have exited, */ - isc_taskmgr_destroy(&ns_g_taskmgr); - isc_timermgr_destroy(&ns_g_timermgr); - isc_socketmgr_destroy(&ns_g_socketmgr); + isc_taskmgr_destroy(&named_g_taskmgr); + isc_timermgr_destroy(&named_g_timermgr); + isc_socketmgr_destroy(&named_g_socketmgr); /* * isc_hash_destroy() cannot be called as long as a resolver may be @@ -880,19 +872,20 @@ dump_symboltable(void) { if (isc__backtrace_nsymbols == 0) return; - if (!isc_log_wouldlog(ns_g_lctx, ISC_LOG_DEBUG(99))) + if (!isc_log_wouldlog(named_g_lctx, ISC_LOG_DEBUG(99))) return; - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN, - ISC_LOG_DEBUG(99), "Symbol table:"); + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_MAIN, ISC_LOG_DEBUG(99), + "Symbol table:"); for (i = 0, result = ISC_R_SUCCESS; result == ISC_R_SUCCESS; i++) { addr = NULL; fname = NULL; result = isc_backtrace_getsymbolfromindex(i, &addr, &fname); if (result == ISC_R_SUCCESS) { - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_MAIN, ISC_LOG_DEBUG(99), + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_MAIN, ISC_LOG_DEBUG(99), "[%d] %p %s", i, addr, fname); } } @@ -911,8 +904,8 @@ setup_seccomp() { ctx = seccomp_init(SCMP_ACT_KILL); if (ctx == NULL) { - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_MAIN, ISC_LOG_WARNING, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_MAIN, ISC_LOG_WARNING, "libseccomp activation failed"); return; } @@ -921,26 +914,26 @@ setup_seccomp() { ret = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, scmp_syscalls[i], 0); if (ret < 0) - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_MAIN, ISC_LOG_WARNING, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_MAIN, ISC_LOG_WARNING, "libseccomp rule failed: %s", scmp_syscall_names[i]); else - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_MAIN, ISC_LOG_DEBUG(9), + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_MAIN, ISC_LOG_DEBUG(9), "added libseccomp rule: %s", scmp_syscall_names[i]); } ret = seccomp_load(ctx); if (ret < 0) { - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_MAIN, ISC_LOG_WARNING, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_MAIN, ISC_LOG_WARNING, "libseccomp unable to load filter"); } else { - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_MAIN, ISC_LOG_NOTICE, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE, "libseccomp sandboxing active"); } @@ -956,6 +949,7 @@ static void setup(void) { isc_result_t result; isc_resourcevalue_t old_openfiles; + ns_server_t *sctx; #ifdef HAVE_LIBSCF char *instance = NULL; #endif @@ -965,25 +959,25 @@ setup(void) { * directory, so the administrator does not need to keep a copy * of the user and group databases in the chroot'ed environment. */ - ns_os_inituserinfo(ns_g_username); + named_os_inituserinfo(named_g_username); /* * Initialize time conversion information */ - ns_os_tzset(); + named_os_tzset(); - ns_os_opendevnull(); + named_os_opendevnull(); #ifdef HAVE_LIBSCF /* Check if named is under smf control, before chroot. */ - result = ns_smf_get_instance(&instance, 0, ns_g_mctx); + result = named_smf_get_instance(&instance, 0, named_g_mctx); /* We don't care about instance, just check if we got one. */ if (result == ISC_R_SUCCESS) - ns_smf_got_instance = 1; + named_smf_got_instance = 1; else - ns_smf_got_instance = 0; + named_smf_got_instance = 0; if (instance != NULL) - isc_mem_free(ns_g_mctx, instance); + isc_mem_free(named_g_mctx, instance); #endif /* HAVE_LIBSCF */ #ifdef PATH_RANDOMDEV @@ -991,32 +985,33 @@ setup(void) { * Initialize system's random device as fallback entropy source * if running chroot'ed. */ - if (ns_g_chrootdir != NULL) { - result = isc_entropy_create(ns_g_mctx, &ns_g_fallbackentropy); + if (named_g_chrootdir != NULL) { + result = isc_entropy_create(named_g_mctx, + &named_g_fallbackentropy); if (result != ISC_R_SUCCESS) - ns_main_earlyfatal("isc_entropy_create() failed: %s", + named_main_earlyfatal("isc_entropy_create() failed: %s", isc_result_totext(result)); - result = isc_entropy_createfilesource(ns_g_fallbackentropy, + result = isc_entropy_createfilesource(named_g_fallbackentropy, PATH_RANDOMDEV); if (result != ISC_R_SUCCESS) { - ns_main_earlywarning("could not open pre-chroot " + named_main_earlywarning("could not open pre-chroot " "entropy source %s: %s", PATH_RANDOMDEV, isc_result_totext(result)); - isc_entropy_detach(&ns_g_fallbackentropy); + isc_entropy_detach(&named_g_fallbackentropy); } } #endif #ifdef ISC_PLATFORM_USETHREADS /* - * Check for the number of cpu's before ns_os_chroot(). + * Check for the number of cpu's before named_os_chroot(). */ - ns_g_cpus_detected = isc_os_ncpus(); + named_g_cpus_detected = isc_os_ncpus(); #endif - ns_os_chroot(ns_g_chrootdir); + named_os_chroot(named_g_chrootdir); /* * For operating systems which have a capability mechanism, now @@ -1026,11 +1021,11 @@ setup(void) { * time. (We need to read the config file to know which possibly * privileged ports to bind() to.) */ - ns_os_minprivs(); + named_os_minprivs(); - result = ns_log_init(ISC_TF(ns_g_username != NULL)); + result = named_log_init(ISC_TF(named_g_username != NULL)); if (result != ISC_R_SUCCESS) - ns_main_earlyfatal("ns_log_init() failed: %s", + named_main_earlyfatal("named_log_init() failed: %s", isc_result_totext(result)); /* @@ -1040,8 +1035,8 @@ setup(void) { * because calling create_managers() will create threads, which * would be lost after fork(). */ - if (!ns_g_foreground) - ns_os_daemonize(); + if (!named_g_foreground) + named_os_daemonize(); /* * We call isc_app_start() here as some versions of FreeBSD's fork() @@ -1049,42 +1044,46 @@ setup(void) { */ result = isc_app_start(); if (result != ISC_R_SUCCESS) - ns_main_earlyfatal("isc_app_start() failed: %s", + named_main_earlyfatal("isc_app_start() failed: %s", isc_result_totext(result)); - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN, - ISC_LOG_NOTICE, "starting %s %s%s%s ", - ns_g_product, ns_g_version, - *ns_g_description ? " " : "", ns_g_description, - ns_g_srcid); + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE, + "starting %s %s%s%s ", + named_g_product, named_g_version, + *named_g_description ? " " : "", named_g_description, + named_g_srcid); - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN, - ISC_LOG_NOTICE, "running on %s", ns_os_uname()); + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE, + "running on %s", named_os_uname()); - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN, - ISC_LOG_NOTICE, "built with %s", ns_g_configargs); + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE, + "built with %s", named_g_configargs); - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN, - ISC_LOG_NOTICE, "running as: %s%s", + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE, + "running as: %s%s", program_name, saved_command_line); - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN, - ISC_LOG_NOTICE, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE, "----------------------------------------------------"); - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN, - ISC_LOG_NOTICE, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE, "BIND 9 is maintained by Internet Systems Consortium,"); - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN, - ISC_LOG_NOTICE, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE, "Inc. (ISC), a non-profit 501(c)(3) public-benefit "); - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN, - ISC_LOG_NOTICE, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE, "corporation. Support and training for BIND 9 are "); - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN, - ISC_LOG_NOTICE, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE, "available at https://www.isc.org/support"); - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN, - ISC_LOG_NOTICE, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE, "----------------------------------------------------"); dump_symboltable(); @@ -1093,60 +1092,61 @@ setup(void) { * Get the initial resource limits. */ (void)isc_resource_getlimit(isc_resource_stacksize, - &ns_g_initstacksize); + &named_g_initstacksize); (void)isc_resource_getlimit(isc_resource_datasize, - &ns_g_initdatasize); + &named_g_initdatasize); (void)isc_resource_getlimit(isc_resource_coresize, - &ns_g_initcoresize); + &named_g_initcoresize); (void)isc_resource_getlimit(isc_resource_openfiles, - &ns_g_initopenfiles); + &named_g_initopenfiles); /* * System resources cannot effectively be tuned on some systems. * Raise the limit in such cases for safety. */ - old_openfiles = ns_g_initopenfiles; - ns_os_adjustnofile(); + old_openfiles = named_g_initopenfiles; + named_os_adjustnofile(); (void)isc_resource_getlimit(isc_resource_openfiles, - &ns_g_initopenfiles); - if (old_openfiles != ns_g_initopenfiles) { - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_MAIN, ISC_LOG_NOTICE, + &named_g_initopenfiles); + if (old_openfiles != named_g_initopenfiles) { + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE, "adjusted limit on open files from " "%" ISC_PRINT_QUADFORMAT "u to " "%" ISC_PRINT_QUADFORMAT "u", - old_openfiles, ns_g_initopenfiles); + old_openfiles, named_g_initopenfiles); } /* * If the named configuration filename is relative, prepend the current * directory's name before possibly changing to another directory. */ - if (! isc_file_isabsolute(ns_g_conffile)) { - result = isc_file_absolutepath(ns_g_conffile, + if (! isc_file_isabsolute(named_g_conffile)) { + result = isc_file_absolutepath(named_g_conffile, absolute_conffile, sizeof(absolute_conffile)); if (result != ISC_R_SUCCESS) - ns_main_earlyfatal("could not construct absolute path " - "of configuration file: %s", - isc_result_totext(result)); - ns_g_conffile = absolute_conffile; + named_main_earlyfatal("could not construct " + "absolute path " + "of configuration file: %s", + isc_result_totext(result)); + named_g_conffile = absolute_conffile; } /* * Record the server's startup time. */ - result = isc_time_now(&ns_g_boottime); + result = isc_time_now(&named_g_boottime); if (result != ISC_R_SUCCESS) - ns_main_earlyfatal("isc_time_now() failed: %s", + named_main_earlyfatal("isc_time_now() failed: %s", isc_result_totext(result)); result = create_managers(); if (result != ISC_R_SUCCESS) - ns_main_earlyfatal("create_managers() failed: %s", + named_main_earlyfatal("create_managers() failed: %s", isc_result_totext(result)); - ns_builtin_init(); + named_builtin_init(); /* * Add calls to register sdb drivers here. @@ -1157,9 +1157,9 @@ setup(void) { /* * Register the DLZ "dlopen" driver. */ - result = dlz_dlopen_init(ns_g_mctx); + result = dlz_dlopen_init(named_g_mctx); if (result != ISC_R_SUCCESS) - ns_main_earlyfatal("dlz_dlopen_init() failed: %s", + named_main_earlyfatal("dlz_dlopen_init() failed: %s", isc_result_totext(result)); #endif @@ -1169,11 +1169,36 @@ setup(void) { */ result = dlz_drivers_init(); if (result != ISC_R_SUCCESS) - ns_main_earlyfatal("dlz_drivers_init() failed: %s", + named_main_earlyfatal("dlz_drivers_init() failed: %s", isc_result_totext(result)); #endif - ns_server_create(ns_g_mctx, &ns_g_server); + named_server_create(named_g_mctx, &named_g_server); + sctx = named_g_server->sctx; + + /* + * Modify server context according to command line options + */ + if (clienttest) + ns_server_setoption(sctx, NS_SERVER_CLIENTTEST, ISC_TRUE); + if (dropedns) + ns_server_setoption(sctx, NS_SERVER_DROPEDNS, ISC_TRUE); + if (noedns) + ns_server_setoption(sctx, NS_SERVER_NOEDNS, ISC_TRUE); + if (nosoa) + ns_server_setoption(sctx, NS_SERVER_NOSOA, ISC_TRUE); + if (noaa) + ns_server_setoption(sctx, NS_SERVER_NOAA, ISC_TRUE); + if (nonearest) + ns_server_setoption(sctx, NS_SERVER_NONEAREST, ISC_TRUE); + if (notcp) + ns_server_setoption(sctx, NS_SERVER_NOTCP, ISC_TRUE); + if (disable4) + ns_server_setoption(sctx, NS_SERVER_DISABLE4, ISC_TRUE); + if (disable6) + ns_server_setoption(sctx, NS_SERVER_DISABLE6, ISC_TRUE); + + named_g_server->sctx->delay = delay; #ifdef HAVE_LIBSECCOMP setup_seccomp(); @@ -1184,16 +1209,16 @@ static void cleanup(void) { destroy_managers(); - if (ns_g_mapped != NULL) - dns_acl_detach(&ns_g_mapped); + if (named_g_mapped != NULL) + dns_acl_detach(&named_g_mapped); - ns_server_destroy(&ns_g_server); + isc_entropy_detach(&named_g_entropy); + if (named_g_fallbackentropy != NULL) + isc_entropy_detach(&named_g_fallbackentropy); - isc_entropy_detach(&ns_g_entropy); - if (ns_g_fallbackentropy != NULL) - isc_entropy_detach(&ns_g_fallbackentropy); + named_server_destroy(&named_g_server); - ns_builtin_deinit(); + named_builtin_deinit(); /* * Add calls to unregister sdb drivers here. @@ -1215,15 +1240,16 @@ cleanup(void) { dns_name_destroy(); - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE, "exiting"); - ns_log_shutdown(); + named_log_shutdown(); } static char *memstats = NULL; void -ns_main_setmemstats(const char *filename) { +named_main_setmemstats(const char *filename) { /* * Caller has to ensure locking. */ @@ -1244,7 +1270,7 @@ ns_main_setmemstats(const char *filename) { * Get FMRI for the named process. */ isc_result_t -ns_smf_get_instance(char **ins_name, int debug, isc_mem_t *mctx) { +named_smf_get_instance(char **ins_name, int debug, isc_mem_t *mctx) { scf_handle_t *h = NULL; int namelen; char *instance; @@ -1279,7 +1305,7 @@ ns_smf_get_instance(char **ins_name, int debug, isc_mem_t *mctx) { if ((instance = isc_mem_allocate(mctx, namelen + 1)) == NULL) { UNEXPECTED_ERROR(__FILE__, __LINE__, - "ns_smf_get_instance memory " + "named_smf_get_instance memory " "allocation failed: %s", isc_result_totext(ISC_R_NOMEMORY)); scf_handle_destroy(h); @@ -1328,19 +1354,16 @@ main(int argc, char *argv[]) { sizeof(version)); result = isc_file_progname(*argv, program_name, sizeof(program_name)); if (result != ISC_R_SUCCESS) - ns_main_earlyfatal("program name too long"); - - if (strcmp(program_name, "lwresd") == 0) - ns_g_lwresdonly = ISC_TRUE; + named_main_earlyfatal("program name too long"); if (result != ISC_R_SUCCESS) - ns_main_earlyfatal("failed to build internal symbol table"); + named_main_earlyfatal("failed to build internal symbol table"); isc_assertion_setcallback(assertion_failed); isc_error_setfatal(library_fatal_error); isc_error_setunexpected(library_unexpected_error); - ns_os_init(program_name); + named_os_init(program_name); dns_result_register(); dst_result_register(); @@ -1352,33 +1375,35 @@ main(int argc, char *argv[]) { parse_command_line(argc, argv); #ifdef ENABLE_AFL - if (ns_g_fuzz_type != ns_fuzz_none) { + if (named_g_fuzz_type != isc_fuzz_none) { named_fuzz_setup(); } - if (ns_g_fuzz_type == ns_fuzz_resolver) { + if (named_g_fuzz_type == isc_fuzz_resolver) { dns_resolver_setfuzzing(); - } else if (ns_g_fuzz_type == ns_fuzz_http) { + } else if (named_g_fuzz_type == isc_fuzz_http) { isc_httpd_setfinishhook(named_fuzz_notify); } #endif /* * Warn about common configuration error. */ - if (ns_g_chrootdir != NULL) { - int len = strlen(ns_g_chrootdir); - if (strncmp(ns_g_chrootdir, ns_g_conffile, len) == 0 && - (ns_g_conffile[len] == '/' || ns_g_conffile[len] == '\\')) - ns_main_earlywarning("config filename (-c %s) contains " - "chroot path (-t %s)", - ns_g_conffile, ns_g_chrootdir); + if (named_g_chrootdir != NULL) { + int len = strlen(named_g_chrootdir); + if (strncmp(named_g_chrootdir, named_g_conffile, len) == 0 && + (named_g_conffile[len] == '/' || + named_g_conffile[len] == '\\')) + named_main_earlywarning("config filename (-c %s) " + "contains chroot path (-t %s)", + named_g_conffile, + named_g_chrootdir); } - result = isc_mem_create(0, 0, &ns_g_mctx); + result = isc_mem_create(0, 0, &named_g_mctx); if (result != ISC_R_SUCCESS) - ns_main_earlyfatal("isc_mem_create() failed: %s", + named_main_earlyfatal("isc_mem_create() failed: %s", isc_result_totext(result)); - isc_mem_setname(ns_g_mctx, "main", NULL); + isc_mem_setname(named_g_mctx, "main", NULL); setup(); @@ -1390,7 +1415,7 @@ main(int argc, char *argv[]) { result = isc_app_run(); if (result == ISC_R_RELOAD) { - ns_server_reloadwanted(ns_g_server); + named_server_reloadwanted(named_g_server); } else if (result != ISC_R_SUCCESS) { UNEXPECTED_ERROR(__FILE__, __LINE__, "isc_app_run(): %s", @@ -1403,8 +1428,8 @@ main(int argc, char *argv[]) { } while (result != ISC_R_SUCCESS); #ifdef HAVE_LIBSCF - if (ns_smf_want_disable == 1) { - result = ns_smf_get_instance(&instance, 1, ns_g_mctx); + if (named_smf_want_disable == 1) { + result = named_smf_get_instance(&instance, 1, named_g_mctx); if (result == ISC_R_SUCCESS && instance != NULL) { if (smf_disable_instance(instance, 0) != 0) UNEXPECTED_ERROR(__FILE__, __LINE__, @@ -1414,36 +1439,36 @@ main(int argc, char *argv[]) { scf_strerror(scf_error())); } if (instance != NULL) - isc_mem_free(ns_g_mctx, instance); + isc_mem_free(named_g_mctx, instance); } #endif /* HAVE_LIBSCF */ cleanup(); if (want_stats) { - isc_mem_stats(ns_g_mctx, stdout); + isc_mem_stats(named_g_mctx, stdout); isc_mutex_stats(stdout); } - if (ns_g_memstatistics && memstats != NULL) { + if (named_g_memstatistics && memstats != NULL) { FILE *fp = NULL; result = isc_stdio_open(memstats, "w", &fp); if (result == ISC_R_SUCCESS) { - isc_mem_stats(ns_g_mctx, fp); + isc_mem_stats(named_g_mctx, fp); isc_mutex_stats(fp); (void) isc_stdio_close(fp); } } - isc_mem_destroy(&ns_g_mctx); + isc_mem_destroy(&named_g_mctx); isc_mem_checkdestroyed(stderr); - ns_main_setmemstats(NULL); + named_main_setmemstats(NULL); isc_app_finish(); - ns_os_closedevnull(); + named_os_closedevnull(); - ns_os_shutdown(); + named_os_shutdown(); #ifdef HAVE_GPERFTOOLS_PROFILER ProfilerStop(); diff --git a/bin/named/named.conf.docbook b/bin/named/named.conf.docbook index 0eb9725c9b..9ffae9fa3d 100644 --- a/bin/named/named.conf.docbook +++ b/bin/named/named.conf.docbook @@ -147,21 +147,6 @@ logging { - LWRES - - -lwres { - listen-on port integer dscp integer { ( ipv4_address - | ipv6_address ) port integer dscp integer ; ... }; - lwres-clients integer; - lwres-tasks integer; - ndots integer; - search { string; ... }; - view string class ; -}; - - - MANAGED-KEYS diff --git a/bin/named/named.docbook b/bin/named/named.docbook index dea5e9b248..ca5032c434 100644 --- a/bin/named/named.docbook +++ b/bin/named/named.docbook @@ -527,10 +527,6 @@ rndc 8 , - - lwresd - 8 - , named.conf 5 diff --git a/bin/named/server.c b/bin/named/server.c index 3c486bcdcc..bbd9ee726b 100644 --- a/bin/named/server.c +++ b/bin/named/server.c @@ -96,16 +96,17 @@ #include #include -#include +#include +#include +#include + #include #include #ifdef HAVE_GEOIP #include #endif /* HAVE_GEOIP */ -#include #include #include -#include #include #include #include @@ -114,7 +115,7 @@ #include #include #ifdef HAVE_LIBSCF -#include +#include #include #endif @@ -171,9 +172,9 @@ #define CHECKM(op, msg) \ do { result = (op); \ if (result != ISC_R_SUCCESS) { \ - isc_log_write(ns_g_lctx, \ - NS_LOGCATEGORY_GENERAL, \ - NS_LOGMODULE_SERVER, \ + isc_log_write(named_g_lctx, \ + NAMED_LOGCATEGORY_GENERAL, \ + NAMED_LOGMODULE_SERVER, \ ISC_LOG_ERROR, \ "%s: %s", msg, \ isc_result_totext(result)); \ @@ -184,9 +185,9 @@ #define CHECKMF(op, msg, file) \ do { result = (op); \ if (result != ISC_R_SUCCESS) { \ - isc_log_write(ns_g_lctx, \ - NS_LOGCATEGORY_GENERAL, \ - NS_LOGMODULE_SERVER, \ + isc_log_write(named_g_lctx, \ + NAMED_LOGCATEGORY_GENERAL, \ + NAMED_LOGMODULE_SERVER, \ ISC_LOG_ERROR, \ "%s '%s': %s", msg, file, \ isc_result_totext(result)); \ @@ -208,20 +209,20 @@ */ #define MAX_ADB_SIZE_FOR_CACHESHARE 8388608U -struct ns_dispatch { +struct named_dispatch { isc_sockaddr_t addr; unsigned int dispatchgen; dns_dispatch_t *dispatch; - ISC_LINK(struct ns_dispatch) link; + ISC_LINK(struct named_dispatch) link; }; -struct ns_cache { +struct named_cache { dns_cache_t *cache; dns_view_t *primaryview; isc_boolean_t needflush; isc_boolean_t adbsizeadjusted; dns_rdataclass_t rdclass; - ISC_LINK(ns_cache_t) link; + ISC_LINK(named_cache_t) link; }; struct dumpcontext { @@ -279,13 +280,13 @@ typedef isc_result_t (*nzfwriter_t)(const cfg_obj_t *config, dns_view_t *view); * with pending zone loads, dereferencing as each view finishes. */ typedef struct { - ns_server_t *server; + named_server_t *server; isc_boolean_t reconfig; isc_refcount_t refs; } ns_zoneload_t; typedef struct { - ns_server_t *server; + named_server_t *server; } catz_cb_data_t; typedef struct catz_chgzone_event { @@ -419,7 +420,7 @@ ISC_PLATFORM_NORETURN_PRE static void fatal(const char *msg, isc_result_t result) ISC_PLATFORM_NORETURN_POST; static void -ns_server_reload(isc_task_t *task, isc_event_t *event); +named_server_reload(isc_task_t *task, isc_event_t *event); static isc_result_t ns_listenelt_fromconfig(const cfg_obj_t *listener, const cfg_obj_t *config, @@ -454,7 +455,7 @@ static isc_result_t add_keydata_zone(dns_view_t *view, const char *directory, isc_mem_t *mctx); static void -end_reserved_dispatches(ns_server_t *server, isc_boolean_t all); +end_reserved_dispatches(named_server_t *server, isc_boolean_t all); static void newzone_cfgctx_destroy(void **cfgp); @@ -526,7 +527,7 @@ configure_view_acl(const cfg_obj_t *vconfig, const cfg_obj_t *config, } maps[i] = NULL; - (void)ns_config_get(maps, aclname, &aclobj); + (void)named_config_get(maps, aclname, &aclobj); if (aclobj == NULL) /* * No value available. *aclp == NULL. @@ -542,7 +543,7 @@ configure_view_acl(const cfg_obj_t *vconfig, const cfg_obj_t *config, aclobj = cfg_tuple_get(aclobj, acltuplename); } - result = cfg_acl_fromconfig(aclobj, config, ns_g_lctx, + result = cfg_acl_fromconfig(aclobj, config, named_g_lctx, actx, mctx, 0, aclp); return (result); @@ -575,7 +576,7 @@ configure_view_sortlist(const cfg_obj_t *vconfig, const cfg_obj_t *config, } maps[i] = NULL; - (void)ns_config_get(maps, "sortlist", &aclobj); + (void)named_config_get(maps, "sortlist", &aclobj); if (aclobj == NULL) return (ISC_R_SUCCESS); @@ -585,7 +586,7 @@ configure_view_sortlist(const cfg_obj_t *vconfig, const cfg_obj_t *config, * as lists of separate, nested ACLs, rather than merged together * into IP tables as is usually done with ACLs. */ - result = cfg_acl_fromconfig(aclobj, config, ns_g_lctx, + result = cfg_acl_fromconfig(aclobj, config, named_g_lctx, actx, mctx, 3, aclp); return (result); @@ -619,7 +620,7 @@ configure_view_nametable(const cfg_obj_t *vconfig, const cfg_obj_t *config, } maps[i] = NULL; - (void)ns_config_get(maps, confname, &obj); + (void)named_config_get(maps, confname, &obj); if (obj == NULL) /* * No value available. *rbtp == NULL. @@ -655,7 +656,7 @@ configure_view_nametable(const cfg_obj_t *vconfig, const cfg_obj_t *config, */ result = dns_rbt_addname(*rbtp, name, (void *)1); if (result != ISC_R_SUCCESS) { - cfg_obj_log(nameobj, ns_g_lctx, ISC_LOG_ERROR, + cfg_obj_log(nameobj, named_g_lctx, ISC_LOG_ERROR, "failed to add %s for %s: %s", str, confname, isc_result_totext(result)); goto cleanup; @@ -703,7 +704,7 @@ dstkey_fromconfig(const cfg_obj_t *vconfig, const cfg_obj_t *key, initmethod = cfg_obj_asstring(cfg_tuple_get(key, "init")); if (strcasecmp(initmethod, "initial-key") != 0) { - cfg_obj_log(key, ns_g_lctx, ISC_LOG_ERROR, + cfg_obj_log(key, named_g_lctx, ISC_LOG_ERROR, "managed key '%s': " "invalid initialization method '%s'", keynamestr, initmethod); @@ -716,7 +717,7 @@ dstkey_fromconfig(const cfg_obj_t *vconfig, const cfg_obj_t *key, viewclass = dns_rdataclass_in; else { const cfg_obj_t *classobj = cfg_tuple_get(vconfig, "class"); - CHECK(ns_config_getclass(classobj, dns_rdataclass_in, + CHECK(named_config_getclass(classobj, dns_rdataclass_in, &viewclass)); } keystruct.common.rdclass = viewclass; @@ -750,7 +751,7 @@ dstkey_fromconfig(const cfg_obj_t *vconfig, const cfg_obj_t *key, if ((keystruct.algorithm == DST_ALG_RSASHA1 || keystruct.algorithm == DST_ALG_RSAMD5) && r.length > 1 && r.base[0] == 1 && r.base[1] == 3) - cfg_obj_log(key, ns_g_lctx, ISC_LOG_WARNING, + cfg_obj_log(key, named_g_lctx, ISC_LOG_WARNING, "%s key '%s' has a weak exponent", managed ? "managed" : "trusted", keynamestr); @@ -771,17 +772,17 @@ dstkey_fromconfig(const cfg_obj_t *vconfig, const cfg_obj_t *key, cleanup: if (result == DST_R_NOCRYPTO) { - cfg_obj_log(key, ns_g_lctx, ISC_LOG_ERROR, + cfg_obj_log(key, named_g_lctx, ISC_LOG_ERROR, "ignoring %s key for '%s': no crypto support", managed ? "managed" : "trusted", keynamestr); } else if (result == DST_R_UNSUPPORTEDALG) { - cfg_obj_log(key, ns_g_lctx, ISC_LOG_WARNING, + cfg_obj_log(key, named_g_lctx, ISC_LOG_WARNING, "skipping %s key for '%s': %s", managed ? "managed" : "trusted", keynamestr, isc_result_totext(result)); } else { - cfg_obj_log(key, ns_g_lctx, ISC_LOG_ERROR, + cfg_obj_log(key, named_g_lctx, ISC_LOG_ERROR, "configuring %s key for '%s': %s", managed ? "managed" : "trusted", keynamestr, isc_result_totext(result)); @@ -922,21 +923,21 @@ configure_view_dnsseckeys(dns_view_t *view, const cfg_obj_t *vconfig, } } - maps[i++] = ns_g_defaults; + maps[i++] = named_g_defaults; maps[i] = NULL; result = dns_view_initsecroots(view, mctx); if (result != ISC_R_SUCCESS) { - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_ERROR, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "couldn't create keytable"); return (ISC_R_UNEXPECTED); } - result = dns_view_initntatable(view, ns_g_taskmgr, ns_g_timermgr); + result = dns_view_initntatable(view, named_g_taskmgr, named_g_timermgr); if (result != ISC_R_SUCCESS) { - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_ERROR, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "couldn't create NTA table"); return (ISC_R_UNEXPECTED); } @@ -947,14 +948,14 @@ configure_view_dnsseckeys(dns_view_t *view, const cfg_obj_t *vconfig, /* * If bind.keys exists and is populated, it overrides - * the managed-keys clause hard-coded in ns_g_config. + * the managed-keys clause hard-coded in named_g_config. */ if (bindkeys != NULL) { - isc_log_write(ns_g_lctx, DNS_LOGCATEGORY_SECURITY, - NS_LOGMODULE_SERVER, ISC_LOG_INFO, + isc_log_write(named_g_lctx, DNS_LOGCATEGORY_SECURITY, + NAMED_LOGMODULE_SERVER, ISC_LOG_INFO, "obtaining DLV key for view %s " "from '%s'", - view->name, ns_g_server->bindkeysfile); + view->name, named_g_server->bindkeysfile); (void)cfg_map_get(bindkeys, "trusted-keys", &builtin_keys); @@ -962,9 +963,9 @@ configure_view_dnsseckeys(dns_view_t *view, const cfg_obj_t *vconfig, &builtin_managed_keys); if ((builtin_keys == NULL) && (builtin_managed_keys == NULL)) - isc_log_write(ns_g_lctx, + isc_log_write(named_g_lctx, DNS_LOGCATEGORY_SECURITY, - NS_LOGMODULE_SERVER, + NAMED_LOGMODULE_SERVER, ISC_LOG_WARNING, "dnssec-lookaside auto: " "WARNING: key for dlv.isc.org " @@ -974,14 +975,14 @@ configure_view_dnsseckeys(dns_view_t *view, const cfg_obj_t *vconfig, if ((builtin_keys == NULL) && (builtin_managed_keys == NULL)) { - isc_log_write(ns_g_lctx, DNS_LOGCATEGORY_SECURITY, - NS_LOGMODULE_SERVER, ISC_LOG_INFO, + isc_log_write(named_g_lctx, DNS_LOGCATEGORY_SECURITY, + NAMED_LOGMODULE_SERVER, ISC_LOG_INFO, "using built-in DLV key for view %s", view->name); - (void)cfg_map_get(ns_g_config, "trusted-keys", + (void)cfg_map_get(named_g_config, "trusted-keys", &builtin_keys); - (void)cfg_map_get(ns_g_config, "managed-keys", + (void)cfg_map_get(named_g_config, "managed-keys", &builtin_managed_keys); } @@ -992,8 +993,8 @@ configure_view_dnsseckeys(dns_view_t *view, const cfg_obj_t *vconfig, CHECK(load_view_keys(builtin_managed_keys, vconfig, view, ISC_TRUE, view->dlv, mctx)); if (!keyloaded(view, view->dlv)) { - isc_log_write(ns_g_lctx, DNS_LOGCATEGORY_SECURITY, - NS_LOGMODULE_SERVER, ISC_LOG_ERROR, + isc_log_write(named_g_lctx, DNS_LOGCATEGORY_SECURITY, + NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "DLV key not loaded"); result = ISC_R_FAILURE; goto cleanup; @@ -1006,14 +1007,14 @@ configure_view_dnsseckeys(dns_view_t *view, const cfg_obj_t *vconfig, /* * If bind.keys exists and is populated, it overrides - * the managed-keys clause hard-coded in ns_g_config. + * the managed-keys clause hard-coded in named_g_config. */ if (bindkeys != NULL) { - isc_log_write(ns_g_lctx, DNS_LOGCATEGORY_SECURITY, - NS_LOGMODULE_SERVER, ISC_LOG_INFO, + isc_log_write(named_g_lctx, DNS_LOGCATEGORY_SECURITY, + NAMED_LOGMODULE_SERVER, ISC_LOG_INFO, "obtaining root key for view %s " "from '%s'", - view->name, ns_g_server->bindkeysfile); + view->name, named_g_server->bindkeysfile); (void)cfg_map_get(bindkeys, "trusted-keys", &builtin_keys); @@ -1022,9 +1023,9 @@ configure_view_dnsseckeys(dns_view_t *view, const cfg_obj_t *vconfig, if ((builtin_keys == NULL) && (builtin_managed_keys == NULL)) - isc_log_write(ns_g_lctx, + isc_log_write(named_g_lctx, DNS_LOGCATEGORY_SECURITY, - NS_LOGMODULE_SERVER, + NAMED_LOGMODULE_SERVER, ISC_LOG_WARNING, "dnssec-validation auto: " "WARNING: root zone key " @@ -1034,14 +1035,14 @@ configure_view_dnsseckeys(dns_view_t *view, const cfg_obj_t *vconfig, if ((builtin_keys == NULL) && (builtin_managed_keys == NULL)) { - isc_log_write(ns_g_lctx, DNS_LOGCATEGORY_SECURITY, - NS_LOGMODULE_SERVER, ISC_LOG_INFO, + isc_log_write(named_g_lctx, DNS_LOGCATEGORY_SECURITY, + NAMED_LOGMODULE_SERVER, ISC_LOG_INFO, "using built-in root key for view %s", view->name); - (void)cfg_map_get(ns_g_config, "trusted-keys", + (void)cfg_map_get(named_g_config, "trusted-keys", &builtin_keys); - (void)cfg_map_get(ns_g_config, "managed-keys", + (void)cfg_map_get(named_g_config, "managed-keys", &builtin_managed_keys); } @@ -1054,8 +1055,8 @@ configure_view_dnsseckeys(dns_view_t *view, const cfg_obj_t *vconfig, mctx)); if (!keyloaded(view, dns_rootname)) { - isc_log_write(ns_g_lctx, DNS_LOGCATEGORY_SECURITY, - NS_LOGMODULE_SERVER, ISC_LOG_ERROR, + isc_log_write(named_g_lctx, DNS_LOGCATEGORY_SECURITY, + NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "root key not loaded"); result = ISC_R_FAILURE; goto cleanup; @@ -1078,19 +1079,19 @@ configure_view_dnsseckeys(dns_view_t *view, const cfg_obj_t *vconfig, * Add key zone for managed-keys. */ obj = NULL; - (void)ns_config_get(maps, "managed-keys-directory", &obj); + (void)named_config_get(maps, "managed-keys-directory", &obj); directory = (obj != NULL ? cfg_obj_asstring(obj) : NULL); if (directory != NULL) result = isc_file_isdirectory(directory); if (result != ISC_R_SUCCESS) { - isc_log_write(ns_g_lctx, DNS_LOGCATEGORY_SECURITY, - NS_LOGMODULE_SERVER, ISC_LOG_ERROR, + isc_log_write(named_g_lctx, DNS_LOGCATEGORY_SECURITY, + NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "invalid managed-keys-directory %s: %s", directory, isc_result_totext(result)); goto cleanup; } - CHECK(add_keydata_zone(view, directory, ns_g_mctx)); + CHECK(add_keydata_zone(view, directory, named_g_mctx)); cleanup: return (result); @@ -1146,11 +1147,11 @@ get_view_querysource_dispatch(const cfg_obj_t **maps, int af, switch (af) { case AF_INET: - result = ns_config_get(maps, "query-source", &obj); + result = named_config_get(maps, "query-source", &obj); INSIST(result == ISC_R_SUCCESS); break; case AF_INET6: - result = ns_config_get(maps, "query-source-v6", &obj); + result = named_config_get(maps, "query-source-v6", &obj); INSIST(result == ISC_R_SUCCESS); break; default: @@ -1199,7 +1200,7 @@ get_view_querysource_dispatch(const cfg_obj_t **maps, int af, } else { INSIST(obj != NULL); if (is_firstview) { - cfg_obj_log(obj, ns_g_lctx, ISC_LOG_INFO, + cfg_obj_log(obj, named_g_lctx, ISC_LOG_INFO, "using specific query-source port " "suppresses port randomization and can be " "insecure."); @@ -1213,8 +1214,8 @@ get_view_querysource_dispatch(const cfg_obj_t **maps, int af, attrmask |= DNS_DISPATCHATTR_IPV6; disp = NULL; - result = dns_dispatch_getudp(ns_g_dispatchmgr, ns_g_socketmgr, - ns_g_taskmgr, &sa, 4096, + result = dns_dispatch_getudp(named_g_dispatchmgr, named_g_socketmgr, + named_g_taskmgr, &sa, 4096, maxdispatchbuffers, 32768, 16411, 16433, attrs, attrmask, &disp); if (result != ISC_R_SUCCESS) { @@ -1232,8 +1233,8 @@ get_view_querysource_dispatch(const cfg_obj_t **maps, int af, if (isc_sockaddr_equal(&sa, &any)) return (ISC_R_SUCCESS); isc_sockaddr_format(&sa, buf, sizeof(buf)); - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_ERROR, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "could not get query source dispatcher (%s)", buf); return (result); @@ -1256,12 +1257,12 @@ configure_order(dns_order_t *order, const cfg_obj_t *ent) { isc_result_t result; isc_boolean_t addroot; - result = ns_config_getclass(cfg_tuple_get(ent, "class"), + result = named_config_getclass(cfg_tuple_get(ent, "class"), dns_rdataclass_any, &rdclass); if (result != ISC_R_SUCCESS) return (result); - result = ns_config_gettype(cfg_tuple_get(ent, "type"), + result = named_config_gettype(cfg_tuple_get(ent, "type"), dns_rdatatype_any, &rdtype); if (result != ISC_R_SUCCESS) return (result); @@ -1401,7 +1402,7 @@ configure_peer(const cfg_obj_t *cpeer, isc_mem_t *mctx, dns_peer_t **peerp) { if (obj != NULL) { isc_uint32_t padding = cfg_obj_asuint32(obj); if (padding > 512U) { - cfg_obj_log(obj, ns_g_lctx, ISC_LOG_WARNING, + cfg_obj_log(obj, named_g_lctx, ISC_LOG_WARNING, "server padding value cannot " "exceed 512: lowering"); padding = 512U; @@ -1459,7 +1460,8 @@ configure_peer(const cfg_obj_t *cpeer, isc_mem_t *mctx, dns_peer_t **peerp) { result = dns_peer_settransferdscp(peer, cfg_obj_getdscp(obj)); if (result != ISC_R_SUCCESS) goto cleanup; - ns_add_reserved_dispatch(ns_g_server, cfg_obj_assockaddr(obj)); + named_add_reserved_dispatch(named_g_server, + cfg_obj_assockaddr(obj)); } obj = NULL; @@ -1475,7 +1477,8 @@ configure_peer(const cfg_obj_t *cpeer, isc_mem_t *mctx, dns_peer_t **peerp) { result = dns_peer_setnotifydscp(peer, cfg_obj_getdscp(obj)); if (result != ISC_R_SUCCESS) goto cleanup; - ns_add_reserved_dispatch(ns_g_server, cfg_obj_assockaddr(obj)); + named_add_reserved_dispatch(named_g_server, + cfg_obj_assockaddr(obj)); } obj = NULL; @@ -1491,7 +1494,8 @@ configure_peer(const cfg_obj_t *cpeer, isc_mem_t *mctx, dns_peer_t **peerp) { result = dns_peer_setquerydscp(peer, cfg_obj_getdscp(obj)); if (result != ISC_R_SUCCESS) goto cleanup; - ns_add_reserved_dispatch(ns_g_server, cfg_obj_assockaddr(obj)); + named_add_reserved_dispatch(named_g_server, + cfg_obj_assockaddr(obj)); } *peerp = peer; @@ -1522,8 +1526,8 @@ configure_dyndb(const cfg_obj_t *dyndb, isc_mem_t *mctx, mctx, dctx); if (result != ISC_R_SUCCESS) - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_ERROR, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "dynamic database '%s' configuration failed: %s", name, isc_result_totext(result)); return (result); @@ -1567,7 +1571,7 @@ disable_algorithms(const cfg_obj_t *disabled, dns_resolver_t *resolver) { } if (result != ISC_R_SUCCESS) { cfg_obj_log(cfg_listelt_value(element), - ns_g_lctx, ISC_LOG_ERROR, + named_g_lctx, ISC_LOG_ERROR, "invalid algorithm"); CHECK(result); } @@ -1609,7 +1613,7 @@ disable_ds_digests(const cfg_obj_t *disabled, dns_resolver_t *resolver) { result = dns_dsdigest_fromtext(&digest, &r); if (result != ISC_R_SUCCESS) { cfg_obj_log(cfg_listelt_value(element), - ns_g_lctx, ISC_LOG_ERROR, + named_g_lctx, ISC_LOG_ERROR, "invalid algorithm"); CHECK(result); } @@ -1687,7 +1691,7 @@ setquerystats(dns_zone_t *zone, isc_mem_t *mctx, dns_zonestat_level_t level) { zoneqrystats = NULL; if (level == dns_zonestat_full) { result = isc_stats_create(mctx, &zoneqrystats, - dns_nsstatscounter_max); + ns_statscounter_max); if (result != ISC_R_SUCCESS) return (result); } @@ -1698,11 +1702,11 @@ setquerystats(dns_zone_t *zone, isc_mem_t *mctx, dns_zonestat_level_t level) { return (ISC_R_SUCCESS); } -static ns_cache_t * -cachelist_find(ns_cachelist_t *cachelist, const char *cachename, +static named_cache_t * +cachelist_find(named_cachelist_t *cachelist, const char *cachename, dns_rdataclass_t rdclass) { - ns_cache_t *nsc; + named_cache_t *nsc; for (nsc = ISC_LIST_HEAD(*cachelist); nsc != NULL; @@ -1770,12 +1774,13 @@ dlzconfigure_callback(dns_view_t *view, dns_dlzdb_t *dlzdb, dns_zone_t *zone) { dns_rdataclass_t zclass = view->rdclass; isc_result_t result; - result = dns_zonemgr_managezone(ns_g_server->zonemgr, zone); + result = dns_zonemgr_managezone(named_g_server->zonemgr, zone); if (result != ISC_R_SUCCESS) return (result); - dns_zone_setstats(zone, ns_g_server->zonestats); + dns_zone_setstats(zone, named_g_server->zonestats); - return (ns_zone_configure_writeable_dlz(dlzdb, zone, zclass, origin)); + return (named_zone_configure_writeable_dlz(dlzdb, zone, + zclass, origin)); } static isc_result_t @@ -1832,10 +1837,10 @@ dns64_reverse(dns_view_t *view, isc_mem_t *mctx, isc_netaddr_t *na, CHECK(dns_zone_create(&zone, mctx)); CHECK(dns_zone_setorigin(zone, name)); dns_zone_setview(zone, view); - CHECK(dns_zonemgr_managezone(ns_g_server->zonemgr, zone)); + CHECK(dns_zonemgr_managezone(named_g_server->zonemgr, zone)); dns_zone_setclass(zone, view->rdclass); dns_zone_settype(zone, dns_zone_master); - dns_zone_setstats(zone, ns_g_server->zonestats); + dns_zone_setstats(zone, named_g_server->zonestats); CHECK(dns_zone_setdbtype(zone, dns64_dbtypec, dns64_dbtype)); if (view->queryacl != NULL) dns_zone_setqueryacl(zone, view->queryacl); @@ -1846,8 +1851,9 @@ dns64_reverse(dns_view_t *view, isc_mem_t *mctx, isc_netaddr_t *na, dns_zone_setoption(zone, DNS_ZONEOPT_NOCHECKNS, ISC_TRUE); CHECK(setquerystats(zone, mctx, dns_zonestat_none)); /* XXXMPA */ CHECK(dns_view_addzone(view, zone)); - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_SERVER, - ISC_LOG_INFO, "dns64 reverse zone%s%s: %s", sep, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_INFO, + "dns64 reverse zone%s%s: %s", sep, viewname, reverse); cleanup: @@ -1864,7 +1870,7 @@ configure_rpz_name(dns_view_t *view, const cfg_obj_t *obj, dns_name_t *name, result = dns_name_fromstring(name, str, DNS_NAME_DOWNCASE, view->mctx); if (result != ISC_R_SUCCESS) - cfg_obj_log(obj, ns_g_lctx, DNS_RPZ_ERROR_LEVEL, + cfg_obj_log(obj, named_g_lctx, DNS_RPZ_ERROR_LEVEL, "invalid %s '%s'", msg, str); return (result); } @@ -1878,7 +1884,7 @@ configure_rpz_name2(dns_view_t *view, const cfg_obj_t *obj, dns_name_t *name, result = dns_name_fromstring2(name, str, origin, DNS_NAME_DOWNCASE, view->mctx); if (result != ISC_R_SUCCESS) - cfg_obj_log(obj, ns_g_lctx, DNS_RPZ_ERROR_LEVEL, + cfg_obj_log(obj, named_g_lctx, DNS_RPZ_ERROR_LEVEL, "invalid zone '%s'", str); return (result); } @@ -1900,7 +1906,7 @@ configure_rpz_zone(dns_view_t *view, const cfg_listelt_t *element, rpz_obj = cfg_listelt_value(element); if (view->rpzs->p.num_zones >= DNS_RPZ_MAX_ZONES) { - cfg_obj_log(rpz_obj, ns_g_lctx, DNS_RPZ_ERROR_LEVEL, + cfg_obj_log(rpz_obj, named_g_lctx, DNS_RPZ_ERROR_LEVEL, "limit of %d response policy zones exceeded", DNS_RPZ_MAX_ZONES); return (ISC_R_FAILURE); @@ -1908,7 +1914,7 @@ configure_rpz_zone(dns_view_t *view, const cfg_listelt_t *element, result = dns_rpz_new_zone(view->rpzs, &zone); if (result != ISC_R_SUCCESS) { - cfg_obj_log(rpz_obj, ns_g_lctx, DNS_RPZ_ERROR_LEVEL, + cfg_obj_log(rpz_obj, named_g_lctx, DNS_RPZ_ERROR_LEVEL, "Error creating new RPZ zone : %s", isc_result_totext(result)); return (result); @@ -1950,14 +1956,14 @@ configure_rpz_zone(dns_view_t *view, const cfg_listelt_t *element, if (result != ISC_R_SUCCESS) return (result); if (dns_name_equal(&zone->origin, dns_rootname)) { - cfg_obj_log(rpz_obj, ns_g_lctx, DNS_RPZ_ERROR_LEVEL, + cfg_obj_log(rpz_obj, named_g_lctx, DNS_RPZ_ERROR_LEVEL, "invalid zone name '%s'", str); return (DNS_R_EMPTYLABEL); } for (rpz_num = 0; rpz_num < view->rpzs->p.num_zones-1; ++rpz_num) { if (dns_name_equal(&view->rpzs->zones[rpz_num]->origin, &zone->origin)) { - cfg_obj_log(rpz_obj, ns_g_lctx, DNS_RPZ_ERROR_LEVEL, + cfg_obj_log(rpz_obj, named_g_lctx, DNS_RPZ_ERROR_LEVEL, "duplicate '%s'", str); result = DNS_R_DUPLICATE; return (result); @@ -2046,7 +2052,7 @@ configure_rpz(dns_view_t *view, const cfg_obj_t *rpz_obj, return (ISC_R_SUCCESS); result = dns_rpz_new_zones(&view->rpzs, view->mctx, - ns_g_taskmgr, ns_g_timermgr); + named_g_taskmgr, named_g_timermgr); if (result != ISC_R_SUCCESS) return (result); @@ -2097,7 +2103,7 @@ configure_rpz(dns_view_t *view, const cfg_obj_t *rpz_obj, zones->p.nsip_wait_recurse = ISC_FALSE; pview = NULL; - result = dns_viewlist_find(&ns_g_server->viewlist, + result = dns_viewlist_find(&named_g_server->viewlist, view->name, view->rdclass, &pview); if (result == ISC_R_SUCCESS) { old = pview->rpzs; @@ -2143,7 +2149,7 @@ configure_rpz(dns_view_t *view, const cfg_obj_t *rpz_obj, } else if (old != NULL && pview != NULL) { pview->rpzs->rpz_ver += 1; view->rpzs->rpz_ver = pview->rpzs->rpz_ver; - cfg_obj_log(rpz_obj, ns_g_lctx, ISC_LOG_DEBUG(1), + cfg_obj_log(rpz_obj, named_g_lctx, ISC_LOG_DEBUG(1), "updated RPZ policy: version %d", view->rpzs->rpz_ver); } @@ -2169,8 +2175,8 @@ catz_addmodzone_taskaction(isc_task_t *task, isc_event_t *event0) { cfg = (ns_cfgctx_t *) ev->view->new_zone_config; if (cfg == NULL) { - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_ERROR, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "catz: allow-new-zones statement missing from " "config; cannot add zone from the catalog"); goto cleanup; @@ -2186,8 +2192,8 @@ catz_addmodzone_taskaction(isc_task_t *task, isc_event_t *event0) { if (ev->mod == ISC_TRUE) { if (result != ISC_R_SUCCESS) { - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_WARNING, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_WARNING, "catz: error \"%s\" while trying to " "modify zone \"%s\"", isc_result_totext(result), @@ -2195,18 +2201,22 @@ catz_addmodzone_taskaction(isc_task_t *task, isc_event_t *event0) { goto cleanup; } else { if (!dns_zone_getadded(zone)) { - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, + isc_log_write(named_g_lctx, + NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_WARNING, - "catz: catz_addmodzone_taskaction: " + "catz: " + "catz_addmodzone_taskaction: " "zone '%s' is not a dynamically " "added zone", nameb); goto cleanup; } if (dns_zone_get_parentcatz(zone) != ev->origin) { - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_WARNING, + isc_log_write(named_g_lctx, + NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, + ISC_LOG_WARNING, "catz: catz_delzone_taskaction: " "zone '%s' exists in multiple " "catalog zones", @@ -2218,8 +2228,8 @@ catz_addmodzone_taskaction(isc_task_t *task, isc_event_t *event0) { } else { if (result != ISC_R_NOTFOUND && result != DNS_R_PARTIALMATCH) { - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_WARNING, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_WARNING, "catz: error \"%s\" while trying to " "add zone \"%s\"", isc_result_totext(result), @@ -2239,8 +2249,8 @@ catz_addmodzone_taskaction(isc_task_t *task, isc_event_t *event0) { &cfg_type_addzoneconf, &zoneconf); isc_buffer_free(&confbuf); if (result != ISC_R_SUCCESS) { - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_ERROR, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "catz: error \"%s\" while trying to generate " "config for zone \"%s\"", isc_result_totext(result), nameb); @@ -2266,8 +2276,8 @@ catz_addmodzone_taskaction(isc_task_t *task, isc_event_t *event0) { isc_task_endexclusive(task); if (result != ISC_R_SUCCESS) { - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_WARNING, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_WARNING, "catz: failed to configure zone \"%s\" - %d", nameb, result); goto cleanup; @@ -2284,8 +2294,8 @@ catz_addmodzone_taskaction(isc_task_t *task, isc_event_t *event0) { result = dns_zone_loadnew(zone); if (result != ISC_R_SUCCESS) { dns_db_t *dbp = NULL; - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_ERROR, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "catz: dns_zone_loadnew() failed " "with %s; reverting.", isc_result_totext(result)); @@ -2333,16 +2343,16 @@ catz_delzone_taskaction(isc_task_t *task, isc_event_t *event0) { result = dns_zt_find(ev->view->zonetable, dns_catz_entry_getname(ev->entry), 0, NULL, &zone); if (result != ISC_R_SUCCESS) { - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_WARNING, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_WARNING, "catz: catz_delzone_taskaction: " "zone '%s' not found", cname); goto cleanup; } if (!dns_zone_getadded(zone)) { - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_WARNING, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_WARNING, "catz: catz_delzone_taskaction: " "zone '%s' is not a dynamically added zone", cname); @@ -2350,8 +2360,8 @@ catz_delzone_taskaction(isc_task_t *task, isc_event_t *event0) { } if (dns_zone_get_parentcatz(zone) != ev->origin) { - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_WARNING, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_WARNING, "catz: catz_delzone_taskaction: zone " "'%s' exists in multiple catalog zones", cname); @@ -2369,8 +2379,8 @@ catz_delzone_taskaction(isc_task_t *task, isc_event_t *event0) { if (file != NULL) isc_file_remove(file); - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_WARNING, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_WARNING, "catz: catz_delzone_taskaction: " "zone '%s' deleted", cname); cleanup: @@ -2476,14 +2486,14 @@ configure_catz_zone(dns_view_t *view, const cfg_obj_t *config, result = DNS_R_EMPTYLABEL; if (result != ISC_R_SUCCESS) { - cfg_obj_log(catz_obj, ns_g_lctx, DNS_CATZ_ERROR_LEVEL, + cfg_obj_log(catz_obj, named_g_lctx, DNS_CATZ_ERROR_LEVEL, "catz: invalid zone name '%s'", str); goto cleanup; } result = dns_catz_add_zone(view->catzs, &origin, &zone); if (result != ISC_R_SUCCESS && result != ISC_R_EXISTS) { - cfg_obj_log(catz_obj, ns_g_lctx, DNS_CATZ_ERROR_LEVEL, + cfg_obj_log(catz_obj, named_g_lctx, DNS_CATZ_ERROR_LEVEL, "catz: unable to create catalog zone '%s', " "error %s", str, isc_result_totext(result)); @@ -2493,7 +2503,7 @@ configure_catz_zone(dns_view_t *view, const cfg_obj_t *config, if (result == ISC_R_EXISTS) { isc_ht_iter_t *it = NULL; - result = dns_viewlist_find(&ns_g_server->viewlist, + result = dns_viewlist_find(&named_g_server->viewlist, view->name, view->rdclass, &pview); RUNTIME_CHECK(result == ISC_R_SUCCESS); @@ -2501,7 +2511,7 @@ configure_catz_zone(dns_view_t *view, const cfg_obj_t *config, /* * xxxwpk todo: reconfigure the zone!!!! */ - cfg_obj_log(catz_obj, ns_g_lctx, DNS_CATZ_ERROR_LEVEL, + cfg_obj_log(catz_obj, named_g_lctx, DNS_CATZ_ERROR_LEVEL, "catz: catalog zone '%s' will not be reconfigured", str); /* @@ -2510,7 +2520,8 @@ configure_catz_zone(dns_view_t *view, const cfg_obj_t *config, */ result = dns_catz_get_iterator(zone, &it); if (result != ISC_R_SUCCESS) { - cfg_obj_log(catz_obj, ns_g_lctx, DNS_CATZ_ERROR_LEVEL, + cfg_obj_log(catz_obj, named_g_lctx, + DNS_CATZ_ERROR_LEVEL, "catz: unable to create iterator"); goto cleanup; } @@ -2553,7 +2564,7 @@ configure_catz_zone(dns_view_t *view, const cfg_obj_t *config, obj = cfg_tuple_get(catz_obj, "default-masters"); if (obj != NULL && cfg_obj_istuple(obj)) - result = ns_config_getipandkeylist(config, obj, + result = named_config_getipandkeylist(config, obj, view->mctx, &opts->masters); obj = cfg_tuple_get(catz_obj, "in-memory"); @@ -2565,7 +2576,7 @@ configure_catz_zone(dns_view_t *view, const cfg_obj_t *config, opts->zonedir = isc_mem_strdup(view->mctx, cfg_obj_asstring(obj)); if (isc_file_isdirectory(opts->zonedir) != ISC_R_SUCCESS) { - cfg_obj_log(obj, ns_g_lctx, DNS_CATZ_ERROR_LEVEL, + cfg_obj_log(obj, named_g_lctx, DNS_CATZ_ERROR_LEVEL, "catz: zone-directory '%s' " "not found; zone files will not be " "saved", opts->zonedir); @@ -2603,16 +2614,17 @@ configure_catz(dns_view_t *view, const cfg_obj_t *config, isc_result_t result; /* xxxwpk TODO do it cleaner, once, somewhere */ - ns_catz_cbdata.server = ns_g_server; + ns_catz_cbdata.server = named_g_server; zone_element = cfg_list_first(cfg_tuple_get(catz_obj, "zone list")); if (zone_element == NULL) return (ISC_R_SUCCESS); CHECK(dns_catz_new_zones(&view->catzs, &ns_catz_zonemodmethods, - view->mctx, ns_g_taskmgr, ns_g_timermgr)); + view->mctx, named_g_taskmgr, + named_g_timermgr)); - result = dns_viewlist_find(&ns_g_server->viewlist, view->name, + result = dns_viewlist_find(&named_g_server->viewlist, view->name, view->rdclass, &pview); if (result == ISC_R_SUCCESS) old = pview->catzs; @@ -2643,7 +2655,7 @@ configure_catz(dns_view_t *view, const cfg_obj_t *config, #define CHECK_RRL(cond, pat, val1, val2) \ do { \ if (!(cond)) { \ - cfg_obj_log(obj, ns_g_lctx, ISC_LOG_ERROR, \ + cfg_obj_log(obj, named_g_lctx, ISC_LOG_ERROR, \ pat, val1, val2); \ result = ISC_R_RANGE; \ goto cleanup; \ @@ -2781,8 +2793,8 @@ configure_rrl(dns_view_t *view, const cfg_obj_t *config, const cfg_obj_t *map) { obj = NULL; result = cfg_map_get(map, "exempt-clients", &obj); if (result == ISC_R_SUCCESS) { - result = cfg_acl_fromconfig(obj, config, ns_g_lctx, - ns_g_aclconfctx, ns_g_mctx, + result = cfg_acl_fromconfig(obj, config, named_g_lctx, + named_g_aclconfctx, named_g_mctx, 0, &rrl->exempt); CHECK_RRL(result == ISC_R_SUCCESS, "invalid %s%s", "address match list", ""); @@ -2988,16 +3000,16 @@ create_empty_zone(dns_zone_t *zone, dns_name_t *name, dns_view_t *view, } if (zone == NULL) { - CHECK(dns_zonemgr_createzone(ns_g_server->zonemgr, &myzone)); + CHECK(dns_zonemgr_createzone(named_g_server->zonemgr, &myzone)); zone = myzone; CHECK(dns_zone_setorigin(zone, name)); - CHECK(dns_zonemgr_managezone(ns_g_server->zonemgr, zone)); + CHECK(dns_zonemgr_managezone(named_g_server->zonemgr, zone)); if (db == NULL) CHECK(dns_zone_setdbtype(zone, empty_dbtypec, empty_dbtype)); dns_zone_setclass(zone, view->rdclass); dns_zone_settype(zone, dns_zone_master); - dns_zone_setstats(zone, ns_g_server->zonestats); + dns_zone_setstats(zone, named_g_server->zonestats); } dns_zone_setoption(zone, ~DNS_ZONEOPT_NOCHECKNS, ISC_FALSE); @@ -3033,8 +3045,9 @@ create_empty_zone(dns_zone_t *zone, dns_name_t *name, dns_view_t *view, viewname = ""; } dns_name_format(name, namebuf, sizeof(namebuf)); - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_SERVER, - ISC_LOG_INFO, "automatic empty zone%s%s: %s", + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_INFO, + "automatic empty zone%s%s: %s", sep, viewname, namebuf); cleanup: @@ -3056,13 +3069,13 @@ configure_dnstap(const cfg_obj_t **maps, dns_view_t *view) { isc_result_t result; const cfg_obj_t *obj, *obj2; const cfg_listelt_t *element; - const char *dpath = ns_g_defaultdnstap; + const char *dpath = named_g_defaultdnstap; const cfg_obj_t *dlist = NULL; dns_dtmsgtype_t dttypes = 0; unsigned int i; struct fstrm_iothr_options *fopt = NULL; - result = ns_config_get(maps, "dnstap", &dlist); + result = named_config_get(maps, "dnstap", &dlist); if (result != ISC_R_SUCCESS) return (ISC_R_SUCCESS); @@ -3107,14 +3120,14 @@ configure_dnstap(const cfg_obj_t **maps, dns_view_t *view) { dttypes |= dt; } - if (ns_g_server->dtenv == NULL && dttypes != 0) { + if (named_g_server->dtenv == NULL && dttypes != 0) { dns_dtmode_t dmode; isc_uint64_t max_size = 0; isc_uint32_t rolls = 0; isc_log_rollsuffix_t suffix = isc_log_rollsuffix_increment; obj = NULL; - CHECKM(ns_config_get(maps, "dnstap-output", &obj), + CHECKM(named_config_get(maps, "dnstap-output", &obj), "'dnstap-output' must be set if 'dnstap' is set"); obj2 = cfg_tuple_get(obj, "mode"); @@ -3135,7 +3148,7 @@ configure_dnstap(const cfg_obj_t **maps, dns_view_t *view) { if (obj2 != NULL && cfg_obj_isuint64(obj2)) { max_size = cfg_obj_asuint64(obj2); if (max_size > SIZE_MAX) { - cfg_obj_log(obj2, ns_g_lctx, + cfg_obj_log(obj2, named_g_lctx, ISC_LOG_WARNING, "'dnstap-output size " "%" ISC_PRINT_QUADFORMAT "u' " @@ -3161,26 +3174,27 @@ configure_dnstap(const cfg_obj_t **maps, dns_view_t *view) { } fopt = fstrm_iothr_options_init(); - fstrm_iothr_options_set_num_input_queues(fopt, ns_g_cpus); + fstrm_iothr_options_set_num_input_queues(fopt, named_g_cpus); fstrm_iothr_options_set_queue_model(fopt, FSTRM_IOTHR_QUEUE_MODEL_MPSC); obj = NULL; - result = ns_config_get(maps, "fstrm-set-buffer-hint", &obj); + result = named_config_get(maps, "fstrm-set-buffer-hint", &obj); if (result == ISC_R_SUCCESS) { i = cfg_obj_asuint32(obj); fstrm_iothr_options_set_buffer_hint(fopt, i); } obj = NULL; - result = ns_config_get(maps, "fstrm-set-flush-timeout", &obj); + result = named_config_get(maps, "fstrm-set-flush-timeout", + &obj); if (result == ISC_R_SUCCESS) { i = cfg_obj_asuint32(obj); fstrm_iothr_options_set_flush_timeout(fopt, i); } obj = NULL; - result = ns_config_get(maps, "fstrm-set-input-queue-size", + result = named_config_get(maps, "fstrm-set-input-queue-size", &obj); if (result == ISC_R_SUCCESS) { i = cfg_obj_asuint32(obj); @@ -3188,7 +3202,7 @@ configure_dnstap(const cfg_obj_t **maps, dns_view_t *view) { } obj = NULL; - result = ns_config_get(maps, + result = named_config_get(maps, "fstrm-set-output-notify-threshold", &obj); if (result == ISC_R_SUCCESS) { @@ -3198,7 +3212,7 @@ configure_dnstap(const cfg_obj_t **maps, dns_view_t *view) { } obj = NULL; - result = ns_config_get(maps, "fstrm-set-output-queue-model", + result = named_config_get(maps, "fstrm-set-output-queue-model", &obj); if (result == ISC_R_SUCCESS) { if (strcasecmp(cfg_obj_asstring(obj), "spsc") == 0) @@ -3209,7 +3223,7 @@ configure_dnstap(const cfg_obj_t **maps, dns_view_t *view) { } obj = NULL; - result = ns_config_get(maps, "fstrm-set-output-queue-size", + result = named_config_get(maps, "fstrm-set-output-queue-size", &obj); if (result == ISC_R_SUCCESS) { i = cfg_obj_asuint32(obj); @@ -3217,49 +3231,50 @@ configure_dnstap(const cfg_obj_t **maps, dns_view_t *view) { } obj = NULL; - result = ns_config_get(maps, "fstrm-set-reopen-interval", + result = named_config_get(maps, "fstrm-set-reopen-interval", &obj); if (result == ISC_R_SUCCESS) { i = cfg_obj_asuint32(obj); fstrm_iothr_options_set_reopen_interval(fopt, i); } - CHECKM(dns_dt_create(ns_g_mctx, dmode, dpath, - &fopt, &ns_g_server->dtenv), + CHECKM(dns_dt_create(named_g_mctx, dmode, dpath, + &fopt, &named_g_server->dtenv), "unable to create dnstap environment"); - CHECKM(dns_dt_setupfile(ns_g_server->dtenv, + CHECKM(dns_dt_setupfile(named_g_server->dtenv, max_size, rolls, suffix), "unable to set up dnstap logfile"); } - if (ns_g_server->dtenv == NULL) + if (named_g_server->dtenv == NULL) return (ISC_R_SUCCESS); obj = NULL; - result = ns_config_get(maps, "dnstap-version", &obj); + result = named_config_get(maps, "dnstap-version", &obj); if (result != ISC_R_SUCCESS) { /* not specified; use the product and version */ - dns_dt_setversion(ns_g_server->dtenv, PRODUCT " " VERSION); + dns_dt_setversion(named_g_server->dtenv, PRODUCT " " VERSION); } else if (result == ISC_R_SUCCESS && !cfg_obj_isvoid(obj)) { /* Quoted string */ - dns_dt_setversion(ns_g_server->dtenv, cfg_obj_asstring(obj)); + dns_dt_setversion(named_g_server->dtenv, cfg_obj_asstring(obj)); } obj = NULL; - result = ns_config_get(maps, "dnstap-identity", &obj); + result = named_config_get(maps, "dnstap-identity", &obj); if (result == ISC_R_SUCCESS && cfg_obj_isboolean(obj)) { /* "hostname" is interpreted as boolean ISC_TRUE */ char buf[256]; - result = ns_os_gethostname(buf, sizeof(buf)); + result = named_os_gethostname(buf, sizeof(buf)); if (result == ISC_R_SUCCESS) - dns_dt_setidentity(ns_g_server->dtenv, buf); + dns_dt_setidentity(named_g_server->dtenv, buf); } else if (result == ISC_R_SUCCESS && !cfg_obj_isvoid(obj)) { /* Quoted string */ - dns_dt_setidentity(ns_g_server->dtenv, cfg_obj_asstring(obj)); + dns_dt_setidentity(named_g_server->dtenv, + cfg_obj_asstring(obj)); } - dns_dt_attach(ns_g_server->dtenv, &view->dtenv); + dns_dt_attach(named_g_server->dtenv, &view->dtenv); view->dttypes = dttypes; result = ISC_R_SUCCESS; @@ -3281,14 +3296,14 @@ create_mapped_acl(void) { isc_netaddr_fromin6(&addr, &in6); - result = dns_acl_create(ns_g_mctx, 1, &acl); + result = dns_acl_create(named_g_mctx, 1, &acl); if (result != ISC_R_SUCCESS) return (result); result = dns_iptable_addprefix2(acl->iptable, &addr, 96, ISC_TRUE, ISC_FALSE); if (result == ISC_R_SUCCESS) - dns_acl_attach(acl, &ns_g_mapped); + dns_acl_attach(acl, &named_g_mapped); dns_acl_detach(&acl); return (result); } @@ -3303,7 +3318,7 @@ create_mapped_acl(void) { static isc_result_t configure_view(dns_view_t *view, dns_viewlist_t *viewlist, cfg_obj_t *config, cfg_obj_t *vconfig, - ns_cachelist_t *cachelist, const cfg_obj_t *bindkeys, + named_cachelist_t *cachelist, const cfg_obj_t *bindkeys, isc_mem_t *mctx, cfg_aclconfctx_t *actx, isc_boolean_t need_hints) { @@ -3356,7 +3371,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, dns_stats_t *resquerystats = NULL; isc_boolean_t auto_dlv = ISC_FALSE; isc_boolean_t auto_root = ISC_FALSE; - ns_cache_t *nsc; + named_cache_t *nsc; isc_boolean_t zero_no_soattl; dns_acl_t *clients = NULL, *mapped = NULL, *excluded = NULL; unsigned int query_timeout, ndisp; @@ -3386,7 +3401,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, optionmaps[j++] = options; } - maps[i++] = ns_g_defaults; + maps[i++] = named_g_defaults; maps[i] = NULL; optionmaps[j] = NULL; if (config != NULL) @@ -3396,14 +3411,14 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, /* * Set the view's port number for outgoing queries. */ - CHECKM(ns_config_getport(config, &port), "port"); + CHECKM(named_config_getport(config, &port), "port"); dns_view_setdstport(view, port); CHECK(configure_view_acl(vconfig, config, "allow-query", NULL, actx, - ns_g_mctx, &view->queryacl)); + named_g_mctx, &view->queryacl)); if (view->queryacl == NULL) { - CHECK(configure_view_acl(NULL, ns_g_config, "allow-query", - NULL, actx, ns_g_mctx, + CHECK(configure_view_acl(NULL, named_g_config, "allow-query", + NULL, actx, named_g_mctx, &view->queryacl)); } @@ -3413,13 +3428,13 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, */ obj = NULL; if (view->rdclass == dns_rdataclass_in && need_hints && - ns_config_get(maps, "response-policy", &obj) == ISC_R_SUCCESS) { + named_config_get(maps, "response-policy", &obj) == ISC_R_SUCCESS) { CHECK(configure_rpz(view, obj, &old_rpz_ok)); } obj = NULL; if (view->rdclass == dns_rdataclass_in && need_hints && - ns_config_get(maps, "catalog-zones", &obj) == ISC_R_SUCCESS) { + named_config_get(maps, "catalog-zones", &obj) == ISC_R_SUCCESS) { CHECK(configure_catz(view, config, obj)); } @@ -3524,12 +3539,12 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, * we can reuse/share an existing cache. */ obj = NULL; - result = ns_config_get(maps, "cleaning-interval", &obj); + result = named_config_get(maps, "cleaning-interval", &obj); INSIST(result == ISC_R_SUCCESS); cleaning_interval = cfg_obj_asuint32(obj) * 60; obj = NULL; - result = ns_config_get(maps, "max-cache-size", &obj); + result = named_config_get(maps, "max-cache-size", &obj); INSIST(result == ISC_R_SUCCESS); if (cfg_obj_isstring(obj)) { str = cfg_obj_asstring(obj); @@ -3542,7 +3557,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, isc_resourcevalue_t value; value = cfg_obj_asuint64(obj); if (value > SIZE_MAX) { - cfg_obj_log(obj, ns_g_lctx, + cfg_obj_log(obj, named_g_lctx, ISC_LOG_WARNING, "'max-cache-size " "%" ISC_PRINT_QUADFORMAT "u' " @@ -3560,13 +3575,13 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, max_cache_size = (size_t) (totalphys * max_cache_size_percent/100); if (totalphys == 0) { - cfg_obj_log(obj, ns_g_lctx, + cfg_obj_log(obj, named_g_lctx, ISC_LOG_WARNING, "Unable to determine amount of physical " "memory, setting 'max-cache-size' to " "unlimited"); } else { - cfg_obj_log(obj, ns_g_lctx, + cfg_obj_log(obj, named_g_lctx, ISC_LOG_INFO, "'max-cache-size %d%%' " "- setting to %" ISC_PRINT_QUADFORMAT "uMB " @@ -3579,7 +3594,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, /* Check-names. */ obj = NULL; - result = ns_checknames_get(maps, "response", &obj); + result = named_checknames_get(maps, "response", &obj); INSIST(result == ISC_R_SUCCESS); str = cfg_obj_asstring(obj); @@ -3596,12 +3611,12 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, INSIST(0); obj = NULL; - result = ns_config_get(maps, "zero-no-soa-ttl-cache", &obj); + result = named_config_get(maps, "zero-no-soa-ttl-cache", &obj); INSIST(result == ISC_R_SUCCESS); zero_no_soattl = cfg_obj_asboolean(obj); obj = NULL; - result = ns_config_get(maps, "dns64", &obj); + result = named_config_get(maps, "dns64", &obj); if (result == ISC_R_SUCCESS && strcmp(view->name, "_bind") && strcmp(view->name, "_meta")) { isc_netaddr_t na, suffix, *sp; @@ -3610,14 +3625,14 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, const cfg_obj_t *myobj; myobj = NULL; - result = ns_config_get(maps, "dns64-server", &myobj); + result = named_config_get(maps, "dns64-server", &myobj); if (result == ISC_R_SUCCESS) server = cfg_obj_asstring(myobj); else server = NULL; myobj = NULL; - result = ns_config_get(maps, "dns64-contact", &myobj); + result = named_config_get(maps, "dns64-contact", &myobj); if (result == ISC_R_SUCCESS) contact = cfg_obj_asstring(myobj); else @@ -3648,7 +3663,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, (void)cfg_map_get(map, "clients", &obj); if (obj != NULL) { result = cfg_acl_fromconfig(obj, config, - ns_g_lctx, actx, + named_g_lctx, actx, mctx, 0, &clients); if (result != ISC_R_SUCCESS) goto cleanup; @@ -3657,7 +3672,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, (void)cfg_map_get(map, "mapped", &obj); if (obj != NULL) { result = cfg_acl_fromconfig(obj, config, - ns_g_lctx, actx, + named_g_lctx, actx, mctx, 0, &mapped); if (result != ISC_R_SUCCESS) goto cleanup; @@ -3666,17 +3681,17 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, (void)cfg_map_get(map, "exclude", &obj); if (obj != NULL) { result = cfg_acl_fromconfig(obj, config, - ns_g_lctx, actx, + named_g_lctx, actx, mctx, 0, &excluded); if (result != ISC_R_SUCCESS) goto cleanup; } else { - if (ns_g_mapped == NULL) { + if (named_g_mapped == NULL) { result = create_mapped_acl(); if (result != ISC_R_SUCCESS) goto cleanup; } - dns_acl_attach(ns_g_mapped, &excluded); + dns_acl_attach(named_g_mapped, &excluded); } obj = NULL; @@ -3710,12 +3725,12 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, } obj = NULL; - result = ns_config_get(maps, "dnssec-accept-expired", &obj); + result = named_config_get(maps, "dnssec-accept-expired", &obj); INSIST(result == ISC_R_SUCCESS); view->acceptexpired = cfg_obj_asboolean(obj); obj = NULL; - result = ns_config_get(maps, "dnssec-validation", &obj); + result = named_config_get(maps, "dnssec-validation", &obj); INSIST(result == ISC_R_SUCCESS); if (cfg_obj_isboolean(obj)) { view->enablevalidation = cfg_obj_asboolean(obj); @@ -3726,33 +3741,33 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, } obj = NULL; - result = ns_config_get(maps, "max-cache-ttl", &obj); + result = named_config_get(maps, "max-cache-ttl", &obj); INSIST(result == ISC_R_SUCCESS); view->maxcachettl = cfg_obj_asuint32(obj); obj = NULL; - result = ns_config_get(maps, "max-ncache-ttl", &obj); + result = named_config_get(maps, "max-ncache-ttl", &obj); INSIST(result == ISC_R_SUCCESS); view->maxncachettl = cfg_obj_asuint32(obj); if (view->maxncachettl > 7 * 24 * 3600) view->maxncachettl = 7 * 24 * 3600; obj = NULL; - result = ns_config_get(maps, "synth-from-dnssec", &obj); + result = named_config_get(maps, "synth-from-dnssec", &obj); INSIST(result == ISC_R_SUCCESS); view->synthfromdnssec = cfg_obj_asboolean(obj); obj = NULL; - result = ns_config_get(maps, "max-stale-ttl", &obj); + result = named_config_get(maps, "max-stale-ttl", &obj); INSIST(result == ISC_R_SUCCESS); max_stale_ttl = cfg_obj_asuint32(obj); obj = NULL; - result = ns_config_get(maps, "stale-answer-enable", &obj); + result = named_config_get(maps, "stale-answer-enable", &obj); INSIST(result == ISC_R_SUCCESS); view->staleanswersenable = cfg_obj_asboolean(obj); - result = dns_viewlist_find(&ns_g_server->viewlist, view->name, + result = dns_viewlist_find(&named_g_server->viewlist, view->name, view->rdclass, &pview); if (result == ISC_R_SUCCESS) { view->staleanswersok = pview->staleanswersok; @@ -3784,7 +3799,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, * ensure these configuration options don't invalidate reusing/sharing. */ obj = NULL; - result = ns_config_get(maps, "attach-cache", &obj); + result = named_config_get(maps, "attach-cache", &obj); if (result == ISC_R_SUCCESS) cachename = cfg_obj_asstring(obj); else @@ -3794,9 +3809,10 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, if (nsc != NULL) { if (!cache_sharable(nsc->primaryview, view, zero_no_soattl, cleaning_interval, max_cache_size, - max_stale_ttl)) { - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_ERROR, + max_stale_ttl)) + { + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "views %s and %s can't share the cache " "due to configuration parameter mismatch", nsc->primaryview->name, view->name); @@ -3807,7 +3823,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, shared_cache = ISC_TRUE; } else { if (strcmp(cachename, view->name) == 0) { - result = dns_viewlist_find(&ns_g_server->viewlist, + result = dns_viewlist_find(&named_g_server->viewlist, cachename, view->rdclass, &pview); if (result != ISC_R_NOTFOUND && result != ISC_R_SUCCESS) @@ -3815,9 +3831,9 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, if (pview != NULL) { if (!cache_reusable(pview, view, zero_no_soattl)) { - isc_log_write(ns_g_lctx, - NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, + isc_log_write(named_g_lctx, + NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_DEBUG(1), "cache cannot be reused " "for view %s due to " @@ -3825,9 +3841,9 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, "mismatch", view->name); } else { INSIST(pview->cache != NULL); - isc_log_write(ns_g_lctx, - NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, + isc_log_write(named_g_lctx, + NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_DEBUG(3), "reusing existing cache"); reused_cache = ISC_TRUE; @@ -3856,8 +3872,8 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, isc_mem_setname(cmctx, "cache", NULL); CHECK(isc_mem_create(0, 0, &hmctx)); isc_mem_setname(hmctx, "cache_heap", NULL); - CHECK(dns_cache_create3(cmctx, hmctx, ns_g_taskmgr, - ns_g_timermgr, view->rdclass, + CHECK(dns_cache_create3(cmctx, hmctx, named_g_taskmgr, + named_g_timermgr, view->rdclass, cachename, "rbt", 0, NULL, &cache)); isc_mem_detach(&cmctx); @@ -3884,7 +3900,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, * should be caught by the configuration checking stage. */ obj = NULL; - result = ns_config_get(maps, "cache-file", &obj); + result = named_config_get(maps, "cache-file", &obj); if (result == ISC_R_SUCCESS && strcmp(view->name, "_bind") != 0) { CHECK(dns_cache_setfilename(cache, cfg_obj_asstring(obj))); if (!reused_cache && !shared_cache) @@ -3898,7 +3914,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, dns_cache_detach(&cache); obj = NULL; - result = ns_config_get(maps, "stale-answer-ttl", &obj); + result = named_config_get(maps, "stale-answer-ttl", &obj); INSIST(result == ISC_R_SUCCESS); view->staleanswerttl = ISC_MAX(cfg_obj_asuint32(obj), 1); @@ -3930,16 +3946,17 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, CHECK(dns_rdatatypestats_create(mctx, &resquerystats)); dns_view_setresquerystats(view, resquerystats); - ndisp = 4 * ISC_MIN(ns_g_udpdisp, MAX_UDP_DISPATCH); - CHECK(dns_view_createresolver(view, ns_g_taskmgr, RESOLVER_NTASKS, - ndisp, ns_g_socketmgr, ns_g_timermgr, - resopts, ns_g_dispatchmgr, + ndisp = 4 * ISC_MIN(named_g_udpdisp, MAX_UDP_DISPATCH); + CHECK(dns_view_createresolver(view, named_g_taskmgr, RESOLVER_NTASKS, + ndisp, named_g_socketmgr, + named_g_timermgr, resopts, + named_g_dispatchmgr, dispatch4, dispatch6)); if (dscp4 == -1) - dscp4 = ns_g_dscp; + dscp4 = named_g_dscp; if (dscp6 == -1) - dscp6 = ns_g_dscp; + dscp6 = named_g_dscp; if (dscp4 != -1) dns_resolver_setquerydscp4(view->resolver, dscp4); if (dscp6 != -1) @@ -3974,7 +3991,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, double low, high, discount; obj = NULL; - result = ns_config_get(maps, "fetches-per-server", &obj); + result = named_config_get(maps, "fetches-per-server", &obj); INSIST(result == ISC_R_SUCCESS); obj2 = cfg_tuple_get(obj, "fetches"); fps = cfg_obj_asuint32(obj2); @@ -3995,7 +4012,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, } obj = NULL; - result = ns_config_get(maps, "fetch-quota-params", &obj); + result = named_config_get(maps, "fetch-quota-params", &obj); INSIST(result == ISC_R_SUCCESS); obj2 = cfg_tuple_get(obj, "frequency"); @@ -4017,7 +4034,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, * Set resolver's lame-ttl. */ obj = NULL; - result = ns_config_get(maps, "lame-ttl", &obj); + result = named_config_get(maps, "lame-ttl", &obj); INSIST(result == ISC_R_SUCCESS); lame_ttl = cfg_obj_asuint32(obj); if (lame_ttl > 1800) @@ -4028,7 +4045,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, * Set the resolver's query timeout. */ obj = NULL; - result = ns_config_get(maps, "resolver-query-timeout", &obj); + result = named_config_get(maps, "resolver-query-timeout", &obj); INSIST(result == ISC_R_SUCCESS); query_timeout = cfg_obj_asuint32(obj); dns_resolver_settimeout(view->resolver, query_timeout); @@ -4040,7 +4057,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, * Set the resolver's EDNS UDP size. */ obj = NULL; - result = ns_config_get(maps, "edns-udp-size", &obj); + result = named_config_get(maps, "edns-udp-size", &obj); INSIST(result == ISC_R_SUCCESS); udpsize = cfg_obj_asuint32(obj); if (udpsize < 512) @@ -4053,7 +4070,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, * Set the maximum UDP response size. */ obj = NULL; - result = ns_config_get(maps, "max-udp-size", &obj); + result = named_config_get(maps, "max-udp-size", &obj); INSIST(result == ISC_R_SUCCESS); udpsize = cfg_obj_asuint32(obj); if (udpsize < 512) @@ -4066,7 +4083,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, * Set the maximum UDP when a COOKIE is not provided. */ obj = NULL; - result = ns_config_get(maps, "nocookie-udp-size", &obj); + result = named_config_get(maps, "nocookie-udp-size", &obj); INSIST(result == ISC_R_SUCCESS); udpsize = cfg_obj_asuint32(obj); if (udpsize < 128) @@ -4079,7 +4096,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, * Set the maximum rsa exponent bits. */ obj = NULL; - result = ns_config_get(maps, "max-rsa-exponent-size", &obj); + result = named_config_get(maps, "max-rsa-exponent-size", &obj); INSIST(result == ISC_R_SUCCESS); maxbits = cfg_obj_asuint32(obj); if (maxbits != 0 && maxbits < 35) @@ -4092,13 +4109,13 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, * Set resolver retry parameters. */ obj = NULL; - CHECK(ns_config_get(maps, "resolver-retry-interval", &obj)); + CHECK(named_config_get(maps, "resolver-retry-interval", &obj)); resolver_param = cfg_obj_asuint32(obj); if (resolver_param > 0) dns_resolver_setretryinterval(view->resolver, resolver_param); obj = NULL; - CHECK(ns_config_get(maps, "resolver-nonbackoff-tries", &obj)); + CHECK(named_config_get(maps, "resolver-nonbackoff-tries", &obj)); resolver_param = cfg_obj_asuint32(obj); if (resolver_param > 0) dns_resolver_setnonbackofftries(view->resolver, resolver_param); @@ -4108,7 +4125,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, */ dns_resolver_reset_algorithms(view->resolver); disabled = NULL; - (void)ns_config_get(maps, "disable-algorithms", &disabled); + (void)named_config_get(maps, "disable-algorithms", &disabled); if (disabled != NULL) { for (element = cfg_list_first(disabled); element != NULL; @@ -4122,7 +4139,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, */ dns_resolver_reset_ds_digests(view->resolver); disabled = NULL; - (void)ns_config_get(maps, "disable-ds-digests", &disabled); + (void)named_config_get(maps, "disable-ds-digests", &disabled); if (disabled != NULL) { for (element = cfg_list_first(disabled); element != NULL; @@ -4137,8 +4154,8 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, */ forwardtype = NULL; forwarders = NULL; - (void)ns_config_get(maps, "forward", &forwardtype); - (void)ns_config_get(maps, "forwarders", &forwarders); + (void)named_config_get(maps, "forward", &forwardtype); + (void)named_config_get(maps, "forwarders", &forwarders); if (forwarders != NULL) CHECK(configure_forward(config, view, dns_rootname, forwarders, forwardtype)); @@ -4147,7 +4164,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, * Dual Stack Servers. */ alternates = NULL; - (void)ns_config_get(maps, "dual-stack-servers", &alternates); + (void)named_config_get(maps, "dual-stack-servers", &alternates); if (alternates != NULL) CHECK(configure_alternates(config, view, alternates)); @@ -4155,7 +4172,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, * We have default hints for class IN if we need them. */ if (view->rdclass == dns_rdataclass_in && view->hints == NULL) - dns_view_sethints(view, ns_g_server->in_roothints); + dns_view_sethints(view, named_g_server->in_roothints); /* * If we still have no hints, this is a non-IN view with no @@ -4172,8 +4189,8 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, need_hints = ISC_FALSE; } if (need_hints) - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_WARNING, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_WARNING, "no root hints for view '%s'", view->name); } @@ -4181,10 +4198,12 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, /* * Configure the view's TSIG keys. */ - CHECK(ns_tsigkeyring_fromconfig(config, vconfig, view->mctx, &ring)); - if (ns_g_server->sessionkey != NULL) { - CHECK(dns_tsigkeyring_add(ring, ns_g_server->session_keyname, - ns_g_server->sessionkey)); + CHECK(named_tsigkeyring_fromconfig(config, vconfig, + view->mctx, &ring)); + if (named_g_server->sessionkey != NULL) { + CHECK(dns_tsigkeyring_add(ring, + named_g_server->session_keyname, + named_g_server->sessionkey)); } dns_view_setkeyring(view, ring); dns_tsigkeyring_detach(&ring); @@ -4192,7 +4211,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, /* * See if we can re-use a dynamic key ring. */ - result = dns_viewlist_find(&ns_g_server->viewlist, view->name, + result = dns_viewlist_find(&named_g_server->viewlist, view->name, view->rdclass, &pview); if (result != ISC_R_NOTFOUND && result != ISC_R_SUCCESS) goto cleanup; @@ -4212,7 +4231,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, const cfg_obj_t *peers = NULL; dns_peerlist_t *newpeers = NULL; - (void)ns_config_get(cfgmaps, "server", &peers); + (void)named_config_get(cfgmaps, "server", &peers); CHECK(dns_peerlist_new(mctx, &newpeers)); for (element = cfg_list_first(peers); element != NULL; @@ -4235,7 +4254,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, { const cfg_obj_t *rrsetorder = NULL; - (void)ns_config_get(maps, "rrset-order", &rrsetorder); + (void)named_config_get(maps, "rrset-order", &rrsetorder); CHECK(dns_order_create(mctx, &order)); for (element = cfg_list_first(rrsetorder); element != NULL; @@ -4253,21 +4272,22 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, /* * Copy the aclenv object. */ - dns_aclenv_copy(&view->aclenv, &ns_g_server->aclenv); + dns_aclenv_copy(&view->aclenv, + ns_interfacemgr_getaclenv(named_g_server->interfacemgr)); /* * Configure the "match-clients" and "match-destinations" ACL. */ CHECK(configure_view_acl(vconfig, config, "match-clients", NULL, actx, - ns_g_mctx, &view->matchclients)); + named_g_mctx, &view->matchclients)); CHECK(configure_view_acl(vconfig, config, "match-destinations", NULL, - actx, ns_g_mctx, &view->matchdestinations)); + actx, named_g_mctx, &view->matchdestinations)); /* * Configure the "match-recursive-only" option. */ obj = NULL; - (void)ns_config_get(maps, "match-recursive-only", &obj); + (void)named_config_get(maps, "match-recursive-only", &obj); if (obj != NULL && cfg_obj_asboolean(obj)) view->matchrecursiveonly = ISC_TRUE; else @@ -4277,27 +4297,27 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, * Configure other configurable data. */ obj = NULL; - result = ns_config_get(maps, "recursion", &obj); + result = named_config_get(maps, "recursion", &obj); INSIST(result == ISC_R_SUCCESS); view->recursion = cfg_obj_asboolean(obj); obj = NULL; - result = ns_config_get(maps, "auth-nxdomain", &obj); + result = named_config_get(maps, "auth-nxdomain", &obj); INSIST(result == ISC_R_SUCCESS); view->auth_nxdomain = cfg_obj_asboolean(obj); obj = NULL; - result = ns_config_get(maps, "glue-cache", &obj); + result = named_config_get(maps, "glue-cache", &obj); INSIST(result == ISC_R_SUCCESS); view->use_glue_cache = cfg_obj_asboolean(obj); obj = NULL; - result = ns_config_get(maps, "minimal-any", &obj); + result = named_config_get(maps, "minimal-any", &obj); INSIST(result == ISC_R_SUCCESS); view->minimal_any = cfg_obj_asboolean(obj); obj = NULL; - result = ns_config_get(maps, "minimal-responses", &obj); + result = named_config_get(maps, "minimal-responses", &obj); INSIST(result == ISC_R_SUCCESS); if (cfg_obj_isboolean(obj)) { if (cfg_obj_asboolean(obj)) @@ -4315,7 +4335,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, } obj = NULL; - result = ns_config_get(maps, "transfer-format", &obj); + result = named_config_get(maps, "transfer-format", &obj); INSIST(result == ISC_R_SUCCESS); str = cfg_obj_asstring(obj); if (strcasecmp(str, "many-answers") == 0) @@ -4326,7 +4346,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, INSIST(0); obj = NULL; - result = ns_config_get(maps, "trust-anchor-telemetry", &obj); + result = named_config_get(maps, "trust-anchor-telemetry", &obj); INSIST(result == ISC_R_SUCCESS); view->trust_anchor_telemetry = cfg_obj_asboolean(obj); @@ -4336,19 +4356,19 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, * configured in named.conf. */ CHECK(configure_view_acl(vconfig, config, "allow-query-cache", NULL, - actx, ns_g_mctx, &view->cacheacl)); + actx, named_g_mctx, &view->cacheacl)); CHECK(configure_view_acl(vconfig, config, "allow-query-cache-on", NULL, - actx, ns_g_mctx, &view->cacheonacl)); + actx, named_g_mctx, &view->cacheonacl)); if (view->cacheonacl == NULL) - CHECK(configure_view_acl(NULL, ns_g_config, + CHECK(configure_view_acl(NULL, named_g_config, "allow-query-cache-on", NULL, actx, - ns_g_mctx, &view->cacheonacl)); + named_g_mctx, &view->cacheonacl)); if (strcmp(view->name, "_bind") != 0) { CHECK(configure_view_acl(vconfig, config, "allow-recursion", - NULL, actx, ns_g_mctx, + NULL, actx, named_g_mctx, &view->recursionacl)); CHECK(configure_view_acl(vconfig, config, "allow-recursion-on", - NULL, actx, ns_g_mctx, + NULL, actx, named_g_mctx, &view->recursiononacl)); } @@ -4368,7 +4388,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, */ if (view->cacheacl == NULL && view->recursion) CHECK(configure_view_acl(vconfig, config, "allow-query", NULL, - actx, ns_g_mctx, &view->cacheacl)); + actx, named_g_mctx, &view->cacheacl)); if (view->recursion && view->recursionacl == NULL && view->cacheacl != NULL) dns_acl_attach(view->cacheacl, &view->recursionacl); @@ -4378,20 +4398,20 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, * "allow-query-cache" acls. */ if (view->recursionacl == NULL && view->recursion) - CHECK(configure_view_acl(NULL, ns_g_config, + CHECK(configure_view_acl(NULL, named_g_config, "allow-recursion", NULL, - actx, ns_g_mctx, + actx, named_g_mctx, &view->recursionacl)); if (view->recursiononacl == NULL && view->recursion) - CHECK(configure_view_acl(NULL, ns_g_config, + CHECK(configure_view_acl(NULL, named_g_config, "allow-recursion-on", NULL, - actx, ns_g_mctx, + actx, named_g_mctx, &view->recursiononacl)); if (view->cacheacl == NULL) { if (view->recursion) - CHECK(configure_view_acl(NULL, ns_g_config, + CHECK(configure_view_acl(NULL, named_g_config, "allow-query-cache", NULL, - actx, ns_g_mctx, + actx, named_g_mctx, &view->cacheacl)); else CHECK(dns_acl_none(mctx, &view->cacheacl)); @@ -4403,7 +4423,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, * and is needed by some broken clients. */ CHECK(configure_view_acl(vconfig, config, "no-case-compress", NULL, - actx, ns_g_mctx, &view->nocasecompress)); + actx, named_g_mctx, &view->nocasecompress)); /* * Disable name compression completely, this is a tradeoff @@ -4411,7 +4431,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, */ obj = NULL; - result = ns_config_get(maps, "message-compression", &obj); + result = named_config_get(maps, "message-compression", &obj); INSIST(result == ISC_R_SUCCESS); view->msgcompression = cfg_obj_asboolean(obj); @@ -4419,25 +4439,26 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, * Filter setting on addresses in the answer section. */ CHECK(configure_view_acl(vconfig, config, "deny-answer-addresses", - "acl", actx, ns_g_mctx, &view->denyansweracl)); + "acl", actx, named_g_mctx, + &view->denyansweracl)); CHECK(configure_view_nametable(vconfig, config, "deny-answer-addresses", - "except-from", ns_g_mctx, + "except-from", named_g_mctx, &view->answeracl_exclude)); /* * Filter setting on names (CNAME/DNAME targets) in the answer section. */ CHECK(configure_view_nametable(vconfig, config, "deny-answer-aliases", - "name", ns_g_mctx, + "name", named_g_mctx, &view->denyanswernames)); CHECK(configure_view_nametable(vconfig, config, "deny-answer-aliases", - "except-from", ns_g_mctx, + "except-from", named_g_mctx, &view->answernames_exclude)); /* * Configure sortlist, if set */ - CHECK(configure_view_sortlist(vconfig, config, actx, ns_g_mctx, + CHECK(configure_view_sortlist(vconfig, config, actx, named_g_mctx, &view->sortlist)); /* @@ -4446,91 +4467,92 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, * inherited by zones. */ if (view->notifyacl == NULL) - CHECK(configure_view_acl(NULL, ns_g_config, + CHECK(configure_view_acl(NULL, named_g_config, "allow-notify", NULL, actx, - ns_g_mctx, &view->notifyacl)); + named_g_mctx, &view->notifyacl)); if (view->transferacl == NULL) - CHECK(configure_view_acl(NULL, ns_g_config, + CHECK(configure_view_acl(NULL, named_g_config, "allow-transfer", NULL, actx, - ns_g_mctx, &view->transferacl)); + named_g_mctx, &view->transferacl)); if (view->updateacl == NULL) - CHECK(configure_view_acl(NULL, ns_g_config, + CHECK(configure_view_acl(NULL, named_g_config, "allow-update", NULL, actx, - ns_g_mctx, &view->updateacl)); + named_g_mctx, &view->updateacl)); if (view->upfwdacl == NULL) - CHECK(configure_view_acl(NULL, ns_g_config, + CHECK(configure_view_acl(NULL, named_g_config, "allow-update-forwarding", NULL, actx, - ns_g_mctx, &view->upfwdacl)); + named_g_mctx, &view->upfwdacl)); obj = NULL; - result = ns_config_get(maps, "provide-ixfr", &obj); + result = named_config_get(maps, "provide-ixfr", &obj); INSIST(result == ISC_R_SUCCESS); view->provideixfr = cfg_obj_asboolean(obj); obj = NULL; - result = ns_config_get(maps, "request-nsid", &obj); + result = named_config_get(maps, "request-nsid", &obj); INSIST(result == ISC_R_SUCCESS); view->requestnsid = cfg_obj_asboolean(obj); obj = NULL; - result = ns_config_get(maps, "send-cookie", &obj); + result = named_config_get(maps, "send-cookie", &obj); INSIST(result == ISC_R_SUCCESS); view->sendcookie = cfg_obj_asboolean(obj); obj = NULL; if (view->pad_acl != NULL) dns_acl_detach(&view->pad_acl); - result = ns_config_get(optionmaps, "response-padding", &obj); + result = named_config_get(optionmaps, "response-padding", &obj); if (result == ISC_R_SUCCESS) { const cfg_obj_t *padobj = cfg_tuple_get(obj, "block-size"); const cfg_obj_t *aclobj = cfg_tuple_get(obj, "acl"); isc_uint32_t padding = cfg_obj_asuint32(padobj); if (padding > 512U) { - cfg_obj_log(obj, ns_g_lctx, ISC_LOG_WARNING, + cfg_obj_log(obj, named_g_lctx, ISC_LOG_WARNING, "response-padding block-size cannot " "exceed 512: lowering"); padding = 512U; } view->padding = (isc_uint16_t)padding; - CHECK(cfg_acl_fromconfig(aclobj, config, ns_g_lctx, - actx, ns_g_mctx, 0, &view->pad_acl)); + CHECK(cfg_acl_fromconfig(aclobj, config, named_g_lctx, + actx, named_g_mctx, 0, + &view->pad_acl)); } obj = NULL; - result = ns_config_get(maps, "require-server-cookie", &obj); + result = named_config_get(maps, "require-server-cookie", &obj); INSIST(result == ISC_R_SUCCESS); view->requireservercookie = cfg_obj_asboolean(obj); obj = NULL; - result = ns_config_get(maps, "v6-bias", &obj); + result = named_config_get(maps, "v6-bias", &obj); INSIST(result == ISC_R_SUCCESS); view->v6bias = cfg_obj_asuint32(obj) * 1000; obj = NULL; - result = ns_config_get(maps, "max-clients-per-query", &obj); + result = named_config_get(maps, "max-clients-per-query", &obj); INSIST(result == ISC_R_SUCCESS); max_clients_per_query = cfg_obj_asuint32(obj); obj = NULL; - result = ns_config_get(maps, "clients-per-query", &obj); + result = named_config_get(maps, "clients-per-query", &obj); INSIST(result == ISC_R_SUCCESS); dns_resolver_setclientsperquery(view->resolver, cfg_obj_asuint32(obj), max_clients_per_query); obj = NULL; - result = ns_config_get(maps, "max-recursion-depth", &obj); + result = named_config_get(maps, "max-recursion-depth", &obj); INSIST(result == ISC_R_SUCCESS); dns_resolver_setmaxdepth(view->resolver, cfg_obj_asuint32(obj)); obj = NULL; - result = ns_config_get(maps, "max-recursion-queries", &obj); + result = named_config_get(maps, "max-recursion-queries", &obj); INSIST(result == ISC_R_SUCCESS); dns_resolver_setmaxqueries(view->resolver, cfg_obj_asuint32(obj)); obj = NULL; - result = ns_config_get(maps, "fetches-per-zone", &obj); + result = named_config_get(maps, "fetches-per-zone", &obj); INSIST(result == ISC_R_SUCCESS); obj2 = cfg_tuple_get(obj, "fetches"); dns_resolver_setfetchesperzone(view->resolver, cfg_obj_asuint32(obj2)); @@ -4552,7 +4574,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, #ifdef ALLOW_FILTER_AAAA obj = NULL; - result = ns_config_get(maps, "filter-aaaa-on-v4", &obj); + result = named_config_get(maps, "filter-aaaa-on-v4", &obj); INSIST(result == ISC_R_SUCCESS); if (cfg_obj_isboolean(obj)) { if (cfg_obj_asboolean(obj)) @@ -4568,7 +4590,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, } obj = NULL; - result = ns_config_get(maps, "filter-aaaa-on-v6", &obj); + result = named_config_get(maps, "filter-aaaa-on-v6", &obj); INSIST(result == ISC_R_SUCCESS); if (cfg_obj_isboolean(obj)) { if (cfg_obj_asboolean(obj)) @@ -4584,10 +4606,10 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, } CHECK(configure_view_acl(vconfig, config, "filter-aaaa", NULL, - actx, ns_g_mctx, &view->aaaa_acl)); + actx, named_g_mctx, &view->aaaa_acl)); #endif obj = NULL; - result = ns_config_get(maps, "prefetch", &obj); + result = named_config_get(maps, "prefetch", &obj); if (result == ISC_R_SUCCESS) { const cfg_obj_t *trigger, *eligible; @@ -4600,7 +4622,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, int m; for (m = 1; maps[m] != NULL; m++) { obj = NULL; - result = ns_config_get(&maps[m], + result = named_config_get(&maps[m], "prefetch", &obj); INSIST(result == ISC_R_SUCCESS); eligible = cfg_tuple_get(obj, "eligible"); @@ -4615,12 +4637,12 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, } obj = NULL; - result = ns_config_get(maps, "dnssec-enable", &obj); + result = named_config_get(maps, "dnssec-enable", &obj); INSIST(result == ISC_R_SUCCESS); view->enablednssec = cfg_obj_asboolean(obj); obj = NULL; - result = ns_config_get(optionmaps, "dnssec-lookaside", &obj); + result = named_config_get(optionmaps, "dnssec-lookaside", &obj); if (result == ISC_R_SUCCESS) { /* If set to "auto", use the version from the defaults */ const char *dom; @@ -4633,7 +4655,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, else if (!strcasecmp(dom, "auto")) { auto_dlv = ISC_TRUE; obj = NULL; - result = cfg_map_get(ns_g_defaults, + result = cfg_map_get(named_g_defaults, "dnssec-lookaside", &obj); } } @@ -4662,7 +4684,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, if (dns_name_equal(view->dlv, iscdlv)) { if (auto_dlv) obj = dlvobj; - cfg_obj_log(obj, ns_g_lctx, ISC_LOG_WARNING, + cfg_obj_log(obj, named_g_lctx, ISC_LOG_WARNING, "WARNING: the DLV server at " "'dlv.isc.org' is expected to " "cease operation by the end " @@ -4680,22 +4702,22 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, auto_dlv, auto_root, mctx)); dns_resolver_resetmustbesecure(view->resolver); obj = NULL; - result = ns_config_get(maps, "dnssec-must-be-secure", &obj); + result = named_config_get(maps, "dnssec-must-be-secure", &obj); if (result == ISC_R_SUCCESS) CHECK(mustbesecure(obj, view->resolver)); obj = NULL; - result = ns_config_get(maps, "nta-recheck", &obj); + result = named_config_get(maps, "nta-recheck", &obj); INSIST(result == ISC_R_SUCCESS); view->nta_recheck = cfg_obj_asuint32(obj); obj = NULL; - result = ns_config_get(maps, "nta-lifetime", &obj); + result = named_config_get(maps, "nta-lifetime", &obj); INSIST(result == ISC_R_SUCCESS); view->nta_lifetime = cfg_obj_asuint32(obj); obj = NULL; - result = ns_config_get(maps, "preferred-glue", &obj); + result = named_config_get(maps, "preferred-glue", &obj); if (result == ISC_R_SUCCESS) { str = cfg_obj_asstring(obj); if (strcasecmp(str, "a") == 0) @@ -4708,7 +4730,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, view->preferred_glue = 0; obj = NULL; - result = ns_config_get(maps, "root-delegation-only", &obj); + result = named_config_get(maps, "root-delegation-only", &obj); if (result == ISC_R_SUCCESS) dns_view_setrootdelonly(view, ISC_TRUE); if (result == ISC_R_SUCCESS && ! cfg_obj_isvoid(obj)) { @@ -4750,10 +4772,10 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, if (dctx == NULL) { const void *hashinit = isc_hash_get_initializer(); CHECK(dns_dyndb_createctx(mctx, hashinit, - ns_g_lctx, view, - ns_g_server->zonemgr, - ns_g_server->task, - ns_g_timermgr, &dctx)); + named_g_lctx, view, + named_g_server->zonemgr, + named_g_server->task, + named_g_timermgr, &dctx)); } CHECK(configure_dyndb(dyndb, mctx, dctx)); @@ -4765,8 +4787,8 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, * they are disabled by default. */ obj = NULL; - (void)ns_config_get(maps, "empty-zones-enable", &obj); - (void)ns_config_get(maps, "disable-empty-zone", &disablelist); + (void)named_config_get(maps, "empty-zones-enable", &obj); + (void)named_config_get(maps, "disable-empty-zone", &disablelist); if (obj == NULL && disablelist == NULL && view->rdclass == dns_rdataclass_in) { empty_zones_enable = view->recursion; @@ -4779,7 +4801,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, empty_zones_enable = ISC_FALSE; } - if (empty_zones_enable && !lwresd_g_useresolvconf) { + if (empty_zones_enable) { const char *empty; int empty_zone = 0; dns_fixedname_t fixed; @@ -4796,7 +4818,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, name = dns_fixedname_name(&fixed); obj = NULL; - result = ns_config_get(maps, "empty-server", &obj); + result = named_config_get(maps, "empty-server", &obj); if (result == ISC_R_SUCCESS) { CHECK(dns_name_fromstring(name, cfg_obj_asstring(obj), 0, NULL)); @@ -4808,7 +4830,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, empty_dbtype[2] = "@"; obj = NULL; - result = ns_config_get(maps, "empty-contact", &obj); + result = named_config_get(maps, "empty-contact", &obj); if (result == ISC_R_SUCCESS) { CHECK(dns_name_fromstring(name, cfg_obj_asstring(obj), 0, NULL)); @@ -4820,7 +4842,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, empty_dbtype[3] = "."; obj = NULL; - result = ns_config_get(maps, "zone-statistics", &obj); + result = named_config_get(maps, "zone-statistics", &obj); INSIST(result == ISC_R_SUCCESS); if (cfg_obj_isboolean(obj)) { if (cfg_obj_asboolean(obj)) @@ -4875,7 +4897,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, /* * See if we can re-use a existing zone. */ - result = dns_viewlist_find(&ns_g_server->viewlist, + result = dns_viewlist_find(&named_g_server->viewlist, view->name, view->rdclass, &pview); if (result != ISC_R_NOTFOUND && @@ -4896,7 +4918,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, } obj = NULL; - result = ns_config_get(maps, "rate-limit", &obj); + result = named_config_get(maps, "rate-limit", &obj); if (result == ISC_R_SUCCESS) { result = configure_rrl(view, config, obj); if (result != ISC_R_SUCCESS) @@ -4907,7 +4929,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, * Set the servfail-ttl. */ obj = NULL; - result = ns_config_get(maps, "servfail-ttl", &obj); + result = named_config_get(maps, "servfail-ttl", &obj); INSIST(result == ISC_R_SUCCESS); fail_ttl = cfg_obj_asuint32(obj); if (fail_ttl > 30) @@ -4918,7 +4940,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, * Name space to look up redirect information in. */ obj = NULL; - result = ns_config_get(maps, "nxdomain-redirect", &obj); + result = named_config_get(maps, "nxdomain-redirect", &obj); if (result == ISC_R_SUCCESS) { dns_name_t *name = dns_fixedname_name(&view->redirectfixed); CHECK(dns_name_fromstring(name, cfg_obj_asstring(obj), 0, @@ -4999,17 +5021,15 @@ configure_alternates(const cfg_obj_t *config, dns_view_t *view, /* * Determine which port to send requests to. */ - if (ns_g_lwresdonly && ns_g_port != 0) - port = ns_g_port; - else - CHECKM(ns_config_getport(config, &port), "port"); + CHECKM(named_config_getport(config, &port), "port"); if (alternates != NULL) { portobj = cfg_tuple_get(alternates, "port"); if (cfg_obj_isuint32(portobj)) { isc_uint32_t val = cfg_obj_asuint32(portobj); if (val > ISC_UINT16_MAX) { - cfg_obj_log(portobj, ns_g_lctx, ISC_LOG_ERROR, + cfg_obj_log(portobj, named_g_lctx, + ISC_LOG_ERROR, "port '%u' out of range", val); return (ISC_R_RANGE); } @@ -5047,7 +5067,7 @@ configure_alternates(const cfg_obj_t *config, dns_view_t *view, if (cfg_obj_isuint32(portobj)) { isc_uint32_t val = cfg_obj_asuint32(portobj); if (val > ISC_UINT16_MAX) { - cfg_obj_log(portobj, ns_g_lctx, + cfg_obj_log(portobj, named_g_lctx, ISC_LOG_ERROR, "port '%u' out of range", val); @@ -5091,17 +5111,15 @@ configure_forward(const cfg_obj_t *config, dns_view_t *view, /* * Determine which port to send forwarded requests to. */ - if (ns_g_lwresdonly && ns_g_port != 0) - port = ns_g_port; - else - CHECKM(ns_config_getport(config, &port), "port"); + CHECKM(named_config_getport(config, &port), "port"); if (forwarders != NULL) { portobj = cfg_tuple_get(forwarders, "port"); if (cfg_obj_isuint32(portobj)) { isc_uint32_t val = cfg_obj_asuint32(portobj); if (val > ISC_UINT16_MAX) { - cfg_obj_log(portobj, ns_g_lctx, ISC_LOG_ERROR, + cfg_obj_log(portobj, named_g_lctx, + ISC_LOG_ERROR, "port '%u' out of range", val); return (ISC_R_RANGE); } @@ -5112,12 +5130,13 @@ configure_forward(const cfg_obj_t *config, dns_view_t *view, /* * DSCP value for forwarded requests. */ - dscp = ns_g_dscp; + dscp = named_g_dscp; if (forwarders != NULL) { dscpobj = cfg_tuple_get(forwarders, "dscp"); if (cfg_obj_isuint32(dscpobj)) { if (cfg_obj_asuint32(dscpobj) > 63) { - cfg_obj_log(dscpobj, ns_g_lctx, ISC_LOG_ERROR, + cfg_obj_log(dscpobj, named_g_lctx, + ISC_LOG_ERROR, "dscp value '%u' is out of range", cfg_obj_asuint32(dscpobj)); return (ISC_R_RANGE); @@ -5152,7 +5171,7 @@ configure_forward(const cfg_obj_t *config, dns_view_t *view, if (ISC_LIST_EMPTY(fwdlist)) { if (forwardtype != NULL) - cfg_obj_log(forwardtype, ns_g_lctx, ISC_LOG_WARNING, + cfg_obj_log(forwardtype, named_g_lctx, ISC_LOG_WARNING, "no forwarders seen; disabling " "forwarding"); fwdpolicy = dns_fwdpolicy_none; @@ -5175,7 +5194,7 @@ configure_forward(const cfg_obj_t *config, dns_view_t *view, if (result != ISC_R_SUCCESS) { char namebuf[DNS_NAME_FORMATSIZE]; dns_name_format(origin, namebuf, sizeof(namebuf)); - cfg_obj_log(forwarders, ns_g_lctx, ISC_LOG_WARNING, + cfg_obj_log(forwarders, named_g_lctx, ISC_LOG_WARNING, "could not set up forwarding for domain '%s': %s", namebuf, isc_result_totext(result)); goto cleanup; @@ -5210,11 +5229,11 @@ get_viewinfo(const cfg_obj_t *vconfig, const char **namep, viewname = cfg_obj_asstring(cfg_tuple_get(vconfig, "name")); classobj = cfg_tuple_get(vconfig, "class"); - CHECK(ns_config_getclass(classobj, dns_rdataclass_in, + CHECK(named_config_getclass(classobj, dns_rdataclass_in, &viewclass)); if (dns_rdataclass_ismeta(viewclass)) { - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_ERROR, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "view '%s': class must not be meta", viewname); CHECK(ISC_R_FAILURE); @@ -5284,21 +5303,17 @@ create_view(const cfg_obj_t *vconfig, dns_viewlist_t *viewlist, return (result); INSIST(view == NULL); - result = dns_view_create(ns_g_mctx, viewclass, viewname, &view); + result = dns_view_create(named_g_mctx, viewclass, viewname, &view); if (result != ISC_R_SUCCESS) return (result); - result = isc_entropy_getdata(ns_g_entropy, view->secret, + result = isc_entropy_getdata(named_g_entropy, view->secret, sizeof(view->secret), NULL, 0); if (result != ISC_R_SUCCESS) { dns_view_detach(&view); return (result); } -#ifdef HAVE_GEOIP - view->aclenv.geoip = ns_g_geoip; -#endif - ISC_LIST_APPEND(*viewlist, view, link); dns_view_attach(view, viewp); return (ISC_R_SUCCESS); @@ -5353,7 +5368,7 @@ configure_zone(const cfg_obj_t *config, const cfg_obj_t *zconfig, &buffer, dns_rootname, 0, NULL)); origin = dns_fixedname_name(&fixorigin); - CHECK(ns_config_getclass(cfg_tuple_get(zconfig, "class"), + CHECK(named_config_getclass(cfg_tuple_get(zconfig, "class"), view->rdclass, &zclass)); if (zclass != view->rdclass) { const char *vname = NULL; @@ -5363,8 +5378,8 @@ configure_zone(const cfg_obj_t *config, const cfg_obj_t *zconfig, else vname = ""; - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_ERROR, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "zone '%s': wrong class for view '%s'", zname, vname); result = ISC_R_FAILURE; @@ -5377,7 +5392,7 @@ configure_zone(const cfg_obj_t *config, const cfg_obj_t *zconfig, dns_view_t *otherview = NULL; if (viewlist == NULL) { - cfg_obj_log(zconfig, ns_g_lctx, ISC_LOG_ERROR, + cfg_obj_log(zconfig, named_g_lctx, ISC_LOG_ERROR, "'in-view' option is not permitted in " "dynamically added zones"); result = ISC_R_FAILURE; @@ -5387,7 +5402,7 @@ configure_zone(const cfg_obj_t *config, const cfg_obj_t *zconfig, result = dns_viewlist_find(viewlist, inview, view->rdclass, &otherview); if (result != ISC_R_SUCCESS) { - cfg_obj_log(zconfig, ns_g_lctx, ISC_LOG_ERROR, + cfg_obj_log(zconfig, named_g_lctx, ISC_LOG_ERROR, "view '%s' is not yet defined.", inview); result = ISC_R_FAILURE; goto cleanup; @@ -5396,7 +5411,7 @@ configure_zone(const cfg_obj_t *config, const cfg_obj_t *zconfig, result = dns_view_findzone(otherview, origin, &zone); dns_view_detach(&otherview); if (result != ISC_R_SUCCESS) { - cfg_obj_log(zconfig, ns_g_lctx, ISC_LOG_ERROR, + cfg_obj_log(zconfig, named_g_lctx, ISC_LOG_ERROR, "zone '%s' not defined in view '%s'", zname, inview); result = ISC_R_FAILURE; @@ -5425,7 +5440,7 @@ configure_zone(const cfg_obj_t *config, const cfg_obj_t *zconfig, (void)cfg_map_get(zoptions, "type", &typeobj); if (typeobj == NULL) { - cfg_obj_log(zconfig, ns_g_lctx, ISC_LOG_ERROR, + cfg_obj_log(zconfig, named_g_lctx, ISC_LOG_ERROR, "zone '%s' 'type' not specified", zname); result = ISC_R_FAILURE; goto cleanup; @@ -5439,8 +5454,8 @@ configure_zone(const cfg_obj_t *config, const cfg_obj_t *zconfig, if (strcasecmp(ztypestr, "hint") == 0) { const cfg_obj_t *fileobj = NULL; if (cfg_map_get(zoptions, "file", &fileobj) != ISC_R_SUCCESS) { - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_ERROR, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "zone '%s': 'file' not specified", zname); result = ISC_R_FAILURE; @@ -5460,8 +5475,8 @@ configure_zone(const cfg_obj_t *config, const cfg_obj_t *zconfig, if (tresult == ISC_R_SUCCESS && cfg_obj_asboolean(only)) CHECK(dns_view_adddelegationonly(view, origin)); } else { - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_WARNING, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_WARNING, "ignoring non-root hint zone '%s'", zname); result = ISC_R_SUCCESS; @@ -5506,7 +5521,7 @@ configure_zone(const cfg_obj_t *config, const cfg_obj_t *zconfig, */ if (strcasecmp(ztypestr, "redirect") == 0) { if (view->redirect != NULL) { - cfg_obj_log(zconfig, ns_g_lctx, ISC_LOG_ERROR, + cfg_obj_log(zconfig, named_g_lctx, ISC_LOG_ERROR, "redirect zone already exists"); result = ISC_R_EXISTS; goto cleanup; @@ -5519,16 +5534,16 @@ configure_zone(const cfg_obj_t *config, const cfg_obj_t *zconfig, dns_zone_attach(pview->redirect, &zone); dns_zone_setview(zone, view); } else { - CHECK(dns_zonemgr_createzone(ns_g_server->zonemgr, + CHECK(dns_zonemgr_createzone(named_g_server->zonemgr, &zone)); CHECK(dns_zone_setorigin(zone, origin)); dns_zone_setview(zone, view); - CHECK(dns_zonemgr_managezone(ns_g_server->zonemgr, + CHECK(dns_zonemgr_managezone(named_g_server->zonemgr, zone)); - dns_zone_setstats(zone, ns_g_server->zonestats); + dns_zone_setstats(zone, named_g_server->zonestats); } - CHECK(ns_zone_configure(config, vconfig, zconfig, aclconf, - zone, NULL)); + CHECK(named_zone_configure(config, vconfig, zconfig, + aclconf, zone, NULL)); dns_zone_attach(zone, &view->redirect); goto cleanup; } @@ -5542,7 +5557,7 @@ configure_zone(const cfg_obj_t *config, const cfg_obj_t *zconfig, /* * We already have this zone! */ - cfg_obj_log(zconfig, ns_g_lctx, ISC_LOG_ERROR, + cfg_obj_log(zconfig, named_g_lctx, ISC_LOG_ERROR, "zone '%s' already exists", zname); dns_zone_detach(&dupzone); result = ISC_R_EXISTS; @@ -5579,7 +5594,7 @@ configure_zone(const cfg_obj_t *config, const cfg_obj_t *zconfig, * or the zone is a policy zone with an unchanged number * and we are using the old policy zone summary data. */ - result = dns_viewlist_find(&ns_g_server->viewlist, view->name, + result = dns_viewlist_find(&named_g_server->viewlist, view->name, view->rdclass, &pview); if (result != ISC_R_NOTFOUND && result != ISC_R_SUCCESS) goto cleanup; @@ -5588,7 +5603,7 @@ configure_zone(const cfg_obj_t *config, const cfg_obj_t *zconfig, if (result != ISC_R_NOTFOUND && result != ISC_R_SUCCESS) goto cleanup; - if (zone != NULL && !ns_zone_reusable(zone, zconfig)) + if (zone != NULL && !named_zone_reusable(zone, zconfig)) dns_zone_detach(&zone); if (zone != NULL && (rpz_num != dns_zone_get_rpz_num(zone) || @@ -5606,17 +5621,17 @@ configure_zone(const cfg_obj_t *config, const cfg_obj_t *zconfig, * We cannot reuse an existing zone, we have * to create a new one. */ - CHECK(dns_zonemgr_createzone(ns_g_server->zonemgr, &zone)); + CHECK(dns_zonemgr_createzone(named_g_server->zonemgr, &zone)); CHECK(dns_zone_setorigin(zone, origin)); dns_zone_setview(zone, view); - CHECK(dns_zonemgr_managezone(ns_g_server->zonemgr, zone)); - dns_zone_setstats(zone, ns_g_server->zonestats); + CHECK(dns_zonemgr_managezone(named_g_server->zonemgr, zone)); + dns_zone_setstats(zone, named_g_server->zonestats); } if (rpz_num != DNS_RPZ_INVALID_NUM) { result = dns_zone_rpz_enable(zone, view->rpzs, rpz_num); if (result != ISC_R_SUCCESS) { - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_ERROR, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "zone '%s': incompatible" " masterfile-format or database" " for a response policy zone", @@ -5667,7 +5682,7 @@ configure_zone(const cfg_obj_t *config, const cfg_obj_t *zconfig, CHECK(dns_zone_create(&raw, mctx)); CHECK(dns_zone_setorigin(raw, origin)); dns_zone_setview(raw, view); - dns_zone_setstats(raw, ns_g_server->zonestats); + dns_zone_setstats(raw, named_g_server->zonestats); CHECK(dns_zone_link(zone, raw)); } } @@ -5675,7 +5690,8 @@ configure_zone(const cfg_obj_t *config, const cfg_obj_t *zconfig, /* * Configure the zone. */ - CHECK(ns_zone_configure(config, vconfig, zconfig, aclconf, zone, raw)); + CHECK(named_zone_configure(config, vconfig, zconfig, + aclconf, zone, raw)); /* * Add the zone to its view in the new view list. @@ -5730,7 +5746,7 @@ add_keydata_zone(dns_view_t *view, const char *directory, isc_mem_t *mctx) { REQUIRE(view != NULL); /* See if we can re-use an existing keydata zone. */ - result = dns_viewlist_find(&ns_g_server->viewlist, + result = dns_viewlist_find(&named_g_server->viewlist, view->name, view->rdclass, &pview); if (result != ISC_R_NOTFOUND && @@ -5746,7 +5762,7 @@ add_keydata_zone(dns_view_t *view, const char *directory, isc_mem_t *mctx) { } /* No existing keydata zone was found; create one */ - CHECK(dns_zonemgr_createzone(ns_g_server->zonemgr, &zone)); + CHECK(dns_zonemgr_createzone(named_g_server->zonemgr, &zone)); CHECK(dns_zone_setorigin(zone, dns_rootname)); defaultview = ISC_TF(strcmp(view->name, "_default") == 0); @@ -5760,7 +5776,7 @@ add_keydata_zone(dns_view_t *view, const char *directory, isc_mem_t *mctx) { dns_zone_settype(zone, dns_zone_key); dns_zone_setclass(zone, view->rdclass); - CHECK(dns_zonemgr_managezone(ns_g_server->zonemgr, zone)); + CHECK(dns_zonemgr_managezone(named_g_server->zonemgr, zone)); CHECK(dns_acl_none(mctx, &none)); dns_zone_setqueryacl(zone, none); @@ -5772,15 +5788,15 @@ add_keydata_zone(dns_view_t *view, const char *directory, isc_mem_t *mctx) { dns_zone_setoption(zone, DNS_ZONEOPT_NOCHECKNS, ISC_TRUE); dns_zone_setjournalsize(zone, 0); - dns_zone_setstats(zone, ns_g_server->zonestats); + dns_zone_setstats(zone, named_g_server->zonestats); CHECK(setquerystats(zone, mctx, dns_zonestat_none)); if (view->managed_keys != NULL) dns_zone_detach(&view->managed_keys); dns_zone_attach(zone, &view->managed_keys); - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_INFO, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_INFO, "set up managed keys zone for view %s, file '%s'", view->name, filename); @@ -5803,7 +5819,7 @@ configure_server_quota(const cfg_obj_t **maps, const char *name, const cfg_obj_t *obj = NULL; isc_result_t result; - result = ns_config_get(maps, name, &obj); + result = named_config_get(maps, name, &obj); INSIST(result == ISC_R_SUCCESS); isc_quota_max(quota, cfg_obj_asuint32(obj)); } @@ -5828,13 +5844,13 @@ directory_callback(const char *clausename, const cfg_obj_t *obj, void *arg) { directory = cfg_obj_asstring(obj); if (! isc_file_ischdiridempotent(directory)) - cfg_obj_log(obj, ns_g_lctx, ISC_LOG_WARNING, + cfg_obj_log(obj, named_g_lctx, ISC_LOG_WARNING, "option 'directory' contains relative path '%s'", directory); result = isc_dir_chdir(directory); if (result != ISC_R_SUCCESS) { - cfg_obj_log(obj, ns_g_lctx, ISC_LOG_ERROR, + cfg_obj_log(obj, named_g_lctx, ISC_LOG_ERROR, "change directory to '%s' failed: %s", directory, isc_result_totext(result)); return (result); @@ -5843,30 +5859,6 @@ directory_callback(const char *clausename, const cfg_obj_t *obj, void *arg) { return (ISC_R_SUCCESS); } -static isc_result_t -scan_interfaces(ns_server_t *server, isc_boolean_t verbose) { - isc_result_t result; - isc_boolean_t match_mapped = server->aclenv.match_mapped; -#ifdef HAVE_GEOIP - isc_boolean_t use_ecs = server->aclenv.geoip_use_ecs; -#endif - - result = ns_interfacemgr_scan(server->interfacemgr, verbose); - /* - * Update the "localhost" and "localnets" ACLs to match the - * current set of network interfaces. - */ - dns_aclenv_copy(&server->aclenv, - ns_interfacemgr_getaclenv(server->interfacemgr)); - - server->aclenv.match_mapped = match_mapped; -#ifdef HAVE_GEOIP - server->aclenv.geoip_use_ecs = use_ecs; -#endif - - return (result); -} - static isc_result_t add_listenelt(isc_mem_t *mctx, ns_listenlist_t *list, isc_sockaddr_t *addr, isc_dscp_t dscp, isc_boolean_t wcardport_ok) @@ -5916,7 +5908,7 @@ add_listenelt(isc_mem_t *mctx, ns_listenlist_t *list, isc_sockaddr_t *addr, * sockets. */ static void -adjust_interfaces(ns_server_t *server, isc_mem_t *mctx) { +adjust_interfaces(named_server_t *server, isc_mem_t *mctx) { isc_result_t result; ns_listenlist_t *list = NULL; dns_view_t *view; @@ -6002,8 +5994,8 @@ adjust_interfaces(ns_server_t *server, isc_mem_t *mctx) { * Even when we failed the procedure, most of other interfaces * should work correctly. We therefore just warn it. */ - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_WARNING, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_WARNING, "could not adjust the listen-on list; " "some interfaces may not work"); goto clean; @@ -6011,32 +6003,22 @@ adjust_interfaces(ns_server_t *server, isc_mem_t *mctx) { /* * This event callback is invoked to do periodic network interface - * scanning. It is also called by ns_server_scan_interfaces(), - * invoked by "rndc scan" + * scanning. */ static void interface_timer_tick(isc_task_t *task, isc_event_t *event) { - isc_result_t result; - ns_server_t *server = (ns_server_t *) event->ev_arg; + named_server_t *server = (named_server_t *) event->ev_arg; INSIST(task == server->task); UNUSED(task); isc_event_free(&event); - - /* - * XXX should scan interfaces unlocked and get exclusive access - * only to replace ACLs. - */ - result = isc_task_beginexclusive(server->task); - RUNTIME_CHECK(result == ISC_R_SUCCESS); - scan_interfaces(server, ISC_FALSE); - isc_task_endexclusive(server->task); + ns_interfacemgr_scan(server->interfacemgr, ISC_FALSE); } static void heartbeat_timer_tick(isc_task_t *task, isc_event_t *event) { - ns_server_t *server = (ns_server_t *) event->ev_arg; + named_server_t *server = (named_server_t *) event->ev_arg; dns_view_t *view; UNUSED(task); @@ -6171,8 +6153,8 @@ dotat(dns_keytable_t *keytable, dns_keynode_t *keynode, void *arg) { return; dns_name_format(tatname, namebuf, sizeof(namebuf)); - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_SERVER, - ISC_LOG_INFO, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_INFO, "%s: sending trust-anchor-telemetry query '%s/NULL'", view->name, namebuf); @@ -6203,7 +6185,7 @@ dotat(dns_keytable_t *keytable, dns_keynode_t *keynode, void *arg) { static void tat_timer_tick(isc_task_t *task, isc_event_t *event) { isc_result_t result; - ns_server_t *server = (ns_server_t *) event->ev_arg; + named_server_t *server = (named_server_t *) event->ev_arg; struct dotat_arg arg; dns_view_t *view; dns_keytable_t *secroots = NULL; @@ -6249,7 +6231,7 @@ pps_timer_tick(isc_task_t *task, isc_event_t *event) { * null-terminated string pointed to by 'value', or NULL. */ static isc_result_t -setstring(ns_server_t *server, char **field, const char *value) { +setstring(named_server_t *server, char **field, const char *value) { char *copy; if (value != NULL) { @@ -6273,7 +6255,7 @@ setstring(ns_server_t *server, char **field, const char *value) { * or NULL if whether 'obj' is a string or void value, respectively. */ static isc_result_t -setoptstring(ns_server_t *server, char **field, const cfg_obj_t *obj) { +setoptstring(named_server_t *server, char **field, const cfg_obj_t *obj) { if (cfg_obj_isvoid(obj)) return (setstring(server, field, NULL)); else @@ -6290,7 +6272,7 @@ set_limit(const cfg_obj_t **maps, const char *configname, isc_resourcevalue_t value; isc_result_t result; - if (ns_config_get(maps, configname, &obj) != ISC_R_SUCCESS) + if (named_config_get(maps, configname, &obj) != ISC_R_SUCCESS) return; if (cfg_obj_isstring(obj)) { @@ -6305,7 +6287,8 @@ set_limit(const cfg_obj_t **maps, const char *configname, value = cfg_obj_asuint64(obj); result = isc_resource_setlimit(resourceid, value); - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_SERVER, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, result == ISC_R_SUCCESS ? ISC_LOG_DEBUG(3) : ISC_LOG_WARNING, "set maximum %s to %" ISC_PRINT_QUADFORMAT "u: %s", @@ -6314,7 +6297,7 @@ set_limit(const cfg_obj_t **maps, const char *configname, #define SETLIMIT(cfgvar, resource, description) \ set_limit(maps, cfgvar, description, isc_resource_ ## resource, \ - ns_g_init ## resource) + named_g_init ## resource) static void set_limits(const cfg_obj_t **maps) { @@ -6393,7 +6376,7 @@ removed(dns_zone_t *zone, void *uap) { } static void -cleanup_session_key(ns_server_t *server, isc_mem_t *mctx) { +cleanup_session_key(named_server_t *server, isc_mem_t *mctx) { if (server->session_keyfile != NULL) { isc_file_remove(server->session_keyfile); isc_mem_free(mctx, server->session_keyfile); @@ -6432,8 +6415,8 @@ generate_session_key(const char *filename, const char *keynamestr, dns_tsigkey_t *tsigkey = NULL; FILE *fp = NULL; - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_INFO, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_INFO, "generating session key for dynamic DNS"); /* generate key */ @@ -6461,10 +6444,10 @@ generate_session_key(const char *filename, const char *keynamestr, &tsigkey)); /* Dump the key to the key file. */ - fp = ns_os_openfile(filename, S_IRUSR|S_IWUSR, ISC_TRUE); + fp = named_os_openfile(filename, S_IRUSR|S_IWUSR, ISC_TRUE); if (fp == NULL) { - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_ERROR, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "could not create %s", filename); result = ISC_R_NOPERM; goto cleanup; @@ -6489,8 +6472,8 @@ generate_session_key(const char *filename, const char *keynamestr, return (ISC_R_SUCCESS); cleanup: - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_ERROR, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "failed to generate session key " "for dynamic DNS: %s", isc_result_totext(result)); if (fp != NULL) { @@ -6506,7 +6489,7 @@ generate_session_key(const char *filename, const char *keynamestr, } static isc_result_t -configure_session_key(const cfg_obj_t **maps, ns_server_t *server, +configure_session_key(const cfg_obj_t **maps, named_server_t *server, isc_mem_t *mctx) { const char *keyfile, *keynamestr, *algstr; @@ -6522,17 +6505,17 @@ configure_session_key(const cfg_obj_t **maps, ns_server_t *server, isc_result_t result; obj = NULL; - result = ns_config_get(maps, "session-keyfile", &obj); + result = named_config_get(maps, "session-keyfile", &obj); if (result == ISC_R_SUCCESS) { if (cfg_obj_isvoid(obj)) keyfile = NULL; /* disable it */ else keyfile = cfg_obj_asstring(obj); } else - keyfile = ns_g_defaultsessionkeyfile; + keyfile = named_g_defaultsessionkeyfile; obj = NULL; - result = ns_config_get(maps, "session-keyname", &obj); + result = named_config_get(maps, "session-keyname", &obj); INSIST(result == ISC_R_SUCCESS); keynamestr = cfg_obj_asstring(obj); dns_fixedname_init(&fname); @@ -6544,15 +6527,16 @@ configure_session_key(const cfg_obj_t **maps, ns_server_t *server, return (result); obj = NULL; - result = ns_config_get(maps, "session-keyalg", &obj); + result = named_config_get(maps, "session-keyalg", &obj); INSIST(result == ISC_R_SUCCESS); algstr = cfg_obj_asstring(obj); algname = NULL; - result = ns_config_getkeyalgorithm2(algstr, &algname, &algtype, &bits); + result = named_config_getkeyalgorithm2(algstr, &algname, &algtype, + &bits); if (result != ISC_R_SUCCESS) { const char *s = " (keeping current key)"; - cfg_obj_log(obj, ns_g_lctx, ISC_LOG_ERROR, "session-keyalg: " + cfg_obj_log(obj, named_g_lctx, ISC_LOG_ERROR, "session-keyalg: " "unsupported or unknown algorithm '%s'%s", algstr, server->session_keyfile != NULL ? s : ""); @@ -6625,15 +6609,15 @@ count_newzones(dns_view_t *view, ns_cfgctx_t *nzcfg, int *num_zonesp) { * This may be called in multiple views, so we reset * the parser each time. */ - cfg_parser_reset(ns_g_addparser); - result = cfg_parse_file(ns_g_addparser, view->new_zone_file, + cfg_parser_reset(named_g_addparser); + result = cfg_parse_file(named_g_addparser, view->new_zone_file, &cfg_type_addzoneconf, &nzcfg->nzf_config); if (result == ISC_R_SUCCESS) { int num_zones; num_zones = count_zones(nzcfg->nzf_config); - isc_log_write(ns_g_lctx, - NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_SERVER, + isc_log_write(named_g_lctx, + NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_SERVER, ISC_LOG_INFO, "NZF file '%s' contains %d zones", view->new_zone_file, num_zones); @@ -6645,8 +6629,8 @@ count_newzones(dns_view_t *view, ns_cfgctx_t *nzcfg, int *num_zonesp) { if (num_zonesp != NULL) *num_zonesp = 0; } else { - isc_log_write(ns_g_lctx, - NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_SERVER, + isc_log_write(named_g_lctx, + NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "Error parsing NZF file '%s': %s", view->new_zone_file, @@ -6669,8 +6653,8 @@ count_newzones(dns_view_t *view, ns_cfgctx_t *nzcfg, int *num_zonesp) { CHECK(migrate_nzf(view)); - isc_log_write(ns_g_lctx, - NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_SERVER, + isc_log_write(named_g_lctx, + NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_SERVER, ISC_LOG_INFO, "loading NZD zone count from '%s' " "for view '%s'", view->new_zone_db, view->name); @@ -6679,8 +6663,8 @@ count_newzones(dns_view_t *view, ns_cfgctx_t *nzcfg, int *num_zonesp) { *num_zonesp = n; - isc_log_write(ns_g_lctx, - NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_SERVER, + isc_log_write(named_g_lctx, + NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_SERVER, ISC_LOG_INFO, "NZD database '%s' contains %d zones", view->new_zone_db, n); @@ -6720,21 +6704,21 @@ setup_newzones(dns_view_t *view, cfg_obj_t *config, cfg_obj_t *vconfig, result = cfg_map_get(config, "options", &options); if (result == ISC_R_SUCCESS) maps[i++] = options; - maps[i++] = ns_g_defaults; + maps[i++] = named_g_defaults; maps[i] = NULL; - result = ns_config_get(maps, "allow-new-zones", &nz); + result = named_config_get(maps, "allow-new-zones", &nz); if (result == ISC_R_SUCCESS) allow = cfg_obj_asboolean(nz); - result = ns_config_get(maps, "new-zones-directory", &nzdir); + result = named_config_get(maps, "new-zones-directory", &nzdir); if (result == ISC_R_SUCCESS) { dir = cfg_obj_asstring(nzdir); if (dir != NULL) { result = isc_file_isdirectory(dir); } if (result != ISC_R_SUCCESS) { - isc_log_write(ns_g_lctx, DNS_LOGCATEGORY_SECURITY, - NS_LOGMODULE_SERVER, ISC_LOG_ERROR, + isc_log_write(named_g_lctx, DNS_LOGCATEGORY_SECURITY, + NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "invalid new-zones-directory %s: %s", dir, isc_result_totext(result)); return (result); @@ -6744,11 +6728,11 @@ setup_newzones(dns_view_t *view, cfg_obj_t *config, cfg_obj_t *vconfig, } #ifdef HAVE_LMDB - result = ns_config_get(maps, "lmdb-mapsize", &obj); + result = named_config_get(maps, "lmdb-mapsize", &obj); if (result == ISC_R_SUCCESS && obj != NULL) { mapsize = cfg_obj_asuint64(obj); if (mapsize < (1ULL << 20)) { /* 1 megabyte */ - cfg_obj_log(obj, ns_g_lctx, + cfg_obj_log(obj, named_g_lctx, ISC_LOG_ERROR, "'lmdb-mapsize " "%" ISC_PRINT_QUADFORMAT "d' " @@ -6756,7 +6740,7 @@ setup_newzones(dns_view_t *view, cfg_obj_t *config, cfg_obj_t *vconfig, mapsize); return (ISC_R_FAILURE); } else if (mapsize > (1ULL << 40)) { /* 1 terabyte */ - cfg_obj_log(obj, ns_g_lctx, + cfg_obj_log(obj, named_g_lctx, ISC_LOG_ERROR, "'lmdb-mapsize " "%" ISC_PRINT_QUADFORMAT "d' " @@ -6774,7 +6758,7 @@ setup_newzones(dns_view_t *view, cfg_obj_t *config, cfg_obj_t *vconfig, */ if (!allow) { const cfg_obj_t *cz = NULL; - result = ns_config_get(maps, "catalog-zones", &cz); + result = named_config_get(maps, "catalog-zones", &cz); if (result == ISC_R_SUCCESS) { const cfg_listelt_t *e = cfg_list_first(cfg_tuple_get(cz, "zone list")); @@ -6803,7 +6787,7 @@ setup_newzones(dns_view_t *view, cfg_obj_t *config, cfg_obj_t *vconfig, */ memset(nzcfg, 0, sizeof(*nzcfg)); cfg_parser_attach(conf_parser, &nzcfg->conf_parser); - cfg_parser_attach(ns_g_addparser, &nzcfg->add_parser); + cfg_parser_attach(named_g_addparser, &nzcfg->add_parser); isc_mem_attach(view->mctx, &nzcfg->mctx); cfg_aclconfctx_attach(actx, &nzcfg->actx); @@ -6837,8 +6821,8 @@ configure_newzones(dns_view_t *view, cfg_obj_t *config, cfg_obj_t *vconfig, if (nzctx == NULL || nzctx->nzf_config == NULL) return (ISC_R_SUCCESS); - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_INFO, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_INFO, "loading additional zones for view '%s'", view->name); @@ -6851,7 +6835,7 @@ configure_newzones(dns_view_t *view, cfg_obj_t *config, cfg_obj_t *vconfig, { const cfg_obj_t *zconfig = cfg_listelt_value(element); CHECK(configure_zone(config, zconfig, vconfig, mctx, - view, &ns_g_server->viewlist, actx, + view, &named_g_server->viewlist, actx, ISC_TRUE, ISC_FALSE, ISC_FALSE)); } @@ -6908,12 +6892,12 @@ data_to_cfg(dns_view_t *view, MDB_val *key, MDB_val *data, putmem(text, (const void *) zone_config, zone_config_len); putstr(text, ";\n"); - cfg_parser_reset(ns_g_addparser); - result = cfg_parse_buffer3(ns_g_addparser, *text, zone_name, 0, + cfg_parser_reset(named_g_addparser); + result = cfg_parse_buffer3(named_g_addparser, *text, zone_name, 0, &cfg_type_addzoneconf, &zoneconf); if (result != ISC_R_SUCCESS) { - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_ERROR, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "parsing config for zone '%.*s' in " "NZD database '%s' failed", (int) zone_name_len, zone_name, @@ -6927,7 +6911,7 @@ data_to_cfg(dns_view_t *view, MDB_val *key, MDB_val *data, cleanup: if (zoneconf != NULL) - cfg_obj_destroy(ns_g_addparser, &zoneconf); + cfg_obj_destroy(named_g_addparser, &zoneconf); return (result); } @@ -6954,8 +6938,8 @@ configure_newzones(dns_view_t *view, cfg_obj_t *config, cfg_obj_t *vconfig, goto cleanup; } - isc_log_write(ns_g_lctx, - NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_SERVER, + isc_log_write(named_g_lctx, + NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_SERVER, ISC_LOG_INFO, "loading NZD configs from '%s' " "for view '%s'", view->new_zone_db, view->name); @@ -6980,10 +6964,10 @@ configure_newzones(dns_view_t *view, cfg_obj_t *config, cfg_obj_t *vconfig, zoneobj = cfg_listelt_value(cfg_list_first(zlist)); CHECK(configure_zone(config, zoneobj, vconfig, mctx, - view, &ns_g_server->viewlist, actx, + view, &named_g_server->viewlist, actx, ISC_TRUE, ISC_FALSE, ISC_FALSE)); - cfg_obj_destroy(ns_g_addparser, &zoneconf); + cfg_obj_destroy(named_g_addparser, &zoneconf); } result = ISC_R_SUCCESS; @@ -6993,7 +6977,7 @@ configure_newzones(dns_view_t *view, cfg_obj_t *config, cfg_obj_t *vconfig, mdb_cursor_close(cursor); (void) nzd_close(&txn, ISC_FALSE); if (zoneconf != NULL) - cfg_obj_destroy(ns_g_addparser, &zoneconf); + cfg_obj_destroy(named_g_addparser, &zoneconf); if (text != NULL) isc_buffer_free(&text); @@ -7020,8 +7004,8 @@ get_newzone_config(dns_view_t *view, const char *zonename, CHECK(nzd_open(view, MDB_RDONLY, &txn, &dbi)); - isc_log_write(ns_g_lctx, - NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_SERVER, + isc_log_write(named_g_lctx, + NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_SERVER, ISC_LOG_INFO, "loading NZD config from '%s' " "for zone '%s'", view->new_zone_db, zonename); @@ -7052,7 +7036,7 @@ get_newzone_config(dns_view_t *view, const char *zonename, (void) nzd_close(&txn, ISC_FALSE); if (zoneconf != NULL) - cfg_obj_destroy(ns_g_addparser, &zoneconf); + cfg_obj_destroy(named_g_addparser, &zoneconf); if (text != NULL) isc_buffer_free(&text); @@ -7079,7 +7063,7 @@ count_zones(const cfg_obj_t *conf) { } static isc_result_t -check_lockfile(ns_server_t *server, const cfg_obj_t *config, +check_lockfile(named_server_t *server, const cfg_obj_t *config, isc_boolean_t first_time) { isc_result_t result; @@ -7094,19 +7078,19 @@ check_lockfile(ns_server_t *server, const cfg_obj_t *config, result = cfg_map_get(config, "options", &options); if (result == ISC_R_SUCCESS) maps[i++] = options; - maps[i++] = ns_g_defaults; + maps[i++] = named_g_defaults; maps[i] = NULL; obj = NULL; - (void) ns_config_get(maps, "lock-file", &obj); + (void) named_config_get(maps, "lock-file", &obj); if (!first_time) { if (obj != NULL && !cfg_obj_isstring(obj) && server->lockfile != NULL && strcmp(cfg_obj_asstring(obj), server->lockfile) != 0) - isc_log_write(ns_g_lctx, - NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, + isc_log_write(named_g_lctx, + NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_WARNING, "changing 'lock-file' " "has no effect until the " @@ -7117,17 +7101,17 @@ check_lockfile(ns_server_t *server, const cfg_obj_t *config, if (obj != NULL) { if (cfg_obj_isvoid(obj)) { - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_DEBUG(1), + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_DEBUG(1), "skipping lock-file check "); return (ISC_R_SUCCESS); - } else if (ns_g_forcelock) { - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_WARNING, + } else if (named_g_forcelock) { + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_WARNING, "'lock-file' has no effect " "because the server was run with -X"); server->lockfile = isc_mem_strdup(server->mctx, - ns_g_defaultlockfile); + named_g_defaultlockfile); } else { filename = cfg_obj_asstring(obj); server->lockfile = isc_mem_strdup(server->mctx, @@ -7138,27 +7122,27 @@ check_lockfile(ns_server_t *server, const cfg_obj_t *config, return (ISC_R_NOMEMORY); } - if (ns_g_forcelock && ns_g_defaultlockfile != NULL) { + if (named_g_forcelock && named_g_defaultlockfile != NULL) { INSIST(server->lockfile == NULL); server->lockfile = isc_mem_strdup(server->mctx, - ns_g_defaultlockfile); + named_g_defaultlockfile); } if (server->lockfile == NULL) return (ISC_R_SUCCESS); - if (ns_os_issingleton(server->lockfile)) + if (named_os_issingleton(server->lockfile)) return (ISC_R_SUCCESS); - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_ERROR, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "could not lock %s; another named " "process may be running", server->lockfile); return (ISC_R_FAILURE); } static isc_result_t -load_configuration(const char *filename, ns_server_t *server, +load_configuration(const char *filename, named_server_t *server, isc_boolean_t first_time) { cfg_obj_t *config = NULL, *bindkeys = NULL; @@ -7175,7 +7159,7 @@ load_configuration(const char *filename, ns_server_t *server, dns_viewlist_t tmpviewlist; dns_viewlist_t viewlist, builtin_viewlist; in_port_t listen_port, udpport_low, udpport_high; - int i; + int i, backlog; int num_zones = 0; isc_boolean_t exclusive = ISC_FALSE; isc_interval_t interval; @@ -7189,12 +7173,15 @@ load_configuration(const char *filename, ns_server_t *server, isc_uint32_t reserved; isc_uint32_t udpsize; isc_uint32_t transfer_message_size; - ns_cache_t *nsc; - ns_cachelist_t cachelist, tmpcachelist; + named_cache_t *nsc; + named_cachelist_t cachelist, tmpcachelist; ns_altsecret_t *altsecret; ns_altsecretlist_t altsecrets, tmpaltsecrets; unsigned int maxsocks; isc_uint32_t softquota = 0; + unsigned int initial, idle, keepalive, advertised; + dns_aclenv_t *env = + ns_interfacemgr_getaclenv(named_g_server->interfacemgr); ISC_LIST_INIT(viewlist); ISC_LIST_INIT(builtin_viewlist); @@ -7202,9 +7189,9 @@ load_configuration(const char *filename, ns_server_t *server, ISC_LIST_INIT(altsecrets); /* Create the ACL configuration context */ - if (ns_g_aclconfctx != NULL) - cfg_aclconfctx_detach(&ns_g_aclconfctx); - CHECK(cfg_aclconfctx_create(ns_g_mctx, &ns_g_aclconfctx)); + if (named_g_aclconfctx != NULL) + cfg_aclconfctx_detach(&named_g_aclconfctx); + CHECK(cfg_aclconfctx_create(named_g_mctx, &named_g_aclconfctx)); /* * Shut down all dyndb instances. @@ -7215,13 +7202,14 @@ load_configuration(const char *filename, ns_server_t *server, * Parse the global default pseudo-config file. */ if (first_time) { - result = ns_config_parsedefaults(ns_g_parser, &ns_g_config); + result = named_config_parsedefaults(named_g_parser, + &named_g_config); if (result != ISC_R_SUCCESS) - ns_main_earlyfatal("unable to load " - "internal defaults: %s", - isc_result_totext(result)); - RUNTIME_CHECK(cfg_map_get(ns_g_config, "options", - &ns_g_defaults) == ISC_R_SUCCESS); + named_main_earlyfatal("unable to load " + "internal defaults: %s", + isc_result_totext(result)); + RUNTIME_CHECK(cfg_map_get(named_g_config, "options", + &named_g_defaults) == ISC_R_SUCCESS); } /* @@ -7229,45 +7217,22 @@ load_configuration(const char *filename, ns_server_t *server, */ result = ISC_R_FAILURE; config = NULL; + isc_log_write(named_g_lctx, + NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_SERVER, + ISC_LOG_INFO, "loading configuration from '%s'", + filename); + CHECK(cfg_parser_create(named_g_mctx, named_g_lctx, + &conf_parser)); + cfg_parser_setcallback(conf_parser, directory_callback, NULL); + result = cfg_parse_file(conf_parser, filename, + &cfg_type_namedconf, &config); - /* - * Unless this is lwresd with the -C option, parse the config file. - */ - if (!(ns_g_lwresdonly && lwresd_g_useresolvconf)) { - isc_log_write(ns_g_lctx, - NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_SERVER, - ISC_LOG_INFO, "loading configuration from '%s'", - filename); - CHECK(cfg_parser_create(ns_g_mctx, ns_g_lctx, &conf_parser)); - cfg_parser_setcallback(conf_parser, directory_callback, NULL); - result = cfg_parse_file(conf_parser, filename, - &cfg_type_namedconf, &config); - } - - /* - * If this is lwresd with the -C option, or lwresd with no -C or -c - * option where the above parsing failed, parse resolv.conf. - */ - if (ns_g_lwresdonly && - (lwresd_g_useresolvconf || - (!ns_g_conffileset && result == ISC_R_FILENOTFOUND))) - { - isc_log_write(ns_g_lctx, - NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_SERVER, - ISC_LOG_INFO, "loading configuration from '%s'", - lwresd_g_resolvconffile); - if (conf_parser != NULL) - cfg_parser_destroy(&conf_parser); - CHECK(cfg_parser_create(ns_g_mctx, ns_g_lctx, &conf_parser)); - result = ns_lwresd_parseeresolvconf(ns_g_mctx, conf_parser, - &config); - } CHECK(result); /* * Check the validity of the configuration. */ - CHECK(bind9_check_namedconf(config, ns_g_lctx, ns_g_mctx)); + CHECK(bind9_check_namedconf(config, named_g_lctx, named_g_mctx)); /* * Fill in the maps array, used for resolving defaults. @@ -7277,7 +7242,7 @@ load_configuration(const char *filename, ns_server_t *server, result = cfg_map_get(config, "options", &options); if (result == ISC_R_SUCCESS) maps[i++] = options; - maps[i++] = ns_g_defaults; + maps[i++] = named_g_defaults; maps[i] = NULL; /* @@ -7287,26 +7252,26 @@ load_configuration(const char *filename, ns_server_t *server, * turned on, then the DLV key found there will too. */ obj = NULL; - result = ns_config_get(maps, "bindkeys-file", &obj); + result = named_config_get(maps, "bindkeys-file", &obj); INSIST(result == ISC_R_SUCCESS); CHECKM(setstring(server, &server->bindkeysfile, cfg_obj_asstring(obj)), "strdup"); if (access(server->bindkeysfile, R_OK) == 0) { - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_INFO, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_INFO, "reading built-in trusted " "keys from file '%s'", server->bindkeysfile); - CHECK(cfg_parser_create(ns_g_mctx, ns_g_lctx, + CHECK(cfg_parser_create(named_g_mctx, named_g_lctx, &bindkeys_parser)); result = cfg_parse_file(bindkeys_parser, server->bindkeysfile, &cfg_type_bindkeys, &bindkeys); CHECK(result); } else { - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_INFO, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_INFO, "unable to open '%s' using built-in keys", server->bindkeysfile); } @@ -7334,13 +7299,13 @@ load_configuration(const char *filename, ns_server_t *server, * but may cause subsequent runtime failures for a busy recursive * server. */ - result = isc_socketmgr_getmaxsockets(ns_g_socketmgr, &maxsocks); + result = isc_socketmgr_getmaxsockets(named_g_socketmgr, &maxsocks); if (result != ISC_R_SUCCESS) maxsocks = 0; result = isc_resource_getcurlimit(isc_resource_openfiles, &nfiles); if (result == ISC_R_SUCCESS && (isc_resourcevalue_t)maxsocks > nfiles) { - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_WARNING, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_WARNING, "max open files (%" ISC_PRINT_QUADFORMAT "u)" " is smaller than max sockets (%u)", nfiles, maxsocks); @@ -7350,7 +7315,7 @@ load_configuration(const char *filename, ns_server_t *server, * Set the number of socket reserved for TCP, stdio etc. */ obj = NULL; - result = ns_config_get(maps, "reserved-sockets", &obj); + result = named_config_get(maps, "reserved-sockets", &obj); INSIST(result == ISC_R_SUCCESS); reserved = cfg_obj_asuint32(obj); if (maxsocks != 0) { @@ -7363,12 +7328,12 @@ load_configuration(const char *filename, ns_server_t *server, if (reserved < 128U) reserved = 128; if (reserved + 128U > maxsocks && maxsocks != 0) { - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_WARNING, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_WARNING, "less than 128 UDP sockets available after " "applying 'reserved-sockets' and 'maxsockets'"); } - isc__socketmgr_setreserved(ns_g_socketmgr, reserved); + isc__socketmgr_setreserved(named_g_socketmgr, reserved); #ifdef HAVE_GEOIP /* @@ -7378,129 +7343,135 @@ load_configuration(const char *filename, ns_server_t *server, * ACLs that can't work. */ obj = NULL; - result = ns_config_get(maps, "geoip-directory", &obj); + result = named_config_get(maps, "geoip-directory", &obj); if (result == ISC_R_SUCCESS && cfg_obj_isstring(obj)) { char *dir; DE_CONST(cfg_obj_asstring(obj), dir); - ns_geoip_load(dir); + named_geoip_load(dir); } else - ns_geoip_load(NULL); - ns_g_aclconfctx->geoip = ns_g_geoip; + named_geoip_load(NULL); + named_g_aclconfctx->geoip = named_g_geoip; obj = NULL; - result = ns_config_get(maps, "geoip-use-ecs", &obj); + result = named_config_get(maps, "geoip-use-ecs", &obj); INSIST(result == ISC_R_SUCCESS); - ns_g_server->aclenv.geoip_use_ecs = cfg_obj_asboolean(obj); + env->geoip_use_ecs = cfg_obj_asboolean(obj); #endif /* HAVE_GEOIP */ /* * Configure various server options. */ - configure_server_quota(maps, "transfers-out", &server->xfroutquota); - configure_server_quota(maps, "tcp-clients", &server->tcpquota); + configure_server_quota(maps, "transfers-out", + &server->sctx->xfroutquota); + configure_server_quota(maps, "tcp-clients", &server->sctx->tcpquota); configure_server_quota(maps, "recursive-clients", - &server->recursionquota); + &server->sctx->recursionquota); - if (server->recursionquota.max > 1000) { - int margin = ISC_MAX(100, ns_g_cpus + 1); - if (margin > server->recursionquota.max - 100) { - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_ERROR, + if (server->sctx->recursionquota.max > 1000) { + int margin = ISC_MAX(100, named_g_cpus + 1); + if (margin > server->sctx->recursionquota.max - 100) { + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "'recursive-clients %d' too low when " "running with %d worker threads", - server->recursionquota.max, ns_g_cpus); + server->sctx->recursionquota.max, + named_g_cpus); CHECK(ISC_R_RANGE); } - softquota = server->recursionquota.max - margin; + softquota = server->sctx->recursionquota.max - margin; } else - softquota = (server->recursionquota.max * 90) / 100; + softquota = (server->sctx->recursionquota.max * 90) / 100; - isc_quota_soft(&server->recursionquota, softquota); + isc_quota_soft(&server->sctx->recursionquota, softquota); CHECK(configure_view_acl(NULL, config, "blackhole", NULL, - ns_g_aclconfctx, ns_g_mctx, - &server->blackholeacl)); - if (server->blackholeacl != NULL) - dns_dispatchmgr_setblackhole(ns_g_dispatchmgr, - server->blackholeacl); + named_g_aclconfctx, named_g_mctx, + &server->sctx->blackholeacl)); + if (server->sctx->blackholeacl != NULL) + dns_dispatchmgr_setblackhole(named_g_dispatchmgr, + server->sctx->blackholeacl); CHECK(configure_view_acl(NULL, config, "keep-response-order", NULL, - ns_g_aclconfctx, ns_g_mctx, - &server->keepresporder)); + named_g_aclconfctx, named_g_mctx, + &server->sctx->keepresporder)); obj = NULL; - result = ns_config_get(maps, "match-mapped-addresses", &obj); + result = named_config_get(maps, "match-mapped-addresses", &obj); INSIST(result == ISC_R_SUCCESS); - server->aclenv.match_mapped = cfg_obj_asboolean(obj); + env->match_mapped = cfg_obj_asboolean(obj); - CHECKM(ns_statschannels_configure(ns_g_server, config, ns_g_aclconfctx), + CHECKM(named_statschannels_configure(named_g_server, config, + named_g_aclconfctx), "configuring statistics server(s)"); obj = NULL; - result = ns_config_get(maps, "tcp-initial-timeout", &obj); + result = named_config_get(maps, "tcp-initial-timeout", &obj); INSIST(result == ISC_R_SUCCESS); - ns_g_initialtimo = cfg_obj_asuint32(obj); - if (ns_g_initialtimo > 1200) { - cfg_obj_log(obj, ns_g_lctx, ISC_LOG_WARNING, + initial = cfg_obj_asuint32(obj); + if (initial > 1200) { + cfg_obj_log(obj, named_g_lctx, ISC_LOG_WARNING, "tcp-initial-timeout value is out of range: " "lowering to 1200"); - ns_g_initialtimo = 1200; - } else if (ns_g_initialtimo < 25) { - cfg_obj_log(obj, ns_g_lctx, ISC_LOG_WARNING, + initial = 1200; + } else if (initial < 25) { + cfg_obj_log(obj, named_g_lctx, ISC_LOG_WARNING, "tcp-initial-timeout value is out of range: " "raising to 25"); - ns_g_initialtimo = 25; + initial = 25; } obj = NULL; - result = ns_config_get(maps, "tcp-idle-timeout", &obj); + result = named_config_get(maps, "tcp-idle-timeout", &obj); INSIST(result == ISC_R_SUCCESS); - ns_g_idletimo = cfg_obj_asuint32(obj); - if (ns_g_idletimo > 1200) { - cfg_obj_log(obj, ns_g_lctx, ISC_LOG_WARNING, + idle = cfg_obj_asuint32(obj); + if (idle > 1200) { + cfg_obj_log(obj, named_g_lctx, ISC_LOG_WARNING, "tcp-idle-timeout value is out of range: " "lowering to 1200"); - ns_g_idletimo = 1200; - } else if (ns_g_idletimo < 1) { - cfg_obj_log(obj, ns_g_lctx, ISC_LOG_WARNING, + idle = 1200; + } else if (idle < 1) { + cfg_obj_log(obj, named_g_lctx, ISC_LOG_WARNING, "tcp-idle-timeout value is out of range: " "raising to 1"); - ns_g_idletimo = 1; + idle = 1; } obj = NULL; - result = ns_config_get(maps, "tcp-keepalive-timeout", &obj); + result = named_config_get(maps, "tcp-keepalive-timeout", &obj); INSIST(result == ISC_R_SUCCESS); - ns_g_keepalivetimo = cfg_obj_asuint32(obj); - if (ns_g_keepalivetimo > 1200) { - cfg_obj_log(obj, ns_g_lctx, ISC_LOG_WARNING, + keepalive = cfg_obj_asuint32(obj); + if (keepalive > 1200) { + cfg_obj_log(obj, named_g_lctx, ISC_LOG_WARNING, "tcp-keepalive-timeout value is out of range: " "lowering to 1200"); - ns_g_keepalivetimo = 1200; - } else if (ns_g_keepalivetimo < 1) { - cfg_obj_log(obj, ns_g_lctx, ISC_LOG_WARNING, + keepalive = 1200; + } else if (keepalive < 1) { + cfg_obj_log(obj, named_g_lctx, ISC_LOG_WARNING, "tcp-keepalive-timeout value is out of range: " "raising to 1"); - ns_g_keepalivetimo = 1; + keepalive = 1; } obj = NULL; - result = ns_config_get(maps, "tcp-advertised-timeout", &obj); + result = named_config_get(maps, "tcp-advertised-timeout", &obj); INSIST(result == ISC_R_SUCCESS); - ns_g_advertisedtimo = cfg_obj_asuint32(obj); - if (ns_g_advertisedtimo > 1200) { - cfg_obj_log(obj, ns_g_lctx, ISC_LOG_WARNING, + advertised = cfg_obj_asuint32(obj); + if (advertised > 1200) { + cfg_obj_log(obj, named_g_lctx, ISC_LOG_WARNING, "tcp-advertized-timeout value is out of range: " "lowering to 1200"); - ns_g_advertisedtimo = 1200; + advertised = 1200; } + ns_server_settimeouts(named_g_server->sctx, + initial, idle, keepalive, advertised); + /* * Configure sets of UDP query source ports. */ - CHECKM(isc_portset_create(ns_g_mctx, &v4portset), + CHECKM(isc_portset_create(named_g_mctx, &v4portset), "creating UDP port set"); - CHECKM(isc_portset_create(ns_g_mctx, &v6portset), + CHECKM(isc_portset_create(named_g_mctx, &v6portset), "creating UDP port set"); usev4ports = NULL; @@ -7508,7 +7479,7 @@ load_configuration(const char *filename, ns_server_t *server, avoidv4ports = NULL; avoidv6ports = NULL; - (void)ns_config_get(maps, "use-v4-udp-ports", &usev4ports); + (void)named_config_get(maps, "use-v4-udp-ports", &usev4ports); if (usev4ports != NULL) portset_fromconf(v4portset, usev4ports, ISC_TRUE); else { @@ -7521,17 +7492,18 @@ load_configuration(const char *filename, ns_server_t *server, isc_portset_addrange(v4portset, udpport_low, udpport_high); } - if (!ns_g_disable4) - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_INFO, + if (!ns_server_getoption(server->sctx, NS_SERVER_DISABLE4)) { + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_INFO, "using default UDP/IPv4 port range: " "[%d, %d]", udpport_low, udpport_high); + } } - (void)ns_config_get(maps, "avoid-v4-udp-ports", &avoidv4ports); + (void)named_config_get(maps, "avoid-v4-udp-ports", &avoidv4ports); if (avoidv4ports != NULL) portset_fromconf(v4portset, avoidv4ports, ISC_FALSE); - (void)ns_config_get(maps, "use-v6-udp-ports", &usev6ports); + (void)named_config_get(maps, "use-v6-udp-ports", &usev6ports); if (usev6ports != NULL) portset_fromconf(v6portset, usev6ports, ISC_TRUE); else { @@ -7544,92 +7516,97 @@ load_configuration(const char *filename, ns_server_t *server, isc_portset_addrange(v6portset, udpport_low, udpport_high); } - if (!ns_g_disable6) - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_INFO, + if (!ns_server_getoption(server->sctx, NS_SERVER_DISABLE6)) { + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_INFO, "using default UDP/IPv6 port range: " "[%d, %d]", udpport_low, udpport_high); + } } - (void)ns_config_get(maps, "avoid-v6-udp-ports", &avoidv6ports); + (void)named_config_get(maps, "avoid-v6-udp-ports", &avoidv6ports); if (avoidv6ports != NULL) portset_fromconf(v6portset, avoidv6ports, ISC_FALSE); - dns_dispatchmgr_setavailports(ns_g_dispatchmgr, v4portset, v6portset); + dns_dispatchmgr_setavailports(named_g_dispatchmgr, v4portset, + v6portset); /* * Set the EDNS UDP size when we don't match a view. */ obj = NULL; - result = ns_config_get(maps, "edns-udp-size", &obj); + result = named_config_get(maps, "edns-udp-size", &obj); INSIST(result == ISC_R_SUCCESS); udpsize = cfg_obj_asuint32(obj); if (udpsize < 512) udpsize = 512; if (udpsize > 4096) udpsize = 4096; - ns_g_udpsize = (isc_uint16_t)udpsize; + server->sctx->udpsize = (isc_uint16_t)udpsize; /* Set the transfer message size for TCP */ obj = NULL; - result = ns_config_get(maps, "transfer-message-size", &obj); + result = named_config_get(maps, "transfer-message-size", &obj); INSIST(result == ISC_R_SUCCESS); transfer_message_size = cfg_obj_asuint32(obj); if (transfer_message_size < 512) transfer_message_size = 512; else if (transfer_message_size > 65535) transfer_message_size = 65535; - server->transfer_tcp_message_size = (isc_uint16_t) transfer_message_size; + server->sctx->transfer_tcp_message_size = + (isc_uint16_t) transfer_message_size; /* * Configure the zone manager. */ obj = NULL; - result = ns_config_get(maps, "transfers-in", &obj); + result = named_config_get(maps, "transfers-in", &obj); INSIST(result == ISC_R_SUCCESS); dns_zonemgr_settransfersin(server->zonemgr, cfg_obj_asuint32(obj)); obj = NULL; - result = ns_config_get(maps, "transfers-per-ns", &obj); + result = named_config_get(maps, "transfers-per-ns", &obj); INSIST(result == ISC_R_SUCCESS); dns_zonemgr_settransfersperns(server->zonemgr, cfg_obj_asuint32(obj)); obj = NULL; - result = ns_config_get(maps, "notify-rate", &obj); + result = named_config_get(maps, "notify-rate", &obj); INSIST(result == ISC_R_SUCCESS); dns_zonemgr_setnotifyrate(server->zonemgr, cfg_obj_asuint32(obj)); obj = NULL; - result = ns_config_get(maps, "startup-notify-rate", &obj); + result = named_config_get(maps, "startup-notify-rate", &obj); INSIST(result == ISC_R_SUCCESS); - dns_zonemgr_setstartupnotifyrate(server->zonemgr, cfg_obj_asuint32(obj)); + dns_zonemgr_setstartupnotifyrate(server->zonemgr, + cfg_obj_asuint32(obj)); obj = NULL; - result = ns_config_get(maps, "serial-query-rate", &obj); + result = named_config_get(maps, "serial-query-rate", &obj); INSIST(result == ISC_R_SUCCESS); dns_zonemgr_setserialqueryrate(server->zonemgr, cfg_obj_asuint32(obj)); /* * Determine which port to use for listening for incoming connections. */ - if (ns_g_port != 0) - listen_port = ns_g_port; + if (named_g_port != 0) + listen_port = named_g_port; else - CHECKM(ns_config_getport(config, &listen_port), "port"); + CHECKM(named_config_getport(config, &listen_port), "port"); /* * Determing the default DSCP code point. */ - CHECKM(ns_config_getdscp(config, &ns_g_dscp), "dscp"); + CHECKM(named_config_getdscp(config, &named_g_dscp), "dscp"); /* * Find the listen queue depth. */ obj = NULL; - result = ns_config_get(maps, "tcp-listen-queue", &obj); + result = named_config_get(maps, "tcp-listen-queue", &obj); INSIST(result == ISC_R_SUCCESS); - ns_g_listen = cfg_obj_asuint32(obj); - if ((ns_g_listen > 0) && (ns_g_listen < 10)) - ns_g_listen = 10; + backlog = cfg_obj_asuint32(obj); + if ((backlog > 0) && (backlog < 10)) + backlog = 10; + ns_interfacemgr_setbacklog(server->interfacemgr, backlog); /* * Configure the interface manager according to the "listen-on" @@ -7642,22 +7619,21 @@ load_configuration(const char *filename, ns_server_t *server, clistenon = NULL; /* * Even though listen-on is present in the default - * configuration, we can't use it here, since it isn't - * used if we're in lwresd mode. This way is easier. + * configuration, this way is easier. */ if (options != NULL) (void)cfg_map_get(options, "listen-on", &clistenon); if (clistenon != NULL) { /* check return code? */ (void)ns_listenlist_fromconfig(clistenon, config, - ns_g_aclconfctx, - ns_g_mctx, AF_INET, + named_g_aclconfctx, + named_g_mctx, AF_INET, &listenon); - } else if (!ns_g_lwresdonly) { + } else { /* * Not specified, use default. */ - CHECK(ns_listenlist_default(ns_g_mctx, listen_port, + CHECK(ns_listenlist_default(named_g_mctx, listen_port, -1, ISC_TRUE, &listenon)); } if (listenon != NULL) { @@ -7678,14 +7654,14 @@ load_configuration(const char *filename, ns_server_t *server, if (clistenon != NULL) { /* check return code? */ (void)ns_listenlist_fromconfig(clistenon, config, - ns_g_aclconfctx, - ns_g_mctx, AF_INET6, + named_g_aclconfctx, + named_g_mctx, AF_INET6, &listenon); - } else if (!ns_g_lwresdonly) { + } else { /* * Not specified, use default. */ - CHECK(ns_listenlist_default(ns_g_mctx, listen_port, + CHECK(ns_listenlist_default(named_g_mctx, listen_port, -1, ISC_TRUE, &listenon)); } if (listenon != NULL) { @@ -7701,7 +7677,7 @@ load_configuration(const char *filename, ns_server_t *server, * to configure the query source, since the dispatcher we use might * be shared with an interface. */ - result = scan_interfaces(server, ISC_TRUE); + result = ns_interfacemgr_scan(server->interfacemgr, ISC_TRUE); /* * Check that named is able to TCP listen on at least one @@ -7709,8 +7685,8 @@ load_configuration(const char *filename, ns_server_t *server, * and we should fail. */ if (first_time && (result == ISC_R_ADDRINUSE)) { - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_ERROR, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "unable to listen on any configured interfaces"); result = ISC_R_FAILURE; goto cleanup; @@ -7721,7 +7697,7 @@ load_configuration(const char *filename, ns_server_t *server, * as specified by the "interface-interval" option. */ obj = NULL; - result = ns_config_get(maps, "interface-interval", &obj); + result = named_config_get(maps, "interface-interval", &obj); INSIST(result == ISC_R_SUCCESS); interface_interval = cfg_obj_asuint32(obj) * 60; if (interface_interval == 0) { @@ -7740,15 +7716,15 @@ load_configuration(const char *filename, ns_server_t *server, * Enable automatic interface scans. */ obj = NULL; - result = ns_config_get(maps, "automatic-interface-scan", &obj); + result = named_config_get(maps, "automatic-interface-scan", &obj); INSIST(result == ISC_R_SUCCESS); - server->interface_auto = cfg_obj_asboolean(obj); + server->sctx->interface_auto = cfg_obj_asboolean(obj); /* * Configure the dialup heartbeat timer. */ obj = NULL; - result = ns_config_get(maps, "heartbeat-interval", &obj); + result = named_config_get(maps, "heartbeat-interval", &obj); INSIST(result == ISC_R_SUCCESS); heartbeat_interval = cfg_obj_asuint32(obj) * 60; if (heartbeat_interval == 0) { @@ -7767,7 +7743,7 @@ load_configuration(const char *filename, ns_server_t *server, CHECK(isc_timer_reset(server->pps_timer, isc_timertype_ticker, NULL, &interval, ISC_FALSE)); - isc_interval_set(&interval, ns_g_tat_interval, 0); + isc_interval_set(&interval, named_g_tat_interval, 0); CHECK(isc_timer_reset(server->tat_timer, isc_timertype_ticker, NULL, &interval, ISC_FALSE)); @@ -7775,15 +7751,14 @@ load_configuration(const char *filename, ns_server_t *server, * Write the PID file. */ obj = NULL; - if (ns_config_get(maps, "pid-file", &obj) == ISC_R_SUCCESS) + if (named_config_get(maps, "pid-file", &obj) == ISC_R_SUCCESS) if (cfg_obj_isvoid(obj)) - ns_os_writepidfile(NULL, first_time); + named_os_writepidfile(NULL, first_time); else - ns_os_writepidfile(cfg_obj_asstring(obj), first_time); - else if (ns_g_lwresdonly) - ns_os_writepidfile(lwresd_g_defaultpidfile, first_time); + named_os_writepidfile(cfg_obj_asstring(obj), + first_time); else - ns_os_writepidfile(ns_g_defaultpidfile, first_time); + named_os_writepidfile(named_g_defaultpidfile, first_time); /* * Configure the server-wide session key. This must be done before @@ -7794,7 +7769,7 @@ load_configuration(const char *filename, ns_server_t *server, * turns out that a session key is really needed but doesn't exist, * we'll treat it as a fatal error then. */ - (void)configure_session_key(maps, server, ns_g_mctx); + (void)configure_session_key(maps, server, named_g_mctx); views = NULL; (void)cfg_map_get(config, "view", &views); @@ -7827,7 +7802,7 @@ load_configuration(const char *filename, ns_server_t *server, num_zones += count_zones(voptions); CHECK(setup_newzones(view, config, vconfig, conf_parser, - ns_g_aclconfctx, &nzf_num_zones)); + named_g_aclconfctx, &nzf_num_zones)); num_zones += nzf_num_zones; dns_view_detach(&view); @@ -7846,7 +7821,7 @@ load_configuration(const char *filename, ns_server_t *server, num_zones = count_zones(config); CHECK(setup_newzones(view, config, NULL, conf_parser, - ns_g_aclconfctx, &nzf_num_zones)); + named_g_aclconfctx, &nzf_num_zones)); num_zones += nzf_num_zones; dns_view_detach(&view); @@ -7855,10 +7830,10 @@ load_configuration(const char *filename, ns_server_t *server, /* * Zones have been counted; set the zone manager task pool size. */ - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_INFO, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_INFO, "sizing zone task pool based on %d zones", num_zones); - CHECK(dns_zonemgr_setsize(ns_g_server->zonemgr, num_zones)); + CHECK(dns_zonemgr_setsize(named_g_server->zonemgr, num_zones)); /* * Configure and freeze all explicit views. Explicit @@ -7874,8 +7849,8 @@ load_configuration(const char *filename, ns_server_t *server, view = NULL; CHECK(find_view(vconfig, &viewlist, &view)); CHECK(configure_view(view, &viewlist, config, vconfig, - &cachelist, bindkeys, ns_g_mctx, - ns_g_aclconfctx, ISC_TRUE)); + &cachelist, bindkeys, named_g_mctx, + named_g_aclconfctx, ISC_TRUE)); dns_view_freeze(view); dns_view_detach(&view); } @@ -7889,7 +7864,8 @@ load_configuration(const char *filename, ns_server_t *server, CHECK(find_view(NULL, &viewlist, &view)); CHECK(configure_view(view, &viewlist, config, NULL, &cachelist, bindkeys, - ns_g_mctx, ns_g_aclconfctx, ISC_TRUE)); + named_g_mctx, named_g_aclconfctx, + ISC_TRUE)); dns_view_freeze(view); dns_view_detach(&view); } @@ -7898,7 +7874,7 @@ load_configuration(const char *filename, ns_server_t *server, * Create (or recreate) the built-in views. */ builtin_views = NULL; - RUNTIME_CHECK(cfg_map_get(ns_g_config, "view", + RUNTIME_CHECK(cfg_map_get(named_g_config, "view", &builtin_views) == ISC_R_SUCCESS); for (element = cfg_list_first(builtin_views); element != NULL; @@ -7909,7 +7885,8 @@ load_configuration(const char *filename, ns_server_t *server, CHECK(create_view(vconfig, &builtin_viewlist, &view)); CHECK(configure_view(view, &viewlist, config, vconfig, &cachelist, bindkeys, - ns_g_mctx, ns_g_aclconfctx, ISC_FALSE)); + named_g_mctx, named_g_aclconfctx, + ISC_FALSE)); dns_view_freeze(view); dns_view_detach(&view); view = NULL; @@ -7938,70 +7915,65 @@ load_configuration(const char *filename, ns_server_t *server, /* Load the TKEY information from the configuration. */ if (options != NULL) { dns_tkeyctx_t *t = NULL; - CHECKM(ns_tkeyctx_fromconfig(options, ns_g_mctx, ns_g_entropy, - &t), + CHECKM(named_tkeyctx_fromconfig(options, named_g_mctx, + named_g_entropy, &t), "configuring TKEY"); - if (server->tkeyctx != NULL) - dns_tkeyctx_destroy(&server->tkeyctx); - server->tkeyctx = t; + if (server->sctx->tkeyctx != NULL) + dns_tkeyctx_destroy(&server->sctx->tkeyctx); + server->sctx->tkeyctx = t; } /* * Bind the control port(s). */ - CHECKM(ns_controls_configure(ns_g_server->controls, config, - ns_g_aclconfctx), + CHECKM(named_controls_configure(named_g_server->controls, config, + named_g_aclconfctx), "binding control channel(s)"); - /* - * Bind the lwresd port(s). - */ - CHECKM(ns_lwresd_configure(ns_g_mctx, config), - "binding lightweight resolver ports"); - /* * Open the source of entropy. */ if (first_time) { obj = NULL; - result = ns_config_get(maps, "random-device", &obj); + result = named_config_get(maps, "random-device", &obj); if (result != ISC_R_SUCCESS) { - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_INFO, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_INFO, "no source of entropy found"); } else { const char *randomdev = cfg_obj_asstring(obj); int level = ISC_LOG_ERROR; - result = isc_entropy_createfilesource(ns_g_entropy, + result = isc_entropy_createfilesource(named_g_entropy, randomdev); #ifdef PATH_RANDOMDEV - if (ns_g_fallbackentropy != NULL) + if (named_g_fallbackentropy != NULL) level = ISC_LOG_INFO; #endif if (result != ISC_R_SUCCESS) - isc_log_write(ns_g_lctx, - NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, + isc_log_write(named_g_lctx, + NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, level, "could not open entropy source " "%s: %s", randomdev, isc_result_totext(result)); #ifdef PATH_RANDOMDEV - if (ns_g_fallbackentropy != NULL) { + if (named_g_fallbackentropy != NULL) { if (result != ISC_R_SUCCESS) { - isc_log_write(ns_g_lctx, - NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, + isc_log_write(named_g_lctx, + NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_INFO, - "using pre-chroot entropy source " - "%s", + "using pre-chroot " + "entropy source %s", PATH_RANDOMDEV); - isc_entropy_detach(&ns_g_entropy); - isc_entropy_attach(ns_g_fallbackentropy, - &ns_g_entropy); + isc_entropy_detach(&named_g_entropy); + isc_entropy_attach( + named_g_fallbackentropy, + &named_g_entropy); } - isc_entropy_detach(&ns_g_fallbackentropy); + isc_entropy_detach(&named_g_fallbackentropy); } #endif } @@ -8028,14 +8000,14 @@ load_configuration(const char *filename, ns_server_t *server, * Relinquish root privileges. */ if (first_time) - ns_os_changeuser(); + named_os_changeuser(); /* * Check that the working directory is writable. */ if (access(".", W_OK) != 0) { - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_ERROR, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "the working directory is not writable"); } @@ -8060,22 +8032,22 @@ load_configuration(const char *filename, ns_server_t *server, * files specified in named.conf get created by the * unprivileged user, not root. */ - if (ns_g_logstderr) { + if (named_g_logstderr) { const cfg_obj_t *logobj = NULL; - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_INFO, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_INFO, "not using config file logging " "statement for logging due to " "-g option"); (void)cfg_map_get(config, "logging", &logobj); if (logobj != NULL) { - result = ns_log_configure(NULL, logobj); + result = named_logconfig(NULL, logobj); if (result != ISC_R_SUCCESS) { - isc_log_write(ns_g_lctx, - NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, + isc_log_write(named_g_lctx, + NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "checking logging configuration " "failed: %s", @@ -8086,29 +8058,29 @@ load_configuration(const char *filename, ns_server_t *server, } else { const cfg_obj_t *logobj = NULL; - CHECKM(isc_logconfig_create(ns_g_lctx, &logc), + CHECKM(isc_logconfig_create(named_g_lctx, &logc), "creating new logging configuration"); logobj = NULL; (void)cfg_map_get(config, "logging", &logobj); if (logobj != NULL) { - CHECKM(ns_log_configure(logc, logobj), + CHECKM(named_logconfig(logc, logobj), "configuring logging"); } else { - CHECKM(ns_log_setdefaultchannels(logc), + CHECKM(named_log_setdefaultchannels(logc), "setting up default logging channels"); - CHECKM(ns_log_setunmatchedcategory(logc), + CHECKM(named_log_setunmatchedcategory(logc), "setting up default 'category unmatched'"); - CHECKM(ns_log_setdefaultcategory(logc), + CHECKM(named_log_setdefaultcategory(logc), "setting up default 'category default'"); } - CHECKM(isc_logconfig_use(ns_g_lctx, logc), + CHECKM(isc_logconfig_use(named_g_lctx, logc), "installing logging configuration"); logc = NULL; - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_DEBUG(1), + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_DEBUG(1), "now using logging configuration from " "config file"); } @@ -8124,8 +8096,10 @@ load_configuration(const char *filename, ns_server_t *server, const cfg_obj_t *categories = NULL; obj = NULL; - if (ns_config_get(maps, "querylog", &obj) == ISC_R_SUCCESS) { - server->log_queries = cfg_obj_asboolean(obj); + if (named_config_get(maps, "querylog", &obj) == ISC_R_SUCCESS) { + ns_server_setoption(server->sctx, + NS_SERVER_LOGQUERIES, + cfg_obj_asboolean(obj)); } else { (void)cfg_map_get(config, "logging", &logobj); @@ -8144,7 +8118,10 @@ load_configuration(const char *filename, ns_server_t *server, catobj = cfg_tuple_get(obj, "name"); str = cfg_obj_asstring(catobj); if (strcasecmp(str, "queries") == 0) - server->log_queries = ISC_TRUE; + ns_server_setoption( + server->sctx, + NS_SERVER_LOGQUERIES, + ISC_TRUE); } } } @@ -8153,45 +8130,45 @@ load_configuration(const char *filename, ns_server_t *server, obj = NULL; if (options != NULL && cfg_map_get(options, "memstatistics", &obj) == ISC_R_SUCCESS) - ns_g_memstatistics = cfg_obj_asboolean(obj); + named_g_memstatistics = cfg_obj_asboolean(obj); else - ns_g_memstatistics = + named_g_memstatistics = ISC_TF((isc_mem_debugging & ISC_MEM_DEBUGRECORD) != 0); obj = NULL; - if (ns_config_get(maps, "memstatistics-file", &obj) == ISC_R_SUCCESS) - ns_main_setmemstats(cfg_obj_asstring(obj)); - else if (ns_g_memstatistics) - ns_main_setmemstats("named.memstats"); + if (named_config_get(maps, "memstatistics-file", &obj) == ISC_R_SUCCESS) + named_main_setmemstats(cfg_obj_asstring(obj)); + else if (named_g_memstatistics) + named_main_setmemstats("named.memstats"); else - ns_main_setmemstats(NULL); + named_main_setmemstats(NULL); obj = NULL; - result = ns_config_get(maps, "statistics-file", &obj); + result = named_config_get(maps, "statistics-file", &obj); INSIST(result == ISC_R_SUCCESS); CHECKM(setstring(server, &server->statsfile, cfg_obj_asstring(obj)), "strdup"); obj = NULL; - result = ns_config_get(maps, "dump-file", &obj); + result = named_config_get(maps, "dump-file", &obj); INSIST(result == ISC_R_SUCCESS); CHECKM(setstring(server, &server->dumpfile, cfg_obj_asstring(obj)), "strdup"); obj = NULL; - result = ns_config_get(maps, "secroots-file", &obj); + result = named_config_get(maps, "secroots-file", &obj); INSIST(result == ISC_R_SUCCESS); CHECKM(setstring(server, &server->secrootsfile, cfg_obj_asstring(obj)), "strdup"); obj = NULL; - result = ns_config_get(maps, "recursing-file", &obj); + result = named_config_get(maps, "recursing-file", &obj); INSIST(result == ISC_R_SUCCESS); CHECKM(setstring(server, &server->recfile, cfg_obj_asstring(obj)), "strdup"); obj = NULL; - result = ns_config_get(maps, "version", &obj); + result = named_config_get(maps, "version", &obj); if (result == ISC_R_SUCCESS) { CHECKM(setoptstring(server, &server->version, obj), "strdup"); server->version_set = ISC_TRUE; @@ -8200,7 +8177,7 @@ load_configuration(const char *filename, ns_server_t *server, } obj = NULL; - result = ns_config_get(maps, "hostname", &obj); + result = named_config_get(maps, "hostname", &obj); if (result == ISC_R_SUCCESS) { CHECKM(setoptstring(server, &server->hostname, obj), "strdup"); server->hostname_set = ISC_TRUE; @@ -8209,23 +8186,23 @@ load_configuration(const char *filename, ns_server_t *server, } obj = NULL; - result = ns_config_get(maps, "server-id", &obj); - server->server_usehostname = ISC_FALSE; + result = named_config_get(maps, "server-id", &obj); + server->sctx->gethostname = NULL; if (result == ISC_R_SUCCESS && cfg_obj_isboolean(obj)) { /* The parser translates "hostname" to ISC_TRUE */ - server->server_usehostname = cfg_obj_asboolean(obj); - result = setstring(server, &server->server_id, NULL); - RUNTIME_CHECK(result == ISC_R_SUCCESS); - } else if (result == ISC_R_SUCCESS) { + server->sctx->gethostname = named_os_gethostname; + result = ns_server_setserverid(server->sctx, NULL); + } else if (result == ISC_R_SUCCESS && !cfg_obj_isvoid(obj)) { /* Found a quoted string */ - CHECKM(setoptstring(server, &server->server_id, obj), "strdup"); + result = ns_server_setserverid(server->sctx, + cfg_obj_asstring(obj)); } else { - result = setstring(server, &server->server_id, NULL); - RUNTIME_CHECK(result == ISC_R_SUCCESS); + result = ns_server_setserverid(server->sctx, NULL); } + RUNTIME_CHECK(result == ISC_R_SUCCESS); obj = NULL; - result = ns_config_get(maps, "flush-zones-on-shutdown", &obj); + result = named_config_get(maps, "flush-zones-on-shutdown", &obj); if (result == ISC_R_SUCCESS) { server->flushonshutdown = cfg_obj_asboolean(obj); } else { @@ -8233,23 +8210,23 @@ load_configuration(const char *filename, ns_server_t *server, } obj = NULL; - result = ns_config_get(maps, "cookie-algorithm", &obj); + result = named_config_get(maps, "cookie-algorithm", &obj); INSIST(result == ISC_R_SUCCESS); if (strcasecmp(cfg_obj_asstring(obj), "aes") == 0) #if defined(HAVE_OPENSSL_AES) || defined(HAVE_OPENSSL_EVP_AES) - server->cookiealg = ns_cookiealg_aes; + server->sctx->cookiealg = ns_cookiealg_aes; #else INSIST(0); #endif else if (strcasecmp(cfg_obj_asstring(obj), "sha1") == 0) - server->cookiealg = ns_cookiealg_sha1; + server->sctx->cookiealg = ns_cookiealg_sha1; else if (strcasecmp(cfg_obj_asstring(obj), "sha256") == 0) - server->cookiealg = ns_cookiealg_sha256; + server->sctx->cookiealg = ns_cookiealg_sha256; else INSIST(0); obj = NULL; - result = ns_config_get(maps, "cookie-secret", &obj); + result = named_config_get(maps, "cookie-secret", &obj); if (result == ISC_R_SUCCESS) { const char *str; isc_boolean_t first = ISC_TRUE; @@ -8264,17 +8241,17 @@ load_configuration(const char *filename, ns_server_t *server, str = cfg_obj_asstring(obj); if (first) { - memset(server->secret, 0, - sizeof(server->secret)); - isc_buffer_init(&b, server->secret, - sizeof(server->secret)); + memset(server->sctx->secret, 0, + sizeof(server->sctx->secret)); + isc_buffer_init(&b, server->sctx->secret, + sizeof(server->sctx->secret)); result = isc_hex_decodestring(str, &b); if (result != ISC_R_SUCCESS && result != ISC_R_NOSPACE) goto cleanup; first = ISC_FALSE; } else { - altsecret = isc_mem_get(server->mctx, + altsecret = isc_mem_get(server->sctx->mctx, sizeof(*altsecret)); if (altsecret == NULL) { result = ISC_R_NOMEMORY; @@ -8285,7 +8262,8 @@ load_configuration(const char *filename, ns_server_t *server, result = isc_hex_decodestring(str, &b); if (result != ISC_R_SUCCESS && result != ISC_R_NOSPACE) { - isc_mem_put(server->mctx, altsecret, + isc_mem_put(server->sctx->mctx, + altsecret, sizeof(*altsecret)); goto cleanup; } @@ -8294,31 +8272,34 @@ load_configuration(const char *filename, ns_server_t *server, } usedlength = isc_buffer_usedlength(&b); - switch (server->cookiealg) { + switch (server->sctx->cookiealg) { case ns_cookiealg_aes: - if (usedlength != ISC_AES128_KEYLENGTH) + if (usedlength != ISC_AES128_KEYLENGTH) { CHECKM(ISC_R_RANGE, "AES cookie-secret must be " "128 bits"); + } break; case ns_cookiealg_sha1: - if (usedlength != ISC_SHA1_DIGESTLENGTH) + if (usedlength != ISC_SHA1_DIGESTLENGTH) { CHECKM(ISC_R_RANGE, "SHA1 cookie-secret must be " "160 bits"); + } break; case ns_cookiealg_sha256: - if (usedlength != ISC_SHA256_DIGESTLENGTH) + if (usedlength != ISC_SHA256_DIGESTLENGTH) { CHECKM(ISC_R_RANGE, "SHA256 cookie-secret must be " "256 bits"); + } break; } } } else { - result = isc_entropy_getdata(ns_g_entropy, - server->secret, - sizeof(server->secret), + result = isc_entropy_getdata(named_g_entropy, + server->sctx->secret, + sizeof(server->sctx->secret), NULL, 0); if (result != ISC_R_SUCCESS) @@ -8328,11 +8309,11 @@ load_configuration(const char *filename, ns_server_t *server, /* * Swap altsecrets lists. */ - tmpaltsecrets = server->altsecrets; - server->altsecrets = altsecrets; + tmpaltsecrets = server->sctx->altsecrets; + server->sctx->altsecrets = altsecrets; altsecrets = tmpaltsecrets; - (void) ns_server_loadnta(server); + (void) named_server_loadnta(server); result = ISC_R_SUCCESS; @@ -8341,10 +8322,10 @@ load_configuration(const char *filename, ns_server_t *server, isc_logconfig_destroy(&logc); if (v4portset != NULL) - isc_portset_destroy(ns_g_mctx, &v4portset); + isc_portset_destroy(named_g_mctx, &v4portset); if (v6portset != NULL) - isc_portset_destroy(ns_g_mctx, &v6portset); + isc_portset_destroy(named_g_mctx, &v6portset); if (conf_parser != NULL) { if (config != NULL) @@ -8387,10 +8368,10 @@ load_configuration(const char *filename, ns_server_t *server, isc_mem_put(server->mctx, nsc, sizeof(*nsc)); } - /* Same cleanup for altsecrets list. */ + /* Cleanup for altsecrets list. */ while ((altsecret = ISC_LIST_HEAD(altsecrets)) != NULL) { ISC_LIST_UNLINK(altsecrets, altsecret, link); - isc_mem_put(server->mctx, altsecret, sizeof(*altsecret)); + isc_mem_put(server->sctx->mctx, altsecret, sizeof(*altsecret)); } /* @@ -8398,22 +8379,23 @@ load_configuration(const char *filename, ns_server_t *server, * addresses specified in views and zones. */ if (isc_net_probeipv6() == ISC_R_SUCCESS) - adjust_interfaces(server, ns_g_mctx); + adjust_interfaces(server, named_g_mctx); /* * Record the time of most recent configuration */ - tresult = isc_time_now(&ns_g_configtime); + tresult = isc_time_now(&named_g_configtime); if (tresult != ISC_R_SUCCESS) - ns_main_earlyfatal("isc_time_now() failed: %s", - isc_result_totext(result)); + named_main_earlyfatal("isc_time_now() failed: %s", + isc_result_totext(result)); /* Relinquish exclusive access to configuration data. */ if (exclusive) isc_task_endexclusive(server->task); - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_SERVER, - ISC_LOG_DEBUG(1), "load_configuration: %s", + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_DEBUG(1), + "load_configuration: %s", isc_result_totext(result)); return (result); @@ -8423,7 +8405,7 @@ static isc_result_t view_loaded(void *arg) { isc_result_t result; ns_zoneload_t *zl = (ns_zoneload_t *) arg; - ns_server_t *server = zl->server; + named_server_t *server = zl->server; isc_boolean_t reconfig = zl->reconfig; unsigned int refs; @@ -8449,27 +8431,27 @@ view_loaded(void *arg) { * as it is */ if (reconfig) { - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_INFO, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_INFO, "any newly configured zones are now loaded"); } else { - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_NOTICE, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_NOTICE, "all zones loaded"); } CHECKFATAL(dns_zonemgr_forcemaint(server->zonemgr), "forcing zone maintenance"); - ns_os_started(); - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_SERVER, - ISC_LOG_NOTICE, "running"); + named_os_started(); + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_NOTICE, "running"); return (ISC_R_SUCCESS); } static isc_result_t -load_zones(ns_server_t *server, isc_boolean_t init, isc_boolean_t reconfig) { +load_zones(named_server_t *server, isc_boolean_t init, isc_boolean_t reconfig) { isc_result_t result; dns_view_t *view; ns_zoneload_t *zl; @@ -8530,7 +8512,8 @@ load_zones(ns_server_t *server, isc_boolean_t init, isc_boolean_t reconfig) { * the initial server setup; it isn't necessary during * a reload.) */ - isc_taskmgr_setmode(ns_g_taskmgr, isc_taskmgrmode_privileged); + isc_taskmgr_setmode(named_g_taskmgr, + isc_taskmgrmode_privileged); } isc_task_endexclusive(server->task); @@ -8540,71 +8523,83 @@ load_zones(ns_server_t *server, isc_boolean_t init, isc_boolean_t reconfig) { static void run_server(isc_task_t *task, isc_event_t *event) { isc_result_t result; - ns_server_t *server = (ns_server_t *)event->ev_arg; + named_server_t *server = (named_server_t *)event->ev_arg; INSIST(task == server->task); isc_event_free(&event); - CHECKFATAL(dns_dispatchmgr_create(ns_g_mctx, ns_g_entropy, - &ns_g_dispatchmgr), + CHECKFATAL(dns_dispatchmgr_create(named_g_mctx, named_g_entropy, + &named_g_dispatchmgr), "creating dispatch manager"); - dns_dispatchmgr_setstats(ns_g_dispatchmgr, server->resolverstats); + dns_dispatchmgr_setstats(named_g_dispatchmgr, server->resolverstats); - CHECKFATAL(ns_interfacemgr_create(ns_g_mctx, ns_g_taskmgr, - ns_g_socketmgr, ns_g_dispatchmgr, - server->task, &server->interfacemgr), +#ifdef HAVE_GEOIP + CHECKFATAL(ns_interfacemgr_create(named_g_mctx, server->sctx, + named_g_taskmgr, named_g_timermgr, + named_g_socketmgr, + named_g_dispatchmgr, + server->task, named_g_udpdisp, + named_g_geoip, + &server->interfacemgr), "creating interface manager"); +#else + CHECKFATAL(ns_interfacemgr_create(named_g_mctx, server->sctx, + named_g_taskmgr, named_g_timermgr, + named_g_socketmgr, + named_g_dispatchmgr, + server->task, named_g_udpdisp, + NULL, + &server->interfacemgr), + "creating interface manager"); +#endif - CHECKFATAL(isc_timer_create(ns_g_timermgr, isc_timertype_inactive, + CHECKFATAL(isc_timer_create(named_g_timermgr, isc_timertype_inactive, NULL, NULL, server->task, interface_timer_tick, server, &server->interface_timer), "creating interface timer"); - CHECKFATAL(isc_timer_create(ns_g_timermgr, isc_timertype_inactive, + CHECKFATAL(isc_timer_create(named_g_timermgr, isc_timertype_inactive, NULL, NULL, server->task, heartbeat_timer_tick, server, &server->heartbeat_timer), "creating heartbeat timer"); - CHECKFATAL(isc_timer_create(ns_g_timermgr, isc_timertype_inactive, + CHECKFATAL(isc_timer_create(named_g_timermgr, isc_timertype_inactive, NULL, NULL, server->task, tat_timer_tick, server, &server->tat_timer), "creating trust anchor telemetry timer"); - CHECKFATAL(isc_timer_create(ns_g_timermgr, isc_timertype_inactive, + CHECKFATAL(isc_timer_create(named_g_timermgr, isc_timertype_inactive, NULL, NULL, server->task, pps_timer_tick, server, &server->pps_timer), "creating pps timer"); - CHECKFATAL(cfg_parser_create(ns_g_mctx, ns_g_lctx, &ns_g_parser), + CHECKFATAL(cfg_parser_create(named_g_mctx, named_g_lctx, + &named_g_parser), "creating default configuration parser"); - CHECKFATAL(cfg_parser_create(ns_g_mctx, ns_g_lctx, &ns_g_addparser), + CHECKFATAL(cfg_parser_create(named_g_mctx, named_g_lctx, + &named_g_addparser), "creating additional configuration parser"); - if (ns_g_lwresdonly) - CHECKFATAL(load_configuration(lwresd_g_conffile, server, - ISC_TRUE), - "loading configuration"); - else - CHECKFATAL(load_configuration(ns_g_conffile, server, ISC_TRUE), - "loading configuration"); + CHECKFATAL(load_configuration(named_g_conffile, server, + ISC_TRUE), + "loading configuration"); isc_hash_init(); CHECKFATAL(load_zones(server, ISC_TRUE, ISC_FALSE), "loading zones"); #ifdef ENABLE_AFL - ns_g_run_done = ISC_TRUE; + named_g_run_done = ISC_TRUE; #endif } void -ns_server_flushonshutdown(ns_server_t *server, isc_boolean_t flush) { - - REQUIRE(NS_SERVER_VALID(server)); +named_server_flushonshutdown(named_server_t *server, isc_boolean_t flush) { + REQUIRE(NAMED_SERVER_VALID(server)); server->flushonshutdown = flush; } @@ -8613,10 +8608,9 @@ static void shutdown_server(isc_task_t *task, isc_event_t *event) { isc_result_t result; dns_view_t *view, *view_next; - ns_server_t *server = (ns_server_t *)event->ev_arg; + named_server_t *server = (named_server_t *)event->ev_arg; isc_boolean_t flush = server->flushonshutdown; - ns_cache_t *nsc; - ns_altsecret_t *altsecret; + named_cache_t *nsc; UNUSED(task); INSIST(task == server->task); @@ -8624,23 +8618,24 @@ shutdown_server(isc_task_t *task, isc_event_t *event) { result = isc_task_beginexclusive(server->task); RUNTIME_CHECK(result == ISC_R_SUCCESS); - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_SERVER, - ISC_LOG_INFO, "shutting down%s", + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_INFO, + "shutting down%s", flush ? ": flushing changes" : ""); - ns_statschannels_shutdown(server); - ns_controls_shutdown(server->controls); + named_statschannels_shutdown(server); + named_controls_shutdown(server->controls); end_reserved_dispatches(server, ISC_TRUE); cleanup_session_key(server, server->mctx); - if (ns_g_aclconfctx != NULL) - cfg_aclconfctx_detach(&ns_g_aclconfctx); + if (named_g_aclconfctx != NULL) + cfg_aclconfctx_detach(&named_g_aclconfctx); - cfg_obj_destroy(ns_g_parser, &ns_g_config); - cfg_parser_destroy(&ns_g_parser); - cfg_parser_destroy(&ns_g_addparser); + cfg_obj_destroy(named_g_parser, &named_g_config); + cfg_parser_destroy(&named_g_parser); + cfg_parser_destroy(&named_g_addparser); - (void) ns_server_saventa(server); + (void) named_server_saventa(server); for (view = ISC_LIST_HEAD(server->viewlist); view != NULL; @@ -8661,11 +8656,6 @@ shutdown_server(isc_task_t *task, isc_event_t *event) { isc_mem_put(server->mctx, nsc, sizeof(*nsc)); } - while ((altsecret = ISC_LIST_HEAD(server->altsecrets)) != NULL) { - ISC_LIST_UNLINK(server->altsecrets, altsecret, link); - isc_mem_put(server->mctx, altsecret, sizeof(*altsecret)); - } - isc_timer_detach(&server->interface_timer); isc_timer_detach(&server->heartbeat_timer); isc_timer_detach(&server->pps_timer); @@ -8674,21 +8664,14 @@ shutdown_server(isc_task_t *task, isc_event_t *event) { ns_interfacemgr_shutdown(server->interfacemgr); ns_interfacemgr_detach(&server->interfacemgr); - dns_dispatchmgr_destroy(&ns_g_dispatchmgr); + dns_dispatchmgr_destroy(&named_g_dispatchmgr); dns_zonemgr_shutdown(server->zonemgr); - if (ns_g_sessionkey != NULL) { - dns_tsigkey_detach(&ns_g_sessionkey); - dns_name_free(&ns_g_sessionkeyname, server->mctx); + if (named_g_sessionkey != NULL) { + dns_tsigkey_detach(&named_g_sessionkey); + dns_name_free(&named_g_sessionkeyname, server->mctx); } - - if (server->keepresporder != NULL) - dns_acl_detach(&server->keepresporder); - - if (server->blackholeacl != NULL) - dns_acl_detach(&server->blackholeacl); - #ifdef HAVE_DNSTAP dns_dt_shutdown(); #endif @@ -8705,45 +8688,83 @@ shutdown_server(isc_task_t *task, isc_event_t *event) { isc_event_free(&event); } +/*% + * Find a view that matches the source and destination addresses of a query. + */ +static isc_result_t +get_matching_view(isc_netaddr_t *srcaddr, isc_netaddr_t *destaddr, + dns_message_t *message, dns_ecs_t *ecs, + isc_result_t *sigresult, dns_view_t **viewp) +{ + dns_aclenv_t *env = + ns_interfacemgr_getaclenv(named_g_server->interfacemgr); + dns_view_t *view; + + REQUIRE(message != NULL); + REQUIRE(sigresult != NULL); + REQUIRE(viewp != NULL && *viewp == NULL); + + for (view = ISC_LIST_HEAD(named_g_server->viewlist); + view != NULL; + view = ISC_LIST_NEXT(view, link)) + { + if (message->rdclass == view->rdclass || + message->rdclass == dns_rdataclass_any) + { + dns_name_t *tsig = NULL; + isc_netaddr_t *addr = NULL; + isc_uint8_t *scope = NULL; + isc_uint8_t source = 0; + + *sigresult = dns_message_rechecksig(message, view); + if (*sigresult == ISC_R_SUCCESS) { + dns_tsigkey_t *tsigkey; + + tsigkey = message->tsigkey; + tsig = dns_tsigkey_identity(tsigkey); + } + + if (ecs != NULL) { + addr = &ecs->addr; + source = ecs->source; + scope = &ecs->scope; + } + + if (dns_acl_allowed(srcaddr, tsig, addr, source, + scope, view->matchclients, env) && + dns_acl_allowed(destaddr, tsig, NULL, 0, NULL, + view->matchdestinations, env) && + !(view->matchrecursiveonly && + (message->flags & DNS_MESSAGEFLAG_RD) == 0)) + { + dns_view_attach(view, viewp); + return (ISC_R_SUCCESS); + } + } + } + + return (ISC_R_NOTFOUND); +} + void -ns_server_create(isc_mem_t *mctx, ns_server_t **serverp) { +named_server_create(isc_mem_t *mctx, named_server_t **serverp) { isc_result_t result; - ns_server_t *server = isc_mem_get(mctx, sizeof(*server)); + named_server_t *server = isc_mem_get(mctx, sizeof(*server)); if (server == NULL) fatal("allocating server object", ISC_R_NOMEMORY); server->mctx = mctx; server->task = NULL; - - /* Initialize configuration data with default values. */ - result = isc_quota_init(&server->xfroutquota, 10); - RUNTIME_CHECK(result == ISC_R_SUCCESS); - result = isc_quota_init(&server->tcpquota, 10); - RUNTIME_CHECK(result == ISC_R_SUCCESS); - result = isc_quota_init(&server->recursionquota, 100); - RUNTIME_CHECK(result == ISC_R_SUCCESS); - - result = dns_aclenv_init(mctx, &server->aclenv); - RUNTIME_CHECK(result == ISC_R_SUCCESS); - -#ifdef HAVE_GEOIP - /* Initialize GeoIP before using ACL environment */ - ns_geoip_init(); - server->aclenv.geoip = ns_g_geoip; -#endif - - /* Initialize server data structures. */ server->zonemgr = NULL; + /* Initialize server data structures. */ server->interfacemgr = NULL; ISC_LIST_INIT(server->viewlist); server->in_roothints = NULL; - server->blackholeacl = NULL; - server->keepresporder = NULL; /* Must be first. */ - CHECKFATAL(dst_lib_init2(ns_g_mctx, ns_g_entropy, - ns_g_engine, ISC_ENTROPY_GOODONLY), + CHECKFATAL(dst_lib_init2(named_g_mctx, named_g_entropy, + named_g_engine, ISC_ENTROPY_GOODONLY), "initializing DST"); CHECKFATAL(dns_rootns_create(mctx, dns_rdataclass_in, NULL, @@ -8753,32 +8774,49 @@ ns_server_create(isc_mem_t *mctx, ns_server_t **serverp) { CHECKFATAL(isc_mutex_init(&server->reload_event_lock), "initializing reload event lock"); server->reload_event = - isc_event_allocate(ns_g_mctx, server, - NS_EVENT_RELOAD, - ns_server_reload, + isc_event_allocate(named_g_mctx, server, + NAMED_EVENT_RELOAD, + named_server_reload, server, sizeof(isc_event_t)); CHECKFATAL(server->reload_event == NULL ? ISC_R_NOMEMORY : ISC_R_SUCCESS, "allocating reload event"); - server->tkeyctx = NULL; - CHECKFATAL(dns_tkeyctx_create(ns_g_mctx, ns_g_entropy, - &server->tkeyctx), - "creating TKEY context"); - /* * Setup the server task, which is responsible for coordinating * startup and shutdown of the server, as well as all exclusive * tasks. */ - CHECKFATAL(isc_task_create(ns_g_taskmgr, 0, &server->task), + CHECKFATAL(isc_task_create(named_g_taskmgr, 0, &server->task), "creating server task"); isc_task_setname(server->task, "server", server); - isc_taskmgr_setexcltask(ns_g_taskmgr, server->task); + isc_taskmgr_setexcltask(named_g_taskmgr, server->task); + + server->sctx = NULL; + CHECKFATAL(ns_server_create(mctx, named_g_entropy, + get_matching_view, + &server->sctx), + "creating server context"); + +#ifdef HAVE_GEOIP + /* + * GeoIP must be initialized before the interface + * manager (which includes the ACL environment) + * is created + */ + named_geoip_init(); +#endif + +#ifdef ENABLE_AFL + server->sctx->fuzztype = named_g_fuzz_type; + server->sctx->fuzznotify = named_fuzz_notify; +#endif + CHECKFATAL(isc_task_onshutdown(server->task, shutdown_server, server), "isc_task_onshutdown"); - CHECKFATAL(isc_app_onrun(ns_g_mctx, server->task, run_server, server), + CHECKFATAL(isc_app_onrun(named_g_mctx, server->task, + run_server, server), "isc_app_onrun"); server->interface_timer = NULL; @@ -8789,8 +8827,9 @@ ns_server_create(isc_mem_t *mctx, ns_server_t **serverp) { server->interface_interval = 0; server->heartbeat_interval = 0; - CHECKFATAL(dns_zonemgr_create(ns_g_mctx, ns_g_taskmgr, ns_g_timermgr, - ns_g_socketmgr, &server->zonemgr), + CHECKFATAL(dns_zonemgr_create(named_g_mctx, named_g_taskmgr, + named_g_timermgr, named_g_socketmgr, + &server->zonemgr), "dns_zonemgr_create"); CHECKFATAL(dns_zonemgr_setsize(server->zonemgr, 1000), "dns_zonemgr_setsize"); @@ -8798,25 +8837,6 @@ ns_server_create(isc_mem_t *mctx, ns_server_t **serverp) { server->statsfile = isc_mem_strdup(server->mctx, "named.stats"); CHECKFATAL(server->statsfile == NULL ? ISC_R_NOMEMORY : ISC_R_SUCCESS, "isc_mem_strdup"); - server->nsstats = NULL; - server->rcvquerystats = NULL; - server->opcodestats = NULL; - server->rcodestats = NULL; - server->zonestats = NULL; - server->resolverstats = NULL; - server->sockstats = NULL; - server->udpinstats4 = NULL; - server->udpoutstats4 = NULL; - server->udpinstats6 = NULL; - server->udpoutstats6 = NULL; - server->tcpinstats4 = NULL; - server->tcpoutstats4 = NULL; - server->tcpinstats6 = NULL; - server->tcpoutstats6 = NULL; - CHECKFATAL(isc_stats_create(server->mctx, &server->sockstats, - isc_sockstatscounter_max), - "isc_stats_create"); - isc_socketmgr_setstats(ns_g_socketmgr, server->sockstats); server->bindkeysfile = isc_mem_strdup(server->mctx, "bind.keys"); CHECKFATAL(server->bindkeysfile == NULL ? ISC_R_NOMEMORY : @@ -8840,69 +8860,28 @@ ns_server_create(isc_mem_t *mctx, ns_server_t **serverp) { server->hostname = NULL; server->version_set = ISC_FALSE; server->version = NULL; - server->server_usehostname = ISC_FALSE; - server->server_id = NULL; - CHECKFATAL(isc_stats_create(ns_g_mctx, &server->nsstats, - dns_nsstatscounter_max), - "dns_stats_create (server)"); + server->zonestats = NULL; + server->resolverstats = NULL; + server->sockstats = NULL; + CHECKFATAL(isc_stats_create(server->mctx, &server->sockstats, + isc_sockstatscounter_max), + "isc_stats_create"); + isc_socketmgr_setstats(named_g_socketmgr, server->sockstats); - CHECKFATAL(dns_rdatatypestats_create(ns_g_mctx, - &server->rcvquerystats), - "dns_stats_create (rcvquery)"); - - CHECKFATAL(dns_opcodestats_create(ns_g_mctx, &server->opcodestats), - "dns_stats_create (opcode)"); - - CHECKFATAL(dns_rcodestats_create(ns_g_mctx, &server->rcodestats), - "dns_stats_create (rcode)"); - - CHECKFATAL(isc_stats_create(ns_g_mctx, &server->zonestats, + CHECKFATAL(isc_stats_create(named_g_mctx, &server->zonestats, dns_zonestatscounter_max), "dns_stats_create (zone)"); - CHECKFATAL(isc_stats_create(ns_g_mctx, &server->resolverstats, + CHECKFATAL(isc_stats_create(named_g_mctx, &server->resolverstats, dns_resstatscounter_max), "dns_stats_create (resolver)"); - CHECKFATAL(isc_stats_create(ns_g_mctx, &server->udpinstats4, - dns_sizecounter_in_max), - "dns_stats_create (inbound UDP IPv4 traffic size)"); - - CHECKFATAL(isc_stats_create(ns_g_mctx, &server->udpoutstats4, - dns_sizecounter_out_max), - "dns_stats_create (outbound UDP IPv4 traffic size)"); - - CHECKFATAL(isc_stats_create(ns_g_mctx, &server->udpinstats6, - dns_sizecounter_in_max), - "dns_stats_create (inbound UDP IPv6 traffic size)"); - - CHECKFATAL(isc_stats_create(ns_g_mctx, &server->udpoutstats6, - dns_sizecounter_out_max), - "dns_stats_create (outbound UDP IPv6 traffic size)"); - - CHECKFATAL(isc_stats_create(ns_g_mctx, &server->tcpinstats4, - dns_sizecounter_in_max), - "dns_stats_create (inbound TCP IPv4 traffic size)"); - - CHECKFATAL(isc_stats_create(ns_g_mctx, &server->tcpoutstats4, - dns_sizecounter_out_max), - "dns_stats_create (outbound TCP IPv4 traffic size)"); - - CHECKFATAL(isc_stats_create(ns_g_mctx, &server->tcpinstats6, - dns_sizecounter_in_max), - "dns_stats_create (inbound TCP IPv6 traffic size)"); - - CHECKFATAL(isc_stats_create(ns_g_mctx, &server->tcpoutstats6, - dns_sizecounter_out_max), - "dns_stats_create (outbound TCP IPv6 traffic size)"); - server->flushonshutdown = ISC_FALSE; - server->log_queries = ISC_FALSE; server->controls = NULL; - CHECKFATAL(ns_controls_create(server, &server->controls), - "ns_controls_create"); + CHECKFATAL(named_controls_create(server, &server->controls), + "named_controls_create"); server->dispatchgen = 0; ISC_LIST_INIT(server->dispatches); @@ -8910,8 +8889,6 @@ ns_server_create(isc_mem_t *mctx, ns_server_t **serverp) { ISC_LIST_INIT(server->cachelist); - ISC_LIST_INIT(server->altsecrets); - server->sessionkey = NULL; server->session_keyfile = NULL; server->session_keyname = NULL; @@ -8922,37 +8899,28 @@ ns_server_create(isc_mem_t *mctx, ns_server_t **serverp) { server->dtenv = NULL; - server->magic = NS_SERVER_MAGIC; + server->magic = NAMED_SERVER_MAGIC; *serverp = server; } void -ns_server_destroy(ns_server_t **serverp) { - ns_server_t *server = *serverp; - REQUIRE(NS_SERVER_VALID(server)); +named_server_destroy(named_server_t **serverp) { + named_server_t *server = *serverp; + REQUIRE(NAMED_SERVER_VALID(server)); #ifdef HAVE_DNSTAP if (server->dtenv != NULL) dns_dt_detach(&server->dtenv); #endif /* HAVE_DNSTAP */ - ns_controls_destroy(&server->controls); + named_controls_destroy(&server->controls); - isc_stats_detach(&server->nsstats); - dns_stats_detach(&server->rcvquerystats); - dns_stats_detach(&server->opcodestats); - dns_stats_detach(&server->rcodestats); isc_stats_detach(&server->zonestats); - isc_stats_detach(&server->resolverstats); isc_stats_detach(&server->sockstats); - isc_stats_detach(&server->udpinstats4); - isc_stats_detach(&server->udpoutstats4); - isc_stats_detach(&server->udpinstats6); - isc_stats_detach(&server->udpoutstats6); - isc_stats_detach(&server->tcpinstats4); - isc_stats_detach(&server->tcpoutstats4); - isc_stats_detach(&server->tcpinstats6); - isc_stats_detach(&server->tcpoutstats6); + isc_stats_detach(&server->resolverstats); + + if (server->sctx != NULL) + ns_server_detach(&server->sctx); isc_mem_free(server->mctx, server->statsfile); isc_mem_free(server->mctx, server->bindkeysfile); @@ -8964,17 +8932,12 @@ ns_server_destroy(ns_server_t **serverp) { isc_mem_free(server->mctx, server->version); if (server->hostname != NULL) isc_mem_free(server->mctx, server->hostname); - if (server->server_id != NULL) - isc_mem_free(server->mctx, server->server_id); if (server->lockfile != NULL) isc_mem_free(server->mctx, server->lockfile); if (server->zonemgr != NULL) dns_zonemgr_detach(&server->zonemgr); - if (server->tkeyctx != NULL) - dns_tkeyctx_destroy(&server->tkeyctx); - dst_lib_destroy(); isc_event_free(&server->reload_event); @@ -8982,12 +8945,6 @@ ns_server_destroy(ns_server_t **serverp) { INSIST(ISC_LIST_EMPTY(server->viewlist)); INSIST(ISC_LIST_EMPTY(server->cachelist)); - dns_aclenv_destroy(&server->aclenv); - - isc_quota_destroy(&server->recursionquota); - isc_quota_destroy(&server->tcpquota); - isc_quota_destroy(&server->xfroutquota); - server->magic = 0; isc_mem_put(server->mctx, server, sizeof(*server)); *serverp = NULL; @@ -8995,28 +8952,29 @@ ns_server_destroy(ns_server_t **serverp) { static void fatal(const char *msg, isc_result_t result) { - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_SERVER, - ISC_LOG_CRITICAL, "%s: %s", msg, - isc_result_totext(result)); - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_SERVER, - ISC_LOG_CRITICAL, "exiting (due to fatal error)"); - ns_os_shutdown(); + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_CRITICAL, + "%s: %s", msg, isc_result_totext(result)); + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_CRITICAL, + "exiting (due to fatal error)"); + named_os_shutdown(); exit(1); } static void -start_reserved_dispatches(ns_server_t *server) { +start_reserved_dispatches(named_server_t *server) { - REQUIRE(NS_SERVER_VALID(server)); + REQUIRE(NAMED_SERVER_VALID(server)); server->dispatchgen++; } static void -end_reserved_dispatches(ns_server_t *server, isc_boolean_t all) { - ns_dispatch_t *dispatch, *nextdispatch; +end_reserved_dispatches(named_server_t *server, isc_boolean_t all) { + named_dispatch_t *dispatch, *nextdispatch; - REQUIRE(NS_SERVER_VALID(server)); + REQUIRE(NAMED_SERVER_VALID(server)); for (dispatch = ISC_LIST_HEAD(server->dispatches); dispatch != NULL; @@ -9031,14 +8989,16 @@ end_reserved_dispatches(ns_server_t *server, isc_boolean_t all) { } void -ns_add_reserved_dispatch(ns_server_t *server, const isc_sockaddr_t *addr) { - ns_dispatch_t *dispatch; +named_add_reserved_dispatch(named_server_t *server, + const isc_sockaddr_t *addr) +{ + named_dispatch_t *dispatch; in_port_t port; char addrbuf[ISC_SOCKADDR_FORMATSIZE]; isc_result_t result; unsigned int attrs, attrmask; - REQUIRE(NS_SERVER_VALID(server)); + REQUIRE(NAMED_SERVER_VALID(server)); port = isc_sockaddr_getport(addr); if (port == 0 || port >= 1024) @@ -9084,8 +9044,8 @@ ns_add_reserved_dispatch(ns_server_t *server, const isc_sockaddr_t *addr) { attrmask |= DNS_DISPATCHATTR_IPV4; attrmask |= DNS_DISPATCHATTR_IPV6; - result = dns_dispatch_getudp(ns_g_dispatchmgr, ns_g_socketmgr, - ns_g_taskmgr, &dispatch->addr, 4096, + result = dns_dispatch_getudp(named_g_dispatchmgr, named_g_socketmgr, + named_g_taskmgr, &dispatch->addr, 4096, UDPBUFFERS, 32768, 16411, 16433, attrs, attrmask, &dispatch->dispatch); if (result != ISC_R_SUCCESS) @@ -9099,28 +9059,26 @@ ns_add_reserved_dispatch(ns_server_t *server, const isc_sockaddr_t *addr) { if (dispatch != NULL) isc_mem_put(server->mctx, dispatch, sizeof(*dispatch)); isc_sockaddr_format(addr, addrbuf, sizeof(addrbuf)); - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_WARNING, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_WARNING, "unable to create dispatch for reserved port %s: %s", addrbuf, isc_result_totext(result)); } static isc_result_t -loadconfig(ns_server_t *server) { +loadconfig(named_server_t *server) { isc_result_t result; start_reserved_dispatches(server); - result = load_configuration(ns_g_lwresdonly ? - lwresd_g_conffile : ns_g_conffile, - server, ISC_FALSE); + result = load_configuration(named_g_conffile, server, ISC_FALSE); if (result == ISC_R_SUCCESS) { end_reserved_dispatches(server, ISC_FALSE); - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_INFO, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_INFO, "reloading configuration succeeded"); } else { - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_ERROR, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "reloading configuration failed: %s", isc_result_totext(result)); } @@ -9129,18 +9087,18 @@ loadconfig(ns_server_t *server) { } static isc_result_t -reload(ns_server_t *server) { +reload(named_server_t *server) { isc_result_t result; CHECK(loadconfig(server)); result = load_zones(server, ISC_FALSE, ISC_FALSE); if (result == ISC_R_SUCCESS) - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_INFO, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_INFO, "reloading zones succeeded"); else - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_ERROR, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "reloading zones failed: %s", isc_result_totext(result)); @@ -9152,14 +9110,14 @@ reload(ns_server_t *server) { * Handle a reload event (from SIGHUP). */ static void -ns_server_reload(isc_task_t *task, isc_event_t *event) { - ns_server_t *server = (ns_server_t *)event->ev_arg; +named_server_reload(isc_task_t *task, isc_event_t *event) { + named_server_t *server = (named_server_t *)event->ev_arg; INSIST(task = server->task); UNUSED(task); - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_INFO, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_INFO, "received SIGHUP signal to reload zones"); (void)reload(server); @@ -9170,7 +9128,7 @@ ns_server_reload(isc_task_t *task, isc_event_t *event) { } void -ns_server_reloadwanted(ns_server_t *server) { +named_server_reloadwanted(named_server_t *server) { LOCK(&server->reload_event_lock); if (server->reload_event != NULL) isc_task_send(server->task, &server->reload_event); @@ -9178,17 +9136,12 @@ ns_server_reloadwanted(ns_server_t *server) { } void -ns_server_scan_interfaces(ns_server_t *server) { - isc_result_t result; - - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_DEBUG(1), +named_server_scan_interfaces(named_server_t *server) { + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_DEBUG(1), "automatic interface rescan"); - result = isc_task_beginexclusive(server->task); - RUNTIME_CHECK(result == ISC_R_SUCCESS); - scan_interfaces(server, ISC_TRUE); - isc_task_endexclusive(server->task); + ns_interfacemgr_scan(server->interfacemgr, ISC_TRUE); } /* @@ -9251,7 +9204,7 @@ next_token(isc_lex_t *lex, isc_buffer_t **text) { * argument before the zone name, as in "rndc sync [-clean] zone".) */ static isc_result_t -zone_from_args(ns_server_t *server, isc_lex_t *lex, const char *zonetxt, +zone_from_args(named_server_t *server, isc_lex_t *lex, const char *zonetxt, dns_zone_t **zonep, char *zonename, isc_buffer_t **text, isc_boolean_t skip) { @@ -9389,8 +9342,8 @@ zone_from_args(ns_server_t *server, isc_lex_t *lex, const char *zonetxt, * Act on a "retransfer" command from the command channel. */ isc_result_t -ns_server_retransfercommand(ns_server_t *server, isc_lex_t *lex, - isc_buffer_t **text) +named_server_retransfercommand(named_server_t *server, isc_lex_t *lex, + isc_buffer_t **text) { isc_result_t result; dns_zone_t *zone = NULL; @@ -9424,8 +9377,8 @@ ns_server_retransfercommand(ns_server_t *server, isc_lex_t *lex, * Act on a "reload" command from the command channel. */ isc_result_t -ns_server_reloadcommand(ns_server_t *server, isc_lex_t *lex, - isc_buffer_t **text) +named_server_reloadcommand(named_server_t *server, isc_lex_t *lex, + isc_buffer_t **text) { isc_result_t result; dns_zone_t *zone = NULL; @@ -9478,19 +9431,19 @@ ns_server_reloadcommand(ns_server_t *server, isc_lex_t *lex, * Act on a "reconfig" command from the command channel. */ isc_result_t -ns_server_reconfigcommand(ns_server_t *server) { +named_server_reconfigcommand(named_server_t *server) { isc_result_t result; CHECK(loadconfig(server)); result = load_zones(server, ISC_FALSE, ISC_TRUE); if (result == ISC_R_SUCCESS) - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_INFO, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_INFO, "scheduled loading new zones"); else - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_ERROR, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "loading new zones failed: %s", isc_result_totext(result)); cleanup: @@ -9501,8 +9454,8 @@ cleanup: * Act on a "notify" command from the command channel. */ isc_result_t -ns_server_notifycommand(ns_server_t *server, isc_lex_t *lex, - isc_buffer_t **text) +named_server_notifycommand(named_server_t *server, isc_lex_t *lex, + isc_buffer_t **text) { isc_result_t result; dns_zone_t *zone = NULL; @@ -9527,8 +9480,8 @@ ns_server_notifycommand(ns_server_t *server, isc_lex_t *lex, * Act on a "refresh" command from the command channel. */ isc_result_t -ns_server_refreshcommand(ns_server_t *server, isc_lex_t *lex, - isc_buffer_t **text) +named_server_refreshcommand(named_server_t *server, isc_lex_t *lex, + isc_buffer_t **text) { isc_result_t result; dns_zone_t *zone = NULL, *raw = NULL; @@ -9566,8 +9519,8 @@ ns_server_refreshcommand(ns_server_t *server, isc_lex_t *lex, } isc_result_t -ns_server_togglequerylog(ns_server_t *server, isc_lex_t *lex) { - isc_boolean_t value; +named_server_togglequerylog(named_server_t *server, isc_lex_t *lex) { + isc_boolean_t prev, value; char *ptr; /* Skip the command name. */ @@ -9575,9 +9528,11 @@ ns_server_togglequerylog(ns_server_t *server, isc_lex_t *lex) { if (ptr == NULL) return (ISC_R_UNEXPECTEDEND); + prev = ns_server_getoption(server->sctx, NS_SERVER_LOGQUERIES); + ptr = next_token(lex, NULL); if (ptr == NULL) - value = server->log_queries ? ISC_FALSE : ISC_TRUE; + value = !prev; else if (strcasecmp(ptr, "yes") == 0 || strcasecmp(ptr, "on") == 0) value = ISC_TRUE; else if (strcasecmp(ptr, "no") == 0 || strcasecmp(ptr, "off") == 0) @@ -9585,15 +9540,14 @@ ns_server_togglequerylog(ns_server_t *server, isc_lex_t *lex) { else return (ISC_R_NOTFOUND); - if (server->log_queries == value) + if (value == prev) return (ISC_R_SUCCESS); - server->log_queries = value; + ns_server_setoption(server->sctx, NS_SERVER_LOGQUERIES, value); - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_INFO, - "query logging is now %s", - server->log_queries ? "on" : "off"); + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_INFO, + "query logging is now %s", value ? "on" : "off"); return (ISC_R_SUCCESS); } @@ -9650,16 +9604,16 @@ ns_listenelt_fromconfig(const cfg_obj_t *listener, const cfg_obj_t *config, portobj = cfg_tuple_get(listener, "port"); if (!cfg_obj_isuint32(portobj)) { - if (ns_g_port != 0) { - port = ns_g_port; + if (named_g_port != 0) { + port = named_g_port; } else { - result = ns_config_getport(config, &port); + result = named_config_getport(config, &port); if (result != ISC_R_SUCCESS) return (result); } } else { if (cfg_obj_asuint32(portobj) >= ISC_UINT16_MAX) { - cfg_obj_log(portobj, ns_g_lctx, ISC_LOG_ERROR, + cfg_obj_log(portobj, named_g_lctx, ISC_LOG_ERROR, "port value '%u' is out of range", cfg_obj_asuint32(portobj)); return (ISC_R_RANGE); @@ -9669,10 +9623,10 @@ ns_listenelt_fromconfig(const cfg_obj_t *listener, const cfg_obj_t *config, dscpobj = cfg_tuple_get(listener, "dscp"); if (!cfg_obj_isuint32(dscpobj)) - dscp = ns_g_dscp; + dscp = named_g_dscp; else { if (cfg_obj_asuint32(dscpobj) > 63) { - cfg_obj_log(dscpobj, ns_g_lctx, ISC_LOG_ERROR, + cfg_obj_log(dscpobj, named_g_lctx, ISC_LOG_ERROR, "dscp value '%u' is out of range", cfg_obj_asuint32(dscpobj)); return (ISC_R_RANGE); @@ -9685,7 +9639,7 @@ ns_listenelt_fromconfig(const cfg_obj_t *listener, const cfg_obj_t *config, return (result); result = cfg_acl_fromconfig2(cfg_tuple_get(listener, "acl"), - config, ns_g_lctx, actx, mctx, 0, + config, named_g_lctx, actx, mctx, 0, family, &delt->acl); if (result != ISC_R_SUCCESS) { ns_listenelt_destroy(delt); @@ -9696,25 +9650,25 @@ ns_listenelt_fromconfig(const cfg_obj_t *listener, const cfg_obj_t *config, } isc_result_t -ns_server_dumpstats(ns_server_t *server) { +named_server_dumpstats(named_server_t *server) { isc_result_t result; FILE *fp = NULL; CHECKMF(isc_stdio_open(server->statsfile, "a", &fp), "could not open statistics dump file", server->statsfile); - result = ns_stats_dump(server, fp); + result = named_stats_dump(server, fp); cleanup: if (fp != NULL) (void)isc_stdio_close(fp); if (result == ISC_R_SUCCESS) - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_INFO, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_INFO, "dumpstats complete"); else - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_ERROR, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "dumpstats failed: %s", dns_result_totext(result)); return (result); @@ -9916,19 +9870,21 @@ dumpdone(void *arg, isc_result_t result) { fprintf(dctx->fp, "; Dump complete\n"); result = isc_stdio_flush(dctx->fp); if (result == ISC_R_SUCCESS) - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_INFO, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_INFO, "dumpdb complete"); cleanup: if (result != ISC_R_SUCCESS) - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_ERROR, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "dumpdb failed: %s", dns_result_totext(result)); dumpcontext_destroy(dctx); } isc_result_t -ns_server_dumpdb(ns_server_t *server, isc_lex_t *lex, isc_buffer_t **text) { +named_server_dumpdb(named_server_t *server, isc_lex_t *lex, + isc_buffer_t **text) +{ struct dumpcontext *dctx = NULL; dns_view_t *view; isc_result_t result; @@ -9968,8 +9924,8 @@ ns_server_dumpdb(ns_server_t *server, isc_lex_t *lex, isc_buffer_t **text) { ptr = next_token(lex, NULL); sep = (ptr == NULL) ? "" : ": "; - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_INFO, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_INFO, "dumpdb started%s%s", sep, (ptr != NULL) ? ptr : ""); if (ptr != NULL && strcmp(ptr, "-all") == 0) { @@ -10042,8 +9998,8 @@ ns_server_dumpdb(ns_server_t *server, isc_lex_t *lex, isc_buffer_t **text) { } isc_result_t -ns_server_dumpsecroots(ns_server_t *server, isc_lex_t *lex, - isc_buffer_t **text) +named_server_dumpsecroots(named_server_t *server, isc_lex_t *lex, + isc_buffer_t **text) { dns_view_t *view; dns_keytable_t *secroots = NULL; @@ -10130,19 +10086,19 @@ ns_server_dumpsecroots(ns_server_t *server, isc_lex_t *lex, (void)isc_stdio_close(fp); } if (result == ISC_R_SUCCESS) - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_INFO, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_INFO, "dumpsecroots complete"); else - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_ERROR, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "dumpsecroots failed: %s", dns_result_totext(result)); return (result); } isc_result_t -ns_server_dumprecursing(ns_server_t *server) { +named_server_dumprecursing(named_server_t *server) { FILE *fp = NULL; dns_view_t *view; isc_result_t result; @@ -10168,19 +10124,19 @@ ns_server_dumprecursing(ns_server_t *server) { if (fp != NULL) result = isc_stdio_close(fp); if (result == ISC_R_SUCCESS) - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_INFO, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_INFO, "dumprecursing complete"); else - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_ERROR, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "dumprecursing failed: %s", dns_result_totext(result)); return (result); } isc_result_t -ns_server_setdebuglevel(ns_server_t *server, isc_lex_t *lex) { +named_server_setdebuglevel(named_server_t *server, isc_lex_t *lex) { char *ptr; char *endp; long newlevel; @@ -10195,24 +10151,24 @@ ns_server_setdebuglevel(ns_server_t *server, isc_lex_t *lex) { /* Look for the new level name. */ ptr = next_token(lex, NULL); if (ptr == NULL) { - if (ns_g_debuglevel < 99) - ns_g_debuglevel++; + if (named_g_debuglevel < 99) + named_g_debuglevel++; } else { newlevel = strtol(ptr, &endp, 10); if (*endp != '\0' || newlevel < 0 || newlevel > 99) return (ISC_R_RANGE); - ns_g_debuglevel = (unsigned int)newlevel; + named_g_debuglevel = (unsigned int)newlevel; } - isc_log_setdebuglevel(ns_g_lctx, ns_g_debuglevel); - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_INFO, - "debug level is now %d", ns_g_debuglevel); + isc_log_setdebuglevel(named_g_lctx, named_g_debuglevel); + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_INFO, + "debug level is now %d", named_g_debuglevel); return (ISC_R_SUCCESS); } isc_result_t -ns_server_validation(ns_server_t *server, isc_lex_t *lex, - isc_buffer_t **text) +named_server_validation(named_server_t *server, isc_lex_t *lex, + isc_buffer_t **text) { char *ptr; dns_view_t *view; @@ -10283,13 +10239,13 @@ ns_server_validation(ns_server_t *server, isc_lex_t *lex, } isc_result_t -ns_server_flushcache(ns_server_t *server, isc_lex_t *lex) { +named_server_flushcache(named_server_t *server, isc_lex_t *lex) { char *ptr; dns_view_t *view; isc_boolean_t flushed; isc_boolean_t found; isc_result_t result; - ns_cache_t *nsc; + named_cache_t *nsc; /* Skip the command name. */ ptr = next_token(lex, NULL); @@ -10346,8 +10302,8 @@ ns_server_flushcache(ns_server_t *server, isc_lex_t *lex) { result = dns_view_flushcache2(nsc->primaryview, ISC_FALSE); if (result != ISC_R_SUCCESS) { flushed = ISC_FALSE; - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_ERROR, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "flushing cache in view '%s' failed: %s", nsc->primaryview->name, isc_result_totext(result)); @@ -10377,8 +10333,10 @@ ns_server_flushcache(ns_server_t *server, isc_lex_t *lex) { result = dns_view_flushcache2(view, ISC_TRUE); if (result != ISC_R_SUCCESS) { flushed = ISC_FALSE; - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_ERROR, + isc_log_write(named_g_lctx, + NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, + ISC_LOG_ERROR, "fixing cache in view '%s' " "failed: %s", view->name, isc_result_totext(result)); @@ -10395,19 +10353,19 @@ ns_server_flushcache(ns_server_t *server, isc_lex_t *lex) { if (flushed && found) { if (ptr != NULL) - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_INFO, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_INFO, "flushing cache in view '%s' succeeded", ptr); else - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_INFO, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_INFO, "flushing caches in all views succeeded"); result = ISC_R_SUCCESS; } else { if (!found) { - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_ERROR, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "flushing cache in view '%s' failed: " "view not found", ptr); result = ISC_R_NOTFOUND; @@ -10419,7 +10377,9 @@ ns_server_flushcache(ns_server_t *server, isc_lex_t *lex) { } isc_result_t -ns_server_flushnode(ns_server_t *server, isc_lex_t *lex, isc_boolean_t tree) { +named_server_flushnode(named_server_t *server, isc_lex_t *lex, + isc_boolean_t tree) +{ char *ptr, *viewname; char target[DNS_NAME_FORMATSIZE]; dns_view_t *view; @@ -10471,8 +10431,8 @@ ns_server_flushnode(ns_server_t *server, isc_lex_t *lex, isc_boolean_t tree) { result = dns_view_flushnode(view, name, tree); if (result != ISC_R_SUCCESS) { flushed = ISC_FALSE; - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_ERROR, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "flushing %s '%s' in cache view '%s' " "failed: %s", tree ? "tree" : "name", @@ -10482,15 +10442,15 @@ ns_server_flushnode(ns_server_t *server, isc_lex_t *lex, isc_boolean_t tree) { } if (flushed && found) { if (viewname != NULL) - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_INFO, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_INFO, "flushing %s '%s' in cache view '%s' " "succeeded", tree ? "tree" : "name", target, viewname); else - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_INFO, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_INFO, "flushing %s '%s' in all cache views " "succeeded", tree ? "tree" : "name", @@ -10498,8 +10458,8 @@ ns_server_flushnode(ns_server_t *server, isc_lex_t *lex, isc_boolean_t tree) { result = ISC_R_SUCCESS; } else { if (!found) - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_ERROR, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "flushing %s '%s' in cache view '%s' " "failed: view not found", tree ? "tree" : "name", @@ -10511,7 +10471,7 @@ ns_server_flushnode(ns_server_t *server, isc_lex_t *lex, isc_boolean_t tree) { } isc_result_t -ns_server_status(ns_server_t *server, isc_buffer_t **text) { +named_server_status(named_server_t *server, isc_buffer_t **text) { isc_result_t result; unsigned int zonecount, xferrunning, xferdeferred, soaqueries; unsigned int automatic; @@ -10520,13 +10480,13 @@ ns_server_status(ns_server_t *server, isc_buffer_t **text) { char configtime[ISC_FORMATHTTPTIMESTAMP_SIZE]; char line[1024], hostname[256]; - if (ns_g_server->version_set) { + if (named_g_server->version_set) { ob = " ("; cb = ")"; - if (ns_g_server->version == NULL) + if (named_g_server->version == NULL) alt = "version.bind/txt/ch disabled"; else - alt = ns_g_server->version; + alt = named_g_server->version; } zonecount = dns_zonemgr_getcount(server->zonemgr, DNS_ZONESTATE_ANY); xferrunning = dns_zonemgr_getcount(server->zonemgr, @@ -10538,22 +10498,22 @@ ns_server_status(ns_server_t *server, isc_buffer_t **text) { automatic = dns_zonemgr_getcount(server->zonemgr, DNS_ZONESTATE_AUTOMATIC); - isc_time_formathttptimestamp(&ns_g_boottime, boottime, + isc_time_formathttptimestamp(&named_g_boottime, boottime, sizeof(boottime)); - isc_time_formathttptimestamp(&ns_g_configtime, configtime, + isc_time_formathttptimestamp(&named_g_configtime, configtime, sizeof(configtime)); snprintf(line, sizeof(line), "version: %s %s%s%s %s%s%s\n", - ns_g_product, ns_g_version, - (*ns_g_description != '\0') ? " " : "", - ns_g_description, ns_g_srcid, ob, alt, cb); + named_g_product, named_g_version, + (*named_g_description != '\0') ? " " : "", + named_g_description, named_g_srcid, ob, alt, cb); CHECK(putstr(text, line)); - result = ns_os_gethostname(hostname, sizeof(hostname)); + result = named_os_gethostname(hostname, sizeof(hostname)); if (result != ISC_R_SUCCESS) strlcpy(hostname, "localhost", sizeof(hostname)); snprintf(line, sizeof(line), "running on %s: %s\n", - hostname, ns_os_uname()); + hostname, named_os_uname()); CHECK(putstr(text, line)); snprintf(line, sizeof(line), "boot time: %s\n", boottime); @@ -10562,24 +10522,24 @@ ns_server_status(ns_server_t *server, isc_buffer_t **text) { snprintf(line, sizeof(line), "last configured: %s\n", configtime); CHECK(putstr(text, line)); - if (ns_g_chrootdir != NULL) { + if (named_g_chrootdir != NULL) { snprintf(line, sizeof(line), "configuration file: %s (%s%s)\n", - ns_g_conffile, ns_g_chrootdir, ns_g_conffile); + named_g_conffile, named_g_chrootdir, named_g_conffile); } else { snprintf(line, sizeof(line), "configuration file: %s\n", - ns_g_conffile); + named_g_conffile); } CHECK(putstr(text, line)); #ifdef ISC_PLATFORM_USETHREADS - snprintf(line, sizeof(line), "CPUs found: %u\n", ns_g_cpus_detected); + snprintf(line, sizeof(line), "CPUs found: %u\n", named_g_cpus_detected); CHECK(putstr(text, line)); - snprintf(line, sizeof(line), "worker threads: %u\n", ns_g_cpus); + snprintf(line, sizeof(line), "worker threads: %u\n", named_g_cpus); CHECK(putstr(text, line)); snprintf(line, sizeof(line), "UDP listeners per interface: %u\n", - ns_g_udpdisp); + named_g_udpdisp); CHECK(putstr(text, line)); #else snprintf(line, sizeof(line), "CPUs found: N/A (threads disabled)\n"); @@ -10590,7 +10550,7 @@ ns_server_status(ns_server_t *server, isc_buffer_t **text) { zonecount, automatic); CHECK(putstr(text, line)); - snprintf(line, sizeof(line), "debug level: %d\n", ns_g_debuglevel); + snprintf(line, sizeof(line), "debug level: %d\n", named_g_debuglevel); CHECK(putstr(text, line)); snprintf(line, sizeof(line), "xfers running: %u\n", xferrunning); @@ -10604,16 +10564,18 @@ ns_server_status(ns_server_t *server, isc_buffer_t **text) { CHECK(putstr(text, line)); snprintf(line, sizeof(line), "query logging is %s\n", - server->log_queries ? "ON" : "OFF"); + ns_server_getoption(server->sctx, NS_SERVER_LOGQUERIES) + ? "ON" : "OFF"); CHECK(putstr(text, line)); snprintf(line, sizeof(line), "recursive clients: %d/%d/%d\n", - server->recursionquota.used, server->recursionquota.soft, - server->recursionquota.max); + server->sctx->recursionquota.used, + server->sctx->recursionquota.soft, + server->sctx->recursionquota.max); CHECK(putstr(text, line)); snprintf(line, sizeof(line), "tcp clients: %d/%d\n", - server->tcpquota.used, server->tcpquota.max); + server->sctx->tcpquota.used, server->sctx->tcpquota.max); CHECK(putstr(text, line)); CHECK(putstr(text, "server is up and running")); @@ -10625,7 +10587,7 @@ ns_server_status(ns_server_t *server, isc_buffer_t **text) { } isc_result_t -ns_server_testgen(isc_lex_t *lex, isc_buffer_t **text) { +named_server_testgen(isc_lex_t *lex, isc_buffer_t **text) { isc_result_t result; char *ptr; unsigned long count; @@ -10717,8 +10679,8 @@ delete_keynames(dns_tsig_keyring_t *ring, char *target, } isc_result_t -ns_server_tsigdelete(ns_server_t *server, isc_lex_t *lex, - isc_buffer_t **text) +named_server_tsigdelete(named_server_t *server, isc_lex_t *lex, + isc_buffer_t **text) { isc_result_t result; dns_view_t *view; @@ -10844,7 +10806,7 @@ list_keynames(dns_view_t *view, dns_tsig_keyring_t *ring, isc_buffer_t **text, } isc_result_t -ns_server_tsiglist(ns_server_t *server, isc_buffer_t **text) { +named_server_tsiglist(named_server_t *server, isc_buffer_t **text) { isc_result_t result; dns_view_t *view; unsigned int foundkeys = 0; @@ -10887,7 +10849,9 @@ ns_server_tsiglist(ns_server_t *server, isc_buffer_t **text) { * Act on a "sign" or "loadkeys" command from the command channel. */ isc_result_t -ns_server_rekey(ns_server_t *server, isc_lex_t *lex, isc_buffer_t **text) { +named_server_rekey(named_server_t *server, isc_lex_t *lex, + isc_buffer_t **text) +{ isc_result_t result; dns_zone_t *zone = NULL; dns_zonetype_t type; @@ -10899,7 +10863,7 @@ ns_server_rekey(ns_server_t *server, isc_lex_t *lex, isc_buffer_t **text) { if (ptr == NULL) return (ISC_R_UNEXPECTEDEND); - if (strcasecmp(ptr, NS_COMMAND_SIGN) == 0) + if (strcasecmp(ptr, NAMED_COMMAND_SIGN) == 0) fullsign = ISC_TRUE; result = zone_from_args(server, lex, NULL, &zone, NULL, @@ -10958,7 +10922,7 @@ synczone(dns_zone_t *zone, void *uap) { } isc_result_t -ns_server_sync(ns_server_t *server, isc_lex_t *lex, isc_buffer_t **text) { +named_server_sync(named_server_t *server, isc_lex_t *lex, isc_buffer_t **text) { isc_result_t result, tresult; dns_view_t *view; dns_zone_t *zone = NULL; @@ -10995,8 +10959,8 @@ ns_server_sync(ns_server_t *server, isc_lex_t *lex, isc_buffer_t **text) { tresult = result; } isc_task_endexclusive(server->task); - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_INFO, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_INFO, "dumping all zones%s: %s", cleanup ? ", removing journal files" : "", isc_result_totext(result)); @@ -11022,8 +10986,8 @@ ns_server_sync(ns_server_t *server, isc_lex_t *lex, isc_buffer_t **text) { sizeof(classstr)); dns_name_format(dns_zone_getorigin(zone), zonename, sizeof(zonename)); - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_INFO, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_INFO, "sync: dumping zone '%s/%s'%s%s%s: %s", zonename, classstr, sep, vname, cleanup ? ", removing journal file" : "", @@ -11036,8 +11000,8 @@ ns_server_sync(ns_server_t *server, isc_lex_t *lex, isc_buffer_t **text) { * Act on a "freeze" or "thaw" command from the command channel. */ isc_result_t -ns_server_freeze(ns_server_t *server, isc_boolean_t freeze, - isc_lex_t *lex, isc_buffer_t **text) +named_server_freeze(named_server_t *server, isc_boolean_t freeze, + isc_lex_t *lex, isc_buffer_t **text) { isc_result_t result, tresult; dns_zone_t *zone = NULL, *raw = NULL; @@ -11066,8 +11030,8 @@ ns_server_freeze(ns_server_t *server, isc_boolean_t freeze, tresult = result; } isc_task_endexclusive(server->task); - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_INFO, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_INFO, "%s all zones: %s", freeze ? "freezing" : "thawing", isc_result_totext(tresult)); @@ -11147,8 +11111,8 @@ ns_server_freeze(ns_server_t *server, isc_boolean_t freeze, sizeof(classstr)); dns_name_format(dns_zone_getorigin(zone), zonename, sizeof(zonename)); - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_INFO, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_INFO, "%s zone '%s/%s'%s%s: %s", freeze ? "freezing" : "thawing", zonename, classstr, sep, vname, @@ -11163,7 +11127,7 @@ ns_server_freeze(ns_server_t *server, isc_boolean_t freeze, * is managed by smf and is also running chroot. */ isc_result_t -ns_smf_add_message(isc_buffer_t **text) { +named_smf_add_message(isc_buffer_t **text) { return (putstr(text, "use svcadm(1M) to manage named")); } #endif /* HAVE_LIBSCF */ @@ -11227,9 +11191,9 @@ nzf_append(dns_view_t *view, const cfg_obj_t *zconfig) { result2 = isc_file_truncate(view->new_zone_file, offset); if (result2 != ISC_R_SUCCESS) { - isc_log_write(ns_g_lctx, - NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, + isc_log_write(named_g_lctx, + NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "Error truncating NZF file '%s' " "during rollback from append: " @@ -11318,9 +11282,9 @@ nzd_save(MDB_txn **txnp, MDB_dbi dbi, dns_zone_t *zone, /* We're deleting the zone from the database */ status = mdb_del(*txnp, dbi, &key, NULL); if (status != 0 && status != MDB_NOTFOUND) { - isc_log_write(ns_g_lctx, - NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, + isc_log_write(named_g_lctx, + NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "Error deleting zone %s " "from NZD database: %s", @@ -11335,9 +11299,9 @@ nzd_save(MDB_txn **txnp, MDB_dbi dbi, dns_zone_t *zone, result = isc_buffer_allocate(view->mctx, &text, 256); if (result != ISC_R_SUCCESS) { - isc_log_write(ns_g_lctx, - NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, + isc_log_write(named_g_lctx, + NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "Unable to allocate buffer in " "nzd_save(): %s", @@ -11347,9 +11311,9 @@ nzd_save(MDB_txn **txnp, MDB_dbi dbi, dns_zone_t *zone, zoptions = cfg_tuple_get(zconfig, "options"); if (zoptions == NULL) { - isc_log_write(ns_g_lctx, - NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, + isc_log_write(named_g_lctx, + NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "Unable to get options from config in " "nzd_save()"); @@ -11364,9 +11328,9 @@ nzd_save(MDB_txn **txnp, MDB_dbi dbi, dns_zone_t *zone, status = mdb_put(*txnp, dbi, &key, &data, 0); if (status != 0) { - isc_log_write(ns_g_lctx, - NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, + isc_log_write(named_g_lctx, + NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "Error inserting zone in " "NZD database: %s", @@ -11386,9 +11350,9 @@ nzd_save(MDB_txn **txnp, MDB_dbi dbi, dns_zone_t *zone, else { status = mdb_txn_commit(*txnp); if (status != 0) { - isc_log_write(ns_g_lctx, - NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, + isc_log_write(named_g_lctx, + NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "Error committing " "NZD database: %s", @@ -11416,18 +11380,18 @@ nzd_writable(dns_view_t *view) { status = mdb_txn_begin((MDB_env *) view->new_zone_dbenv, 0, 0, &txn); if (status != 0) { - isc_log_write(ns_g_lctx, - NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_SERVER, - ISC_LOG_WARNING, "mdb_txn_begin: %s", + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_WARNING, + "mdb_txn_begin: %s", mdb_strerror(status)); return (ISC_R_FAILURE); } status = mdb_dbi_open(txn, NULL, 0, &dbi); if (status != 0) { - isc_log_write(ns_g_lctx, - NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_SERVER, - ISC_LOG_WARNING, "mdb_dbi_open: %s", + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_WARNING, + "mdb_dbi_open: %s", mdb_strerror(status)); result = ISC_R_FAILURE; } @@ -11448,8 +11412,8 @@ nzd_open(dns_view_t *view, unsigned int flags, MDB_txn **txnp, MDB_dbi *dbi) { status = mdb_txn_begin((MDB_env *) view->new_zone_dbenv, 0, flags, &txn); if (status != 0) { - isc_log_write(ns_g_lctx, - NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_SERVER, + isc_log_write(named_g_lctx, + NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_SERVER, ISC_LOG_WARNING, "mdb_txn_begin: %s", mdb_strerror(status)); goto cleanup; @@ -11457,8 +11421,8 @@ nzd_open(dns_view_t *view, unsigned int flags, MDB_txn **txnp, MDB_dbi *dbi) { status = mdb_dbi_open(txn, NULL, 0, dbi); if (status != 0) { - isc_log_write(ns_g_lctx, - NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_SERVER, + isc_log_write(named_g_lctx, + NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_SERVER, ISC_LOG_WARNING, "mdb_dbi_open: %s", mdb_strerror(status)); goto cleanup; @@ -11599,8 +11563,8 @@ nzd_count(dns_view_t *view, int *countp) { status = mdb_stat(txn, dbi, &statbuf); if (status != 0) { - isc_log_write(ns_g_lctx, - NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_SERVER, + isc_log_write(named_g_lctx, + NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_SERVER, ISC_LOG_WARNING, "mdb_stat: %s", mdb_strerror(status)); result = ISC_R_FAILURE; @@ -11644,8 +11608,8 @@ migrate_nzf(dns_view_t *view) { goto cleanup; } - isc_log_write(ns_g_lctx, - NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_SERVER, + isc_log_write(named_g_lctx, + NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_SERVER, ISC_LOG_INFO, "Migrating zones from NZF file '%s' to " "NZD database '%s'", @@ -11656,12 +11620,12 @@ migrate_nzf(dns_view_t *view) { * config type, giving us a guarantee that valid configuration * will be written to DB. */ - cfg_parser_reset(ns_g_addparser); - result = cfg_parse_file(ns_g_addparser, view->new_zone_file, + cfg_parser_reset(named_g_addparser); + result = cfg_parse_file(named_g_addparser, view->new_zone_file, &cfg_type_addzoneconf, &nzf_config); if (result != ISC_R_SUCCESS) { - isc_log_write(ns_g_lctx, - NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_SERVER, + isc_log_write(named_g_lctx, + NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "Error parsing NZF file '%s': %s", view->new_zone_file, @@ -11724,9 +11688,9 @@ migrate_nzf(dns_view_t *view) { status = mdb_put(txn, dbi, &key, &data, MDB_NOOVERWRITE); if (status != 0) { - isc_log_write(ns_g_lctx, - NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, + isc_log_write(named_g_lctx, + NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "Error inserting zone in " "NZD database: %s", @@ -11760,7 +11724,7 @@ migrate_nzf(dns_view_t *view) { if (text != NULL) isc_buffer_free(&text); if (nzf_config != NULL) - cfg_obj_destroy(ns_g_addparser, &nzf_config); + cfg_obj_destroy(named_g_addparser, &nzf_config); return (result); } @@ -11768,7 +11732,7 @@ migrate_nzf(dns_view_t *view) { #endif /* HAVE_LMDB */ static isc_result_t -newzone_parse(ns_server_t *server, char *command, dns_view_t **viewp, +newzone_parse(named_server_t *server, char *command, dns_view_t **viewp, cfg_obj_t **zoneconfp, const cfg_obj_t **zoneobjp, isc_boolean_t *redirectp, isc_buffer_t **text) { @@ -11807,8 +11771,8 @@ newzone_parse(ns_server_t *server, char *command, dns_view_t **viewp, */ isc_buffer_forward(&argbuf, 3); - cfg_parser_reset(ns_g_addparser); - CHECK(cfg_parse_buffer3(ns_g_addparser, &argbuf, bn, 0, + cfg_parser_reset(named_g_addparser); + CHECK(cfg_parse_buffer3(named_g_addparser, &argbuf, bn, 0, &cfg_type_addzoneconf, &zoneconf)); CHECK(cfg_map_get(zoneconf, "zone", &zlist)); if (!cfg_obj_islist(zlist)) @@ -11849,7 +11813,7 @@ newzone_parse(ns_server_t *server, char *command, dns_view_t **viewp, /* Make sense of optional class argument */ obj = cfg_tuple_get(zoneobj, "class"); - CHECK(ns_config_getclass(obj, dns_rdataclass_in, &rdclass)); + CHECK(named_config_getclass(obj, dns_rdataclass_in, &rdclass)); /* Make sense of optional view argument */ obj = cfg_tuple_get(zoneobj, "view"); @@ -11877,7 +11841,7 @@ newzone_parse(ns_server_t *server, char *command, dns_view_t **viewp, cleanup: if (zoneconf != NULL) - cfg_obj_destroy(ns_g_addparser, &zoneconf); + cfg_obj_destroy(named_g_addparser, &zoneconf); if (view != NULL) dns_view_detach(&view); @@ -11947,7 +11911,7 @@ delete_zoneconf(dns_view_t *view, cfg_parser_t *pctx, } static isc_result_t -do_addzone(ns_server_t *server, ns_cfgctx_t *cfg, dns_view_t *view, +do_addzone(named_server_t *server, ns_cfgctx_t *cfg, dns_view_t *view, dns_name_t *name, cfg_obj_t *zoneconf, const cfg_obj_t *zoneobj, isc_boolean_t redirect, isc_buffer_t **text) { @@ -12031,9 +11995,9 @@ do_addzone(ns_server_t *server, ns_cfgctx_t *cfg, dns_view_t *view, } else { result = dns_zt_find(view->zonetable, name, 0, NULL, &zone); if (result != ISC_R_SUCCESS) { - isc_log_write(ns_g_lctx, - NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, + isc_log_write(named_g_lctx, + NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "added new zone was not found: %s", isc_result_totext(result)); @@ -12068,8 +12032,8 @@ do_addzone(ns_server_t *server, ns_cfgctx_t *cfg, dns_view_t *view, TCHECK(putstr(text, "dns_zone_loadnew failed: ")); TCHECK(putstr(text, isc_result_totext(result))); - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_INFO, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_INFO, "addzone failed; reverting."); /* If the zone loaded partially, unload it */ @@ -12112,7 +12076,7 @@ do_addzone(ns_server_t *server, ns_cfgctx_t *cfg, dns_view_t *view, } static isc_result_t -do_modzone(ns_server_t *server, ns_cfgctx_t *cfg, dns_view_t *view, +do_modzone(named_server_t *server, ns_cfgctx_t *cfg, dns_view_t *view, dns_name_t *name, const char *zname, const cfg_obj_t *zoneobj, isc_boolean_t redirect, isc_buffer_t **text) { @@ -12264,8 +12228,8 @@ do_modzone(ns_server_t *server, ns_cfgctx_t *cfg, dns_view_t *view, TCHECK(putstr(text, "Use 'rndc addzone' to correct\n")); TCHECK(putstr(text, "the problem and restore service.")); - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_INFO, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_INFO, "modzone failed; removing zone."); /* If the zone loaded partially, unload it */ @@ -12331,7 +12295,9 @@ do_modzone(ns_server_t *server, ns_cfgctx_t *cfg, dns_view_t *view, * Act on an "addzone" or "modzone" command from the command channel. */ isc_result_t -ns_server_changezone(ns_server_t *server, char *command, isc_buffer_t **text) { +named_server_changezone(named_server_t *server, char *command, + isc_buffer_t **text) +{ isc_result_t result; isc_boolean_t addzone; isc_boolean_t redirect = ISC_FALSE; @@ -12397,21 +12363,21 @@ ns_server_changezone(ns_server_t *server, char *command, isc_buffer_t **text) { CHECK(do_modzone(server, cfg, view, dnsname, zonename, zoneobj, redirect, text)); - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_INFO, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_INFO, "%s zone %s in view %s via %s", addzone ? "added" : "updated", zonename, view->name, - addzone ? NS_COMMAND_ADDZONE : NS_COMMAND_MODZONE); + addzone ? NAMED_COMMAND_ADDZONE : NAMED_COMMAND_MODZONE); /* Changing a zone counts as reconfiguration */ - CHECK(isc_time_now(&ns_g_configtime)); + CHECK(isc_time_now(&named_g_configtime)); cleanup: if (isc_buffer_usedlength(*text) > 0) (void) putnull(text); if (zoneconf != NULL) - cfg_obj_destroy(ns_g_addparser, &zoneconf); + cfg_obj_destroy(named_g_addparser, &zoneconf); if (view != NULL) dns_view_detach(&view); @@ -12440,7 +12406,7 @@ typedef struct { } ns_dzctx_t; /* - * Carry out a zone deletion scheduled by ns_server_addzone(). + * Carry out a zone deletion scheduled by named_server_addzone(). */ static void rmzone(isc_task_t *task, isc_event_t *event) { @@ -12467,8 +12433,8 @@ rmzone(isc_task_t *task, isc_event_t *event) { cfg = (ns_cfgctx_t *) view->new_zone_config; dns_name_format(dns_zone_getorigin(zone), zonename, sizeof(zonename)); - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_INFO, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_INFO, "deleting zone %s in view %s via delzone", zonename, view->name); @@ -12480,8 +12446,8 @@ rmzone(isc_task_t *task, isc_event_t *event) { /* Make sure we can open the NZD database */ result = nzd_open(view, 0, &txn, &dbi); if (result != ISC_R_SUCCESS) { - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "unable to open NZD database for '%s'", view->new_zone_db); @@ -12490,8 +12456,8 @@ rmzone(isc_task_t *task, isc_event_t *event) { } if (result != ISC_R_SUCCESS) { - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "unable to " "delete zone configuration: %s", isc_result_totext(result)); @@ -12502,8 +12468,8 @@ rmzone(isc_task_t *task, isc_event_t *event) { dns_zone_getorigin(zone), nzf_writeconf); if (result != ISC_R_SUCCESS) { - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "unable to " "delete zone configuration: %s", isc_result_totext(result)); @@ -12526,8 +12492,8 @@ rmzone(isc_task_t *task, isc_event_t *event) { NULL); } if (result != ISC_R_SUCCESS){ - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "unable to " "delete zone configuration: %s", isc_result_totext(result)); @@ -12550,8 +12516,8 @@ rmzone(isc_task_t *task, isc_event_t *event) { file = dns_zone_getfile(mayberaw); result = isc_file_remove(file); if (result != ISC_R_SUCCESS) { - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_WARNING, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_WARNING, "file %s not removed: %s", file, isc_result_totext(result)); } @@ -12559,8 +12525,8 @@ rmzone(isc_task_t *task, isc_event_t *event) { file = dns_zone_getjournal(mayberaw); result = isc_file_remove(file); if (result != ISC_R_SUCCESS) { - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_WARNING, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_WARNING, "file %s not removed: %s", file, isc_result_totext(result)); } @@ -12569,8 +12535,9 @@ rmzone(isc_task_t *task, isc_event_t *event) { file = dns_zone_getfile(zone); result = isc_file_remove(file); if (result != ISC_R_SUCCESS) { - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, + isc_log_write(named_g_lctx, + NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_WARNING, "file %s not removed: %s", file, isc_result_totext(result)); @@ -12579,8 +12546,9 @@ rmzone(isc_task_t *task, isc_event_t *event) { file = dns_zone_getjournal(zone); result = isc_file_remove(file); if (result != ISC_R_SUCCESS) { - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, + isc_log_write(named_g_lctx, + NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_WARNING, "file %s not removed: %s", file, isc_result_totext(result)); @@ -12595,7 +12563,7 @@ rmzone(isc_task_t *task, isc_event_t *event) { if (raw != NULL) dns_zone_detach(&raw); dns_zone_detach(&zone); - isc_mem_put(ns_g_mctx, dz, sizeof(*dz)); + isc_mem_put(named_g_mctx, dz, sizeof(*dz)); isc_task_detach(&task); } @@ -12603,7 +12571,9 @@ rmzone(isc_task_t *task, isc_event_t *event) { * Act on a "delzone" command from the command channel. */ isc_result_t -ns_server_delzone(ns_server_t *server, isc_lex_t *lex, isc_buffer_t **text) { +named_server_delzone(named_server_t *server, isc_lex_t *lex, + isc_buffer_t **text) +{ isc_result_t result, tresult; dns_zone_t *zone = NULL; dns_zone_t *raw = NULL; @@ -12658,14 +12628,14 @@ ns_server_delzone(ns_server_t *server, isc_lex_t *lex, isc_buffer_t **text) { CHECK(dns_zt_unmount(view->zonetable, zone)); /* Send cleanup event */ - dz = isc_mem_get(ns_g_mctx, sizeof(*dz)); + dz = isc_mem_get(named_g_mctx, sizeof(*dz)); if (dz == NULL) CHECK(ISC_R_NOMEMORY); dz->cleanup = cleanup; dz->zone = NULL; dns_zone_attach(zone, &dz->zone); - dzevent = isc_event_allocate(ns_g_mctx, server, NS_EVENT_DELZONE, + dzevent = isc_event_allocate(named_g_mctx, server, NAMED_EVENT_DELZONE, rmzone, dz, sizeof(isc_event_t)); if (dzevent == NULL) CHECK(ISC_R_NOMEMORY); @@ -12716,12 +12686,12 @@ ns_server_delzone(ns_server_t *server, isc_lex_t *lex, isc_buffer_t **text) { } } - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_INFO, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_INFO, "zone %s scheduled for removal via delzone", zonename); /* Removing a zone counts as reconfiguration */ - CHECK(isc_time_now(&ns_g_configtime)); + CHECK(isc_time_now(&named_g_configtime)); result = ISC_R_SUCCESS; @@ -12734,7 +12704,7 @@ ns_server_delzone(ns_server_t *server, isc_lex_t *lex, isc_buffer_t **text) { dns_zone_detach(&zone); if (dz != NULL) { dns_zone_detach(&dz->zone); - isc_mem_put(ns_g_mctx, dz, sizeof(*dz)); + isc_mem_put(named_g_mctx, dz, sizeof(*dz)); } return (result); @@ -12812,7 +12782,9 @@ emitzone(void *arg, const char *buf, int len) { * Act on a "showzone" command from the command channel. */ isc_result_t -ns_server_showzone(ns_server_t *server, isc_lex_t *lex, isc_buffer_t **text) { +named_server_showzone(named_server_t *server, isc_lex_t *lex, + isc_buffer_t **text) +{ isc_result_t result; const cfg_obj_t *vconfig = NULL, *zconfig = NULL; char zonename[DNS_NAME_FORMATSIZE]; @@ -12867,7 +12839,8 @@ ns_server_showzone(ns_server_t *server, isc_lex_t *lex, isc_buffer_t **text) { #ifndef HAVE_LMDB if (zconfig == NULL && cfg->nzf_config != NULL) zconfig = find_name_in_list_from_map(cfg->nzf_config, - "zone", zonename, redirect); + "zone", zonename, + redirect); #else /* HAVE_LMDB */ if (zconfig == NULL) { const cfg_obj_t *zlist = NULL; @@ -12892,7 +12865,7 @@ ns_server_showzone(ns_server_t *server, isc_lex_t *lex, isc_buffer_t **text) { cleanup: #ifdef HAVE_LMDB if (nzconfig != NULL) - cfg_obj_destroy(ns_g_addparser, &nzconfig); + cfg_obj_destroy(named_g_addparser, &nzconfig); #endif /* HAVE_LMDB */ if (isc_buffer_usedlength(*text) > 0) (void) putnull(text); @@ -12959,15 +12932,17 @@ generate_salt(unsigned char *salt, size_t saltlen) { RUNTIME_CHECK(result == ISC_R_SUCCESS); text[saltlen * 2] = 0; - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_INFO, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_INFO, "generated salt: %s", text); return (ISC_R_SUCCESS); } isc_result_t -ns_server_signing(ns_server_t *server, isc_lex_t *lex, isc_buffer_t **text) { +named_server_signing(named_server_t *server, isc_lex_t *lex, + isc_buffer_t **text) +{ isc_result_t result = ISC_R_SUCCESS; dns_zone_t *zone = NULL; dns_name_t *origin; @@ -13184,8 +13159,8 @@ putnull(isc_buffer_t **b) { } isc_result_t -ns_server_zonestatus(ns_server_t *server, isc_lex_t *lex, - isc_buffer_t **text) +named_server_zonestatus(named_server_t *server, isc_lex_t *lex, + isc_buffer_t **text) { isc_result_t result = ISC_R_SUCCESS; dns_zone_t *zone = NULL, *raw = NULL; @@ -13466,8 +13441,8 @@ argcheck(char *cmd, const char *full) { } isc_result_t -ns_server_nta(ns_server_t *server, isc_lex_t *lex, isc_boolean_t readonly, - isc_buffer_t **text) +named_server_nta(named_server_t *server, isc_lex_t *lex, + isc_boolean_t readonly, isc_buffer_t **text) { dns_view_t *view; dns_ntatable_t *ntatable = NULL; @@ -13560,8 +13535,8 @@ ns_server_nta(ns_server_t *server, isc_lex_t *lex, isc_boolean_t readonly, } if (readonly) { - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_CONTROL, ISC_LOG_INFO, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_CONTROL, ISC_LOG_INFO, "rejecting restricted control channel " "NTA command"); CHECK(ISC_R_FAILURE); @@ -13618,8 +13593,8 @@ ns_server_nta(ns_server_t *server, isc_lex_t *lex, isc_boolean_t readonly, } result = dns_view_flushnode(view, ntaname, ISC_TRUE); - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_INFO, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_INFO, "flush tree '%s' in cache view '%s': %s", namebuf, view->name, isc_result_totext(result)); @@ -13639,8 +13614,8 @@ ns_server_nta(ns_server_t *server, isc_lex_t *lex, isc_boolean_t readonly, CHECK(putstr(text, ", expires ")); CHECK(putstr(text, tbuf)); - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_INFO, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_INFO, "added NTA '%s' (%d sec) in view '%s'", namebuf, ntattl, view->name); } else { @@ -13651,16 +13626,16 @@ ns_server_nta(ns_server_t *server, isc_lex_t *lex, isc_boolean_t readonly, CHECK(putstr(text, "/")); CHECK(putstr(text, view->name)); - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_INFO, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_INFO, "removed NTA '%s' in view %s", namebuf, view->name); } result = dns_view_saventa(view); if (result != ISC_R_SUCCESS) { - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_ERROR, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "error writing NTA file " "for view '%s': %s", view->name, isc_result_totext(result)); @@ -13683,7 +13658,7 @@ ns_server_nta(ns_server_t *server, isc_lex_t *lex, isc_boolean_t readonly, } isc_result_t -ns_server_saventa(ns_server_t *server) { +named_server_saventa(named_server_t *server) { dns_view_t *view; for (view = ISC_LIST_HEAD(server->viewlist); @@ -13693,8 +13668,8 @@ ns_server_saventa(ns_server_t *server) { isc_result_t result = dns_view_saventa(view); if (result != ISC_R_SUCCESS) { - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_ERROR, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "error writing NTA file " "for view '%s': %s", view->name, isc_result_totext(result)); @@ -13705,7 +13680,7 @@ ns_server_saventa(ns_server_t *server) { } isc_result_t -ns_server_loadnta(ns_server_t *server) { +named_server_loadnta(named_server_t *server) { dns_view_t *view; for (view = ISC_LIST_HEAD(server->viewlist); @@ -13718,8 +13693,8 @@ ns_server_loadnta(ns_server_t *server) { (result != ISC_R_FILENOTFOUND) && (result != ISC_R_NOTFOUND)) { - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_ERROR, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "error loading NTA file " "for view '%s': %s", view->name, isc_result_totext(result)); @@ -13888,7 +13863,9 @@ mkey_status(dns_view_t *view, isc_buffer_t **text) { } isc_result_t -ns_server_mkeys(ns_server_t *server, isc_lex_t *lex, isc_buffer_t **text) { +named_server_mkeys(named_server_t *server, isc_lex_t *lex, + isc_buffer_t **text) +{ char *cmd, *classtxt, *viewtxt = NULL; isc_result_t result = ISC_R_SUCCESS; dns_view_t *view = NULL; @@ -14002,7 +13979,9 @@ ns_server_mkeys(ns_server_t *server, isc_lex_t *lex, isc_buffer_t **text) { } isc_result_t -ns_server_dnstap(ns_server_t *server, isc_lex_t *lex, isc_buffer_t **text) { +named_server_dnstap(named_server_t *server, isc_lex_t *lex, + isc_buffer_t **text) +{ #if HAVE_DNSTAP char *ptr; isc_result_t result; @@ -14056,13 +14035,10 @@ ns_server_dnstap(ns_server_t *server, isc_lex_t *lex, isc_buffer_t **text) { } isc_result_t -ns_server_tcptimeouts(isc_lex_t *lex, isc_buffer_t **text) { +named_server_tcptimeouts(isc_lex_t *lex, isc_buffer_t **text) { char *ptr; isc_result_t result = ISC_R_SUCCESS; - unsigned int initial; - unsigned int idle; - unsigned int keepalive; - unsigned int advertised; + unsigned int initial, idle, keepalive, advertised; char msg[128]; /* Skip the command name. */ @@ -14070,6 +14046,9 @@ ns_server_tcptimeouts(isc_lex_t *lex, isc_buffer_t **text) { if (ptr == NULL) return (ISC_R_UNEXPECTEDEND); + ns_server_gettimeouts(named_g_server->sctx, + &initial, &idle, &keepalive, &advertised); + /* Look for optional arguments. */ ptr = next_token(lex, NULL); if (ptr != NULL) { @@ -14104,28 +14083,22 @@ ns_server_tcptimeouts(isc_lex_t *lex, isc_buffer_t **text) { if (advertised > 1200) CHECK(ISC_R_RANGE); - result = isc_task_beginexclusive(ns_g_server->task); + result = isc_task_beginexclusive(named_g_server->task); RUNTIME_CHECK(result == ISC_R_SUCCESS); - ns_g_initialtimo = initial; - ns_g_idletimo = idle; - ns_g_keepalivetimo = keepalive; - ns_g_advertisedtimo = advertised; + ns_server_settimeouts(named_g_server->sctx, initial, idle, + keepalive, advertised); - isc_task_endexclusive(ns_g_server->task); + isc_task_endexclusive(named_g_server->task); } - snprintf(msg, sizeof(msg), "tcp-initial-timeout=%u\n", - ns_g_initialtimo); + snprintf(msg, sizeof(msg), "tcp-initial-timeout=%u\n", initial); CHECK(putstr(text, msg)); - snprintf(msg, sizeof(msg), "tcp-idle-timeout=%u\n", - ns_g_idletimo); + snprintf(msg, sizeof(msg), "tcp-idle-timeout=%u\n", idle); CHECK(putstr(text, msg)); - snprintf(msg, sizeof(msg), "tcp-keepalive-timeout=%u\n", - ns_g_keepalivetimo); + snprintf(msg, sizeof(msg), "tcp-keepalive-timeout=%u\n", keepalive); CHECK(putstr(text, msg)); - snprintf(msg, sizeof(msg), "tcp-advertised-timeout=%u", - ns_g_advertisedtimo); + snprintf(msg, sizeof(msg), "tcp-advertised-timeout=%u", advertised); CHECK(putstr(text, msg)); cleanup: @@ -14136,8 +14109,8 @@ ns_server_tcptimeouts(isc_lex_t *lex, isc_buffer_t **text) { } isc_result_t -ns_server_servestale(ns_server_t *server, isc_lex_t *lex, - isc_buffer_t **text) +named_server_servestale(named_server_t *server, isc_lex_t *lex, + isc_buffer_t **text) { char *ptr, *classtxt, *viewtxt = NULL; char msg[128]; @@ -14252,7 +14225,7 @@ ns_server_servestale(ns_server_t *server, isc_lex_t *lex, } found = ISC_TRUE; } - isc_task_endexclusive(ns_g_server->task); + isc_task_endexclusive(named_g_server->task); if (!found) result = ISC_R_NOTFOUND; diff --git a/bin/named/statschannel.c b/bin/named/statschannel.c index db2628a814..4332fa1a8f 100644 --- a/bin/named/statschannel.c +++ b/bin/named/statschannel.c @@ -32,13 +32,15 @@ #include #include +#include + #include #include #include #include "bind9.xsl.h" -struct ns_statschannel { +struct named_statschannel { /* Unlocked */ isc_httpdmgr_t *httpdmgr; isc_sockaddr_t address; @@ -52,7 +54,7 @@ struct ns_statschannel { dns_acl_t *acl; /* Locked by server task */ - ISC_LINK(struct ns_statschannel) link; + ISC_LINK(struct named_statschannel) link; }; typedef struct @@ -113,7 +115,7 @@ user_zonetype( dns_zone_t *zone ) { * compile time, but we configure them run time in the init_desc() function * below so that they'll be less susceptible to counter name changes. */ -static const char *nsstats_desc[dns_nsstatscounter_max]; +static const char *nsstats_desc[ns_statscounter_max]; static const char *resstats_desc[dns_resstatscounter_max]; static const char *adbstats_desc[dns_adbstats_max]; static const char *zonestats_desc[dns_zonestatscounter_max]; @@ -125,7 +127,7 @@ static const char *tcpinsizestats_desc[dns_sizecounter_in_max]; static const char *tcpoutsizestats_desc[dns_sizecounter_out_max]; static const char *dnstapstats_desc[dns_dnstapcounter_max]; #if defined(EXTENDED_STATS) -static const char *nsstats_xmldesc[dns_nsstatscounter_max]; +static const char *nsstats_xmldesc[ns_statscounter_max]; static const char *resstats_xmldesc[dns_resstatscounter_max]; static const char *adbstats_xmldesc[dns_adbstats_max]; static const char *zonestats_xmldesc[dns_zonestatscounter_max]; @@ -157,7 +159,7 @@ static const char *dnstapstats_xmldesc[dns_dnstapcounter_max]; * preference, regardless of the order of counter indices. For example, * nsstats_desc[nsstats_index[0]] will be the description that is shown first. */ -static int nsstats_index[dns_nsstatscounter_max]; +static int nsstats_index[ns_statscounter_max]; static int resstats_index[dns_resstatscounter_max]; static int adbstats_index[dns_adbstats_max]; static int zonestats_index[dns_zonestatscounter_max]; @@ -193,19 +195,19 @@ init_desc(void) { int i; /* Initialize name server statistics */ - for (i = 0; i < dns_nsstatscounter_max; i++) + for (i = 0; i < ns_statscounter_max; i++) nsstats_desc[i] = NULL; #if defined(EXTENDED_STATS) - for (i = 0; i < dns_nsstatscounter_max; i++) + for (i = 0; i < ns_statscounter_max; i++) nsstats_xmldesc[i] = NULL; #endif #define SET_NSSTATDESC(counterid, desc, xmldesc) \ do { \ - set_desc(dns_nsstatscounter_ ## counterid, \ - dns_nsstatscounter_max, \ + set_desc(ns_statscounter_ ## counterid, \ + ns_statscounter_max, \ desc, nsstats_desc, xmldesc, nsstats_xmldesc); \ - nsstats_index[i++] = dns_nsstatscounter_ ## counterid; \ + nsstats_index[i++] = ns_statscounter_ ## counterid; \ } while (0) i = 0; @@ -299,7 +301,7 @@ init_desc(void) { SET_NSSTATDESC(usedstale, "successful uses of stale cache data after lookup failure", "QryUsedStale"); - INSIST(i == dns_nsstatscounter_max); + INSIST(i == ns_statscounter_max); /* Initialize resolver statistics */ for (i = 0; i < dns_resstatscounter_max; i++) @@ -612,7 +614,7 @@ init_desc(void) { INSIST(i == dns_dnstapcounter_max); /* Sanity check */ - for (i = 0; i < dns_nsstatscounter_max; i++) + for (i = 0; i < ns_statscounter_max; i++) INSIST(nsstats_desc[i] != NULL); for (i = 0; i < dns_resstatscounter_max; i++) INSIST(resstats_desc[i] != NULL); @@ -627,7 +629,7 @@ init_desc(void) { for (i = 0; i < dns_dnstapcounter_max; i++) INSIST(dnstapstats_desc[i] != NULL); #if defined(EXTENDED_STATS) - for (i = 0; i < dns_nsstatscounter_max; i++) + for (i = 0; i < ns_statscounter_max; i++) INSIST(nsstats_xmldesc[i] != NULL); for (i = 0; i < dns_resstatscounter_max; i++) INSIST(resstats_xmldesc[i] != NULL); @@ -959,7 +961,7 @@ init_desc(void) { INSIST(i == dns_sizecounter_out_max); /* Sanity check */ - for (i = 0; i < dns_nsstatscounter_max; i++) + for (i = 0; i < ns_statscounter_max; i++) INSIST(nsstats_desc[i] != NULL); for (i = 0; i < dns_resstatscounter_max; i++) INSIST(resstats_desc[i] != NULL); @@ -980,7 +982,7 @@ init_desc(void) { INSIST(tcpoutsizestats_desc[i] != NULL); } #if defined(EXTENDED_STATS) - for (i = 0; i < dns_nsstatscounter_max; i++) + for (i = 0; i < ns_statscounter_max; i++) INSIST(nsstats_xmldesc[i] != NULL); for (i = 0; i < dns_resstatscounter_max; i++) INSIST(resstats_xmldesc[i] != NULL); @@ -1130,8 +1132,9 @@ dump_counters(isc_stats_t *stats, isc_statsformat_t type, void *arg, return (ISC_R_SUCCESS); #ifdef HAVE_LIBXML2 error: - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_SERVER, - ISC_LOG_ERROR, "failed at dump_counters()"); + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, + "failed at dump_counters()"); return (ISC_R_FAILURE); #endif } @@ -1192,8 +1195,9 @@ rdtypestat_dump(dns_rdatastatstype_t type, isc_uint64_t val, void *arg) { return; #ifdef HAVE_LIBXML2 error: - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_SERVER, - ISC_LOG_ERROR, "failed at rdtypestat_dump()"); + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, + "failed at rdtypestat_dump()"); dumparg->result = ISC_R_FAILURE; return; #endif @@ -1277,8 +1281,9 @@ rdatasetstats_dump(dns_rdatastatstype_t type, isc_uint64_t val, void *arg) { return; #ifdef HAVE_LIBXML2 error: - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_SERVER, - ISC_LOG_ERROR, "failed at rdatasetstats_dump()"); + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, + "failed at rdatasetstats_dump()"); dumparg->result = ISC_R_FAILURE; #endif @@ -1333,8 +1338,9 @@ opcodestat_dump(dns_opcode_t code, isc_uint64_t val, void *arg) { #ifdef HAVE_LIBXML2 error: - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_SERVER, - ISC_LOG_ERROR, "failed at opcodestat_dump()"); + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, + "failed at opcodestat_dump()"); dumparg->result = ISC_R_FAILURE; return; #endif @@ -1389,8 +1395,9 @@ rcodestat_dump(dns_rcode_t code, isc_uint64_t val, void *arg) { #ifdef HAVE_LIBXML2 error: - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_SERVER, - ISC_LOG_ERROR, "failed at rcodestat_dump()"); + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, + "failed at rcodestat_dump()"); dumparg->result = ISC_R_FAILURE; return; #endif @@ -1419,7 +1426,7 @@ zone_xmlrender(dns_zone_t *zone, void *arg) { isc_stats_t *zonestats; dns_stats_t *rcvquerystats; dns_zonestat_level_t statlevel; - isc_uint64_t nsstat_values[dns_nsstatscounter_max]; + isc_uint64_t nsstat_values[ns_statscounter_max]; int xmlrc; stats_dumparg_t dumparg; const char *ztype; @@ -1466,7 +1473,7 @@ zone_xmlrender(dns_zone_t *zone, void *arg) { result = dump_counters(zonestats, isc_statsformat_xml, writer, NULL, nsstats_xmldesc, - dns_nsstatscounter_max, nsstats_index, + ns_statscounter_max, nsstats_index, nsstat_values, ISC_STATSDUMP_VERBOSE); if (result != ISC_R_SUCCESS) goto error; @@ -1493,13 +1500,14 @@ zone_xmlrender(dns_zone_t *zone, void *arg) { return (ISC_R_SUCCESS); error: - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_SERVER, - ISC_LOG_ERROR, "Failed at zone_xmlrender()"); + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, + "Failed at zone_xmlrender()"); return (ISC_R_FAILURE); } static isc_result_t -generatexml(ns_server_t *server, isc_uint32_t flags, +generatexml(named_server_t *server, isc_uint32_t flags, int *buflen, xmlChar **buf) { char boottime[sizeof "yyyy-mm-ddThh:mm:ss.sssZ"]; @@ -1512,7 +1520,7 @@ generatexml(ns_server_t *server, isc_uint32_t flags, dns_view_t *view; stats_dumparg_t dumparg; dns_stats_t *cacherrstats; - isc_uint64_t nsstat_values[dns_nsstatscounter_max]; + isc_uint64_t nsstat_values[ns_statscounter_max]; isc_uint64_t resstat_values[dns_resstatscounter_max]; isc_uint64_t adbstat_values[dns_adbstats_max]; isc_uint64_t zonestat_values[dns_zonestatscounter_max]; @@ -1527,8 +1535,9 @@ generatexml(ns_server_t *server, isc_uint32_t flags, isc_result_t result; isc_time_now(&now); - isc_time_formatISO8601ms(&ns_g_boottime, boottime, sizeof boottime); - isc_time_formatISO8601ms(&ns_g_configtime, configtime, sizeof configtime); + isc_time_formatISO8601ms(&named_g_boottime, boottime, sizeof boottime); + isc_time_formatISO8601ms(&named_g_configtime, configtime, + sizeof configtime); isc_time_formatISO8601ms(&now, nowstr, sizeof nowstr); writer = xmlNewTextWriterDoc(&doc, 0); @@ -1557,7 +1566,7 @@ generatexml(ns_server_t *server, isc_uint32_t flags, TRY0(xmlTextWriterWriteString(writer, ISC_XMLCHAR nowstr)); TRY0(xmlTextWriterEndElement(writer)); /* current-time */ TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "version")); - TRY0(xmlTextWriterWriteString(writer, ISC_XMLCHAR ns_g_version)); + TRY0(xmlTextWriterWriteString(writer, ISC_XMLCHAR named_g_version)); TRY0(xmlTextWriterEndElement(writer)); /* version */ if ((flags & STATS_XML_SERVER) != 0) { @@ -1567,8 +1576,9 @@ generatexml(ns_server_t *server, isc_uint32_t flags, TRY0(xmlTextWriterWriteAttribute(writer, ISC_XMLCHAR "type", ISC_XMLCHAR "opcode")); - dns_opcodestats_dump(server->opcodestats, opcodestat_dump, - &dumparg, ISC_STATSDUMP_VERBOSE); + dns_opcodestats_dump(server->sctx->opcodestats, + opcodestat_dump, &dumparg, + ISC_STATSDUMP_VERBOSE); if (dumparg.result != ISC_R_SUCCESS) goto error; @@ -1578,8 +1588,9 @@ generatexml(ns_server_t *server, isc_uint32_t flags, TRY0(xmlTextWriterWriteAttribute(writer, ISC_XMLCHAR "type", ISC_XMLCHAR "rcode")); - dns_rcodestats_dump(server->rcodestats, rcodestat_dump, - &dumparg, ISC_STATSDUMP_VERBOSE); + dns_rcodestats_dump(server->sctx->rcodestats, + rcodestat_dump, &dumparg, + ISC_STATSDUMP_VERBOSE); if (dumparg.result != ISC_R_SUCCESS) goto error; @@ -1590,8 +1601,8 @@ generatexml(ns_server_t *server, isc_uint32_t flags, ISC_XMLCHAR "qtype")); dumparg.result = ISC_R_SUCCESS; - dns_rdatatypestats_dump(server->rcvquerystats, rdtypestat_dump, - &dumparg, 0); + dns_rdatatypestats_dump(server->sctx->rcvquerystats, + rdtypestat_dump, &dumparg, 0); if (dumparg.result != ISC_R_SUCCESS) goto error; TRY0(xmlTextWriterEndElement(writer)); /* counters */ @@ -1600,9 +1611,10 @@ generatexml(ns_server_t *server, isc_uint32_t flags, TRY0(xmlTextWriterWriteAttribute(writer, ISC_XMLCHAR "type", ISC_XMLCHAR "nsstat")); - result = dump_counters(server->nsstats, isc_statsformat_xml, + result = dump_counters(ns_stats_get(server->sctx->nsstats), + isc_statsformat_xml, writer, NULL, nsstats_xmldesc, - dns_nsstatscounter_max, + ns_statscounter_max, nsstats_index, nsstat_values, ISC_STATSDUMP_VERBOSE); if (result != ISC_R_SUCCESS) @@ -1648,7 +1660,7 @@ generatexml(ns_server_t *server, isc_uint32_t flags, TRY0(xmlTextWriterWriteAttribute(writer, ISC_XMLCHAR "type", ISC_XMLCHAR "dnstap")); - dns_dt_getstats(ns_g_server->dtenv, &dnstapstats); + dns_dt_getstats(named_g_server->dtenv, &dnstapstats); result = dump_counters(dnstapstats, isc_statsformat_xml, writer, NULL, dnstapstats_xmldesc, @@ -1688,7 +1700,7 @@ generatexml(ns_server_t *server, isc_uint32_t flags, TRY0(xmlTextWriterWriteAttribute(writer, ISC_XMLCHAR "type", ISC_XMLCHAR "request-size")); - result = dump_counters(server->udpinstats4, + result = dump_counters(server->sctx->udpinstats4, isc_statsformat_xml, writer, NULL, udpinsizestats_xmldesc, dns_sizecounter_in_max, @@ -1703,7 +1715,7 @@ generatexml(ns_server_t *server, isc_uint32_t flags, TRY0(xmlTextWriterWriteAttribute(writer, ISC_XMLCHAR "type", ISC_XMLCHAR "response-size")); - result = dump_counters(server->udpoutstats4, + result = dump_counters(server->sctx->udpoutstats4, isc_statsformat_xml, writer, NULL, udpoutsizestats_xmldesc, dns_sizecounter_out_max, @@ -1720,7 +1732,7 @@ generatexml(ns_server_t *server, isc_uint32_t flags, TRY0(xmlTextWriterWriteAttribute(writer, ISC_XMLCHAR "type", ISC_XMLCHAR "request-size")); - result = dump_counters(server->tcpinstats4, + result = dump_counters(server->sctx->tcpinstats4, isc_statsformat_xml, writer, NULL, tcpinsizestats_xmldesc, dns_sizecounter_in_max, @@ -1735,7 +1747,7 @@ generatexml(ns_server_t *server, isc_uint32_t flags, TRY0(xmlTextWriterWriteAttribute(writer, ISC_XMLCHAR "type", ISC_XMLCHAR "response-size")); - result = dump_counters(server->tcpoutstats4, + result = dump_counters(server->sctx->tcpoutstats4, isc_statsformat_xml, writer, NULL, tcpoutsizestats_xmldesc, dns_sizecounter_out_max, @@ -1754,7 +1766,7 @@ generatexml(ns_server_t *server, isc_uint32_t flags, TRY0(xmlTextWriterWriteAttribute(writer, ISC_XMLCHAR "type", ISC_XMLCHAR "request-size")); - result = dump_counters(server->udpinstats6, + result = dump_counters(server->sctx->udpinstats6, isc_statsformat_xml, writer, NULL, udpinsizestats_xmldesc, dns_sizecounter_in_max, @@ -1769,7 +1781,7 @@ generatexml(ns_server_t *server, isc_uint32_t flags, TRY0(xmlTextWriterWriteAttribute(writer, ISC_XMLCHAR "type", ISC_XMLCHAR "response-size")); - result = dump_counters(server->udpoutstats6, + result = dump_counters(server->sctx->udpoutstats6, isc_statsformat_xml, writer, NULL, udpoutsizestats_xmldesc, dns_sizecounter_out_max, @@ -1786,7 +1798,7 @@ generatexml(ns_server_t *server, isc_uint32_t flags, TRY0(xmlTextWriterWriteAttribute(writer, ISC_XMLCHAR "type", ISC_XMLCHAR "request-size")); - result = dump_counters(server->tcpinstats6, + result = dump_counters(server->sctx->tcpinstats6, isc_statsformat_xml, writer, NULL, tcpinsizestats_xmldesc, dns_sizecounter_in_max, @@ -1801,7 +1813,7 @@ generatexml(ns_server_t *server, isc_uint32_t flags, TRY0(xmlTextWriterWriteAttribute(writer, ISC_XMLCHAR "type", ISC_XMLCHAR "response-size")); - result = dump_counters(server->tcpoutstats6, + result = dump_counters(server->sctx->tcpoutstats6, isc_statsformat_xml, writer, NULL, tcpoutsizestats_xmldesc, dns_sizecounter_out_max, @@ -1923,13 +1935,13 @@ generatexml(ns_server_t *server, isc_uint32_t flags, if ((flags & STATS_XML_NET) != 0) { TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "socketmgr")); - TRY0(isc_socketmgr_renderxml(ns_g_socketmgr, writer)); + TRY0(isc_socketmgr_renderxml(named_g_socketmgr, writer)); TRY0(xmlTextWriterEndElement(writer)); /* /socketmgr */ } if ((flags & STATS_XML_TASKS) != 0) { TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "taskmgr")); - TRY0(isc_taskmgr_renderxml(ns_g_taskmgr, writer)); + TRY0(isc_taskmgr_renderxml(named_g_taskmgr, writer)); TRY0(xmlTextWriterEndElement(writer)); /* /taskmgr */ } @@ -1952,8 +1964,9 @@ generatexml(ns_server_t *server, isc_uint32_t flags, return (ISC_R_SUCCESS); error: - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_SERVER, - ISC_LOG_ERROR, "failed generating XML response"); + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, + "failed generating XML response"); if (writer != NULL) xmlFreeTextWriter(writer); if (doc != NULL) @@ -1977,7 +1990,7 @@ render_xml(isc_uint32_t flags, const char *url, isc_httpdurl_t *urlinfo, { unsigned char *msg = NULL; int msglen; - ns_server_t *server = arg; + named_server_t *server = arg; isc_result_t result; UNUSED(url); @@ -1996,8 +2009,8 @@ render_xml(isc_uint32_t flags, const char *url, isc_httpdurl_t *urlinfo, *freecb = wrap_xmlfree; *freecb_args = NULL; } else - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_ERROR, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "failed at rendering XML()"); return (result); @@ -2172,7 +2185,7 @@ zone_jsonrender(dns_zone_t *zone, void *arg) { char *class_only = NULL; dns_rdataclass_t rdclass; isc_uint32_t serial; - isc_uint64_t nsstat_values[dns_nsstatscounter_max]; + isc_uint64_t nsstat_values[ns_statscounter_max]; isc_stats_t *zonestats; dns_stats_t *rcvquerystats; json_object *zonearray = (json_object *) arg; @@ -2211,7 +2224,7 @@ zone_jsonrender(dns_zone_t *zone, void *arg) { result = dump_counters(zonestats, isc_statsformat_json, counters, NULL, nsstats_xmldesc, - dns_nsstatscounter_max, nsstats_index, + ns_statscounter_max, nsstats_index, nsstat_values, 0); if (result != ISC_R_SUCCESS) { json_object_put(counters); @@ -2256,7 +2269,7 @@ zone_jsonrender(dns_zone_t *zone, void *arg) { } static isc_result_t -generatejson(ns_server_t *server, size_t *msglen, +generatejson(named_server_t *server, size_t *msglen, const char **msg, json_object **rootp, isc_uint32_t flags) { dns_view_t *view; @@ -2267,7 +2280,7 @@ generatejson(ns_server_t *server, size_t *msglen, json_object *tcpreq4 = NULL, *tcpresp4 = NULL; json_object *udpreq6 = NULL, *udpresp6 = NULL; json_object *tcpreq6 = NULL, *tcpresp6 = NULL; - isc_uint64_t nsstat_values[dns_nsstatscounter_max]; + isc_uint64_t nsstat_values[ns_statscounter_max]; isc_uint64_t resstat_values[dns_resstatscounter_max]; isc_uint64_t adbstat_values[dns_adbstats_max]; isc_uint64_t zonestat_values[dns_zonestatscounter_max]; @@ -2301,10 +2314,10 @@ generatejson(ns_server_t *server, size_t *msglen, json_object_object_add(bindstats, "json-stats-version", obj); isc_time_now(&now); - isc_time_formatISO8601ms(&ns_g_boottime, - boottime, sizeof(boottime)); - isc_time_formatISO8601ms(&ns_g_configtime, - configtime, sizeof configtime); + isc_time_formatISO8601ms(&named_g_boottime, + boottime, sizeof(boottime)); + isc_time_formatISO8601ms(&named_g_configtime, + configtime, sizeof configtime); isc_time_formatISO8601ms(&now, nowstr, sizeof(nowstr)); obj = json_object_new_string(boottime); @@ -2318,7 +2331,7 @@ generatejson(ns_server_t *server, size_t *msglen, obj = json_object_new_string(nowstr); CHECKMEM(obj); json_object_object_add(bindstats, "current-time", obj); - obj = json_object_new_string(ns_g_version); + obj = json_object_new_string(named_g_version); CHECKMEM(obj); json_object_object_add(bindstats, "version", obj); @@ -2330,7 +2343,7 @@ generatejson(ns_server_t *server, size_t *msglen, dumparg.type = isc_statsformat_json; dumparg.arg = counters; - dns_opcodestats_dump(server->opcodestats, + dns_opcodestats_dump(server->sctx->opcodestats, opcodestat_dump, &dumparg, ISC_STATSDUMP_VERBOSE); if (dumparg.result != ISC_R_SUCCESS) { @@ -2349,7 +2362,7 @@ generatejson(ns_server_t *server, size_t *msglen, dumparg.type = isc_statsformat_json; dumparg.arg = counters; - dns_rcodestats_dump(server->rcodestats, rcodestat_dump, + dns_rcodestats_dump(server->sctx->rcodestats, rcodestat_dump, &dumparg, ISC_STATSDUMP_VERBOSE); if (dumparg.result != ISC_R_SUCCESS) { json_object_put(counters); @@ -2367,7 +2380,7 @@ generatejson(ns_server_t *server, size_t *msglen, dumparg.result = ISC_R_SUCCESS; dumparg.arg = counters; - dns_rdatatypestats_dump(server->rcvquerystats, + dns_rdatatypestats_dump(server->sctx->rcvquerystats, rdtypestat_dump, &dumparg, 0); if (dumparg.result != ISC_R_SUCCESS) { json_object_put(counters); @@ -2385,10 +2398,11 @@ generatejson(ns_server_t *server, size_t *msglen, dumparg.result = ISC_R_SUCCESS; dumparg.arg = counters; - result = dump_counters(server->nsstats, isc_statsformat_json, - counters, NULL, nsstats_xmldesc, - dns_nsstatscounter_max, - nsstats_index, nsstat_values, 0); + result = dump_counters(ns_stats_get(server->sctx->nsstats), + isc_statsformat_json, + counters, NULL, nsstats_xmldesc, + ns_statscounter_max, + nsstats_index, nsstat_values, 0); if (result != ISC_R_SUCCESS) { json_object_put(counters); goto error; @@ -2405,10 +2419,11 @@ generatejson(ns_server_t *server, size_t *msglen, dumparg.result = ISC_R_SUCCESS; dumparg.arg = counters; - result = dump_counters(server->zonestats, isc_statsformat_json, - counters, NULL, zonestats_xmldesc, - dns_zonestatscounter_max, - zonestats_index, zonestat_values, 0); + result = dump_counters(server->zonestats, + isc_statsformat_json, + counters, NULL, zonestats_xmldesc, + dns_zonestatscounter_max, + zonestats_index, zonestat_values, 0); if (result != ISC_R_SUCCESS) { json_object_put(counters); goto error; @@ -2443,9 +2458,9 @@ generatejson(ns_server_t *server, size_t *msglen, #if HAVE_DNSTAP /* dnstap stat counters */ - if (ns_g_server->dtenv != NULL) { + if (named_g_server->dtenv != NULL) { isc_stats_t *dnstapstats = NULL; - dns_dt_getstats(ns_g_server->dtenv, &dnstapstats); + dns_dt_getstats(named_g_server->dtenv, &dnstapstats); counters = json_object_new_object(); dumparg.result = ISC_R_SUCCESS; dumparg.arg = counters; @@ -2639,7 +2654,7 @@ generatejson(ns_server_t *server, size_t *msglen, sockets = json_object_new_object(); CHECKMEM(sockets); - result = isc_socketmgr_renderjson(ns_g_socketmgr, sockets); + result = isc_socketmgr_renderjson(named_g_socketmgr, sockets); if (result != ISC_R_SUCCESS) { json_object_put(sockets); goto error; @@ -2652,7 +2667,7 @@ generatejson(ns_server_t *server, size_t *msglen, json_object *tasks = json_object_new_object(); CHECKMEM(tasks); - result = isc_taskmgr_renderjson(ns_g_taskmgr, tasks); + result = isc_taskmgr_renderjson(named_g_taskmgr, tasks); if (result != ISC_R_SUCCESS) { json_object_put(tasks); goto error; @@ -2703,56 +2718,56 @@ generatejson(ns_server_t *server, size_t *msglen, tcpresp6 = json_object_new_object(); CHECKMEM(tcpresp6); - CHECK(dump_counters(server->udpinstats4, + CHECK(dump_counters(server->sctx->udpinstats4, isc_statsformat_json, udpreq4, NULL, udpinsizestats_xmldesc, dns_sizecounter_in_max, udpinsizestats_index, udpinsizestat_values, 0)); - CHECK(dump_counters(server->udpoutstats4, + CHECK(dump_counters(server->sctx->udpoutstats4, isc_statsformat_json, udpresp4, NULL, udpoutsizestats_xmldesc, dns_sizecounter_out_max, udpoutsizestats_index, udpoutsizestat_values, 0)); - CHECK(dump_counters(server->tcpinstats4, + CHECK(dump_counters(server->sctx->tcpinstats4, isc_statsformat_json, tcpreq4, NULL, tcpinsizestats_xmldesc, dns_sizecounter_in_max, tcpinsizestats_index, tcpinsizestat_values, 0)); - CHECK(dump_counters(server->tcpoutstats4, + CHECK(dump_counters(server->sctx->tcpoutstats4, isc_statsformat_json, tcpresp4, NULL, tcpoutsizestats_xmldesc, dns_sizecounter_out_max, tcpoutsizestats_index, tcpoutsizestat_values, 0)); - CHECK(dump_counters(server->udpinstats6, + CHECK(dump_counters(server->sctx->udpinstats6, isc_statsformat_json, udpreq6, NULL, udpinsizestats_xmldesc, dns_sizecounter_in_max, udpinsizestats_index, udpinsizestat_values, 0)); - CHECK(dump_counters(server->udpoutstats6, + CHECK(dump_counters(server->sctx->udpoutstats6, isc_statsformat_json, udpresp6, NULL, udpoutsizestats_xmldesc, dns_sizecounter_out_max, udpoutsizestats_index, udpoutsizestat_values, 0)); - CHECK(dump_counters(server->tcpinstats6, + CHECK(dump_counters(server->sctx->tcpinstats6, isc_statsformat_json, tcpreq6, NULL, tcpinsizestats_xmldesc, dns_sizecounter_in_max, tcpinsizestats_index, tcpinsizestat_values, 0)); - CHECK(dump_counters(server->tcpoutstats6, + CHECK(dump_counters(server->sctx->tcpoutstats6, isc_statsformat_json, tcpresp6, NULL, tcpoutsizestats_xmldesc, dns_sizecounter_out_max, @@ -2841,7 +2856,7 @@ render_json(isc_uint32_t flags, { isc_result_t result; json_object *bindstats = NULL; - ns_server_t *server = arg; + named_server_t *server = arg; const char *msg = NULL; size_t msglen = 0; char *p; @@ -2862,8 +2877,8 @@ render_json(isc_uint32_t flags, *freecb = wrap_jsonfree; *freecb_args = bindstats; } else - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_ERROR, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "failed at rendering JSON()"); return (result); @@ -3031,11 +3046,12 @@ render_xsl(const char *url, isc_httpdurl_t *urlinfo, } static void -shutdown_listener(ns_statschannel_t *listener) { +shutdown_listener(named_statschannel_t *listener) { char socktext[ISC_SOCKADDR_FORMATSIZE]; isc_sockaddr_format(&listener->address, socktext, sizeof(socktext)); - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_SERVER, - ISC_LOG_NOTICE, "stopping statistics channel on %s", + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_NOTICE, + "stopping statistics channel on %s", socktext); isc_httpdmgr_shutdown(&listener->httpdmgr); @@ -3043,7 +3059,9 @@ shutdown_listener(ns_statschannel_t *listener) { static isc_boolean_t client_ok(const isc_sockaddr_t *fromaddr, void *arg) { - ns_statschannel_t *listener = arg; + named_statschannel_t *listener = arg; + dns_aclenv_t *env = + ns_interfacemgr_getaclenv(named_g_server->interfacemgr); isc_netaddr_t netaddr; char socktext[ISC_SOCKADDR_FORMATSIZE]; int match; @@ -3053,16 +3071,17 @@ client_ok(const isc_sockaddr_t *fromaddr, void *arg) { isc_netaddr_fromsockaddr(&netaddr, fromaddr); LOCK(&listener->lock); - if (dns_acl_match(&netaddr, NULL, listener->acl, &ns_g_server->aclenv, - &match, NULL) == ISC_R_SUCCESS && match > 0) { + if (dns_acl_match(&netaddr, NULL, listener->acl, env, + &match, NULL) == ISC_R_SUCCESS && match > 0) + { UNLOCK(&listener->lock); return (ISC_TRUE); } UNLOCK(&listener->lock); isc_sockaddr_format(fromaddr, socktext, sizeof(socktext)); - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_WARNING, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_WARNING, "rejected statistics connection from %s", socktext); return (ISC_FALSE); @@ -3070,7 +3089,7 @@ client_ok(const isc_sockaddr_t *fromaddr, void *arg) { static void destroy_listener(void *arg) { - ns_statschannel_t *listener = arg; + named_statschannel_t *listener = arg; REQUIRE(listener != NULL); REQUIRE(!ISC_LINK_LINKED(listener, link)); @@ -3083,13 +3102,13 @@ destroy_listener(void *arg) { } static isc_result_t -add_listener(ns_server_t *server, ns_statschannel_t **listenerp, +add_listener(named_server_t *server, named_statschannel_t **listenerp, const cfg_obj_t *listen_params, const cfg_obj_t *config, isc_sockaddr_t *addr, cfg_aclconfctx_t *aclconfctx, const char *socktext) { isc_result_t result; - ns_statschannel_t *listener; + named_statschannel_t *listener; isc_task_t *task = NULL; isc_socket_t *sock = NULL; const cfg_obj_t *allow; @@ -3115,7 +3134,7 @@ add_listener(ns_server_t *server, ns_statschannel_t **listenerp, allow = cfg_tuple_get(listen_params, "allow"); if (allow != NULL && cfg_obj_islist(allow)) { - result = cfg_acl_fromconfig(allow, config, ns_g_lctx, + result = cfg_acl_fromconfig(allow, config, named_g_lctx, aclconfctx, listener->mctx, 0, &new_acl); } else @@ -3125,12 +3144,12 @@ add_listener(ns_server_t *server, ns_statschannel_t **listenerp, dns_acl_attach(new_acl, &listener->acl); dns_acl_detach(&new_acl); - result = isc_task_create(ns_g_taskmgr, 0, &task); + result = isc_task_create(named_g_taskmgr, 0, &task); if (result != ISC_R_SUCCESS) goto cleanup; isc_task_setname(task, "statchannel", NULL); - result = isc_socket_create(ns_g_socketmgr, isc_sockaddr_pf(addr), + result = isc_socket_create(named_g_socketmgr, isc_sockaddr_pf(addr), isc_sockettype_tcp, &sock); if (result != ISC_R_SUCCESS) goto cleanup; @@ -3145,8 +3164,8 @@ add_listener(ns_server_t *server, ns_statschannel_t **listenerp, goto cleanup; result = isc_httpdmgr_create(server->mctx, sock, task, client_ok, - destroy_listener, listener, ns_g_timermgr, - &listener->httpdmgr); + destroy_listener, listener, + named_g_timermgr, &listener->httpdmgr); if (result != ISC_R_SUCCESS) goto cleanup; @@ -3196,8 +3215,8 @@ add_listener(ns_server_t *server, ns_statschannel_t **listenerp, render_xsl, server); *listenerp = listener; - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_NOTICE, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_NOTICE, "statistics channel listening on %s", socktext); cleanup: @@ -3217,12 +3236,12 @@ cleanup: } static void -update_listener(ns_server_t *server, ns_statschannel_t **listenerp, +update_listener(named_server_t *server, named_statschannel_t **listenerp, const cfg_obj_t *listen_params, const cfg_obj_t *config, isc_sockaddr_t *addr, cfg_aclconfctx_t *aclconfctx, const char *socktext) { - ns_statschannel_t *listener; + named_statschannel_t *listener; const cfg_obj_t *allow = NULL; dns_acl_t *new_acl = NULL; isc_result_t result = ISC_R_SUCCESS; @@ -3243,7 +3262,7 @@ update_listener(ns_server_t *server, ns_statschannel_t **listenerp, */ allow = cfg_tuple_get(listen_params, "allow"); if (allow != NULL && cfg_obj_islist(allow)) { - result = cfg_acl_fromconfig(allow, config, ns_g_lctx, + result = cfg_acl_fromconfig(allow, config, named_g_lctx, aclconfctx, listener->mctx, 0, &new_acl); } else @@ -3258,7 +3277,7 @@ update_listener(ns_server_t *server, ns_statschannel_t **listenerp, UNLOCK(&listener->lock); } else { - cfg_obj_log(listen_params, ns_g_lctx, ISC_LOG_WARNING, + cfg_obj_log(listen_params, named_g_lctx, ISC_LOG_WARNING, "couldn't install new acl for " "statistics channel %s: %s", socktext, isc_result_totext(result)); @@ -3268,11 +3287,11 @@ update_listener(ns_server_t *server, ns_statschannel_t **listenerp, } isc_result_t -ns_statschannels_configure(ns_server_t *server, const cfg_obj_t *config, - cfg_aclconfctx_t *aclconfctx) +named_statschannels_configure(named_server_t *server, const cfg_obj_t *config, + cfg_aclconfctx_t *aclconfctx) { - ns_statschannel_t *listener, *listener_next; - ns_statschannellist_t new_listeners; + named_statschannel_t *listener, *listener_next; + named_statschannellist_t new_listeners; const cfg_obj_t *statschannellist = NULL; const cfg_listelt_t *element, *element2; char socktext[ISC_SOCKADDR_FORMATSIZE]; @@ -3296,20 +3315,20 @@ ns_statschannels_configure(ns_server_t *server, const cfg_obj_t *config, */ if (statschannellist != NULL) { #ifndef EXTENDED_STATS - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_WARNING, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_WARNING, "statistics-channels specified but not effective " "due to missing XML and/or JSON library"); #else /* EXTENDED_STATS */ #ifndef HAVE_LIBXML2 - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_WARNING, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_WARNING, "statistics-channels: XML library missing, " "only JSON stats will be available"); #endif /* !HAVE_LIBXML2 */ #ifndef HAVE_JSON - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_WARNING, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_WARNING, "statistics-channels: JSON library missing, " "only XML stats will be available"); #endif /* !HAVE_JSON */ @@ -3340,14 +3359,14 @@ ns_statschannels_configure(ns_server_t *server, const cfg_obj_t *config, addr = *cfg_obj_assockaddr(obj); if (isc_sockaddr_getport(&addr) == 0) isc_sockaddr_setport(&addr, - NS_STATSCHANNEL_HTTPPORT); + NAMED_STATSCHANNEL_HTTPPORT); isc_sockaddr_format(&addr, socktext, sizeof(socktext)); - isc_log_write(ns_g_lctx, - NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, + isc_log_write(named_g_lctx, + NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_DEBUG(9), "processing statistics " "channel %s", @@ -3376,13 +3395,13 @@ ns_statschannels_configure(ns_server_t *server, const cfg_obj_t *config, socktext); if (r != ISC_R_SUCCESS) { cfg_obj_log(listen_params, - ns_g_lctx, - ISC_LOG_WARNING, - "couldn't allocate " - "statistics channel" - " %s: %s", - socktext, - isc_result_totext(r)); + named_g_lctx, + ISC_LOG_WARNING, + "couldn't allocate " + "statistics channel" + " %s: %s", + socktext, + isc_result_totext(r)); } } @@ -3406,8 +3425,8 @@ ns_statschannels_configure(ns_server_t *server, const cfg_obj_t *config, } void -ns_statschannels_shutdown(ns_server_t *server) { - ns_statschannel_t *listener; +named_statschannels_shutdown(named_server_t *server) { + named_statschannel_t *listener; while ((listener = ISC_LIST_HEAD(server->statschannels)) != NULL) { ISC_LIST_UNLINK(server->statschannels, listener, link); @@ -3416,13 +3435,13 @@ ns_statschannels_shutdown(ns_server_t *server) { } isc_result_t -ns_stats_dump(ns_server_t *server, FILE *fp) { +named_stats_dump(named_server_t *server, FILE *fp) { isc_stdtime_t now; isc_result_t result; dns_view_t *view; dns_zone_t *zone, *next; stats_dumparg_t dumparg; - isc_uint64_t nsstat_values[dns_nsstatscounter_max]; + isc_uint64_t nsstat_values[ns_statscounter_max]; isc_uint64_t resstat_values[dns_resstatscounter_max]; isc_uint64_t adbstat_values[dns_adbstats_max]; isc_uint64_t zonestat_values[dns_zonestatscounter_max]; @@ -3438,14 +3457,16 @@ ns_stats_dump(ns_server_t *server, FILE *fp) { fprintf(fp, "+++ Statistics Dump +++ (%lu)\n", (unsigned long)now); fprintf(fp, "++ Incoming Requests ++\n"); - dns_opcodestats_dump(server->opcodestats, opcodestat_dump, &dumparg, 0); + dns_opcodestats_dump(server->sctx->opcodestats, + opcodestat_dump, &dumparg, 0); fprintf(fp, "++ Incoming Queries ++\n"); - dns_rdatatypestats_dump(server->rcvquerystats, rdtypestat_dump, - &dumparg, 0); + dns_rdatatypestats_dump(server->sctx->rcvquerystats, + rdtypestat_dump, &dumparg, 0); fprintf(fp, "++ Outgoing Rcodes ++\n"); - dns_rcodestats_dump(server->rcodestats, rcodestat_dump, &dumparg, 0); + dns_rcodestats_dump(server->sctx->rcodestats, + rcodestat_dump, &dumparg, 0); fprintf(fp, "++ Outgoing Queries ++\n"); for (view = ISC_LIST_HEAD(server->viewlist); @@ -3462,8 +3483,9 @@ ns_stats_dump(ns_server_t *server, FILE *fp) { } fprintf(fp, "++ Name Server Statistics ++\n"); - (void) dump_counters(server->nsstats, isc_statsformat_file, fp, NULL, - nsstats_desc, dns_nsstatscounter_max, + (void) dump_counters(ns_stats_get(server->sctx->nsstats), + isc_statsformat_file, fp, NULL, + nsstats_desc, ns_statscounter_max, nsstats_index, nsstat_values, 0); fprintf(fp, "++ Zone Maintenance Statistics ++\n"); @@ -3576,7 +3598,7 @@ ns_stats_dump(ns_server_t *server, FILE *fp) { (void) dump_counters(zonestats, isc_statsformat_file, fp, NULL, nsstats_desc, - dns_nsstatscounter_max, + ns_statscounter_max, nsstats_index, nsstat_values, 0); } } diff --git a/bin/named/tkeyconf.c b/bin/named/tkeyconf.c index ae0bbe047b..31eb332fd0 100644 --- a/bin/named/tkeyconf.c +++ b/bin/named/tkeyconf.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999-2001, 2004-2007, 2009, 2010, 2012, 2014, 2016 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 1999-2001, 2004-2007, 2009, 2010, 2012, 2014, 2016, 2017 Internet Systems Consortium, Inc. ("ISC") * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -35,15 +35,15 @@ #include #define LOG(msg) \ - isc_log_write(ns_g_lctx, \ - NS_LOGCATEGORY_GENERAL, \ - NS_LOGMODULE_SERVER, \ + isc_log_write(named_g_lctx, \ + NAMED_LOGCATEGORY_GENERAL, \ + NAMED_LOGMODULE_SERVER, \ ISC_LOG_ERROR, \ "%s", msg) isc_result_t -ns_tkeyctx_fromconfig(const cfg_obj_t *options, isc_mem_t *mctx, - isc_entropy_t *ectx, dns_tkeyctx_t **tctxp) +named_tkeyctx_fromconfig(const cfg_obj_t *options, isc_mem_t *mctx, + isc_entropy_t *ectx, dns_tkeyctx_t **tctxp) { isc_result_t result; dns_tkeyctx_t *tctx = NULL; diff --git a/bin/named/tsigconf.c b/bin/named/tsigconf.c index 9a913f5536..e892b4d1f4 100644 --- a/bin/named/tsigconf.c +++ b/bin/named/tsigconf.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999-2001, 2004-2007, 2009, 2011, 2012, 2016 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 1999-2001, 2004-2007, 2009, 2011, 2012, 2016, 2017 Internet Systems Consortium, Inc. ("ISC") * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -81,10 +81,11 @@ add_initial_keys(const cfg_obj_t *list, dns_tsig_keyring_t *ring, * Create the algorithm. */ algstr = cfg_obj_asstring(algobj); - if (ns_config_getkeyalgorithm(algstr, &alg, &bits) + if (named_config_getkeyalgorithm(algstr, &alg, &bits) != ISC_R_SUCCESS) { - cfg_obj_log(algobj, ns_g_lctx, ISC_LOG_ERROR, - "key '%s': has a unsupported algorithm '%s'", + cfg_obj_log(algobj, named_g_lctx, ISC_LOG_ERROR, + "key '%s': has a " + "unsupported algorithm '%s'", keyid, algstr); ret = DNS_R_BADALG; goto failure; @@ -121,7 +122,7 @@ add_initial_keys(const cfg_obj_t *list, dns_tsig_keyring_t *ring, return (ISC_R_SUCCESS); failure: - cfg_obj_log(key, ns_g_lctx, ISC_LOG_ERROR, + cfg_obj_log(key, named_g_lctx, ISC_LOG_ERROR, "configuring key '%s': %s", keyid, isc_result_totext(ret)); @@ -131,8 +132,8 @@ add_initial_keys(const cfg_obj_t *list, dns_tsig_keyring_t *ring, } isc_result_t -ns_tsigkeyring_fromconfig(const cfg_obj_t *config, const cfg_obj_t *vconfig, - isc_mem_t *mctx, dns_tsig_keyring_t **ringp) +named_tsigkeyring_fromconfig(const cfg_obj_t *config, const cfg_obj_t *vconfig, + isc_mem_t *mctx, dns_tsig_keyring_t **ringp) { const cfg_obj_t *maps[3]; const cfg_obj_t *keylist; diff --git a/bin/named/unix/include/named/os.h b/bin/named/unix/include/named/os.h index 62b3af864e..872d7b1457 100644 --- a/bin/named/unix/include/named/os.h +++ b/bin/named/unix/include/named/os.h @@ -6,8 +6,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef NS_OS_H -#define NS_OS_H 1 +#ifndef NAMED_OS_H +#define NAMED_OS_H 1 /*! \file */ @@ -16,60 +16,60 @@ #include void -ns_os_init(const char *progname); +named_os_init(const char *progname); void -ns_os_daemonize(void); +named_os_daemonize(void); void -ns_os_opendevnull(void); +named_os_opendevnull(void); void -ns_os_closedevnull(void); +named_os_closedevnull(void); void -ns_os_chroot(const char *root); +named_os_chroot(const char *root); void -ns_os_inituserinfo(const char *username); +named_os_inituserinfo(const char *username); void -ns_os_changeuser(void); +named_os_changeuser(void); uid_t ns_os_uid(void); void -ns_os_adjustnofile(void); +named_os_adjustnofile(void); void -ns_os_minprivs(void); +named_os_minprivs(void); FILE * -ns_os_openfile(const char *filename, mode_t mode, isc_boolean_t switch_user); +named_os_openfile(const char *filename, mode_t mode, isc_boolean_t switch_user); void -ns_os_writepidfile(const char *filename, isc_boolean_t first_time); +named_os_writepidfile(const char *filename, isc_boolean_t first_time); isc_boolean_t -ns_os_issingleton(const char *filename); +named_os_issingleton(const char *filename); void -ns_os_shutdown(void); +named_os_shutdown(void); isc_result_t -ns_os_gethostname(char *buf, size_t len); +named_os_gethostname(char *buf, size_t len); void -ns_os_shutdownmsg(char *command, isc_buffer_t *text); +named_os_shutdownmsg(char *command, isc_buffer_t *text); void -ns_os_tzset(void); +named_os_tzset(void); void -ns_os_started(void); +named_os_started(void); char * -ns_os_uname(void); +named_os_uname(void); -#endif /* NS_OS_H */ +#endif /* NAMED_OS_H */ diff --git a/bin/named/unix/os.c b/bin/named/unix/os.c index 4bef0a5a77..001499e344 100644 --- a/bin/named/unix/os.c +++ b/bin/named/unix/os.c @@ -43,7 +43,7 @@ #include #include #ifdef HAVE_LIBSCF -#include +#include #endif static char *pidfile = NULL; @@ -182,10 +182,10 @@ linux_setcaps(cap_t caps) { if (syscall(SYS_capset, &caphead, &cap) < 0) { #endif isc__strerror(errno, strbuf, sizeof(strbuf)); - ns_main_earlyfatal(SETCAPS_FUNC "failed: %s:" - " please ensure that the capset kernel" - " module is loaded. see insmod(8)", - strbuf); + named_main_earlyfatal(SETCAPS_FUNC "failed: %s:" + " please ensure that the capset kernel" + " module is loaded. see insmod(8)", + strbuf); } } @@ -199,13 +199,13 @@ linux_setcaps(cap_t caps) { err = cap_set_flag(caps, CAP_EFFECTIVE, 1, &capval, CAP_SET); \ if (err == -1) { \ isc__strerror(errno, strbuf, sizeof(strbuf)); \ - ns_main_earlyfatal("cap_set_proc failed: %s", strbuf); \ + named_main_earlyfatal("cap_set_proc failed: %s", strbuf); \ } \ \ err = cap_set_flag(caps, CAP_PERMITTED, 1, &capval, CAP_SET); \ if (err == -1) { \ isc__strerror(errno, strbuf, sizeof(strbuf)); \ - ns_main_earlyfatal("cap_set_proc failed: %s", strbuf); \ + named_main_earlyfatal("cap_set_proc failed: %s", strbuf); \ } \ } \ } while (0) @@ -214,12 +214,12 @@ linux_setcaps(cap_t caps) { caps = cap_init(); \ if (caps == NULL) { \ isc__strerror(errno, strbuf, sizeof(strbuf)); \ - ns_main_earlyfatal("cap_init failed: %s", strbuf); \ + named_main_earlyfatal("cap_init failed: %s", strbuf); \ } \ curcaps = cap_get_proc(); \ if (curcaps == NULL) { \ isc__strerror(errno, strbuf, sizeof(strbuf)); \ - ns_main_earlyfatal("cap_get_proc failed: %s", strbuf); \ + named_main_earlyfatal("cap_get_proc failed: %s", strbuf); \ } \ } while (0) #define FREE_CAP \ @@ -351,7 +351,7 @@ linux_keepcaps(void) { if (prctl(PR_SET_KEEPCAPS, 1, 0, 0, 0) < 0) { if (errno != EINVAL) { isc__strerror(errno, strbuf, sizeof(strbuf)); - ns_main_earlyfatal("prctl() failed: %s", strbuf); + named_main_earlyfatal("prctl() failed: %s", strbuf); } } else { non_root_caps = ISC_TRUE; @@ -376,7 +376,7 @@ setup_syslog(const char *progname) { } void -ns_os_init(const char *progname) { +named_os_init(const char *progname) { setup_syslog(progname); #ifdef HAVE_LINUX_CAPABILITY_H linux_initialprivs(); @@ -390,19 +390,19 @@ ns_os_init(const char *progname) { } void -ns_os_daemonize(void) { +named_os_daemonize(void) { pid_t pid; char strbuf[ISC_STRERRORSIZE]; if (pipe(dfd) == -1) { isc__strerror(errno, strbuf, sizeof(strbuf)); - ns_main_earlyfatal("pipe(): %s", strbuf); + named_main_earlyfatal("pipe(): %s", strbuf); } pid = fork(); if (pid == -1) { isc__strerror(errno, strbuf, sizeof(strbuf)); - ns_main_earlyfatal("fork(): %s", strbuf); + named_main_earlyfatal("fork(): %s", strbuf); } if (pid != 0) { int n; @@ -432,7 +432,7 @@ ns_os_daemonize(void) { if (setsid() == -1) { isc__strerror(errno, strbuf, sizeof(strbuf)); - ns_main_earlyfatal("setsid(): %s", strbuf); + named_main_earlyfatal("setsid(): %s", strbuf); } /* @@ -454,7 +454,7 @@ ns_os_daemonize(void) { (void)close(STDOUT_FILENO); (void)dup2(devnullfd, STDOUT_FILENO); } - if (devnullfd != STDERR_FILENO && !ns_g_keepstderr) { + if (devnullfd != STDERR_FILENO && !named_g_keepstderr) { (void)close(STDERR_FILENO); (void)dup2(devnullfd, STDERR_FILENO); } @@ -462,7 +462,7 @@ ns_os_daemonize(void) { } void -ns_os_started(void) { +named_os_started(void) { char buf = 0; /* @@ -470,20 +470,21 @@ ns_os_started(void) { */ if (dfd[0] != -1 && dfd[1] != -1) { if (write(dfd[1], &buf, 1) != 1) - ns_main_earlyfatal("unable to signal parent that we " - "otherwise started successfully."); + named_main_earlyfatal("unable to signal parent that we " + "otherwise started " + "successfully."); close(dfd[1]); dfd[0] = dfd[1] = -1; } } void -ns_os_opendevnull(void) { +named_os_opendevnull(void) { devnullfd = open("/dev/null", O_RDWR, 0); } void -ns_os_closedevnull(void) { +named_os_closedevnull(void) { if (devnullfd != STDIN_FILENO && devnullfd != STDOUT_FILENO && devnullfd != STDERR_FILENO) { @@ -505,33 +506,33 @@ all_digits(const char *s) { } void -ns_os_chroot(const char *root) { +named_os_chroot(const char *root) { char strbuf[ISC_STRERRORSIZE]; #ifdef HAVE_LIBSCF - ns_smf_chroot = 0; + named_smf_chroot = 0; #endif if (root != NULL) { #ifdef HAVE_CHROOT if (chroot(root) < 0) { isc__strerror(errno, strbuf, sizeof(strbuf)); - ns_main_earlyfatal("chroot(): %s", strbuf); + named_main_earlyfatal("chroot(): %s", strbuf); } #else - ns_main_earlyfatal("chroot(): disabled"); + named_main_earlyfatal("chroot(): disabled"); #endif if (chdir("/") < 0) { isc__strerror(errno, strbuf, sizeof(strbuf)); - ns_main_earlyfatal("chdir(/): %s", strbuf); + named_main_earlyfatal("chdir(/): %s", strbuf); } #ifdef HAVE_LIBSCF - /* Set ns_smf_chroot flag on successful chroot. */ - ns_smf_chroot = 1; + /* Set named_smf_chroot flag on successful chroot. */ + named_smf_chroot = 1; #endif } } void -ns_os_inituserinfo(const char *username) { +named_os_inituserinfo(const char *username) { char strbuf[ISC_STRERRORSIZE]; if (username == NULL) return; @@ -543,19 +544,19 @@ ns_os_inituserinfo(const char *username) { endpwent(); if (runas_pw == NULL) - ns_main_earlyfatal("user '%s' unknown", username); + named_main_earlyfatal("user '%s' unknown", username); if (getuid() == 0) { if (initgroups(runas_pw->pw_name, runas_pw->pw_gid) < 0) { isc__strerror(errno, strbuf, sizeof(strbuf)); - ns_main_earlyfatal("initgroups(): %s", strbuf); + named_main_earlyfatal("initgroups(): %s", strbuf); } } } void -ns_os_changeuser(void) { +named_os_changeuser(void) { char strbuf[ISC_STRERRORSIZE]; if (runas_pw == NULL || done_setuid) return; @@ -565,24 +566,24 @@ ns_os_changeuser(void) { #ifdef HAVE_LINUXTHREADS #ifdef HAVE_LINUX_CAPABILITY_H if (!non_root_caps) - ns_main_earlyfatal("-u with Linux threads not supported: " - "requires kernel support for " - "prctl(PR_SET_KEEPCAPS)"); + named_main_earlyfatal("-u with Linux threads not supported: " + "requires kernel support for " + "prctl(PR_SET_KEEPCAPS)"); #else - ns_main_earlyfatal("-u with Linux threads not supported: " - "no capabilities support or capabilities " - "disabled at build time"); + named_main_earlyfatal("-u with Linux threads not supported: " + "no capabilities support or capabilities " + "disabled at build time"); #endif #endif if (setgid(runas_pw->pw_gid) < 0) { isc__strerror(errno, strbuf, sizeof(strbuf)); - ns_main_earlyfatal("setgid(): %s", strbuf); + named_main_earlyfatal("setgid(): %s", strbuf); } if (setuid(runas_pw->pw_uid) < 0) { isc__strerror(errno, strbuf, sizeof(strbuf)); - ns_main_earlyfatal("setuid(): %s", strbuf); + named_main_earlyfatal("setuid(): %s", strbuf); } #if defined(HAVE_SYS_PRCTL_H) && defined(PR_SET_DUMPABLE) @@ -592,8 +593,8 @@ ns_os_changeuser(void) { */ if (prctl(PR_SET_DUMPABLE,1,0,0,0) < 0) { isc__strerror(errno, strbuf, sizeof(strbuf)); - ns_main_earlywarning("prctl(PR_SET_DUMPABLE) failed: %s", - strbuf); + named_main_earlywarning("prctl(PR_SET_DUMPABLE) failed: %s", + strbuf); } #endif #if defined(HAVE_LINUX_CAPABILITY_H) && !defined(HAVE_LINUXTHREADS) @@ -609,7 +610,7 @@ ns_os_uid(void) { } void -ns_os_adjustnofile(void) { +named_os_adjustnofile(void) { #ifdef HAVE_LINUXTHREADS isc_result_t result; isc_resourcevalue_t newvalue; @@ -622,18 +623,18 @@ ns_os_adjustnofile(void) { result = isc_resource_setlimit(isc_resource_openfiles, newvalue); if (result != ISC_R_SUCCESS) - ns_main_earlywarning("couldn't adjust limit on open files"); + named_main_earlywarning("couldn't adjust limit on open files"); #endif } void -ns_os_minprivs(void) { +named_os_minprivs(void) { #ifdef HAVE_SYS_PRCTL_H linux_keepcaps(); #endif #ifdef HAVE_LINUXTHREADS - ns_os_changeuser(); /* Call setuid() before threads are started */ + named_os_changeuser(); /* Call setuid() before threads are started */ #endif #if defined(HAVE_LINUX_CAPABILITY_H) && defined(HAVE_LINUXTHREADS) @@ -670,7 +671,7 @@ cleanup_pidfile(void) { if (pidfile != NULL) { n = unlink(pidfile); if (n == -1 && errno != ENOENT) - ns_main_earlywarning("unlink '%s': failed", pidfile); + named_main_earlywarning("unlink '%s': failed", pidfile); free(pidfile); } pidfile = NULL; @@ -686,7 +687,8 @@ cleanup_lockfile(void) { if (lockfile != NULL) { int n = unlink(lockfile); if (n == -1 && errno != ENOENT) - ns_main_earlywarning("unlink '%s': failed", lockfile); + named_main_earlywarning("unlink '%s': failed", + lockfile); free(lockfile); lockfile = NULL; } @@ -763,15 +765,16 @@ setperms(uid_t uid, gid_t gid) { #if defined(HAVE_SETEGID) if (getegid() != gid && setegid(gid) == -1) { isc__strerror(errno, strbuf, sizeof(strbuf)); - ns_main_earlywarning("unable to set effective gid to %ld: %s", - (long)gid, strbuf); + named_main_earlywarning("unable to set effective " + "gid to %ld: %s", + (long)gid, strbuf); } #elif defined(HAVE_SETRESGID) if (getresgid(&tmpg, &oldgid, &tmpg) == -1 || oldgid != gid) { if (setresgid(-1, gid, -1) == -1) { isc__strerror(errno, strbuf, sizeof(strbuf)); - ns_main_earlywarning("unable to set effective " - "gid to %d: %s", gid, strbuf); + named_main_earlywarning("unable to set effective " + "gid to %d: %s", gid, strbuf); } } #endif @@ -779,22 +782,23 @@ setperms(uid_t uid, gid_t gid) { #if defined(HAVE_SETEUID) if (geteuid() != uid && seteuid(uid) == -1) { isc__strerror(errno, strbuf, sizeof(strbuf)); - ns_main_earlywarning("unable to set effective uid to %ld: %s", - (long)uid, strbuf); + named_main_earlywarning("unable to set effective " + "uid to %ld: %s", + (long)uid, strbuf); } #elif defined(HAVE_SETRESUID) if (getresuid(&tmpu, &olduid, &tmpu) == -1 || olduid != uid) { if (setresuid(-1, uid, -1) == -1) { isc__strerror(errno, strbuf, sizeof(strbuf)); - ns_main_earlywarning("unable to set effective " - "uid to %d: %s", uid, strbuf); + named_main_earlywarning("unable to set effective " + "uid to %d: %s", uid, strbuf); } } #endif } FILE * -ns_os_openfile(const char *filename, mode_t mode, isc_boolean_t switch_user) { +named_os_openfile(const char *filename, mode_t mode, isc_boolean_t switch_user) { char strbuf[ISC_STRERRORSIZE], *f; FILE *fp; int fd; @@ -805,11 +809,11 @@ ns_os_openfile(const char *filename, mode_t mode, isc_boolean_t switch_user) { f = strdup(filename); if (f == NULL) { isc__strerror(errno, strbuf, sizeof(strbuf)); - ns_main_earlywarning("couldn't strdup() '%s': %s", - filename, strbuf); + named_main_earlywarning("couldn't strdup() '%s': %s", + filename, strbuf); return (NULL); } - if (mkdirpath(f, ns_main_earlywarning) == -1) { + if (mkdirpath(f, named_main_earlywarning) == -1) { free(f); return (NULL); } @@ -833,22 +837,22 @@ ns_os_openfile(const char *filename, mode_t mode, isc_boolean_t switch_user) { #ifndef HAVE_LINUXTHREADS fd = safe_open(filename, mode, ISC_FALSE); if (fd != -1) { - ns_main_earlywarning("Required root " - "permissions to open " - "'%s'.", filename); + named_main_earlywarning("Required root " + "permissions to open " + "'%s'.", filename); } else { - ns_main_earlywarning("Could not open " - "'%s'.", filename); + named_main_earlywarning("Could not open " + "'%s'.", filename); } - ns_main_earlywarning("Please check file and " - "directory permissions " - "or reconfigure the filename."); + named_main_earlywarning("Please check file and " + "directory permissions " + "or reconfigure the filename."); #else /* HAVE_LINUXTHREADS */ - ns_main_earlywarning("Could not open " - "'%s'.", filename); - ns_main_earlywarning("Please check file and " - "directory permissions " - "or reconfigure the filename."); + named_main_earlywarning("Could not open " + "'%s'.", filename); + named_main_earlywarning("Please check file and " + "directory permissions " + "or reconfigure the filename."); #endif /* HAVE_LINUXTHREADS */ } } else { @@ -857,23 +861,23 @@ ns_os_openfile(const char *filename, mode_t mode, isc_boolean_t switch_user) { if (fd < 0) { isc__strerror(errno, strbuf, sizeof(strbuf)); - ns_main_earlywarning("could not open file '%s': %s", - filename, strbuf); + named_main_earlywarning("could not open file '%s': %s", + filename, strbuf); return (NULL); } fp = fdopen(fd, "w"); if (fp == NULL) { isc__strerror(errno, strbuf, sizeof(strbuf)); - ns_main_earlywarning("could not fdopen() file '%s': %s", - filename, strbuf); + named_main_earlywarning("could not fdopen() file '%s': %s", + filename, strbuf); } return (fp); } void -ns_os_writepidfile(const char *filename, isc_boolean_t first_time) { +named_os_writepidfile(const char *filename, isc_boolean_t first_time) { FILE *fh; pid_t pid; char strbuf[ISC_STRERRORSIZE]; @@ -883,7 +887,7 @@ ns_os_writepidfile(const char *filename, isc_boolean_t first_time) { * The caller must ensure any required synchronization. */ - report = first_time ? ns_main_earlyfatal : ns_main_earlywarning; + report = first_time ? named_main_earlyfatal : named_main_earlywarning; cleanup_pidfile(); @@ -897,8 +901,8 @@ ns_os_writepidfile(const char *filename, isc_boolean_t first_time) { return; } - fh = ns_os_openfile(filename, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH, - first_time); + fh = named_os_openfile(filename, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH, + first_time); if (fh == NULL) { cleanup_pidfile(); return; @@ -924,7 +928,7 @@ ns_os_writepidfile(const char *filename, isc_boolean_t first_time) { } isc_boolean_t -ns_os_issingleton(const char *filename) { +named_os_issingleton(const char *filename) { char strbuf[ISC_STRERRORSIZE]; struct flock lock; @@ -940,19 +944,20 @@ ns_os_issingleton(const char *filename) { lockfile = strdup(filename); if (lockfile == NULL) { isc__strerror(errno, strbuf, sizeof(strbuf)); - ns_main_earlyfatal("couldn't allocate memory for '%s': %s", - filename, strbuf); + named_main_earlyfatal("couldn't allocate memory for '%s': %s", + filename, strbuf); } else { - int ret = mkdirpath(lockfile, ns_main_earlywarning); + int ret = mkdirpath(lockfile, named_main_earlywarning); if (ret == -1) { - ns_main_earlywarning("couldn't create '%s'", filename); + named_main_earlywarning("couldn't create '%s'", + filename); cleanup_lockfile(); return (ISC_FALSE); } } /* - * ns_os_openfile() uses safeopen() which removes any existing + * named_os_openfile() uses safeopen() which removes any existing * files. We can't use that here. */ singletonfd = open(filename, O_WRONLY | O_CREAT, @@ -979,14 +984,14 @@ ns_os_issingleton(const char *filename) { } void -ns_os_shutdown(void) { +named_os_shutdown(void) { closelog(); cleanup_pidfile(); cleanup_lockfile(); } isc_result_t -ns_os_gethostname(char *buf, size_t len) { +named_os_gethostname(char *buf, size_t len) { int n; n = gethostname(buf, len); @@ -1006,7 +1011,7 @@ next_token(char **stringp, const char *delim) { } void -ns_os_shutdownmsg(char *command, isc_buffer_t *text) { +named_os_shutdownmsg(char *command, isc_buffer_t *text) { char *input, *ptr; unsigned int n; pid_t pid; @@ -1040,7 +1045,7 @@ ns_os_shutdownmsg(char *command, isc_buffer_t *text) { } void -ns_os_tzset(void) { +named_os_tzset(void) { #ifdef HAVE_TZSET tzset(); #endif @@ -1070,7 +1075,7 @@ getuname(void) { } char * -ns_os_uname(void) { +named_os_uname(void) { if (unamep == NULL) getuname(); return (unamep); diff --git a/bin/named/win32/include/named/os.h b/bin/named/win32/include/named/os.h index 08aa2a4fb4..1344ec0f99 100644 --- a/bin/named/win32/include/named/os.h +++ b/bin/named/win32/include/named/os.h @@ -6,66 +6,66 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef NS_OS_H -#define NS_OS_H 1 +#ifndef NAMED_OS_H +#define NAMED_OS_H 1 #include void -ns_os_init(const char *progname); +named_os_init(const char *progname); void -ns_os_daemonize(void); +named_os_daemonize(void); void -ns_os_opendevnull(void); +named_os_opendevnull(void); void -ns_os_closedevnull(void); +named_os_closedevnull(void); void -ns_os_chroot(const char *root); +named_os_chroot(const char *root); void -ns_os_inituserinfo(const char *username); +named_os_inituserinfo(const char *username); void -ns_os_changeuser(void); +named_os_changeuser(void); unsigned int ns_os_uid(void); void -ns_os_adjustnofile(void); +named_os_adjustnofile(void); void -ns_os_minprivs(void); +named_os_minprivs(void); FILE * -ns_os_openfile(const char *filename, int mode, isc_boolean_t switch_user); +named_os_openfile(const char *filename, int mode, isc_boolean_t switch_user); void -ns_os_writepidfile(const char *filename, isc_boolean_t first_time); +named_os_writepidfile(const char *filename, isc_boolean_t first_time); isc_boolean_t -ns_os_issingleton(const char *filename); +named_os_issingleton(const char *filename); void -ns_os_shutdown(void); +named_os_shutdown(void); isc_result_t -ns_os_gethostname(char *buf, size_t len); +named_os_gethostname(char *buf, size_t len); void -ns_os_shutdownmsg(char *command, isc_buffer_t *text); +named_os_shutdownmsg(char *command, isc_buffer_t *text); void -ns_os_tzset(void); +named_os_tzset(void); void -ns_os_started(void); +named_os_started(void); char * -ns_os_uname(void); +named_os_uname(void); -#endif /* NS_OS_H */ +#endif /* NAMED_OS_H */ diff --git a/bin/named/win32/named.dsp.in b/bin/named/win32/named.dsp.in deleted file mode 100644 index 354b88b185..0000000000 --- a/bin/named/win32/named.dsp.in +++ /dev/null @@ -1,341 +0,0 @@ -# Microsoft Developer Studio Project File - Name="named" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103 - -CFG=named - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "named.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "named.mak" CFG="named - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "named - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "named - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "named - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 @OPENSSL_INC@ @GSSAPI_INC@ @GEOIP_INC@ /I "./" /I "../../../" @LIBXML2_INC@ /I "../win32/include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isccc/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /I "../../../lib/isccfg/include" /I "../../../lib/bind9/include" @CRYPTO@ @USE_GSSAPI@ /D "BUILDER=\"old Visual Studio\"" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console @MACHINE@ -# ADD LINK32 @LIBXML2_LIB@ @OPENSSL_LIB@ @GSSAPI_LIB@ @GEOIP_LIB@ user32.lib advapi32.lib kernel32.lib version.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/isccc/win32/Release/libisccc.lib ../../../lib/lwres/win32/Release/liblwres.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/bind9/win32/Release/libbind9.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/named.exe" - -!ELSEIF "$(CFG)" == "named - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od @OPENSSL_INC@ @GSSAPI_INC@ @GEOIP_INC@ /I "./" /I "../../../" @LIBXML2_INC@ /I "../win32/include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isccc/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /I "../../../lib/isccfg/include" /I "../../../lib/bind9/include" @CRYPTO@ @USE_GSSAPI@ /D "BUILDER=\"old Visual Studio\"" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR /FD /GZ /c -# SUBTRACT CPP /X @COPTY@ -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console /debug @MACHINE@ /pdbtype:sept -# ADD LINK32 @LIBXML2_LIB@ @OPENSSL_LIB@ @GSSAPI_LIB@ @GEOIP_LIB@ user32.lib advapi32.lib kernel32.lib version.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/isccc/win32/Debug/libisccc.lib ../../../lib/lwres/win32/Debug/liblwres.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/bind9/win32/Debug/libbind9.lib /nologo /subsystem:console /map /debug @MACHINE@ /out:"../../../Build/Debug/named.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "named - @PLATFORM@ Release" -# Name "named - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\builtin.c -# End Source File -# Begin Source File - -SOURCE=..\client.c -# End Source File -# Begin Source File - -SOURCE=..\config.c -# End Source File -# Begin Source File - -SOURCE=..\control.c -# End Source File -# Begin Source File - -SOURCE=..\controlconf.c -# End Source File -# Begin Source File - -SOURCE=.\dlz_dlopen_driver.c -# End Source File -@IF GEOIP -# Begin Source File - -SOURCE=..\geoip.c -# End Source File -@END GEOIP -# Begin Source File - -SOURCE=..\interfacemgr.c -# End Source File -# Begin Source File - -SOURCE=..\listenlist.c -# End Source File -# Begin Source File - -SOURCE=..\log.c -# End Source File -# Begin Source File - -SOURCE=..\logconf.c -# End Source File -# Begin Source File - -SOURCE=..\lwaddr.c -# End Source File -# Begin Source File - -SOURCE=..\lwdclient.c -# End Source File -# Begin Source File - -SOURCE=..\lwderror.c -# End Source File -# Begin Source File - -SOURCE=..\lwdgabn.c -# End Source File -# Begin Source File - -SOURCE=..\lwdgnba.c -# End Source File -# Begin Source File - -SOURCE=..\lwdgrbn.c -# End Source File -# Begin Source File - -SOURCE=..\lwdnoop.c -# End Source File -# Begin Source File - -SOURCE=..\lwresd.c -# End Source File -# Begin Source File - -SOURCE=..\lwsearch.c -# End Source File -# Begin Source File - -SOURCE=..\main.c -# End Source File -# Begin Source File - -SOURCE=..\notify.c -# End Source File -# Begin Source File - -SOURCE=.\ntservice.c -# End Source File -# Begin Source File - -SOURCE=.\os.c -# End Source File -# Begin Source File - -SOURCE=..\query.c -# End Source File -# Begin Source File - -SOURCE=..\server.c -# End Source File -# Begin Source File - -SOURCE=..\sortlist.c -# End Source File -# Begin Source File - -SOURCE=..\statschannel.c -# End Source File -# Begin Source File - -SOURCE=..\tkeyconf.c -# End Source File -# Begin Source File - -SOURCE=..\tsigconf.c -# End Source File -# Begin Source File - -SOURCE=..\update.c -# End Source File -# Begin Source File - -SOURCE=..\xfrout.c -# End Source File -# Begin Source File - -SOURCE=..\zoneconf.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\include\named\client.h -# End Source File -# Begin Source File - -SOURCE=..\include\named\config.h -# End Source File -# Begin Source File - -SOURCE=..\include\named\globals.h -# End Source File -# Begin Source File - -SOURCE=..\include\named\interfacemgr.h -# End Source File -# Begin Source File - -SOURCE=..\include\named\listenlist.h -# End Source File -# Begin Source File - -SOURCE=..\include\named\log.h -# End Source File -# Begin Source File - -SOURCE=..\include\named\logconf.h -# End Source File -# Begin Source File - -SOURCE=..\include\named\lwaddr.h -# End Source File -# Begin Source File - -SOURCE=..\include\named\lwdclient.h -# End Source File -# Begin Source File - -SOURCE=..\include\named\lwresd.h -# End Source File -# Begin Source File - -SOURCE=..\include\named\lwsearch.h -# End Source File -# Begin Source File - -SOURCE=..\include\named\main.h -# End Source File -# Begin Source File - -SOURCE=..\include\named\notify.h -# End Source File -# Begin Source File - -SOURCE=.\include\named\ntservice.h -# End Source File -# Begin Source File - -SOURCE=..\include\named\omapi.h -# End Source File -# Begin Source File - -SOURCE=.\include\named\os.h -# End Source File -# Begin Source File - -SOURCE=..\include\named\query.h -# End Source File -# Begin Source File - -SOURCE=..\include\named\seccomp.h -# End Source File -# Begin Source File - -SOURCE=..\include\named\server.h -# End Source File -# Begin Source File - -SOURCE=..\include\named\sortlist.h -# End Source File -# Begin Source File - -SOURCE=..\include\named\statschannel.h -# End Source File -# Begin Source File - -SOURCE=..\include\named\tkeyconf.h -# End Source File -# Begin Source File - -SOURCE=..\include\named\tsigconf.h -# End Source File -# Begin Source File - -SOURCE=..\include\named\types.h -# End Source File -# Begin Source File - -SOURCE=..\include\named\update.h -# End Source File -# Begin Source File - -SOURCE=..\include\named\xfrout.h -# End Source File -# Begin Source File - -SOURCE=..\include\named\zoneconf.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/bin/named/win32/named.dsw b/bin/named/win32/named.dsw deleted file mode 100644 index a1a4f34026..0000000000 --- a/bin/named/win32/named.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "named"=".\named.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/bin/named/win32/named.mak.in b/bin/named/win32/named.mak.in deleted file mode 100644 index 9e73888e32..0000000000 --- a/bin/named/win32/named.mak.in +++ /dev/null @@ -1,1233 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on named.dsp -!IF "$(CFG)" == "" -CFG=named - @PLATFORM@ Debug -!MESSAGE No configuration specified. Defaulting to named - @PLATFORM@ Debug. -!ENDIF - -!IF "$(CFG)" != "named - @PLATFORM@ Release" && "$(CFG)" != "named - @PLATFORM@ Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "named.mak" CFG="named - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "named - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "named - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -CPP=cl.exe -RSC=rc.exe -LIBXML=@LIBXML2_LIB@ - -!IF "$(CFG)" == "named - @PLATFORM@ 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)" == "named - @PLATFORM@ Release" - -OUTDIR=.\Release -INTDIR=.\Release - -!IF "$(RECURSE)" == "0" - -ALL : "..\..\..\Build\Release\named.exe" - -!ELSE - -ALL : "libisccfg - @PLATFORM@ Release" "libisccc - @PLATFORM@ Release" "liblwres - @PLATFORM@ Release" "libbind9 - @PLATFORM@ Release" "libisc - @PLATFORM@ Release" "libdns - @PLATFORM@ Release" "..\..\..\Build\Release\named.exe" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"libdns - @PLATFORM@ ReleaseCLEAN" "libisc - @PLATFORM@ ReleaseCLEAN" "libbind9 - @PLATFORM@ ReleaseCLEAN" "liblwres - @PLATFORM@ ReleaseCLEAN" "libisccc - @PLATFORM@ ReleaseCLEAN" "libisccfg - @PLATFORM@ ReleaseCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\builtin.obj" - -@erase "$(INTDIR)\client.obj" - -@erase "$(INTDIR)\config.obj" - -@erase "$(INTDIR)\control.obj" - -@erase "$(INTDIR)\controlconf.obj" - -@erase "$(INTDIR)\dlz_dlopen_driver.obj" -@IF GEOIP - -@erase "$(INTDIR)\geoip.obj" -@END GEOIP - -@erase "$(INTDIR)\interfacemgr.obj" - -@erase "$(INTDIR)\listenlist.obj" - -@erase "$(INTDIR)\log.obj" - -@erase "$(INTDIR)\logconf.obj" - -@erase "$(INTDIR)\lwaddr.obj" - -@erase "$(INTDIR)\lwdclient.obj" - -@erase "$(INTDIR)\lwderror.obj" - -@erase "$(INTDIR)\lwdgabn.obj" - -@erase "$(INTDIR)\lwdgnba.obj" - -@erase "$(INTDIR)\lwdgrbn.obj" - -@erase "$(INTDIR)\lwdnoop.obj" - -@erase "$(INTDIR)\lwresd.obj" - -@erase "$(INTDIR)\lwsearch.obj" - -@erase "$(INTDIR)\main.obj" - -@erase "$(INTDIR)\notify.obj" - -@erase "$(INTDIR)\ntservice.obj" - -@erase "$(INTDIR)\os.obj" - -@erase "$(INTDIR)\query.obj" - -@erase "$(INTDIR)\server.obj" - -@erase "$(INTDIR)\sortlist.obj" - -@erase "$(INTDIR)\statschannel.obj" - -@erase "$(INTDIR)\tkeyconf.obj" - -@erase "$(INTDIR)\tsigconf.obj" - -@erase "$(INTDIR)\update.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\xfrout.obj" - -@erase "$(INTDIR)\zoneconf.obj" - -@erase "..\..\..\Build\Release\named.exe" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 @OPENSSL_INC@ @GSSAPI_INC@ /I "./" /I "../../../" @LIBXML2_INC@ /I "../win32/include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isccc/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /I "../../../lib/isccfg/include" /I "../../../lib/bind9/include" @CRYPTO@ @USE_GSSAPI@ /D "BUILDER=\"nmake\"" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\named.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\named.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib version.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/isccc/win32/Release/libisccc.lib ../../../lib/lwres/win32/Release/liblwres.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/bind9/win32/Release/libbind9.lib $(LIBXML) @OPENSSL_LIB@ @GSSAPI_LIB@ @GEOIP_LIB@ /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\named.pdb" @MACHINE@ /out:"../../../Build/Release/named.exe" -LINK32_OBJS= \ - "$(INTDIR)\client.obj" \ - "$(INTDIR)\config.obj" \ - "$(INTDIR)\control.obj" \ - "$(INTDIR)\controlconf.obj" \ - "$(INTDIR)\dlz_dlopen_driver.obj" \ -@IF GEOIP - "$(INTDIR)\geoip.obj" \ -@END GEOIP - "$(INTDIR)\interfacemgr.obj" \ - "$(INTDIR)\listenlist.obj" \ - "$(INTDIR)\log.obj" \ - "$(INTDIR)\logconf.obj" \ - "$(INTDIR)\lwaddr.obj" \ - "$(INTDIR)\lwdclient.obj" \ - "$(INTDIR)\lwderror.obj" \ - "$(INTDIR)\lwdgabn.obj" \ - "$(INTDIR)\lwdgnba.obj" \ - "$(INTDIR)\lwdgrbn.obj" \ - "$(INTDIR)\lwdnoop.obj" \ - "$(INTDIR)\lwresd.obj" \ - "$(INTDIR)\lwsearch.obj" \ - "$(INTDIR)\main.obj" \ - "$(INTDIR)\notify.obj" \ - "$(INTDIR)\ntservice.obj" \ - "$(INTDIR)\os.obj" \ - "$(INTDIR)\query.obj" \ - "$(INTDIR)\server.obj" \ - "$(INTDIR)\sortlist.obj" \ - "$(INTDIR)\statschannel.obj" \ - "$(INTDIR)\tkeyconf.obj" \ - "$(INTDIR)\tsigconf.obj" \ - "$(INTDIR)\update.obj" \ - "$(INTDIR)\xfrout.obj" \ - "$(INTDIR)\zoneconf.obj" \ - "$(INTDIR)\builtin.obj" \ - "..\..\..\lib\dns\win32\Release\libdns.lib" \ - "..\..\..\lib\isc\win32\Release\libisc.lib" \ - "..\..\..\lib\bind9\win32\Release\libbind9.lib" \ - "..\..\..\lib\lwres\win32\Release\liblwres.lib" \ - "..\..\..\lib\isccc\win32\Release\libisccc.lib" \ - "..\..\..\lib\isccfg\win32\Release\libisccfg.lib" - -"..\..\..\Build\Release\named.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ELSEIF "$(CFG)" == "named - @PLATFORM@ Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : "..\..\..\Build\Debug\named.exe" "$(OUTDIR)\named.bsc" - -!ELSE - -ALL : "libisccfg - @PLATFORM@ Debug" "libisccc - @PLATFORM@ Debug" "liblwres - @PLATFORM@ Debug" "libbind9 - @PLATFORM@ Debug" "libisc - @PLATFORM@ Debug" "libdns - @PLATFORM@ Debug" "..\..\..\Build\Debug\named.exe" "$(OUTDIR)\named.bsc" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"libdns - @PLATFORM@ DebugCLEAN" "libisc - @PLATFORM@ DebugCLEAN" "libbind9 - @PLATFORM@ DebugCLEAN" "liblwres - @PLATFORM@ DebugCLEAN" "libisccc - @PLATFORM@ DebugCLEAN" "libisccfg - @PLATFORM@ DebugCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\builtin.obj" - -@erase "$(INTDIR)\builtin.sbr" - -@erase "$(INTDIR)\client.obj" - -@erase "$(INTDIR)\client.sbr" - -@erase "$(INTDIR)\config.obj" - -@erase "$(INTDIR)\config.sbr" - -@erase "$(INTDIR)\control.obj" - -@erase "$(INTDIR)\control.sbr" - -@erase "$(INTDIR)\controlconf.obj" - -@erase "$(INTDIR)\controlconf.sbr" - -@erase "$(INTDIR)\dlz_dlopen_driver.obj" - -@erase "$(INTDIR)\dlz_dlopen_driver.sbr" -@IF GEOIP - -@erase "$(INTDIR)\geoip.obj" - -@erase "$(INTDIR)\geoip.sbr" -@END GEOIP - -@erase "$(INTDIR)\interfacemgr.obj" - -@erase "$(INTDIR)\interfacemgr.sbr" - -@erase "$(INTDIR)\listenlist.obj" - -@erase "$(INTDIR)\listenlist.sbr" - -@erase "$(INTDIR)\log.obj" - -@erase "$(INTDIR)\log.sbr" - -@erase "$(INTDIR)\logconf.obj" - -@erase "$(INTDIR)\logconf.sbr" - -@erase "$(INTDIR)\lwaddr.obj" - -@erase "$(INTDIR)\lwaddr.sbr" - -@erase "$(INTDIR)\lwdclient.obj" - -@erase "$(INTDIR)\lwdclient.sbr" - -@erase "$(INTDIR)\lwderror.obj" - -@erase "$(INTDIR)\lwderror.sbr" - -@erase "$(INTDIR)\lwdgabn.obj" - -@erase "$(INTDIR)\lwdgabn.sbr" - -@erase "$(INTDIR)\lwdgnba.obj" - -@erase "$(INTDIR)\lwdgnba.sbr" - -@erase "$(INTDIR)\lwdgrbn.obj" - -@erase "$(INTDIR)\lwdgrbn.sbr" - -@erase "$(INTDIR)\lwdnoop.obj" - -@erase "$(INTDIR)\lwdnoop.sbr" - -@erase "$(INTDIR)\lwresd.obj" - -@erase "$(INTDIR)\lwresd.sbr" - -@erase "$(INTDIR)\lwsearch.obj" - -@erase "$(INTDIR)\lwsearch.sbr" - -@erase "$(INTDIR)\main.obj" - -@erase "$(INTDIR)\main.sbr" - -@erase "$(INTDIR)\notify.obj" - -@erase "$(INTDIR)\notify.sbr" - -@erase "$(INTDIR)\ntservice.obj" - -@erase "$(INTDIR)\ntservice.sbr" - -@erase "$(INTDIR)\os.obj" - -@erase "$(INTDIR)\os.sbr" - -@erase "$(INTDIR)\query.obj" - -@erase "$(INTDIR)\query.sbr" - -@erase "$(INTDIR)\server.obj" - -@erase "$(INTDIR)\server.sbr" - -@erase "$(INTDIR)\sortlist.obj" - -@erase "$(INTDIR)\sortlist.sbr" - -@erase "$(INTDIR)\statschannel.obj" - -@erase "$(INTDIR)\statschannel.sbr" - -@erase "$(INTDIR)\tkeyconf.obj" - -@erase "$(INTDIR)\tkeyconf.sbr" - -@erase "$(INTDIR)\tsigconf.obj" - -@erase "$(INTDIR)\tsigconf.sbr" - -@erase "$(INTDIR)\update.obj" - -@erase "$(INTDIR)\update.sbr" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(INTDIR)\xfrout.obj" - -@erase "$(INTDIR)\xfrout.sbr" - -@erase "$(INTDIR)\zoneconf.obj" - -@erase "$(INTDIR)\zoneconf.sbr" - -@erase "$(OUTDIR)\named.bsc" - -@erase "$(OUTDIR)\named.map" - -@erase "$(OUTDIR)\named.pdb" - -@erase "..\..\..\Build\Debug\named.exe" - -@erase "..\..\..\Build\Debug\named.ilk" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od @OPENSSL_INC@ @GSSAPI_INC@ /I "./" /I "../../../" @LIBXML2_INC@ /I "../win32/include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isccc/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /I "../../../lib/isccfg/include" /I "../../../lib/bind9/include" @CRYPTO@ @USE_GSSAPI@ /D "BUILDER=\"nmake\"" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\named.bsc" -BSC32_SBRS= \ - "$(INTDIR)\client.sbr" \ - "$(INTDIR)\config.sbr" \ - "$(INTDIR)\control.sbr" \ - "$(INTDIR)\controlconf.sbr" \ - "$(INTDIR)\dlz_dlopen_driver.sbr" \ -@IF GEOIP - "$(INTDIR)\geoip.sbr" \ -@END GEOIP - "$(INTDIR)\interfacemgr.sbr" \ - "$(INTDIR)\listenlist.sbr" \ - "$(INTDIR)\log.sbr" \ - "$(INTDIR)\logconf.sbr" \ - "$(INTDIR)\lwaddr.sbr" \ - "$(INTDIR)\lwdclient.sbr" \ - "$(INTDIR)\lwderror.sbr" \ - "$(INTDIR)\lwdgabn.sbr" \ - "$(INTDIR)\lwdgnba.sbr" \ - "$(INTDIR)\lwdgrbn.sbr" \ - "$(INTDIR)\lwdnoop.sbr" \ - "$(INTDIR)\lwresd.sbr" \ - "$(INTDIR)\lwsearch.sbr" \ - "$(INTDIR)\main.sbr" \ - "$(INTDIR)\notify.sbr" \ - "$(INTDIR)\ntservice.sbr" \ - "$(INTDIR)\os.sbr" \ - "$(INTDIR)\query.sbr" \ - "$(INTDIR)\server.sbr" \ - "$(INTDIR)\sortlist.sbr" \ - "$(INTDIR)\statschannel.sbr" \ - "$(INTDIR)\tkeyconf.sbr" \ - "$(INTDIR)\tsigconf.sbr" \ - "$(INTDIR)\update.sbr" \ - "$(INTDIR)\xfrout.sbr" \ - "$(INTDIR)\zoneconf.sbr" \ - "$(INTDIR)\builtin.sbr" - -"$(OUTDIR)\named.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib version.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/isccc/win32/Debug/libisccc.lib ../../../lib/lwres/win32/Debug/liblwres.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/bind9/win32/Debug/libbind9.lib $(LIBXML) @OPENSSL_LIB@ @GSSAPI_LIB@ @GEOIP_LIB@ /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\named.pdb" /map:"$(INTDIR)\named.map" /debug @MACHINE@ /out:"../../../Build/Debug/named.exe" /pdbtype:sept -LINK32_OBJS= \ - "$(INTDIR)\client.obj" \ - "$(INTDIR)\config.obj" \ - "$(INTDIR)\control.obj" \ - "$(INTDIR)\controlconf.obj" \ - "$(INTDIR)\dlz_dlopen_driver.obj" \ -@IF GEOIP - "$(INTDIR)\geoip.obj" \ -@END GEOIP - "$(INTDIR)\interfacemgr.obj" \ - "$(INTDIR)\listenlist.obj" \ - "$(INTDIR)\log.obj" \ - "$(INTDIR)\logconf.obj" \ - "$(INTDIR)\lwaddr.obj" \ - "$(INTDIR)\lwdclient.obj" \ - "$(INTDIR)\lwderror.obj" \ - "$(INTDIR)\lwdgabn.obj" \ - "$(INTDIR)\lwdgnba.obj" \ - "$(INTDIR)\lwdgrbn.obj" \ - "$(INTDIR)\lwdnoop.obj" \ - "$(INTDIR)\lwresd.obj" \ - "$(INTDIR)\lwsearch.obj" \ - "$(INTDIR)\main.obj" \ - "$(INTDIR)\notify.obj" \ - "$(INTDIR)\ntservice.obj" \ - "$(INTDIR)\os.obj" \ - "$(INTDIR)\query.obj" \ - "$(INTDIR)\server.obj" \ - "$(INTDIR)\sortlist.obj" \ - "$(INTDIR)\statschannel.obj" \ - "$(INTDIR)\tkeyconf.obj" \ - "$(INTDIR)\tsigconf.obj" \ - "$(INTDIR)\update.obj" \ - "$(INTDIR)\xfrout.obj" \ - "$(INTDIR)\zoneconf.obj" \ - "$(INTDIR)\builtin.obj" \ - "..\..\..\lib\dns\win32\Debug\libdns.lib" \ - "..\..\..\lib\isc\win32\Debug\libisc.lib" \ - "..\..\..\lib\bind9\win32\Debug\libbind9.lib" \ - "..\..\..\lib\lwres\win32\Debug\liblwres.lib" \ - "..\..\..\lib\isccc\win32\Debug\libisccc.lib" \ - "..\..\..\lib\isccfg\win32\Debug\libisccfg.lib" - -"..\..\..\Build\Debug\named.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ENDIF - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("named.dep") -!INCLUDE "named.dep" -!ELSE -!MESSAGE Warning: cannot find "named.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "named - @PLATFORM@ Release" || "$(CFG)" == "named - @PLATFORM@ Debug" -SOURCE=..\builtin.c - -!IF "$(CFG)" == "named - @PLATFORM@ Release" - - -"$(INTDIR)\builtin.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "named - @PLATFORM@ Debug" - - -"$(INTDIR)\builtin.obj" "$(INTDIR)\builtin.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=..\client.c - -!IF "$(CFG)" == "named - @PLATFORM@ Release" - - -"$(INTDIR)\client.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "named - @PLATFORM@ Debug" - - -"$(INTDIR)\client.obj" "$(INTDIR)\client.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=..\config.c - -!IF "$(CFG)" == "named - @PLATFORM@ Release" - - -"$(INTDIR)\config.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "named - @PLATFORM@ Debug" - - -"$(INTDIR)\config.obj" "$(INTDIR)\config.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=..\control.c - -!IF "$(CFG)" == "named - @PLATFORM@ Release" - - -"$(INTDIR)\control.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "named - @PLATFORM@ Debug" - - -"$(INTDIR)\control.obj" "$(INTDIR)\control.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=..\controlconf.c - -!IF "$(CFG)" == "named - @PLATFORM@ Release" - - -"$(INTDIR)\controlconf.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "named - @PLATFORM@ Debug" - - -"$(INTDIR)\controlconf.obj" "$(INTDIR)\controlconf.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=.\dlz_dlopen_driver.c - -!IF "$(CFG)" == "named - @PLATFORM@ Release" - - -"$(INTDIR)\dlz_dlopen_driver.obj" : $(SOURCE) "$(INTDIR)" - - -!ELSEIF "$(CFG)" == "named - @PLATFORM@ Debug" - - -"$(INTDIR)\dlz_dlopen_driver.obj" "$(INTDIR)\dlz_dlopen_driver.sbr" : $(SOURCE) "$(INTDIR)" - - -!ENDIF - -@IF GEOIP -SOURCE=..\geoip.c - -!IF "$(CFG)" == "named - @PLATFORM@ Release" - - -"$(INTDIR)\geoip.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "named - @PLATFORM@ Debug" - - -"$(INTDIR)\geoip.obj" "$(INTDIR)\geoip.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF -@END GEOIP - -SOURCE=..\interfacemgr.c - -!IF "$(CFG)" == "named - @PLATFORM@ Release" - - -"$(INTDIR)\interfacemgr.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "named - @PLATFORM@ Debug" - - -"$(INTDIR)\interfacemgr.obj" "$(INTDIR)\interfacemgr.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=..\listenlist.c - -!IF "$(CFG)" == "named - @PLATFORM@ Release" - - -"$(INTDIR)\listenlist.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "named - @PLATFORM@ Debug" - - -"$(INTDIR)\listenlist.obj" "$(INTDIR)\listenlist.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=..\log.c - -!IF "$(CFG)" == "named - @PLATFORM@ Release" - - -"$(INTDIR)\log.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "named - @PLATFORM@ Debug" - - -"$(INTDIR)\log.obj" "$(INTDIR)\log.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=..\logconf.c - -!IF "$(CFG)" == "named - @PLATFORM@ Release" - - -"$(INTDIR)\logconf.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "named - @PLATFORM@ Debug" - - -"$(INTDIR)\logconf.obj" "$(INTDIR)\logconf.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=..\lwaddr.c - -!IF "$(CFG)" == "named - @PLATFORM@ Release" - - -"$(INTDIR)\lwaddr.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "named - @PLATFORM@ Debug" - - -"$(INTDIR)\lwaddr.obj" "$(INTDIR)\lwaddr.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=..\lwdclient.c - -!IF "$(CFG)" == "named - @PLATFORM@ Release" - - -"$(INTDIR)\lwdclient.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "named - @PLATFORM@ Debug" - - -"$(INTDIR)\lwdclient.obj" "$(INTDIR)\lwdclient.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=..\lwderror.c - -!IF "$(CFG)" == "named - @PLATFORM@ Release" - - -"$(INTDIR)\lwderror.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "named - @PLATFORM@ Debug" - - -"$(INTDIR)\lwderror.obj" "$(INTDIR)\lwderror.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=..\lwdgabn.c - -!IF "$(CFG)" == "named - @PLATFORM@ Release" - - -"$(INTDIR)\lwdgabn.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "named - @PLATFORM@ Debug" - - -"$(INTDIR)\lwdgabn.obj" "$(INTDIR)\lwdgabn.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=..\lwdgnba.c - -!IF "$(CFG)" == "named - @PLATFORM@ Release" - - -"$(INTDIR)\lwdgnba.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "named - @PLATFORM@ Debug" - - -"$(INTDIR)\lwdgnba.obj" "$(INTDIR)\lwdgnba.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=..\lwdgrbn.c - -!IF "$(CFG)" == "named - @PLATFORM@ Release" - - -"$(INTDIR)\lwdgrbn.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "named - @PLATFORM@ Debug" - - -"$(INTDIR)\lwdgrbn.obj" "$(INTDIR)\lwdgrbn.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=..\lwdnoop.c - -!IF "$(CFG)" == "named - @PLATFORM@ Release" - - -"$(INTDIR)\lwdnoop.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "named - @PLATFORM@ Debug" - - -"$(INTDIR)\lwdnoop.obj" "$(INTDIR)\lwdnoop.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=..\lwresd.c - -!IF "$(CFG)" == "named - @PLATFORM@ Release" - - -"$(INTDIR)\lwresd.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "named - @PLATFORM@ Debug" - - -"$(INTDIR)\lwresd.obj" "$(INTDIR)\lwresd.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=..\lwsearch.c - -!IF "$(CFG)" == "named - @PLATFORM@ Release" - - -"$(INTDIR)\lwsearch.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "named - @PLATFORM@ Debug" - - -"$(INTDIR)\lwsearch.obj" "$(INTDIR)\lwsearch.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=..\main.c - -!IF "$(CFG)" == "named - @PLATFORM@ Release" - - -"$(INTDIR)\main.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "named - @PLATFORM@ Debug" - - -"$(INTDIR)\main.obj" "$(INTDIR)\main.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=..\notify.c - -!IF "$(CFG)" == "named - @PLATFORM@ Release" - - -"$(INTDIR)\notify.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "named - @PLATFORM@ Debug" - - -"$(INTDIR)\notify.obj" "$(INTDIR)\notify.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=.\ntservice.c - -!IF "$(CFG)" == "named - @PLATFORM@ Release" - - -"$(INTDIR)\ntservice.obj" : $(SOURCE) "$(INTDIR)" - - -!ELSEIF "$(CFG)" == "named - @PLATFORM@ Debug" - - -"$(INTDIR)\ntservice.obj" "$(INTDIR)\ntservice.sbr" : $(SOURCE) "$(INTDIR)" - - -!ENDIF - -SOURCE=.\os.c - -!IF "$(CFG)" == "named - @PLATFORM@ Release" - - -"$(INTDIR)\os.obj" : $(SOURCE) "$(INTDIR)" - - -!ELSEIF "$(CFG)" == "named - @PLATFORM@ Debug" - - -"$(INTDIR)\os.obj" "$(INTDIR)\os.sbr" : $(SOURCE) "$(INTDIR)" - - -!ENDIF - -SOURCE=..\query.c - -!IF "$(CFG)" == "named - @PLATFORM@ Release" - - -"$(INTDIR)\query.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "named - @PLATFORM@ Debug" - - -"$(INTDIR)\query.obj" "$(INTDIR)\query.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=..\server.c - -!IF "$(CFG)" == "named - @PLATFORM@ Release" - - -"$(INTDIR)\server.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "named - @PLATFORM@ Debug" - - -"$(INTDIR)\server.obj" "$(INTDIR)\server.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=..\sortlist.c - -!IF "$(CFG)" == "named - @PLATFORM@ Release" - - -"$(INTDIR)\sortlist.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "named - @PLATFORM@ Debug" - - -"$(INTDIR)\sortlist.obj" "$(INTDIR)\sortlist.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=..\statschannel.c - -!IF "$(CFG)" == "named - @PLATFORM@ Release" - - -"$(INTDIR)\statschannel.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "named - @PLATFORM@ Debug" - - -"$(INTDIR)\statschannel.obj" "$(INTDIR)\statschannel.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=..\tkeyconf.c - -!IF "$(CFG)" == "named - @PLATFORM@ Release" - - -"$(INTDIR)\tkeyconf.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "named - @PLATFORM@ Debug" - - -"$(INTDIR)\tkeyconf.obj" "$(INTDIR)\tkeyconf.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=..\tsigconf.c - -!IF "$(CFG)" == "named - @PLATFORM@ Release" - - -"$(INTDIR)\tsigconf.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "named - @PLATFORM@ Debug" - - -"$(INTDIR)\tsigconf.obj" "$(INTDIR)\tsigconf.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=..\update.c - -!IF "$(CFG)" == "named - @PLATFORM@ Release" - - -"$(INTDIR)\update.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "named - @PLATFORM@ Debug" - - -"$(INTDIR)\update.obj" "$(INTDIR)\update.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=..\xfrout.c - -!IF "$(CFG)" == "named - @PLATFORM@ Release" - - -"$(INTDIR)\xfrout.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "named - @PLATFORM@ Debug" - - -"$(INTDIR)\xfrout.obj" "$(INTDIR)\xfrout.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=..\zoneconf.c - -!IF "$(CFG)" == "named - @PLATFORM@ Release" - - -"$(INTDIR)\zoneconf.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "named - @PLATFORM@ Debug" - - -"$(INTDIR)\zoneconf.obj" "$(INTDIR)\zoneconf.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -!IF "$(CFG)" == "named - @PLATFORM@ Release" - -"libdns - @PLATFORM@ Release" : - cd "..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" - cd "..\..\..\bin\named\win32" - -"libdns - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\named\win32" - -!ELSEIF "$(CFG)" == "named - @PLATFORM@ Debug" - -"libdns - @PLATFORM@ Debug" : - cd "..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" - cd "..\..\..\bin\named\win32" - -"libdns - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\named\win32" - -!ENDIF - -!IF "$(CFG)" == "named - @PLATFORM@ Release" - -"libisc - @PLATFORM@ Release" : - cd "..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" - cd "..\..\..\bin\named\win32" - -"libisc - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\named\win32" - -!ELSEIF "$(CFG)" == "named - @PLATFORM@ Debug" - -"libisc - @PLATFORM@ Debug" : - cd "..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" - cd "..\..\..\bin\named\win32" - -"libisc - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\named\win32" - -!ENDIF - -!IF "$(CFG)" == "named - @PLATFORM@ Release" - -"libbind9 - @PLATFORM@ Release" : - cd "..\..\..\lib\bind9\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - @PLATFORM@ Release" - cd "..\..\..\bin\named\win32" - -"libbind9 - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\lib\bind9\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\named\win32" - -!ELSEIF "$(CFG)" == "named - @PLATFORM@ Debug" - -"libbind9 - @PLATFORM@ Debug" : - cd "..\..\..\lib\bind9\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - @PLATFORM@ Debug" - cd "..\..\..\bin\named\win32" - -"libbind9 - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\lib\bind9\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\named\win32" - -!ENDIF - -!IF "$(CFG)" == "named - @PLATFORM@ Release" - -"liblwres - @PLATFORM@ Release" : - cd "..\..\..\lib\lwres\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - @PLATFORM@ Release" - cd "..\..\..\bin\named\win32" - -"liblwres - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\lib\lwres\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\named\win32" - -!ELSEIF "$(CFG)" == "named - @PLATFORM@ Debug" - -"liblwres - @PLATFORM@ Debug" : - cd "..\..\..\lib\lwres\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - @PLATFORM@ Debug" - cd "..\..\..\bin\named\win32" - -"liblwres - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\lib\lwres\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\named\win32" - -!ENDIF - -!IF "$(CFG)" == "named - @PLATFORM@ Release" - -"libisccc - @PLATFORM@ Release" : - cd "..\..\..\lib\isccc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisccc.mak" CFG="libisccc - @PLATFORM@ Release" - cd "..\..\..\bin\named\win32" - -"libisccc - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\lib\isccc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisccc.mak" CFG="libisccc - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\named\win32" - -!ELSEIF "$(CFG)" == "named - @PLATFORM@ Debug" - -"libisccc - @PLATFORM@ Debug" : - cd "..\..\..\lib\isccc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisccc.mak" CFG="libisccc - @PLATFORM@ Debug" - cd "..\..\..\bin\named\win32" - -"libisccc - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\lib\isccc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisccc.mak" CFG="libisccc - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\named\win32" - -!ENDIF - -!IF "$(CFG)" == "named - @PLATFORM@ Release" - -"libisccfg - @PLATFORM@ Release" : - cd "..\..\..\lib\isccfg\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - @PLATFORM@ Release" - cd "..\..\..\bin\named\win32" - -"libisccfg - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\lib\isccfg\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\named\win32" - -!ELSEIF "$(CFG)" == "named - @PLATFORM@ Debug" - -"libisccfg - @PLATFORM@ Debug" : - cd "..\..\..\lib\isccfg\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - @PLATFORM@ Debug" - cd "..\..\..\bin\named\win32" - -"libisccfg - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\lib\isccfg\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\named\win32" - -!ENDIF - - -!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 -1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest" -<< KEEP - -$(_VC_MANIFEST_BASENAME).auto.manifest : - type <<$@ - - - -<< KEEP diff --git a/bin/named/win32/named.vcxproj.filters.in b/bin/named/win32/named.vcxproj.filters.in index 8cc6a7b21f..12702e020e 100644 --- a/bin/named/win32/named.vcxproj.filters.in +++ b/bin/named/win32/named.vcxproj.filters.in @@ -27,9 +27,6 @@ Source Files - - Source Files - Source Files @@ -44,60 +41,18 @@ Source Files @END GEOIP - - Source Files - - - Source Files - Source Files Source Files - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - Source Files - - Source Files - - - Source Files - Source Files - - Source Files - Source Files @@ -107,12 +62,6 @@ Source Files - - Source Files - - - Source Files - Source Files @@ -127,9 +76,6 @@ Header Files - - Header Files - Header Files @@ -144,48 +90,21 @@ Header Files - - Header Files - - - Header Files - Header Files Header Files - - Header Files - - - Header Files - - - Header Files - - - Header Files - Header Files - - Header Files - - - Header Files - Header Files Header Files - - Header Files - Header Files @@ -198,14 +117,8 @@ Header Files - - Header Files - - - Header Files - Header Files - \ No newline at end of file + diff --git a/bin/named/win32/named.vcxproj.in b/bin/named/win32/named.vcxproj.in index f2d70ccf10..e20e544ee5 100644 --- a/bin/named/win32/named.vcxproj.in +++ b/bin/named/win32/named.vcxproj.in @@ -60,15 +60,15 @@ .\$(Configuration)\ $(OutDir)$(TargetName).pdb true - @OPENSSL_INC@@GSSAPI_INC@@GEOIP_INC@.\;..\..\..\;@LIBXML2_INC@..\win32\include;..\include;..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\dns\include;..\..\..\lib\isccc\include;..\..\..\lib\lwres\win32\include;..\..\..\lib\lwres\include;..\..\..\lib\isccfg\include;..\..\..\lib\bind9\include;%(AdditionalIncludeDirectories) + @OPENSSL_INC@@GSSAPI_INC@@GEOIP_INC@.\;..\..\..\;@LIBXML2_INC@..\win32\include;..\include;..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\dns\include;..\..\..\lib\isccc\include;..\..\..\lib\isccfg\include;..\..\..\lib\bind9\include;..\..\..\lib\ns\include;%(AdditionalIncludeDirectories) CompileAsC Console true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) - ..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\isccc\win32\$(Configuration);..\..\..\lib\lwres\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);%(AdditionalLibraryDirectories) - @LIBXML2_LIB@@OPENSSL_LIB@@GSSAPI_LIB@@GEOIP_LIB@libisc.lib;libdns.lib;libisccc.lib;liblwres.lib;libisccfg.lib;libbind9.lib;version.lib;ws2_32.lib;%(AdditionalDependencies) + ..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\isccc\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);..\..\..\lib\ns\win32\$(Configuration);%(AdditionalLibraryDirectories) + @LIBXML2_LIB@@OPENSSL_LIB@@GSSAPI_LIB@@GEOIP_LIB@libisc.lib;libdns.lib;libisccc.lib;libisccfg.lib;libbind9.lib;libns.lib;version.lib;ws2_32.lib;%(AdditionalDependencies) @@ -87,7 +87,7 @@ .\$(Configuration)\ .\$(Configuration)\ $(OutDir)$(TargetName).pdb - @OPENSSL_INC@@GSSAPI_INC@@GEOIP_INC@.\;..\..\..\;@LIBXML2_INC@..\win32\include;..\include;..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\dns\include;..\..\..\lib\isccc\include;..\..\..\lib\lwres\win32\include;..\..\..\lib\lwres\include;..\..\..\lib\isccfg\include;..\..\..\lib\bind9\include;%(AdditionalIncludeDirectories) + @OPENSSL_INC@@GSSAPI_INC@@GEOIP_INC@.\;..\..\..\;@LIBXML2_INC@..\win32\include;..\include;..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\dns\include;..\..\..\lib\isccc\include;..\..\..\lib\isccfg\include;..\..\..\lib\bind9\include;..\..\..\lib\ns\include;%(AdditionalIncludeDirectories) CompileAsC @@ -97,42 +97,25 @@ true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) Default - ..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\isccc\win32\$(Configuration);..\..\..\lib\lwres\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);%(AdditionalLibraryDirectories) - @LIBXML2_LIB@@OPENSSL_LIB@@GSSAPI_LIB@@GEOIP_LIB@libisc.lib;libdns.lib;libisccc.lib;liblwres.lib;libisccfg.lib;libbind9.lib;version.lib;ws2_32.lib;%(AdditionalDependencies) + ..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\isccc\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);..\..\..\lib\ns\win32\$(Configuration);%(AdditionalLibraryDirectories) + @LIBXML2_LIB@@OPENSSL_LIB@@GSSAPI_LIB@@GEOIP_LIB@libisc.lib;libdns.lib;libisccc.lib;libisccfg.lib;libbind9.lib;libns.lib;version.lib;ws2_32.lib;%(AdditionalDependencies) - @IF GEOIP @END GEOIP - - - - - - - - - - - - - - - - @@ -140,33 +123,21 @@ - @IF GEOIP @END GEOIP - - - - - - - - - - - diff --git a/bin/named/win32/ntservice.c b/bin/named/win32/ntservice.c index 3d2797f824..71610ec630 100644 --- a/bin/named/win32/ntservice.c +++ b/bin/named/win32/ntservice.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999-2002, 2004, 2006, 2007, 2009, 2011, 2013-2016 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 1999-2002, 2004, 2006, 2007, 2009, 2011, 2013-2017 Internet Systems Consortium, Inc. ("ISC") * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -42,7 +42,7 @@ ntservice_init(void) { hServiceStatus = RegisterServiceCtrlHandler(BIND_SERVICE_NAME, (LPHANDLER_FUNCTION)ServiceControl); if (!hServiceStatus) { - ns_main_earlyfatal( + named_main_earlyfatal( "could not register service control handler"); UpdateSCM(SERVICE_STOPPED); exit(1); @@ -80,7 +80,7 @@ ServiceControl(DWORD dwCtrlCode) { case SERVICE_CONTROL_SHUTDOWN: case SERVICE_CONTROL_STOP: - ns_server_flushonshutdown(ns_g_server, ISC_TRUE); + named_server_flushonshutdown(named_g_server, ISC_TRUE); isc_app_shutdown(); UpdateSCM(SERVICE_STOPPED); break; @@ -132,7 +132,9 @@ int main(int argc, char *argv[]) /* Command line users should put -f in the options. */ isc_commandline_errprint = ISC_FALSE; - while ((ch = isc_commandline_parse(argc, argv, NS_MAIN_ARGS)) != -1) { + while ((ch = isc_commandline_parse(argc, argv, + NAMED_MAIN_ARGS)) != -1) + { switch (ch) { case 'f': case 'g': diff --git a/bin/named/win32/os.c b/bin/named/win32/os.c index cb38223d35..450b01f111 100644 --- a/bin/named/win32/os.c +++ b/bin/named/win32/os.c @@ -47,20 +47,17 @@ static char *version_error = "named requires Windows 2000 Service Pack 2 or later to run correctly"; void -ns_paths_init(void) { +named_paths_init(void) { if (!Initialized) isc_ntpaths_init(); - ns_g_conffile = isc_ntpaths_get(NAMED_CONF_PATH); - lwresd_g_conffile = isc_ntpaths_get(LWRES_CONF_PATH); - lwresd_g_resolvconffile = isc_ntpaths_get(RESOLV_CONF_PATH); - ns_g_conffile = isc_ntpaths_get(NAMED_CONF_PATH); - ns_g_defaultpidfile = isc_ntpaths_get(NAMED_PID_PATH); - lwresd_g_defaultpidfile = isc_ntpaths_get(LWRESD_PID_PATH); - ns_g_defaultlockfile = isc_ntpaths_get(NAMED_LOCK_PATH); - ns_g_keyfile = isc_ntpaths_get(RNDC_KEY_PATH); - ns_g_defaultsessionkeyfile = isc_ntpaths_get(SESSION_KEY_PATH); - ns_g_defaultdnstap = NULL; + named_g_conffile = isc_ntpaths_get(NAMED_CONF_PATH); + named_g_conffile = isc_ntpaths_get(NAMED_CONF_PATH); + named_g_defaultpidfile = isc_ntpaths_get(NAMED_PID_PATH); + named_g_defaultlockfile = isc_ntpaths_get(NAMED_LOCK_PATH); + named_g_keyfile = isc_ntpaths_get(RNDC_KEY_PATH); + named_g_defaultsessionkeyfile = isc_ntpaths_get(SESSION_KEY_PATH); + named_g_defaultdnstap = NULL; Initialized = TRUE; } @@ -96,12 +93,12 @@ setup_syslog(const char *progname) { } void -ns_os_init(const char *progname) { - ns_paths_init(); +named_os_init(const char *progname) { + named_paths_init(); setup_syslog(progname); /* * XXXMPA. We may need to split ntservice_init() in two and - * just mark as running in ns_os_started(). If we do that + * just mark as running in named_os_started(). If we do that * this is where the first part of ntservice_init() should be * called from. * @@ -113,7 +110,7 @@ ns_os_init(const char *progname) { } void -ns_os_daemonize(void) { +named_os_daemonize(void) { /* * Try to set stdin, stdout, and stderr to /dev/null, but press * on even if it fails. @@ -135,12 +132,12 @@ ns_os_daemonize(void) { } void -ns_os_opendevnull(void) { +named_os_opendevnull(void) { devnullfd = open("NUL", O_RDWR, 0); } void -ns_os_closedevnull(void) { +named_os_closedevnull(void) { if (devnullfd != _fileno(stdin) && devnullfd != _fileno(stdout) && devnullfd != _fileno(stderr)) { @@ -150,17 +147,17 @@ ns_os_closedevnull(void) { } void -ns_os_chroot(const char *root) { +named_os_chroot(const char *root) { if (root != NULL) - ns_main_earlyfatal("chroot(): isn't supported by Win32 API"); + named_main_earlyfatal("chroot(): isn't supported by Win32 API"); } void -ns_os_inituserinfo(const char *username) { +named_os_inituserinfo(const char *username) { } void -ns_os_changeuser(void) { +named_os_changeuser(void) { } unsigned int @@ -169,11 +166,11 @@ ns_os_uid(void) { } void -ns_os_adjustnofile(void) { +named_os_adjustnofile(void) { } void -ns_os_minprivs(void) { +named_os_minprivs(void) { } static int @@ -215,14 +212,15 @@ cleanup_lockfile(void) { if (lockfile != NULL) { int n = unlink(lockfile); if (n == -1 && errno != ENOENT) - ns_main_earlywarning("unlink '%s': failed", lockfile); + named_main_earlywarning("unlink '%s': failed", + lockfile); free(lockfile); lockfile = NULL; } } FILE * -ns_os_openfile(const char *filename, int mode, isc_boolean_t switch_user) { +named_os_openfile(const char *filename, int mode, isc_boolean_t switch_user) { char strbuf[ISC_STRERRORSIZE]; FILE *fp; int fd; @@ -231,16 +229,16 @@ ns_os_openfile(const char *filename, int mode, isc_boolean_t switch_user) { fd = safe_open(filename, mode, ISC_FALSE); if (fd < 0) { isc__strerror(errno, strbuf, sizeof(strbuf)); - ns_main_earlywarning("could not open file '%s': %s", - filename, strbuf); + named_main_earlywarning("could not open file '%s': %s", + filename, strbuf); return (NULL); } fp = fdopen(fd, "w"); if (fp == NULL) { isc__strerror(errno, strbuf, sizeof(strbuf)); - ns_main_earlywarning("could not fdopen() file '%s': %s", - filename, strbuf); + named_main_earlywarning("could not fdopen() file '%s': %s", + filename, strbuf); close(fd); } @@ -248,7 +246,7 @@ ns_os_openfile(const char *filename, int mode, isc_boolean_t switch_user) { } void -ns_os_writepidfile(const char *filename, isc_boolean_t first_time) { +named_os_writepidfile(const char *filename, isc_boolean_t first_time) { FILE *pidlockfile; pid_t pid; char strbuf[ISC_STRERRORSIZE]; @@ -258,7 +256,7 @@ ns_os_writepidfile(const char *filename, isc_boolean_t first_time) { * The caller must ensure any required synchronization. */ - report = first_time ? ns_main_earlyfatal : ns_main_earlywarning; + report = first_time ? named_main_earlyfatal : named_main_earlywarning; cleanup_pidfile(); @@ -272,8 +270,9 @@ ns_os_writepidfile(const char *filename, isc_boolean_t first_time) { return; } - pidlockfile = ns_os_openfile(filename, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH, - ISC_FALSE); + pidlockfile = named_os_openfile(filename, + S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH, + ISC_FALSE); if (pidlockfile == NULL) { free(pidfile); pidfile = NULL; @@ -298,7 +297,7 @@ ns_os_writepidfile(const char *filename, isc_boolean_t first_time) { } isc_boolean_t -ns_os_issingleton(const char *filename) { +named_os_issingleton(const char *filename) { char strbuf[ISC_STRERRORSIZE]; OVERLAPPED o; @@ -311,12 +310,12 @@ ns_os_issingleton(const char *filename) { lockfile = strdup(filename); if (lockfile == NULL) { isc__strerror(errno, strbuf, sizeof(strbuf)); - ns_main_earlyfatal("couldn't allocate memory for '%s': %s", - filename, strbuf); + named_main_earlyfatal("couldn't allocate memory for '%s': %s", + filename, strbuf); } /* - * ns_os_openfile() uses safeopen() which removes any existing + * named_os_openfile() uses safeopen() which removes any existing * files. We can't use that here. */ lockfilefd = open(filename, O_WRONLY | O_CREAT, @@ -340,7 +339,7 @@ ns_os_issingleton(const char *filename) { void -ns_os_shutdown(void) { +named_os_shutdown(void) { closelog(); cleanup_pidfile(); @@ -354,7 +353,7 @@ ns_os_shutdown(void) { } isc_result_t -ns_os_gethostname(char *buf, size_t len) { +named_os_gethostname(char *buf, size_t len) { int n; n = gethostname(buf, (int)len); @@ -362,20 +361,20 @@ ns_os_gethostname(char *buf, size_t len) { } void -ns_os_shutdownmsg(char *command, isc_buffer_t *text) { +named_os_shutdownmsg(char *command, isc_buffer_t *text) { UNUSED(command); UNUSED(text); } void -ns_os_tzset(void) { +named_os_tzset(void) { #ifdef HAVE_TZSET tzset(); #endif } void -ns_os_started(void) { +named_os_started(void) { ntservice_init(); } @@ -450,7 +449,7 @@ getuname(void) { * so we had to switch to the recommended way to get the Windows version. */ char * -ns_os_uname(void) { +named_os_uname(void) { if (unamep == NULL) getuname(); return (unamep); diff --git a/bin/named/zoneconf.c b/bin/named/zoneconf.c index 4485b1bc89..51325a4cf7 100644 --- a/bin/named/zoneconf.c +++ b/bin/named/zoneconf.c @@ -32,10 +32,12 @@ #include #include #include +#include #include #include -#include +#include + #include #include #include @@ -123,7 +125,7 @@ configure_zone_acl(const cfg_obj_t *zconfig, const cfg_obj_t *vconfig, /* First check to see if ACL is defined within the zone */ if (zconfig != NULL) { maps[0] = cfg_tuple_get(zconfig, "options"); - (void)ns_config_get(maps, aclname, &aclobj); + (void)named_config_get(maps, aclname, &aclobj); if (aclobj != NULL) { aclp = NULL; goto parse_acl; @@ -148,17 +150,17 @@ configure_zone_acl(const cfg_obj_t *zconfig, const cfg_obj_t *vconfig, if (options != NULL) maps[i++] = options; } - maps[i++] = ns_g_defaults; + maps[i++] = named_g_defaults; maps[i] = NULL; - (void)ns_config_get(maps, aclname, &aclobj); + (void)named_config_get(maps, aclname, &aclobj); if (aclobj == NULL) { (*clearzacl)(zone); return (ISC_R_SUCCESS); } parse_acl: - result = cfg_acl_fromconfig(aclobj, config, ns_g_lctx, actx, + result = cfg_acl_fromconfig(aclobj, config, named_g_lctx, actx, dns_zone_getmctx(zone), 0, &acl); if (result != ISC_R_SUCCESS) return (result); @@ -270,7 +272,7 @@ configure_zone_ssutable(const cfg_obj_t *zconfig, dns_zone_t *zone, result = dns_name_fromtext(dns_fixedname_name(&fident), &b, dns_rootname, 0, NULL); if (result != ISC_R_SUCCESS) { - cfg_obj_log(identity, ns_g_lctx, ISC_LOG_ERROR, + cfg_obj_log(identity, named_g_lctx, ISC_LOG_ERROR, "'%s' is not a valid name", str); goto cleanup; } @@ -281,7 +283,8 @@ configure_zone_ssutable(const cfg_obj_t *zconfig, dns_zone_t *zone, dns_fixedname_name(&fname), NULL); if (result != ISC_R_SUCCESS) { - cfg_obj_log(identity, ns_g_lctx, ISC_LOG_ERROR, + cfg_obj_log(identity, named_g_lctx, + ISC_LOG_ERROR, "error copying origin: %s", isc_result_totext(result)); goto cleanup; @@ -293,13 +296,14 @@ configure_zone_ssutable(const cfg_obj_t *zconfig, dns_zone_t *zone, result = dns_name_fromtext(dns_fixedname_name(&fname), &b, dns_rootname, 0, NULL); if (result != ISC_R_SUCCESS) { - cfg_obj_log(identity, ns_g_lctx, ISC_LOG_ERROR, + cfg_obj_log(identity, named_g_lctx, + ISC_LOG_ERROR, "'%s' is not a valid name", str); goto cleanup; } } - n = ns_config_listcount(typelist); + n = named_config_listcount(typelist); if (n == 0) types = NULL; else { @@ -327,7 +331,8 @@ configure_zone_ssutable(const cfg_obj_t *zconfig, dns_zone_t *zone, result = dns_rdatatype_fromtext(&types[i++], &r); if (result != ISC_R_SUCCESS) { - cfg_obj_log(identity, ns_g_lctx, ISC_LOG_ERROR, + cfg_obj_log(identity, named_g_lctx, + ISC_LOG_ERROR, "'%s' is not a valid type", str); isc_mem_put(mctx, types, n * sizeof(dns_rdatatype_t)); @@ -356,9 +361,9 @@ configure_zone_ssutable(const cfg_obj_t *zconfig, dns_zone_t *zone, if (autoddns) { dns_rdatatype_t any = dns_rdatatype_any; - if (ns_g_server->session_keyname == NULL) { - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_ERROR, + if (named_g_server->session_keyname == NULL) { + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "failed to enable auto DDNS policy " "for zone %s: session key not found", zname); @@ -367,7 +372,7 @@ configure_zone_ssutable(const cfg_obj_t *zconfig, dns_zone_t *zone, } result = dns_ssutable_addrule(table, ISC_TRUE, - ns_g_server->session_keyname, + named_g_server->session_keyname, DNS_SSUMATCHTYPE_SUBDOMAIN, dns_zone_getorigin(zone), 1, &any); @@ -422,14 +427,14 @@ configure_staticstub_serveraddrs(const cfg_obj_t *zconfig, dns_zone_t *zone, sa = cfg_obj_assockaddr(address); if (isc_sockaddr_getport(sa) != 0) { - cfg_obj_log(zconfig, ns_g_lctx, ISC_LOG_ERROR, + cfg_obj_log(zconfig, named_g_lctx, ISC_LOG_ERROR, "port is not configurable for " "static stub server-addresses"); return (ISC_R_FAILURE); } isc_netaddr_fromsockaddr(&na, sa); if (isc_netaddr_getzone(&na) != 0) { - cfg_obj_log(zconfig, ns_g_lctx, ISC_LOG_ERROR, + cfg_obj_log(zconfig, named_g_lctx, ISC_LOG_ERROR, "scoped address is not allowed " "for static stub " "server-addresses"); @@ -525,13 +530,13 @@ configure_staticstub_servernames(const cfg_obj_t *zconfig, dns_zone_t *zone, isc_buffer_add(&b, strlen(str)); result = dns_name_fromtext(nsname, &b, dns_rootname, 0, NULL); if (result != ISC_R_SUCCESS) { - cfg_obj_log(zconfig, ns_g_lctx, ISC_LOG_ERROR, + cfg_obj_log(zconfig, named_g_lctx, ISC_LOG_ERROR, "server-name '%s' is not a valid " "name", str); return (result); } if (dns_name_issubdomain(nsname, dns_zone_getorigin(zone))) { - cfg_obj_log(zconfig, ns_g_lctx, ISC_LOG_ERROR, + cfg_obj_log(zconfig, named_g_lctx, ISC_LOG_ERROR, "server-name '%s' must not be a " "subdomain of zone name '%s'", str, zname); @@ -627,8 +632,8 @@ configure_staticstub(const cfg_obj_t *zconfig, dns_zone_t *zone, * to trigger delegation. */ if (ISC_LIST_EMPTY(rdatalist_ns.rdata)) { - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_ERROR, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "No NS record is configured for a " "static-stub zone '%s'", zname); result = ISC_R_FAILURE; @@ -715,7 +720,7 @@ zonetype_fromconfig(const cfg_obj_t *map) { result = cfg_map_get(map, "type", &obj); INSIST(result == ISC_R_SUCCESS && obj != NULL); - return (ns_config_getzonetype(obj)); + return (named_config_getzonetype(obj)); } /*% @@ -777,12 +782,76 @@ checknames(dns_zonetype_t ztype, const cfg_obj_t **maps, default: INSIST(0); } - result = ns_checknames_get(maps, zone, objp); + result = named_checknames_get(maps, zone, objp); INSIST(result == ISC_R_SUCCESS && objp != NULL && *objp != NULL); } +/* + * Callback to see if a non-recursive query coming from 'srcaddr' to + * 'destaddr', with optional key 'mykey' for class 'rdclass' would be + * delivered to 'myview'. + * + * We run this unlocked as both the view list and the interface list + * are updated when the appropriate task has exclusivity. + */ +static isc_boolean_t +isself(dns_view_t *myview, dns_tsigkey_t *mykey, + const isc_sockaddr_t *srcaddr, const isc_sockaddr_t *dstaddr, + dns_rdataclass_t rdclass, void *arg) +{ + ns_interfacemgr_t *interfacemgr = (ns_interfacemgr_t *) arg; + dns_aclenv_t *env = ns_interfacemgr_getaclenv(interfacemgr); + dns_view_t *view; + dns_tsigkey_t *key = NULL; + dns_name_t *tsig = NULL; + isc_netaddr_t netsrc; + isc_netaddr_t netdst; + + if (interfacemgr == NULL) + return (ISC_TRUE); + + if (!ns_interfacemgr_listeningon(interfacemgr, dstaddr)) + return (ISC_FALSE); + + isc_netaddr_fromsockaddr(&netsrc, srcaddr); + isc_netaddr_fromsockaddr(&netdst, dstaddr); + + for (view = ISC_LIST_HEAD(named_g_server->viewlist); + view != NULL; + view = ISC_LIST_NEXT(view, link)) { + + if (view->matchrecursiveonly) + continue; + + if (rdclass != view->rdclass) + continue; + + if (mykey != NULL) { + isc_boolean_t match; + isc_result_t result; + + result = dns_view_gettsig(view, &mykey->name, &key); + if (result != ISC_R_SUCCESS) + continue; + match = dst_key_compare(mykey->key, key->key); + dns_tsigkey_detach(&key); + if (!match) + continue; + tsig = dns_tsigkey_identity(mykey); + } + + if (dns_acl_allowed(&netsrc, tsig, NULL, 0, NULL, + view->matchclients, env) && + dns_acl_allowed(&netdst, tsig, NULL, 0, NULL, + view->matchdestinations, env)) + break; + } + return (ISC_TF(view == myview)); +} + + isc_result_t -ns_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig, +named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig, const cfg_obj_t *zconfig, cfg_aclconfctx_t *ac, dns_zone_t *zone, dns_zone_t *raw) { @@ -842,11 +911,11 @@ ns_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig, } } nodefault[i] = NULL; - maps[i++] = ns_g_defaults; + maps[i++] = named_g_defaults; maps[i] = NULL; if (vconfig != NULL) - RETERR(ns_config_getclass(cfg_tuple_get(vconfig, "class"), + RETERR(named_config_getclass(cfg_tuple_get(vconfig, "class"), dns_rdataclass_in, &vclass)); else vclass = dns_rdataclass_in; @@ -857,7 +926,7 @@ ns_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig, zname = cfg_obj_asstring(cfg_tuple_get(zconfig, "name")); - RETERR(ns_config_getclass(cfg_tuple_get(zconfig, "class"), + RETERR(named_config_getclass(cfg_tuple_get(zconfig, "class"), vclass, &zclass)); dns_zone_setclass(zone, zclass); if (raw != NULL) @@ -884,8 +953,8 @@ ns_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig, size_t len; if (cpval != default_dbtype) { - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_ERROR, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "zone '%s': both 'database' and 'dlz' " "specified", zname); return (ISC_R_FAILURE); @@ -927,8 +996,8 @@ ns_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig, */ if (ztype == dns_zone_master && cpval == default_dbtype && filename == NULL) { - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_ERROR, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "zone '%s': 'file' not specified", zname); return (ISC_R_FAILURE); @@ -939,7 +1008,7 @@ ns_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig, else masterformat = dns_masterformat_text; obj = NULL; - result = ns_config_get(maps, "masterfile-format", &obj); + result = named_config_get(maps, "masterfile-format", &obj); if (result == ISC_R_SUCCESS) { const char *masterformatstr = cfg_obj_asstring(obj); @@ -954,12 +1023,12 @@ ns_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig, } obj = NULL; - result = ns_config_get(maps, "masterfile-style", &obj); + result = named_config_get(maps, "masterfile-style", &obj); if (result == ISC_R_SUCCESS) { const char *masterstylestr = cfg_obj_asstring(obj); if (masterformat != dns_masterformat_text) { - cfg_obj_log(obj, ns_g_lctx, ISC_LOG_ERROR, + cfg_obj_log(obj, named_g_lctx, ISC_LOG_ERROR, "zone '%s': 'masterfile-style' " "can only be used with " "'masterfile-format text'", zname); @@ -975,10 +1044,10 @@ ns_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig, } obj = NULL; - result = ns_config_get(maps, "max-zone-ttl", &obj); + result = named_config_get(maps, "max-zone-ttl", &obj); if (result == ISC_R_SUCCESS && masterformat == dns_masterformat_map) { - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_ERROR, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "zone '%s': 'max-zone-ttl' is not compatible " "with 'masterfile-format map'", zname); return (ISC_R_FAILURE); @@ -993,7 +1062,7 @@ ns_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig, } obj = NULL; - result = ns_config_get(maps, "max-records", &obj); + result = named_config_get(maps, "max-records", &obj); INSIST(result == ISC_R_SUCCESS && obj != NULL); dns_zone_setmaxrecords(mayberaw, cfg_obj_asuint32(obj)); if (zone != mayberaw) @@ -1048,7 +1117,7 @@ ns_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig, dns_zone_clearqueryonacl)); obj = NULL; - result = ns_config_get(maps, "dialup", &obj); + result = named_config_get(maps, "dialup", &obj); INSIST(result == ISC_R_SUCCESS && obj != NULL); if (cfg_obj_isboolean(obj)) { if (cfg_obj_asboolean(obj)) @@ -1073,7 +1142,7 @@ ns_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig, dns_zone_setdialup(zone, dialup); obj = NULL; - result = ns_config_get(maps, "zone-statistics", &obj); + result = named_config_get(maps, "zone-statistics", &obj); INSIST(result == ISC_R_SUCCESS && obj != NULL); if (cfg_obj_isboolean(obj)) { if (cfg_obj_asboolean(obj)) @@ -1097,7 +1166,7 @@ ns_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig, rcvquerystats = NULL; if (statlevel == dns_zonestat_full) { RETERR(isc_stats_create(mctx, &zoneqrystats, - dns_nsstatscounter_max)); + ns_statscounter_max)); RETERR(dns_rdatatypestats_create(mctx, &rcvquerystats)); } @@ -1118,7 +1187,7 @@ ns_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig, if (ztype != dns_zone_stub && ztype != dns_zone_staticstub && ztype != dns_zone_redirect) { obj = NULL; - result = ns_config_get(maps, "notify", &obj); + result = named_config_get(maps, "notify", &obj); INSIST(result == ISC_R_SUCCESS && obj != NULL); if (cfg_obj_isboolean(obj)) { if (cfg_obj_asboolean(obj)) @@ -1139,7 +1208,7 @@ ns_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig, dns_zone_setnotifytype(zone, notifytype); obj = NULL; - result = ns_config_get(maps, "also-notify", &obj); + result = named_config_get(maps, "also-notify", &obj); if (result == ISC_R_SUCCESS && (notifytype == dns_notifytype_yes || notifytype == dns_notifytype_explicit || @@ -1149,7 +1218,7 @@ ns_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig, dns_ipkeylist_t ipkl; dns_ipkeylist_init(&ipkl); - RETERR(ns_config_getipandkeylist(config, obj, mctx, + RETERR(named_config_getipandkeylist(config, obj, mctx, &ipkl)); result = dns_zone_setalsonotifydscpkeys(zone, ipkl.addrs, @@ -1162,32 +1231,34 @@ ns_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig, RETERR(dns_zone_setalsonotify(zone, NULL, 0)); obj = NULL; - result = ns_config_get(maps, "notify-source", &obj); + result = named_config_get(maps, "notify-source", &obj); INSIST(result == ISC_R_SUCCESS && obj != NULL); RETERR(dns_zone_setnotifysrc4(zone, cfg_obj_assockaddr(obj))); dscp = cfg_obj_getdscp(obj); if (dscp == -1) - dscp = ns_g_dscp; + dscp = named_g_dscp; RETERR(dns_zone_setnotifysrc4dscp(zone, dscp)); - ns_add_reserved_dispatch(ns_g_server, cfg_obj_assockaddr(obj)); + named_add_reserved_dispatch(named_g_server, + cfg_obj_assockaddr(obj)); obj = NULL; - result = ns_config_get(maps, "notify-source-v6", &obj); + result = named_config_get(maps, "notify-source-v6", &obj); INSIST(result == ISC_R_SUCCESS && obj != NULL); RETERR(dns_zone_setnotifysrc6(zone, cfg_obj_assockaddr(obj))); dscp = cfg_obj_getdscp(obj); if (dscp == -1) - dscp = ns_g_dscp; + dscp = named_g_dscp; RETERR(dns_zone_setnotifysrc6dscp(zone, dscp)); - ns_add_reserved_dispatch(ns_g_server, cfg_obj_assockaddr(obj)); + named_add_reserved_dispatch(named_g_server, + cfg_obj_assockaddr(obj)); obj = NULL; - result = ns_config_get(maps, "notify-to-soa", &obj); + result = named_config_get(maps, "notify-to-soa", &obj); INSIST(result == ISC_R_SUCCESS && obj != NULL); dns_zone_setoption(zone, DNS_ZONEOPT_NOTIFYTOSOA, cfg_obj_asboolean(obj)); - dns_zone_setisself(zone, ns_client_isself, NULL); + dns_zone_setisself(zone, isself, named_g_server->interfacemgr); RETERR(configure_zone_acl(zconfig, vconfig, config, allow_transfer, ac, zone, @@ -1195,17 +1266,17 @@ ns_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig, dns_zone_clearxfracl)); obj = NULL; - result = ns_config_get(maps, "max-transfer-time-out", &obj); + result = named_config_get(maps, "max-transfer-time-out", &obj); INSIST(result == ISC_R_SUCCESS && obj != NULL); dns_zone_setmaxxfrout(zone, cfg_obj_asuint32(obj) * 60); obj = NULL; - result = ns_config_get(maps, "max-transfer-idle-out", &obj); + result = named_config_get(maps, "max-transfer-idle-out", &obj); INSIST(result == ISC_R_SUCCESS && obj != NULL); dns_zone_setidleout(zone, cfg_obj_asuint32(obj) * 60); obj = NULL; - result = ns_config_get(maps, "max-journal-size", &obj); + result = named_config_get(maps, "max-journal-size", &obj); INSIST(result == ISC_R_SUCCESS && obj != NULL); if (raw != NULL) dns_zone_setjournalsize(raw, -1); @@ -1222,7 +1293,7 @@ ns_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig, isc_resourcevalue_t value; value = cfg_obj_asuint64(obj); if (value > DNS_JOURNAL_SIZE_MAX) { - cfg_obj_log(obj, ns_g_lctx, + cfg_obj_log(obj, named_g_lctx, ISC_LOG_ERROR, "'max-journal-size " "%" ISC_PRINT_QUADFORMAT "d' " @@ -1237,7 +1308,7 @@ ns_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig, dns_zone_setjournalsize(zone, journal_size); obj = NULL; - result = ns_config_get(maps, "ixfr-from-differences", &obj); + result = named_config_get(maps, "ixfr-from-differences", &obj); INSIST(result == ISC_R_SUCCESS && obj != NULL); if (cfg_obj_isboolean(obj)) ixfrdiff = cfg_obj_asboolean(obj); @@ -1259,12 +1330,12 @@ ns_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig, ixfrdiff); obj = NULL; - result = ns_config_get(maps, "request-expire", &obj); + result = named_config_get(maps, "request-expire", &obj); INSIST(result == ISC_R_SUCCESS); dns_zone_setrequestexpire(zone, cfg_obj_asboolean(obj)); obj = NULL; - result = ns_config_get(maps, "request-ixfr", &obj); + result = named_config_get(maps, "request-ixfr", &obj); INSIST(result == ISC_R_SUCCESS); dns_zone_setrequestixfr(zone, cfg_obj_asboolean(obj)); @@ -1296,18 +1367,18 @@ ns_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig, } obj = NULL; - result = ns_config_get(maps, "notify-delay", &obj); + result = named_config_get(maps, "notify-delay", &obj); INSIST(result == ISC_R_SUCCESS && obj != NULL); dns_zone_setnotifydelay(zone, cfg_obj_asuint32(obj)); obj = NULL; - result = ns_config_get(maps, "check-sibling", &obj); + result = named_config_get(maps, "check-sibling", &obj); INSIST(result == ISC_R_SUCCESS && obj != NULL); dns_zone_setoption(zone, DNS_ZONEOPT_CHECKSIBLING, cfg_obj_asboolean(obj)); obj = NULL; - result = ns_config_get(maps, "check-spf", &obj); + result = named_config_get(maps, "check-spf", &obj); INSIST(result == ISC_R_SUCCESS && obj != NULL); if (strcasecmp(cfg_obj_asstring(obj), "warn") == 0) { check = ISC_TRUE; @@ -1318,12 +1389,12 @@ ns_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig, dns_zone_setoption(zone, DNS_ZONEOPT_CHECKSPF, check); obj = NULL; - result = ns_config_get(maps, "zero-no-soa-ttl", &obj); + result = named_config_get(maps, "zero-no-soa-ttl", &obj); INSIST(result == ISC_R_SUCCESS && obj != NULL); dns_zone_setzeronosoattl(zone, cfg_obj_asboolean(obj)); obj = NULL; - result = ns_config_get(maps, "nsec3-test-zone", &obj); + result = named_config_get(maps, "nsec3-test-zone", &obj); INSIST(result == ISC_R_SUCCESS && obj != NULL); dns_zone_setoption(zone, DNS_ZONEOPT_NSEC3TESTZONE, cfg_obj_asboolean(obj)); @@ -1331,7 +1402,7 @@ ns_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig, dns_zone_setnotifytype(zone, dns_notifytype_no); obj = NULL; - result = ns_config_get(maps, "max-journal-size", &obj); + result = named_config_get(maps, "max-journal-size", &obj); INSIST(result == ISC_R_SUCCESS && obj != NULL); dns_zone_setjournalsize(zone, -1); if (cfg_obj_isstring(obj)) { @@ -1346,7 +1417,7 @@ ns_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig, isc_resourcevalue_t value; value = cfg_obj_asuint64(obj); if (value > DNS_JOURNAL_SIZE_MAX) { - cfg_obj_log(obj, ns_g_lctx, + cfg_obj_log(obj, named_g_lctx, ISC_LOG_ERROR, "'max-journal-size " "%" ISC_PRINT_QUADFORMAT "d' " @@ -1373,8 +1444,8 @@ ns_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig, updateacl = dns_zone_getupdateacl(mayberaw); if (updateacl != NULL && dns_acl_isinsecure(updateacl)) - isc_log_write(ns_g_lctx, DNS_LOGCATEGORY_SECURITY, - NS_LOGMODULE_SERVER, ISC_LOG_WARNING, + isc_log_write(named_g_lctx, DNS_LOGCATEGORY_SECURITY, + NAMED_LOGMODULE_SERVER, ISC_LOG_WARNING, "zone '%s' allows unsigned updates " "from remote hosts, which is insecure", zname); @@ -1386,7 +1457,7 @@ ns_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig, isc_boolean_t allow = ISC_FALSE, maint = ISC_FALSE; obj = NULL; - result = ns_config_get(maps, "sig-validity-interval", &obj); + result = named_config_get(maps, "sig-validity-interval", &obj); INSIST(result == ISC_R_SUCCESS && obj != NULL); { const cfg_obj_t *validity, *resign; @@ -1410,41 +1481,42 @@ ns_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig, } obj = NULL; - result = ns_config_get(maps, "key-directory", &obj); + result = named_config_get(maps, "key-directory", &obj); if (result == ISC_R_SUCCESS) { filename = cfg_obj_asstring(obj); RETERR(dns_zone_setkeydirectory(zone, filename)); } obj = NULL; - result = ns_config_get(maps, "sig-signing-signatures", &obj); + result = named_config_get(maps, "sig-signing-signatures", &obj); INSIST(result == ISC_R_SUCCESS && obj != NULL); dns_zone_setsignatures(zone, cfg_obj_asuint32(obj)); obj = NULL; - result = ns_config_get(maps, "sig-signing-nodes", &obj); + result = named_config_get(maps, "sig-signing-nodes", &obj); INSIST(result == ISC_R_SUCCESS && obj != NULL); dns_zone_setnodes(zone, cfg_obj_asuint32(obj)); obj = NULL; - result = ns_config_get(maps, "sig-signing-type", &obj); + result = named_config_get(maps, "sig-signing-type", &obj); INSIST(result == ISC_R_SUCCESS && obj != NULL); dns_zone_setprivatetype(zone, cfg_obj_asuint32(obj)); obj = NULL; - result = ns_config_get(maps, "update-check-ksk", &obj); + result = named_config_get(maps, "update-check-ksk", &obj); INSIST(result == ISC_R_SUCCESS && obj != NULL); dns_zone_setoption(zone, DNS_ZONEOPT_UPDATECHECKKSK, cfg_obj_asboolean(obj)); obj = NULL; - result = ns_config_get(maps, "dnssec-dnskey-kskonly", &obj); + result = named_config_get(maps, "dnssec-dnskey-kskonly", &obj); INSIST(result == ISC_R_SUCCESS && obj != NULL); dns_zone_setoption(zone, DNS_ZONEOPT_DNSKEYKSKONLY, cfg_obj_asboolean(obj)); obj = NULL; - result = ns_config_get(maps, "dnssec-loadkeys-interval", &obj); + result = named_config_get(maps, "dnssec-loadkeys-interval", + &obj); INSIST(result == ISC_R_SUCCESS && obj != NULL); RETERR(dns_zone_setrefreshkeyinterval(zone, cfg_obj_asuint32(obj))); @@ -1478,7 +1550,7 @@ ns_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig, */ if (ztype == dns_zone_master) { obj = NULL; - result = ns_config_get(maps, "check-wildcard", &obj); + result = named_config_get(maps, "check-wildcard", &obj); if (result == ISC_R_SUCCESS) check = cfg_obj_asboolean(obj); else @@ -1492,12 +1564,14 @@ ns_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig, */ obj = NULL; if (masterformat != dns_masterformat_map) { - result = ns_config_get(maps, "check-dup-records", &obj); + result = named_config_get(maps, "check-dup-records", + &obj); INSIST(result == ISC_R_SUCCESS && obj != NULL); dupcheck = cfg_obj_asstring(obj); } else { - result = ns_config_get(nodefault, "check-dup-records", - &obj); + result = named_config_get(nodefault, + "check-dup-records", + &obj); if (result == ISC_R_SUCCESS) dupcheck = cfg_obj_asstring(obj); else @@ -1517,7 +1591,7 @@ ns_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig, dns_zone_setoption(mayberaw, DNS_ZONEOPT_CHECKDUPRRFAIL, fail); obj = NULL; - result = ns_config_get(maps, "check-mx", &obj); + result = named_config_get(maps, "check-mx", &obj); INSIST(result == ISC_R_SUCCESS && obj != NULL); if (strcasecmp(cfg_obj_asstring(obj), "warn") == 0) { fail = ISC_FALSE; @@ -1538,13 +1612,14 @@ ns_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig, */ obj = NULL; if (masterformat != dns_masterformat_map) { - result = ns_config_get(maps, "check-integrity", &obj); + result = named_config_get(maps, "check-integrity", + &obj); INSIST(result == ISC_R_SUCCESS && obj != NULL); dns_zone_setoption(mayberaw, DNS_ZONEOPT_CHECKINTEGRITY, cfg_obj_asboolean(obj)); } else { check = ISC_FALSE; - result = ns_config_get(nodefault, "check-integrity", + result = named_config_get(nodefault, "check-integrity", &obj); if (result == ISC_R_SUCCESS) check = cfg_obj_asboolean(obj); @@ -1553,7 +1628,7 @@ ns_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig, } obj = NULL; - result = ns_config_get(maps, "check-mx-cname", &obj); + result = named_config_get(maps, "check-mx-cname", &obj); INSIST(result == ISC_R_SUCCESS && obj != NULL); if (strcasecmp(cfg_obj_asstring(obj), "warn") == 0) { warn = ISC_TRUE; @@ -1568,7 +1643,7 @@ ns_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig, dns_zone_setoption(mayberaw, DNS_ZONEOPT_IGNOREMXCNAME, ignore); obj = NULL; - result = ns_config_get(maps, "check-srv-cname", &obj); + result = named_config_get(maps, "check-srv-cname", &obj); INSIST(result == ISC_R_SUCCESS && obj != NULL); if (strcasecmp(cfg_obj_asstring(obj), "warn") == 0) { warn = ISC_TRUE; @@ -1584,7 +1659,8 @@ ns_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig, ignore); obj = NULL; - result = ns_config_get(maps, "dnssec-secure-to-insecure", &obj); + result = named_config_get(maps, "dnssec-secure-to-insecure", + &obj); INSIST(result == ISC_R_SUCCESS && obj != NULL); dns_zone_setoption(mayberaw, DNS_ZONEOPT_SECURETOINSECURE, cfg_obj_asboolean(obj)); @@ -1603,7 +1679,7 @@ ns_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig, } obj = NULL; - result = ns_config_get(maps, "serial-update-method", &obj); + result = named_config_get(maps, "serial-update-method", &obj); INSIST(result == ISC_R_SUCCESS && obj != NULL); if (strcasecmp(cfg_obj_asstring(obj), "unixtime") == 0) dns_zone_setserialupdatemethod(zone, @@ -1630,7 +1706,7 @@ ns_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig, dns_ipkeylist_t ipkl; dns_ipkeylist_init(&ipkl); - RETERR(ns_config_getipandkeylist(config, obj, mctx, + RETERR(named_config_getipandkeylist(config, obj, mctx, &ipkl)); result = dns_zone_setmasterswithkeys(mayberaw, ipkl.addrs, @@ -1645,86 +1721,88 @@ ns_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig, multi = ISC_FALSE; if (count > 1) { obj = NULL; - result = ns_config_get(maps, "multi-master", &obj); + result = named_config_get(maps, "multi-master", &obj); INSIST(result == ISC_R_SUCCESS && obj != NULL); multi = cfg_obj_asboolean(obj); } dns_zone_setoption(mayberaw, DNS_ZONEOPT_MULTIMASTER, multi); obj = NULL; - result = ns_config_get(maps, "max-transfer-time-in", &obj); + result = named_config_get(maps, "max-transfer-time-in", &obj); INSIST(result == ISC_R_SUCCESS && obj != NULL); dns_zone_setmaxxfrin(mayberaw, cfg_obj_asuint32(obj) * 60); obj = NULL; - result = ns_config_get(maps, "max-transfer-idle-in", &obj); + result = named_config_get(maps, "max-transfer-idle-in", &obj); INSIST(result == ISC_R_SUCCESS && obj != NULL); dns_zone_setidlein(mayberaw, cfg_obj_asuint32(obj) * 60); obj = NULL; - result = ns_config_get(maps, "max-refresh-time", &obj); + result = named_config_get(maps, "max-refresh-time", &obj); INSIST(result == ISC_R_SUCCESS && obj != NULL); dns_zone_setmaxrefreshtime(mayberaw, cfg_obj_asuint32(obj)); obj = NULL; - result = ns_config_get(maps, "min-refresh-time", &obj); + result = named_config_get(maps, "min-refresh-time", &obj); INSIST(result == ISC_R_SUCCESS && obj != NULL); dns_zone_setminrefreshtime(mayberaw, cfg_obj_asuint32(obj)); obj = NULL; - result = ns_config_get(maps, "max-retry-time", &obj); + result = named_config_get(maps, "max-retry-time", &obj); INSIST(result == ISC_R_SUCCESS && obj != NULL); dns_zone_setmaxretrytime(mayberaw, cfg_obj_asuint32(obj)); obj = NULL; - result = ns_config_get(maps, "min-retry-time", &obj); + result = named_config_get(maps, "min-retry-time", &obj); INSIST(result == ISC_R_SUCCESS && obj != NULL); dns_zone_setminretrytime(mayberaw, cfg_obj_asuint32(obj)); obj = NULL; - result = ns_config_get(maps, "transfer-source", &obj); + result = named_config_get(maps, "transfer-source", &obj); INSIST(result == ISC_R_SUCCESS && obj != NULL); RETERR(dns_zone_setxfrsource4(mayberaw, cfg_obj_assockaddr(obj))); dscp = cfg_obj_getdscp(obj); if (dscp == -1) - dscp = ns_g_dscp; + dscp = named_g_dscp; RETERR(dns_zone_setxfrsource4dscp(mayberaw, dscp)); - ns_add_reserved_dispatch(ns_g_server, cfg_obj_assockaddr(obj)); + named_add_reserved_dispatch(named_g_server, + cfg_obj_assockaddr(obj)); obj = NULL; - result = ns_config_get(maps, "transfer-source-v6", &obj); + result = named_config_get(maps, "transfer-source-v6", &obj); INSIST(result == ISC_R_SUCCESS && obj != NULL); RETERR(dns_zone_setxfrsource6(mayberaw, cfg_obj_assockaddr(obj))); dscp = cfg_obj_getdscp(obj); if (dscp == -1) - dscp = ns_g_dscp; + dscp = named_g_dscp; RETERR(dns_zone_setxfrsource6dscp(mayberaw, dscp)); - ns_add_reserved_dispatch(ns_g_server, cfg_obj_assockaddr(obj)); + named_add_reserved_dispatch(named_g_server, + cfg_obj_assockaddr(obj)); obj = NULL; - result = ns_config_get(maps, "alt-transfer-source", &obj); + result = named_config_get(maps, "alt-transfer-source", &obj); INSIST(result == ISC_R_SUCCESS && obj != NULL); RETERR(dns_zone_setaltxfrsource4(mayberaw, cfg_obj_assockaddr(obj))); dscp = cfg_obj_getdscp(obj); if (dscp == -1) - dscp = ns_g_dscp; + dscp = named_g_dscp; RETERR(dns_zone_setaltxfrsource4dscp(mayberaw, dscp)); obj = NULL; - result = ns_config_get(maps, "alt-transfer-source-v6", &obj); + result = named_config_get(maps, "alt-transfer-source-v6", &obj); INSIST(result == ISC_R_SUCCESS && obj != NULL); RETERR(dns_zone_setaltxfrsource6(mayberaw, cfg_obj_assockaddr(obj))); dscp = cfg_obj_getdscp(obj); if (dscp == -1) - dscp = ns_g_dscp; + dscp = named_g_dscp; RETERR(dns_zone_setaltxfrsource6dscp(mayberaw, dscp)); obj = NULL; - (void)ns_config_get(maps, "use-alt-transfer-source", &obj); + (void)named_config_get(maps, "use-alt-transfer-source", &obj); if (obj == NULL) { /* * Default off when views are in use otherwise @@ -1740,7 +1818,7 @@ ns_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig, dns_zone_setoption(mayberaw, DNS_ZONEOPT_USEALTXFRSRC, alt); obj = NULL; - (void)ns_config_get(maps, "try-tcp-refresh", &obj); + (void)named_config_get(maps, "try-tcp-refresh", &obj); dns_zone_setoption(mayberaw, DNS_ZONEOPT_TRYTCPREFRESH, cfg_obj_asboolean(obj)); break; @@ -1757,13 +1835,14 @@ ns_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig, return (ISC_R_SUCCESS); } - /* * Set up a DLZ zone as writeable */ isc_result_t -ns_zone_configure_writeable_dlz(dns_dlzdb_t *dlzdatabase, dns_zone_t *zone, - dns_rdataclass_t rdclass, dns_name_t *name) +named_zone_configure_writeable_dlz(dns_dlzdb_t *dlzdatabase, + dns_zone_t *zone, + dns_rdataclass_t rdclass, + dns_name_t *name) { dns_db_t *db = NULL; isc_time_t now; @@ -1781,7 +1860,7 @@ ns_zone_configure_writeable_dlz(dns_dlzdb_t *dlzdatabase, dns_zone_t *zone, } isc_boolean_t -ns_zone_reusable(dns_zone_t *zone, const cfg_obj_t *zconfig) { +named_zone_reusable(dns_zone_t *zone, const cfg_obj_t *zconfig) { const cfg_obj_t *zoptions = NULL; const cfg_obj_t *obj = NULL; const char *cfilename; diff --git a/bin/nsupdate/Makefile.in b/bin/nsupdate/Makefile.in index 21d5c61f33..786878c51f 100644 --- a/bin/nsupdate/Makefile.in +++ b/bin/nsupdate/Makefile.in @@ -4,8 +4,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -# $Id: Makefile.in,v 1.36 2009/12/05 23:31:40 each Exp $ - srcdir = @srcdir@ VPATH = @srcdir@ top_srcdir = @top_srcdir@ @@ -18,31 +16,34 @@ READLINE_LIB = @READLINE_LIB@ DST_GSSAPI_INC = @DST_GSSAPI_INC@ -CINCLUDES = ${LWRES_INCLUDES} ${DNS_INCLUDES} \ - ${BIND9_INCLUDES} ${ISC_INCLUDES} \ - ${ISCCFG_INCLUDES} ${DST_GSSAPI_INC} @DST_OPENSSL_INC@ +CINCLUDES = ${DNS_INCLUDES} ${BIND9_INCLUDES} ${ISC_INCLUDES} \ + ${ISCCFG_INCLUDES} ${IRS_INCLUDES} ${DST_GSSAPI_INC} \ + @DST_OPENSSL_INC@ CDEFINES = -DVERSION=\"${VERSION}\" @CRYPTO@ @USE_GSSAPI@ CWARNINGS = -LWRESLIBS = ../../lib/lwres/liblwres.@A@ DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@ BIND9LIBS = ../../lib/bind9/libbind9.@A@ ISCLIBS = ../../lib/isc/libisc.@A@ ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@ +IRSLIBS = ../../lib/irs/libirs.@A@ -LWRESDEPLIBS = ../../lib/lwres/liblwres.@A@ DNSDEPLIBS = ../../lib/dns/libdns.@A@ BIND9DEPLIBS = ../../lib/bind9/libbind9.@A@ ISCDEPLIBS = ../../lib/isc/libisc.@A@ ISCCFGDEPLIBS = ../../lib/isccfg/libisccfg.@A@ +IRSDEPLIBS = ../../lib/irs/libirs.@A@ -DEPLIBS = ${DNSDEPLIBS} ${BIND9DEPLIBS} ${ISCDEPLIBS} ${ISCCFGDEPLIBS} +DEPLIBS = ${DNSDEPLIBS} ${IRSDEPLIBS} ${BIND9DEPLIBS} \ + ${ISCDEPLIBS} ${ISCCFGDEPLIBS} -LIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} ${ISCCFGLIBS} ${ISCLIBS} @LIBS@ +LIBS = ${DNSLIBS} ${IRSLIBS} ${BIND9LIBS} \ + ${ISCCFGLIBS} ${ISCLIBS} @LIBS@ -NOSYMLIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} ${ISCCFGLIBS} ${ISCNOSYMLIBS} @LIBS@ +NOSYMLIBS = ${DNSLIBS} ${IRSLIBS} ${BIND9LIBS} \ + ${ISCCFGLIBS} ${ISCNOSYMLIBS} @LIBS@ SUBDIRS = @@ -69,6 +70,7 @@ nsupdate.@O@: nsupdate.c nsupdate@EXEEXT@: nsupdate.@O@ ${UOBJS} ${DEPLIBS} export BASEOBJS="nsupdate.@O@ ${READLINE_LIB} ${UOBJS}"; \ + export LIBS0="${DNSLIBS} ${IRSLIBS}"; \ ${FINALBUILDCMD} doc man:: ${MANOBJS} diff --git a/bin/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c index 06e536622b..763e28f484 100644 --- a/bin/nsupdate/nsupdate.c +++ b/bin/nsupdate/nsupdate.c @@ -67,8 +67,8 @@ #include -#include -#include +#include +#include #ifdef GSSAPI #include @@ -157,8 +157,6 @@ static dns_name_t restart_master; static dns_tsig_keyring_t *gssring = NULL; static dns_tsigkey_t *tsigkey = NULL; static dst_key_t *sig0key = NULL; -static lwres_context_t *lwctx = NULL; -static lwres_conf_t *lwconf; static isc_sockaddr_t *servers = NULL; static isc_sockaddr_t *master_servers = NULL; static isc_boolean_t default_servers = ISC_TRUE; @@ -383,16 +381,6 @@ check_result(isc_result_t result, const char *msg) { fatal("%s: %s", msg, isc_result_totext(result)); } -static void * -mem_alloc(void *arg, size_t size) { - return (isc_mem_get(arg, size)); -} - -static void -mem_free(void *arg, void *mem, size_t size) { - isc_mem_put(arg, mem, size); -} - static char * nsu_strsep(char **stringp, const char *delim) { char *string = *stringp; @@ -805,9 +793,6 @@ doshutdown(void) { cleanup_entropy(&entropy); - lwres_conf_clear(lwctx); - lwres_context_destroy(&lwctx); - ddebug("Destroying request manager"); dns_requestmgr_detach(&requestmgr); @@ -849,10 +834,10 @@ static void setup_system(void) { isc_result_t result; isc_sockaddr_t bind_any, bind_any6; - lwres_result_t lwresult; - unsigned int attrs, attrmask, flags; - int i; + unsigned int attrs, attrmask; + isc_sockaddrlist_t *nslist; isc_logconfig_t *logconfig = NULL; + irs_resconf_t *resconf = NULL; ddebug("setup_system()"); @@ -870,21 +855,12 @@ setup_system(void) { isc_log_setdebuglevel(glctx, logdebuglevel); - flags = LWRES_CONTEXT_SERVERMODE; - if (have_ipv4) { - flags |= LWRES_CONTEXT_USEIPV4; - } - if (have_ipv6) { - flags |= LWRES_CONTEXT_USEIPV6; + result = irs_resconf_load(gmctx, RESOLV_CONF, &resconf); + if (result != ISC_R_SUCCESS && result != ISC_R_FILENOTFOUND) { + fatal("parse of %s failed", RESOLV_CONF); } - lwresult = lwres_context_create(&lwctx, gmctx, mem_alloc, mem_free, - flags); - if (lwresult != LWRES_R_SUCCESS) - fatal("lwres_context_create failed"); - - (void)lwres_conf_parse(lwctx, RESOLV_CONF); - lwconf = lwres_conf_get(lwctx); + nslist = irs_resconf_getnameservers(resconf); if (servers != NULL) { if (master_servers == servers) @@ -893,7 +869,7 @@ setup_system(void) { } ns_inuse = 0; - if (local_only || lwconf->nsnext <= 0) { + if (local_only || ISC_LIST_EMPTY(*nslist)) { struct in_addr in; struct in6_addr in6; @@ -918,28 +894,68 @@ setup_system(void) { &in, dnsport); } } else { - ns_total = ns_alloc = lwconf->nsnext; + isc_sockaddr_t *sa; + int i = 0; + + /* + * Count the nameservers (skipping any that we can't use + * because of address family restrictions) and allocate + * the servers array. + */ + ns_total = ns_alloc = 0; + for (sa = ISC_LIST_HEAD(*nslist); + sa != NULL; + sa = ISC_LIST_NEXT(sa, link)) + { + switch (sa->type.sa.sa_family) { + case AF_INET: + if (have_ipv4) { + ns_total++; + continue; + } + break; + case AF_INET6: + if (have_ipv6) { + ns_total++; + continue; + } + break; + default: + fatal("bad family"); + } + } + + ns_alloc = ns_total; servers = isc_mem_get(gmctx, ns_alloc * sizeof(isc_sockaddr_t)); if (servers == NULL) fatal("out of memory"); - for (i = 0; i < ns_total; i++) { - if (lwconf->nameservers[i].family == LWRES_ADDRTYPE_V4) - { - struct in_addr in4; - memmove(&in4, - lwconf->nameservers[i].address, 4); - isc_sockaddr_fromin(&servers[i], - &in4, dnsport); - } else { - struct in6_addr in6; - memmove(&in6, - lwconf->nameservers[i].address, 16); - isc_sockaddr_fromin6(&servers[i], - &in6, dnsport); + + for (sa = ISC_LIST_HEAD(*nslist); + sa != NULL; + sa = ISC_LIST_NEXT(sa, link)) + { + switch (sa->type.sa.sa_family) { + case AF_INET: + if (!have_ipv4) { + continue; + } + sa->type.sin.sin_port = htons(dnsport); + break; + case AF_INET6: + if (!have_ipv6) { + continue; + } + sa->type.sin6.sin6_port = htons(dnsport); + break; + default: + fatal("bad family"); } + servers[i++] = *sa; } } + irs_resconf_destroy(&resconf); + setup_entropy(gmctx, NULL, &entropy); result = isc_hash_create(gmctx, entropy, DNS_NAME_MAXWIRE); diff --git a/bin/nsupdate/win32/nsupdate.dsp.in b/bin/nsupdate/win32/nsupdate.dsp.in deleted file mode 100644 index 18442a5257..0000000000 --- a/bin/nsupdate/win32/nsupdate.dsp.in +++ /dev/null @@ -1,103 +0,0 @@ -# Microsoft Developer Studio Project File - Name="nsupdate" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103 - -CFG=nsupdate - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "nsupdate.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "nsupdate.mak" CFG="nsupdate - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "nsupdate - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "nsupdate - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "nsupdate - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../include" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ @GSSAPI_INC@ @READLINE_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /I "../../../lib/lwres/win32/include/lwres" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/isccfg/include" /D "WIN32" @CRYPTO@ @USE_GSSAPI@ /D "USE_READLINE_STATIC" /D "__STDC__" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console @MACHINE@ -# ADD LINK32 @GSSAPI_LIB@ @KRB5_LIB@ @READLINE_LIB@ ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/lwres/win32/Release/liblwres.lib user32.lib advapi32.lib ws2_32.lib ../../../lib/bind9/win32/Release/libbind9.lib ../../../lib/isccfg/win32/Release/libisccfg.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/nsupdate.exe" - -!ELSEIF "$(CFG)" == "nsupdate - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../include" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ @GSSAPI_INC@ @READLINE_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /I "../../../lib/lwres/win32/include/lwres" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/isccfg/include" /D "WIN32" @CRYPTO@ @USE_GSSAPI@ /D "USE_READLINE_STATIC" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c -# SUBTRACT CPP /X /u @COPTY@ -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console /debug @MACHINE@ /pdbtype:sept -# ADD LINK32 @GSSAPI_LIB@ @KRB5_LIB@ @READLINE_LIBD@ ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/lwres/win32/Debug/liblwres.lib user32.lib advapi32.lib ws2_32.lib ../../../lib/bind9/win32/Debug/libbind9.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/nsupdate.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "nsupdate - @PLATFORM@ Release" -# Name "nsupdate - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\nsupdate.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/bin/nsupdate/win32/nsupdate.dsw b/bin/nsupdate/win32/nsupdate.dsw deleted file mode 100644 index e3b777225a..0000000000 --- a/bin/nsupdate/win32/nsupdate.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "nsupdate"=".\nsupdate.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/bin/nsupdate/win32/nsupdate.mak.in b/bin/nsupdate/win32/nsupdate.mak.in deleted file mode 100644 index 7095e13b4c..0000000000 --- a/bin/nsupdate/win32/nsupdate.mak.in +++ /dev/null @@ -1,375 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on nsupdate.dsp -!IF "$(CFG)" == "" -CFG=nsupdate - @PLATFORM@ Debug -!MESSAGE No configuration specified. Defaulting to nsupdate - @PLATFORM@ Debug. -!ENDIF - -!IF "$(CFG)" != "nsupdate - @PLATFORM@ Release" && "$(CFG)" != "nsupdate - @PLATFORM@ Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "nsupdate.mak" CFG="nsupdate - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "nsupdate - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "nsupdate - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "nsupdate - @PLATFORM@ 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)" == "nsupdate - @PLATFORM@ Release" - -OUTDIR=.\Release -INTDIR=.\Release - -!IF "$(RECURSE)" == "0" - -ALL : "..\..\..\Build\Release\nsupdate.exe" - -!ELSE - -ALL : "libbind9 - @PLATFORM@ Release" "libisc - @PLATFORM@ Release" "libdns - @PLATFORM@ Release" "..\..\..\Build\Release\nsupdate.exe" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"libdns - @PLATFORM@ ReleaseCLEAN" "libisc - @PLATFORM@ ReleaseCLEAN" "libbind9 - @PLATFORM@ ReleaseCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\nsupdate.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "..\..\..\Build\Release\nsupdate.exe" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../include" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ @GSSAPI_INC@ @READLINE_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /I "../../../lib/lwres/win32/include/lwres" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/isccfg/include" /D "WIN32" @CRYPTO@ @USE_GSSAPI@ /D "USE_READLINE_STATIC" /D "__STDC__" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\nsupdate.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\nsupdate.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/lwres/win32/Release/liblwres.lib user32.lib advapi32.lib ws2_32.lib ../../../lib/bind9/win32/Release/libbind9.lib ../../../lib/isccfg/win32/Release/libisccfg.lib @GSSAPI_LIB@ @KRB5_LIB@ @READLINE_LIB@ /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\nsupdate.pdb" @MACHINE@ /out:"../../../Build/Release/nsupdate.exe" -LINK32_OBJS= \ - "$(INTDIR)\nsupdate.obj" \ - "..\..\..\lib\dns\win32\Release\libdns.lib" \ - "..\..\..\lib\isc\win32\Release\libisc.lib" \ - "..\..\..\lib\bind9\win32\Release\libbind9.lib" \ - "..\..\..\lib\isccfg\win32\Release\libisccfg.lib" - -"..\..\..\Build\Release\nsupdate.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ELSEIF "$(CFG)" == "nsupdate - @PLATFORM@ Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : "..\..\..\Build\Debug\nsupdate.exe" "$(OUTDIR)\nsupdate.bsc" - -!ELSE - -ALL : "libbind9 - @PLATFORM@ Debug" "libisc - @PLATFORM@ Debug" "libdns - @PLATFORM@ Debug" "..\..\..\Build\Debug\nsupdate.exe" "$(OUTDIR)\nsupdate.bsc" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"libdns - @PLATFORM@ DebugCLEAN" "libisc - @PLATFORM@ DebugCLEAN" "libbind9 - @PLATFORM@ DebugCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\nsupdate.obj" - -@erase "$(INTDIR)\nsupdate.sbr" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\nsupdate.bsc" - -@erase "$(OUTDIR)\nsupdate.pdb" - -@erase "..\..\..\Build\Debug\nsupdate.exe" - -@erase "..\..\..\Build\Debug\nsupdate.ilk" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../include" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ @GSSAPI_INC@ @READLINE_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /I "../../../lib/lwres/win32/include/lwres" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/isccfg/include" /D "WIN32" @CRYPTO@ @USE_GSSAPI@ /D "USE_READLINE_STATIC" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\nsupdate.bsc" -BSC32_SBRS= \ - "$(INTDIR)\nsupdate.sbr" - -"$(OUTDIR)\nsupdate.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -LINK32_FLAGS=../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/lwres/win32/Debug/liblwres.lib user32.lib advapi32.lib ws2_32.lib ../../../lib/bind9/win32/Debug/libbind9.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib @GSSAPI_LIB@ @KRB5_LIB@ @READLINE_LIBD@ /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\nsupdate.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/nsupdate.exe" /pdbtype:sept -LINK32_OBJS= \ - "$(INTDIR)\nsupdate.obj" \ - "..\..\..\lib\dns\win32\Debug\libdns.lib" \ - "..\..\..\lib\isc\win32\Debug\libisc.lib" \ - "..\..\..\lib\bind9\win32\Debug\libbind9.lib" \ - "..\..\..\lib\isccfg\win32\Release\libisccfg.lib" - -"..\..\..\Build\Debug\nsupdate.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ENDIF - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("nsupdate.dep") -!INCLUDE "nsupdate.dep" -!ELSE -!MESSAGE Warning: cannot find "nsupdate.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "nsupdate - @PLATFORM@ Release" || "$(CFG)" == "nsupdate - @PLATFORM@ Debug" -SOURCE=..\nsupdate.c - -!IF "$(CFG)" == "nsupdate - @PLATFORM@ Release" - - -"$(INTDIR)\nsupdate.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "nsupdate - @PLATFORM@ Debug" - - -"$(INTDIR)\nsupdate.obj" "$(INTDIR)\nsupdate.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -!IF "$(CFG)" == "nsupdate - @PLATFORM@ Release" - -"libdns - @PLATFORM@ Release" : - cd "..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" - cd "..\..\..\bin\nsupdate\win32" - -"libdns - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\nsupdate\win32" - -!ELSEIF "$(CFG)" == "nsupdate - @PLATFORM@ Debug" - -"libdns - @PLATFORM@ Debug" : - cd "..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" - cd "..\..\..\bin\nsupdate\win32" - -"libdns - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\nsupdate\win32" - -!ENDIF - -!IF "$(CFG)" == "nsupdate - @PLATFORM@ Release" - -"libisc - @PLATFORM@ Release" : - cd "..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" - cd "..\..\..\bin\nsupdate\win32" - -"libisc - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\nsupdate\win32" - -!ELSEIF "$(CFG)" == "nsupdate - @PLATFORM@ Debug" - -"libisc - @PLATFORM@ Debug" : - cd "..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" - cd "..\..\..\bin\nsupdate\win32" - -"libisc - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\nsupdate\win32" - -!ENDIF - -!IF "$(CFG)" == "nsupdate - @PLATFORM@ Release" - -"libbind9 - @PLATFORM@ Release" : - cd "..\..\..\lib\bind9\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - @PLATFORM@ Release" - cd "..\..\..\bin\nsupdate\win32" - -"libbind9 - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\lib\bind9\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\nsupdate\win32" - -!ELSEIF "$(CFG)" == "nsupdate - @PLATFORM@ Debug" - -"libbind9 - @PLATFORM@ Debug" : - cd "..\..\..\lib\bind9\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - @PLATFORM@ Debug" - cd "..\..\..\bin\nsupdate\win32" - -"libbind9 - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\lib\bind9\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\nsupdate\win32" - -!ENDIF - - -!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 -1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest" -<< KEEP - -$(_VC_MANIFEST_BASENAME).auto.manifest : - type <<$@ - - - -<< KEEP diff --git a/bin/nsupdate/win32/nsupdate.vcxproj.in b/bin/nsupdate/win32/nsupdate.vcxproj.in index 58a1a3611e..c89e648103 100644 --- a/bin/nsupdate/win32/nsupdate.vcxproj.in +++ b/bin/nsupdate/win32/nsupdate.vcxproj.in @@ -60,15 +60,15 @@ .\$(Configuration)\ $(OutDir)$(TargetName).pdb true - .\;..\include;..\..\..\;@LIBXML2_INC@@OPENSSL_INC@@GSSAPI_INC@@READLINE_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\lwres\win32\include;..\..\..\lib\lwres\include;..\..\..\lib\lwres\win32\include\lwres;..\..\..\lib\dns\include;..\..\..\lib\bind9\include;..\..\..\lib\isccfg\include;%(AdditionalIncludeDirectories) + .\;..\include;..\..\..\;@LIBXML2_INC@@OPENSSL_INC@@GSSAPI_INC@@READLINE_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\dns\include;..\..\..\lib\irs\include;..\..\..\lib\irs\win32\include;..\..\..\lib\bind9\include;..\..\..\lib\isccfg\include;%(AdditionalIncludeDirectories) CompileAsC Console true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) - ..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\lwres\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);%(AdditionalLibraryDirectories) - @READLINE_LIBD@@GSSAPI_LIB@@KRB5_LIB@libisc.lib;libdns.lib;liblwres.lib;libbind9.lib;libisccfg.lib;ws2_32.lib;%(AdditionalDependencies) + ..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\irs\win32\$(Configuration);%(AdditionalLibraryDirectories) + @READLINE_LIBD@@GSSAPI_LIB@@KRB5_LIB@libisc.lib;libdns.lib;libbind9.lib;libisccfg.lib;libirs.lib;ws2_32.lib;%(AdditionalDependencies) @@ -87,7 +87,7 @@ .\$(Configuration)\ .\$(Configuration)\ $(OutDir)$(TargetName).pdb - .\;..\include;..\..\..\;@LIBXML2_INC@@OPENSSL_INC@@GSSAPI_INC@@READLINE_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\lwres\win32\include;..\..\..\lib\lwres\include;..\..\..\lib\lwres\win32\include\lwres;..\..\..\lib\dns\include;..\..\..\lib\bind9\include;..\..\..\lib\isccfg\include;%(AdditionalIncludeDirectories) + .\;..\include;..\..\..\;@LIBXML2_INC@@OPENSSL_INC@@GSSAPI_INC@@READLINE_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\dns\include;..\..\..\lib\irs\include;..\..\..\lib\irs\win32\include;..\..\..\lib\bind9\include;..\..\..\lib\isccfg\include;%(AdditionalIncludeDirectories) CompileAsC @@ -97,8 +97,8 @@ true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) Default - ..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\lwres\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);%(AdditionalLibraryDirectories) - @READLINE_LIB@@GSSAPI_LIB@@KRB5_LIB@libisc.lib;libdns.lib;liblwres.lib;libbind9.lib;libisccfg.lib;ws2_32.lib;%(AdditionalDependencies) + ..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\irs\win32\$(Configuration);%(AdditionalLibraryDirectories) + @READLINE_LIB@@GSSAPI_LIB@@KRB5_LIB@libisc.lib;libdns.lib;libbind9.lib;libisccfg.lib;libirs.lib;ws2_32.lib;%(AdditionalDependencies) diff --git a/bin/pkcs11/win32/pk11destroy.dsp.in b/bin/pkcs11/win32/pk11destroy.dsp.in deleted file mode 100644 index 6c217d9ac0..0000000000 --- a/bin/pkcs11/win32/pk11destroy.dsp.in +++ /dev/null @@ -1,103 +0,0 @@ -# Microsoft Developer Studio Project File - Name="pk11destroy" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103 - -CFG=pk11destroy - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "pk11destroy.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "pk11destroy.mak" CFG="pk11destroy - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "pk11destroy - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "pk11destroy - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "pk11destroy - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../.." /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @PK11_LIB_LOCATION@ @COPTY@ /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console @MACHINE@ -# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/pkcs11-destroy.exe" - -!ELSEIF "$(CFG)" == "pk11destroy - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../.." /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @PK11_LIB_LOCATION@ /FR /FD /GZ /c -# SUBTRACT CPP /X @COPTY@ -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console /debug @MACHINE@ /pdbtype:sept -# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/pkcs11-destroy.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "pk11destroy - @PLATFORM@ Release" -# Name "pk11destroy - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE="..\pkcs11-destroy.c" -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/bin/pkcs11/win32/pk11destroy.dsw b/bin/pkcs11/win32/pk11destroy.dsw deleted file mode 100644 index cd467834d4..0000000000 --- a/bin/pkcs11/win32/pk11destroy.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "pk11destroy"=".\pk11destroy.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/bin/pkcs11/win32/pk11destroy.mak.in b/bin/pkcs11/win32/pk11destroy.mak.in deleted file mode 100644 index 1fc79d13f8..0000000000 --- a/bin/pkcs11/win32/pk11destroy.mak.in +++ /dev/null @@ -1,296 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on pk11destroy.dsp -!IF "$(CFG)" == "" -CFG=pk11destroy - @PLATFORM@ Debug -!MESSAGE No configuration specified. Defaulting to pk11destroy - @PLATFORM@ Debug. -!ENDIF - -!IF "$(CFG)" != "pk11destroy - @PLATFORM@ Release" && "$(CFG)" != "pk11destroy - @PLATFORM@ Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "pk11destroy.mak" CFG="pk11destroy - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "pk11destroy - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "pk11destroy - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -!IF "$(CFG)" == "pk11destroy - @PLATFORM@ 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)" == "pk11destroy - @PLATFORM@ Release" - -OUTDIR=.\Release -INTDIR=.\Release - -ALL : "..\..\..\Build\Release\pkcs11-destroy.exe" - - -CLEAN : - -@erase "$(INTDIR)\pkcs11-destroy.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "..\..\..\Build\Release\pkcs11-destroy.exe" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../.." /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @PK11_LIB_LOCATION@ /Fp"$(INTDIR)\pk11destroy.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\pk11destroy.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\pkcs11-destroy.pdb" @MACHINE@ /out:"../../../Build/Release/pkcs11-destroy.exe" -LINK32_OBJS= "$(INTDIR)\pkcs11-destroy.obj" - -"..\..\..\Build\Release\pkcs11-destroy.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ELSEIF "$(CFG)" == "pk11destroy - @PLATFORM@ Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -ALL : "..\..\..\Build\Debug\pkcs11-destroy.exe" "$(OUTDIR)\pk11destroy.bsc" - - -CLEAN : - -@erase "$(INTDIR)\pkcs11-destroy.obj" - -@erase "$(INTDIR)\pkcs11-destroy.sbr" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\pkcs11-destroy.pdb" - -@erase "$(OUTDIR)\pk11destroy.bsc" - -@erase "..\..\..\Build\Debug\pkcs11-destroy.exe" - -@erase "..\..\..\Build\Debug\pkcs11-destroy.ilk" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../.." /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @PK11_LIB_LOCATION@ /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\pk11destroy.bsc" -BSC32_SBRS= "$(INTDIR)\pkcs11-destroy.sbr" - -"$(OUTDIR)\pk11destroy.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\pkcs11-destroy.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/pkcs11-destroy.exe" /pdbtype:sept -LINK32_OBJS= "$(INTDIR)\pkcs11-destroy.obj" - -"..\..\..\Build\Debug\pkcs11-destroy.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ENDIF - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("pk11destroy.dep") -!INCLUDE "pk11destroy.dep" -!ELSE -!MESSAGE Warning: cannot find "pk11destroy.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "pk11destroy - @PLATFORM@ Release" || "$(CFG)" == "pk11destroy - @PLATFORM@ Debug" -SOURCE="..\pkcs11-destroy.c" - -!IF "$(CFG)" == "pk11destroy - @PLATFORM@ Release" - - -"$(INTDIR)\pkcs11-destroy.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "pk11destroy - @PLATFORM@ Debug" - - -"$(INTDIR)\pkcs11-destroy.obj" "$(INTDIR)\pkcs11-destroy.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -!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 -1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest" -<< KEEP - -$(_VC_MANIFEST_BASENAME).auto.manifest : - type <<$@ - - - -<< KEEP diff --git a/bin/pkcs11/win32/pk11keygen.dsp.in b/bin/pkcs11/win32/pk11keygen.dsp.in deleted file mode 100644 index 98d52e288e..0000000000 --- a/bin/pkcs11/win32/pk11keygen.dsp.in +++ /dev/null @@ -1,103 +0,0 @@ -# Microsoft Developer Studio Project File - Name="pk11keygen" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103 - -CFG=pk11keygen - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "pk11keygen.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "pk11keygen.mak" CFG="pk11keygen - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "pk11keygen - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "pk11keygen - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "pk11keygen - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../.." /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @PK11_LIB_LOCATION@ @COPTY@ /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console @MACHINE@ -# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/pkcs11-keygen.exe" - -!ELSEIF "$(CFG)" == "pk11keygen - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../.." /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @PK11_LIB_LOCATION@ /FR /FD /GZ /c -# SUBTRACT CPP /X @COPTY@ -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console /debug @MACHINE@ /pdbtype:sept -# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/pkcs11-keygen.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "pk11keygen - @PLATFORM@ Release" -# Name "pk11keygen - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE="..\pkcs11-keygen.c" -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/bin/pkcs11/win32/pk11keygen.dsw b/bin/pkcs11/win32/pk11keygen.dsw deleted file mode 100644 index 5c52ce05d7..0000000000 --- a/bin/pkcs11/win32/pk11keygen.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "pk11keygen"=".\pk11keygen.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/bin/pkcs11/win32/pk11keygen.mak.in b/bin/pkcs11/win32/pk11keygen.mak.in deleted file mode 100644 index d00f677901..0000000000 --- a/bin/pkcs11/win32/pk11keygen.mak.in +++ /dev/null @@ -1,296 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on pk11keygen.dsp -!IF "$(CFG)" == "" -CFG=pk11keygen - @PLATFORM@ Debug -!MESSAGE No configuration specified. Defaulting to pk11keygen - @PLATFORM@ Debug. -!ENDIF - -!IF "$(CFG)" != "pk11keygen - @PLATFORM@ Release" && "$(CFG)" != "pk11keygen - @PLATFORM@ Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "pk11keygen.mak" CFG="pk11keygen - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "pk11keygen - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "pk11keygen - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -!IF "$(CFG)" == "pk11keygen - @PLATFORM@ 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)" == "pk11keygen - @PLATFORM@ Release" - -OUTDIR=.\Release -INTDIR=.\Release - -ALL : "..\..\..\Build\Release\pkcs11-keygen.exe" - - -CLEAN : - -@erase "$(INTDIR)\pkcs11-keygen.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "..\..\..\Build\Release\pkcs11-keygen.exe" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../.." /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @PK11_LIB_LOCATION@ /Fp"$(INTDIR)\pk11keygen.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\pk11keygen.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\pkcs11-keygen.pdb" @MACHINE@ /out:"../../../Build/Release/pkcs11-keygen.exe" -LINK32_OBJS= "$(INTDIR)\pkcs11-keygen.obj" - -"..\..\..\Build\Release\pkcs11-keygen.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ELSEIF "$(CFG)" == "pk11keygen - @PLATFORM@ Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -ALL : "..\..\..\Build\Debug\pkcs11-keygen.exe" "$(OUTDIR)\pk11keygen.bsc" - - -CLEAN : - -@erase "$(INTDIR)\pkcs11-keygen.obj" - -@erase "$(INTDIR)\pkcs11-keygen.sbr" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\pkcs11-keygen.pdb" - -@erase "$(OUTDIR)\pk11keygen.bsc" - -@erase "..\..\..\Build\Debug\pkcs11-keygen.exe" - -@erase "..\..\..\Build\Debug\pkcs11-keygen.ilk" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../.." /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @PK11_LIB_LOCATION@ /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\pk11keygen.bsc" -BSC32_SBRS= "$(INTDIR)\pkcs11-keygen.sbr" - -"$(OUTDIR)\pk11keygen.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\pkcs11-keygen.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/pkcs11-keygen.exe" /pdbtype:sept -LINK32_OBJS= "$(INTDIR)\pkcs11-keygen.obj" - -"..\..\..\Build\Debug\pkcs11-keygen.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ENDIF - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("pk11keygen.dep") -!INCLUDE "pk11keygen.dep" -!ELSE -!MESSAGE Warning: cannot find "pk11keygen.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "pk11keygen - @PLATFORM@ Release" || "$(CFG)" == "pk11keygen - @PLATFORM@ Debug" -SOURCE="..\pkcs11-keygen.c" - -!IF "$(CFG)" == "pk11keygen - @PLATFORM@ Release" - - -"$(INTDIR)\pkcs11-keygen.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "pk11keygen - @PLATFORM@ Debug" - - -"$(INTDIR)\pkcs11-keygen.obj" "$(INTDIR)\pkcs11-keygen.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -!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 -1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest" -<< KEEP - -$(_VC_MANIFEST_BASENAME).auto.manifest : - type <<$@ - - - -<< KEEP diff --git a/bin/pkcs11/win32/pk11list.dsp.in b/bin/pkcs11/win32/pk11list.dsp.in deleted file mode 100644 index 35e6c9cb2e..0000000000 --- a/bin/pkcs11/win32/pk11list.dsp.in +++ /dev/null @@ -1,103 +0,0 @@ -# Microsoft Developer Studio Project File - Name="pk11list" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103 - -CFG=pk11list - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "pk11list.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "pk11list.mak" CFG="pk11list - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "pk11list - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "pk11list - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "pk11list - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../.." /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @PK11_LIB_LOCATION@ @COPTY@ /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console @MACHINE@ -# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/pkcs11-list.exe" - -!ELSEIF "$(CFG)" == "pk11list - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../.." /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @PK11_LIB_LOCATION@ /FR /FD /GZ /c -# SUBTRACT CPP /X @COPTY@ -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console /debug @MACHINE@ /pdbtype:sept -# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/pkcs11-list.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "pk11list - @PLATFORM@ Release" -# Name "pk11list - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE="..\pkcs11-list.c" -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/bin/pkcs11/win32/pk11list.dsw b/bin/pkcs11/win32/pk11list.dsw deleted file mode 100644 index 352a03cd0e..0000000000 --- a/bin/pkcs11/win32/pk11list.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "pk11list"=".\pk11list.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/bin/pkcs11/win32/pk11list.mak.in b/bin/pkcs11/win32/pk11list.mak.in deleted file mode 100644 index 3cd25378a5..0000000000 --- a/bin/pkcs11/win32/pk11list.mak.in +++ /dev/null @@ -1,296 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on pk11list.dsp -!IF "$(CFG)" == "" -CFG=pk11list - @PLATFORM@ Debug -!MESSAGE No configuration specified. Defaulting to pk11list - @PLATFORM@ Debug. -!ENDIF - -!IF "$(CFG)" != "pk11list - @PLATFORM@ Release" && "$(CFG)" != "pk11list - @PLATFORM@ Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "pk11list.mak" CFG="pk11list - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "pk11list - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "pk11list - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -!IF "$(CFG)" == "pk11list - @PLATFORM@ 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)" == "pk11list - @PLATFORM@ Release" - -OUTDIR=.\Release -INTDIR=.\Release - -ALL : "..\..\..\Build\Release\pkcs11-list.exe" - - -CLEAN : - -@erase "$(INTDIR)\pkcs11-list.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "..\..\..\Build\Release\pkcs11-list.exe" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../.." /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @PK11_LIB_LOCATION@ /Fp"$(INTDIR)\pk11list.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\pk11list.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\pkcs11-list.pdb" @MACHINE@ /out:"../../../Build/Release/pkcs11-list.exe" -LINK32_OBJS= "$(INTDIR)\pkcs11-list.obj" - -"..\..\..\Build\Release\pkcs11-list.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ELSEIF "$(CFG)" == "pk11list - @PLATFORM@ Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -ALL : "..\..\..\Build\Debug\pkcs11-list.exe" "$(OUTDIR)\pk11list.bsc" - - -CLEAN : - -@erase "$(INTDIR)\pkcs11-list.obj" - -@erase "$(INTDIR)\pkcs11-list.sbr" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\pkcs11-list.pdb" - -@erase "$(OUTDIR)\pk11list.bsc" - -@erase "..\..\..\Build\Debug\pkcs11-list.exe" - -@erase "..\..\..\Build\Debug\pkcs11-list.ilk" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../.." /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @PK11_LIB_LOCATION@ /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\pk11list.bsc" -BSC32_SBRS= "$(INTDIR)\pkcs11-list.sbr" - -"$(OUTDIR)\pk11list.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\pkcs11-list.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/pkcs11-list.exe" /pdbtype:sept -LINK32_OBJS= "$(INTDIR)\pkcs11-list.obj" - -"..\..\..\Build\Debug\pkcs11-list.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ENDIF - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("pk11list.dep") -!INCLUDE "pk11list.dep" -!ELSE -!MESSAGE Warning: cannot find "pk11list.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "pk11list - @PLATFORM@ Release" || "$(CFG)" == "pk11list - @PLATFORM@ Debug" -SOURCE="..\pkcs11-list.c" - -!IF "$(CFG)" == "pk11list - @PLATFORM@ Release" - - -"$(INTDIR)\pkcs11-list.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "pk11list - @PLATFORM@ Debug" - - -"$(INTDIR)\pkcs11-list.obj" "$(INTDIR)\pkcs11-list.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -!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 -1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest" -<< KEEP - -$(_VC_MANIFEST_BASENAME).auto.manifest : - type <<$@ - - - -<< KEEP diff --git a/bin/pkcs11/win32/pk11tokens.dsp.in b/bin/pkcs11/win32/pk11tokens.dsp.in deleted file mode 100644 index 013df20ac9..0000000000 --- a/bin/pkcs11/win32/pk11tokens.dsp.in +++ /dev/null @@ -1,103 +0,0 @@ -# Microsoft Developer Studio Project File - Name="pk11tokens" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103 - -CFG=pk11tokens - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "pk11tokens.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "pk11tokens.mak" CFG="pk11tokens - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "pk11tokens - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "pk11tokens - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "pk11tokens - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../.." @LIBXML2_INC@ /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @PK11_LIB_LOCATION@ @COPTY@ /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console @MACHINE@ -# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/pkcs11-tokens.exe" - -!ELSEIF "$(CFG)" == "pk11tokens - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../.." @LIBXML2_INC@ /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @PK11_LIB_LOCATION@ /FR /FD /GZ /c -# SUBTRACT CPP /X @COPTY@ -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console /debug @MACHINE@ /pdbtype:sept -# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/pkcs11-tokens.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "pk11tokens - @PLATFORM@ Release" -# Name "pk11tokens - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE="..\pkcs11-tokens.c" -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/bin/pkcs11/win32/pk11tokens.dsw b/bin/pkcs11/win32/pk11tokens.dsw deleted file mode 100644 index 571b588d21..0000000000 --- a/bin/pkcs11/win32/pk11tokens.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "pk11tokens"=".\pk11tokens.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/bin/pkcs11/win32/pk11tokens.mak.in b/bin/pkcs11/win32/pk11tokens.mak.in deleted file mode 100644 index b7dec13ff9..0000000000 --- a/bin/pkcs11/win32/pk11tokens.mak.in +++ /dev/null @@ -1,296 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on pk11tokens.dsp -!IF "$(CFG)" == "" -CFG=pk11tokens - @PLATFORM@ Debug -!MESSAGE No configuration specified. Defaulting to pk11tokens - @PLATFORM@ Debug. -!ENDIF - -!IF "$(CFG)" != "pk11tokens - @PLATFORM@ Release" && "$(CFG)" != "pk11tokens - @PLATFORM@ Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "pk11tokens.mak" CFG="pk11tokens - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "pk11tokens - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "pk11tokens - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -!IF "$(CFG)" == "pk11tokens - @PLATFORM@ 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)" == "pk11tokens - @PLATFORM@ Release" - -OUTDIR=.\Release -INTDIR=.\Release - -ALL : "..\..\..\Build\Release\pkcs11-tokens.exe" - - -CLEAN : - -@erase "$(INTDIR)\pkcs11-tokens.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "..\..\..\Build\Release\pkcs11-tokens.exe" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../.." @LIBXML2_INC@ /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @PK11_LIB_LOCATION@ /Fp"$(INTDIR)\pk11tokens.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\pk11tokens.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\pkcs11-tokens.pdb" @MACHINE@ /out:"../../../Build/Release/pkcs11-tokens.exe" -LINK32_OBJS= "$(INTDIR)\pkcs11-tokens.obj" - -"..\..\..\Build\Release\pkcs11-tokens.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ELSEIF "$(CFG)" == "pk11tokens - @PLATFORM@ Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -ALL : "..\..\..\Build\Debug\pkcs11-tokens.exe" "$(OUTDIR)\pk11tokens.bsc" - - -CLEAN : - -@erase "$(INTDIR)\pkcs11-tokens.obj" - -@erase "$(INTDIR)\pkcs11-tokens.sbr" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\pkcs11-tokens.pdb" - -@erase "$(OUTDIR)\pk11tokens.bsc" - -@erase "..\..\..\Build\Debug\pkcs11-tokens.exe" - -@erase "..\..\..\Build\Debug\pkcs11-tokens.ilk" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../.." @LIBXML2_INC@ /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @PK11_LIB_LOCATION@ /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\pk11tokens.bsc" -BSC32_SBRS= "$(INTDIR)\pkcs11-tokens.sbr" - -"$(OUTDIR)\pk11tokens.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\pkcs11-tokens.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/pkcs11-tokens.exe" /pdbtype:sept -LINK32_OBJS= "$(INTDIR)\pkcs11-tokens.obj" - -"..\..\..\Build\Debug\pkcs11-tokens.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ENDIF - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("pk11tokens.dep") -!INCLUDE "pk11tokens.dep" -!ELSE -!MESSAGE Warning: cannot find "pk11tokens.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "pk11tokens - @PLATFORM@ Release" || "$(CFG)" == "pk11tokens - @PLATFORM@ Debug" -SOURCE="..\pkcs11-tokens.c" - -!IF "$(CFG)" == "pk11tokens - @PLATFORM@ Release" - - -"$(INTDIR)\pkcs11-tokens.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "pk11tokens - @PLATFORM@ Debug" - - -"$(INTDIR)\pkcs11-tokens.obj" "$(INTDIR)\pkcs11-tokens.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -!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 -1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest" -<< KEEP - -$(_VC_MANIFEST_BASENAME).auto.manifest : - type <<$@ - - - -<< KEEP diff --git a/bin/rndc/win32/rndc.dsp.in b/bin/rndc/win32/rndc.dsp.in deleted file mode 100644 index 5bee95a755..0000000000 --- a/bin/rndc/win32/rndc.dsp.in +++ /dev/null @@ -1,107 +0,0 @@ -# Microsoft Developer Studio Project File - Name="rndc" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103 - -CFG=rndc - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "rndc.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "rndc.mak" CFG="rndc - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "rndc - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "rndc - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "rndc - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isccc/include" /I "../../../lib/isccfg/include" /I "../../../lib/bind9/include" /I "../../../lib/dns/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console @MACHINE@ -# ADD LINK32 user32.lib advapi32.lib ws2_32.lib Release/util.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/isccc/win32/Release/libisccc.lib ../../../lib/bind9/win32/Release/libbind9.lib /nologo /subsystem:console /profile @MACHINE@ /out:"../../../Build/Release/rndc.exe" - -!ELSEIF "$(CFG)" == "rndc - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isccc/include" /I "../../../lib/isccfg/include" /I "../../../lib/bind9/include" /I "../../../lib/dns/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c -# SUBTRACT CPP /X @COPTY@ -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console /debug @MACHINE@ /pdbtype:sept -# ADD LINK32 user32.lib advapi32.lib ws2_32.lib Debug/util.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/isccc/win32/Debug/libisccc.lib ../../../lib/bind9/win32/Debug/libbind9.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/rndc.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "rndc - @PLATFORM@ Release" -# Name "rndc - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\rndc.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\util.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/bin/rndc/win32/rndc.dsw b/bin/rndc/win32/rndc.dsw deleted file mode 100644 index ceeaa8d36e..0000000000 --- a/bin/rndc/win32/rndc.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "rndc"=".\rndc.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/bin/rndc/win32/rndc.mak.in b/bin/rndc/win32/rndc.mak.in deleted file mode 100644 index 242f0bbca6..0000000000 --- a/bin/rndc/win32/rndc.mak.in +++ /dev/null @@ -1,425 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on rndc.dsp -!IF "$(CFG)" == "" -CFG=rndc - @PLATFORM@ Debug -!MESSAGE No configuration specified. Defaulting to rndc - @PLATFORM@ Debug. -!ENDIF - -!IF "$(CFG)" != "rndc - @PLATFORM@ Release" && "$(CFG)" != "rndc - @PLATFORM@ Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "rndc.mak" CFG="rndc - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "rndc - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "rndc - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "rndc - @PLATFORM@ 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)" == "rndc - @PLATFORM@ Release" - -OUTDIR=.\Release -INTDIR=.\Release - -!IF "$(RECURSE)" == "0" - -ALL : "..\..\..\Build\Release\rndc.exe" - -!ELSE - -ALL : "libbind9 - @PLATFORM@ Release" "libisccfg - @PLATFORM@ Release" "libisccc - @PLATFORM@ Release" "libisc - @PLATFORM@ Release" "..\..\..\Build\Release\rndc.exe" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"libisc - @PLATFORM@ ReleaseCLEAN" "libisccc - @PLATFORM@ ReleaseCLEAN" "libisccfg - @PLATFORM@ ReleaseCLEAN" "libbind9 - @PLATFORM@ ReleaseCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\rndc.obj" - -@erase "$(INTDIR)\util.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "..\..\..\Build\Release\rndc.exe" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isccc/include" /I "../../../lib/isccfg/include" /I "../../../lib/bind9/include" /I "../../../lib/dns/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\rndc.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\rndc.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/isccc/win32/Release/libisccc.lib ../../../lib/bind9/win32/Release/libbind9.lib /nologo /subsystem:console /profile @MACHINE@ /out:"../../../Build/Release/rndc.exe" -LINK32_OBJS= \ - "$(INTDIR)\rndc.obj" \ - "$(INTDIR)\util.obj" \ - "..\..\..\lib\isc\win32\Release\libisc.lib" \ - "..\..\..\lib\isccc\win32\Release\libisccc.lib" \ - "..\..\..\lib\isccfg\win32\Release\libisccfg.lib" \ - "..\..\..\lib\bind9\win32\Release\libbind9.lib" - -"..\..\..\Build\Release\rndc.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ELSEIF "$(CFG)" == "rndc - @PLATFORM@ Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : "..\..\..\Build\Debug\rndc.exe" "$(OUTDIR)\rndc.bsc" - -!ELSE - -ALL : "libbind9 - @PLATFORM@ Debug" "libisccfg - @PLATFORM@ Debug" "libisccc - @PLATFORM@ Debug" "libisc - @PLATFORM@ Debug" "..\..\..\Build\Debug\rndc.exe" "$(OUTDIR)\rndc.bsc" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"libisc - @PLATFORM@ DebugCLEAN" "libisccc - @PLATFORM@ DebugCLEAN" "libisccfg - @PLATFORM@ DebugCLEAN" "libbind9 - @PLATFORM@ DebugCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\rndc.obj" - -@erase "$(INTDIR)\rndc.sbr" - -@erase "$(INTDIR)\util.obj" - -@erase "$(INTDIR)\util.sbr" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\rndc.bsc" - -@erase "$(OUTDIR)\rndc.pdb" - -@erase "..\..\..\Build\Debug\rndc.exe" - -@erase "..\..\..\Build\Debug\rndc.ilk" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isccc/include" /I "../../../lib/isccfg/include" /I "../../../lib/bind9/include" /I "../../../lib/dns/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\rndc.bsc" -BSC32_SBRS= \ - "$(INTDIR)\rndc.sbr" \ - "$(INTDIR)\util.sbr" - -"$(OUTDIR)\rndc.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/isccc/win32/Debug/libisccc.lib ../../../lib/bind9/win32/Debug/libbind9.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\rndc.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/rndc.exe" /pdbtype:sept -LINK32_OBJS= \ - "$(INTDIR)\rndc.obj" \ - "$(INTDIR)\util.obj" \ - "..\..\..\lib\isc\win32\Debug\libisc.lib" \ - "..\..\..\lib\isccc\win32\Debug\libisccc.lib" \ - "..\..\..\lib\isccfg\win32\Debug\libisccfg.lib" \ - "..\..\..\lib\bind9\win32\Debug\libbind9.lib" - -"..\..\..\Build\Debug\rndc.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ENDIF - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("rndc.dep") -!INCLUDE "rndc.dep" -!ELSE -!MESSAGE Warning: cannot find "rndc.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "rndc - @PLATFORM@ Release" || "$(CFG)" == "rndc - @PLATFORM@ Debug" -SOURCE=..\rndc.c - -!IF "$(CFG)" == "rndc - @PLATFORM@ Release" - - -"$(INTDIR)\rndc.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "rndc - @PLATFORM@ Debug" - - -"$(INTDIR)\rndc.obj" "$(INTDIR)\rndc.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=..\util.c - -!IF "$(CFG)" == "rndc - @PLATFORM@ Release" - - -"$(INTDIR)\util.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "rndc - @PLATFORM@ Debug" - - -"$(INTDIR)\util.obj" "$(INTDIR)\util.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -!IF "$(CFG)" == "rndc - @PLATFORM@ Release" - -"libisc - @PLATFORM@ Release" : - cd "..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" - cd "..\..\..\bin\rndc\win32" - -"libisc - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\rndc\win32" - -!ELSEIF "$(CFG)" == "rndc - @PLATFORM@ Debug" - -"libisc - @PLATFORM@ Debug" : - cd "..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" - cd "..\..\..\bin\rndc\win32" - -"libisc - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\rndc\win32" - -!ENDIF - -!IF "$(CFG)" == "rndc - @PLATFORM@ Release" - -"libisccc - @PLATFORM@ Release" : - cd "..\..\..\lib\isccc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisccc.mak" CFG="libisccc - @PLATFORM@ Release" - cd "..\..\..\bin\rndc\win32" - -"libisccc - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\lib\isccc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisccc.mak" CFG="libisccc - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\rndc\win32" - -!ELSEIF "$(CFG)" == "rndc - @PLATFORM@ Debug" - -"libisccc - @PLATFORM@ Debug" : - cd "..\..\..\lib\isccc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisccc.mak" CFG="libisccc - @PLATFORM@ Debug" - cd "..\..\..\bin\rndc\win32" - -"libisccc - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\lib\isccc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisccc.mak" CFG="libisccc - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\rndc\win32" - -!ENDIF - -!IF "$(CFG)" == "rndc - @PLATFORM@ Release" - -"libisccfg - @PLATFORM@ Release" : - cd "..\..\..\lib\isccfg\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - @PLATFORM@ Release" - cd "..\..\..\bin\rndc\win32" - -"libisccfg - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\lib\isccfg\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\rndc\win32" - -!ELSEIF "$(CFG)" == "rndc - @PLATFORM@ Debug" - -"libisccfg - @PLATFORM@ Debug" : - cd "..\..\..\lib\isccfg\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - @PLATFORM@ Debug" - cd "..\..\..\bin\rndc\win32" - -"libisccfg - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\lib\isccfg\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\rndc\win32" - -!ENDIF - -!IF "$(CFG)" == "rndc - @PLATFORM@ Release" - -"libbind9 - @PLATFORM@ Release" : - cd "..\..\..\lib\bind9\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - @PLATFORM@ Release" - cd "..\..\..\bin\rndc\win32" - -"libbind9 - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\lib\bind9\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\rndc\win32" - -!ELSEIF "$(CFG)" == "rndc - @PLATFORM@ Debug" - -"libbind9 - @PLATFORM@ Debug" : - cd "..\..\..\lib\bind9\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - @PLATFORM@ Debug" - cd "..\..\..\bin\rndc\win32" - -"libbind9 - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\lib\bind9\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\rndc\win32" - -!ENDIF - - -!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 -1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest" -<< KEEP - -$(_VC_MANIFEST_BASENAME).auto.manifest : - type <<$@ - - - -<< KEEP diff --git a/bin/rndc/win32/rndcutil.dsp.in b/bin/rndc/win32/rndcutil.dsp.in deleted file mode 100644 index aafdd3c7ff..0000000000 --- a/bin/rndc/win32/rndcutil.dsp.in +++ /dev/null @@ -1,119 +0,0 @@ -# Microsoft Developer Studio Project File - Name="rndcutil" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Static-Link Library" 0x0104 - -CFG=rndcutil - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "rndcutil.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "rndcutil.mak" CFG="rndcutil - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "rndcutil - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Static-Link Library") -!MESSAGE "rndcutil - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Static-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "rndcutil - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" @COPTY@ /FD /c /Fdutil -# SUBTRACT CPP /X -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 -# ADD LINK32 /out:"Release/util.lib" -LIB32=lib.exe -# ADD BASE LIB32 -# ADD LIB32 /out:"Release/util.lib" - -!ELSEIF "$(CFG)" == "rndcutil - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /FR @COPTY@ /FD /GZ /c /Fdutil -# SUBTRACT CPP /X -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 -# ADD LINK32 /debug /out:"Debug/util.lib" -LIB32=lib.exe -# ADD BASE LIB32 -# ADD LIB32 /out:"Debug/util.lib" - -!ENDIF - -# Begin Target - -# Name "rndcutil - @PLATFORM@ Release" -# Name "rndcutil - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# Begin Group "Main Dns Lib" - -# PROP Default_Filter "c" -# Begin Source File - -SOURCE=..\util.c -# End Source File -# End Group -# End Target -# End Project diff --git a/bin/rndc/win32/rndcutil.dsw b/bin/rndc/win32/rndcutil.dsw deleted file mode 100644 index c6d981a417..0000000000 --- a/bin/rndc/win32/rndcutil.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "rndcutil"=".\rndcutil.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/bin/tests/.gitignore b/bin/tests/.gitignore index 95cbf67820..cb5d4521d5 100644 --- a/bin/tests/.gitignore +++ b/bin/tests/.gitignore @@ -19,7 +19,6 @@ t_resolver t_sockaddr conf.sh dlopen -lwtest keycreate keydelete gssapi_krb diff --git a/bin/tests/Makefile.in b/bin/tests/Makefile.in index e80ad0be23..02d514b136 100644 --- a/bin/tests/Makefile.in +++ b/bin/tests/Makefile.in @@ -21,13 +21,11 @@ DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@ ISCLIBS = ../../lib/isc/libisc.@A@ @ISC_OPENSSL_LIBS@ ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @ISC_OPENSSL_LIBS@ ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@ -LWRESLIBS = ../../lib/lwres/liblwres.@A@ DNSDEPLIBS = ../../lib/dns/libdns.@A@ ISCDEPLIBS = ../../lib/isc/libisc.@A@ ISCDEPNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ ISCCFGDEPLIBS = ../../lib/isccfg/libisccfg.@A@ -LWRESDEPLIBS = ../../lib/lwres/liblwres.@A@ LIBS = @LIBS@ @@ -54,8 +52,6 @@ XTARGETS = adb_test@EXEEXT@ \ db_test@EXEEXT@ \ entropy_test@EXEEXT@ \ entropy2_test@EXEEXT@ \ - gxba_test@EXEEXT@ \ - gxbn_test@EXEEXT@ \ hash_test@EXEEXT@ \ fsaccess_test@EXEEXT@ \ inter_test@EXEEXT@ \ @@ -63,8 +59,6 @@ XTARGETS = adb_test@EXEEXT@ \ lex_test@EXEEXT@ \ lfsr_test@EXEEXT@ \ log_test@EXEEXT@ \ - lwres_test@EXEEXT@ \ - lwresconf_test@EXEEXT@ \ master_test@EXEEXT@ \ mempool_test@EXEEXT@ \ name_test@EXEEXT@ \ @@ -92,8 +86,6 @@ XSRCS = adb_test.c \ db_test.c \ entropy_test.c \ entropy2_test.c \ - gxba_test.c \ - gxbn_test.c \ hash_test.c \ fsaccess_test.c \ inter_test.c \ @@ -101,8 +93,6 @@ XSRCS = adb_test.c \ lex_test.c \ lfsr_test.c \ log_test.c \ - lwres_test.c \ - lwresconf_test.c \ master_test.c \ mempool_test.c \ name_test.c \ @@ -266,22 +256,6 @@ keyboard_test@EXEEXT@: keyboard_test.@O@ ${ISCDEPLIBS} ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ keyboard_test.@O@ \ ${ISCLIBS} ${LIBS} -lwresconf_test@EXEEXT@: lwresconf_test.@O@ ${ISCDEPLIBS} ${LWRESDEPLIBS} - ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ lwresconf_test.@O@ \ - ${LWRESLIBS} ${ISCLIBS} ${LIBS} - -lwres_test@EXEEXT@: lwres_test.@O@ ${ISCDEPLIBS} ${LWRESDEPLIBS} - ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ lwres_test.@O@ \ - ${LWRESLIBS} ${ISCLIBS} ${LIBS} - -gxbn_test@EXEEXT@: gxbn_test.@O@ ${LWRESDEPLIBS} - ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ gxbn_test.@O@ \ - ${LWRESLIBS} ${ISCLIBS} ${LIBS} - -gxba_test@EXEEXT@: gxba_test.@O@ ${LWRESDEPLIBS} - ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ gxba_test.@O@ \ - ${LWRESLIBS} ${ISCLIBS} ${LIBS} - sig0_test@EXEEXT@: sig0_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS} ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ sig0_test.@O@ \ ${DNSLIBS} ${ISCLIBS} ${LIBS} diff --git a/bin/tests/atomic/win32/t_atomic.dsp.in b/bin/tests/atomic/win32/t_atomic.dsp.in deleted file mode 100644 index 85b0a1ea2c..0000000000 --- a/bin/tests/atomic/win32/t_atomic.dsp.in +++ /dev/null @@ -1,95 +0,0 @@ -# Microsoft Developer Studio Project File - Name="t_atomic" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103 - -CFG=t_atomic - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "t_atomic.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "t_atomic.mak" CFG="t_atomic - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "t_atomic - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "t_atomic - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "t_atomic - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" /I "../../../../lib/tests/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console @MACHINE@ -# ADD LINK32 @LIBXML2_LIB@ user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Release/libisc.lib ../../../../lib/dns/win32/Release/libdns.lib ../../../../lib/tests/win32/Release/libtests.lib /nologo /subsystem:console @MACHINE@ /out:"../../../../Build/Release/t_atomic.exe" - -!ELSEIF "$(CFG)" == "t_atomic - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" /I "../../../../lib/tests/include" /I "../../../../lib/bind9/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR /FD /GZ /c -# SUBTRACT CPP /X @COPTY@ -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console /debug @MACHINE@ /pdbtype:sept -# ADD LINK32 @LIBXML2_LIB@ user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Debug/libisc.lib ../../../../lib/dns/win32/Debug/libdns.lib ../../../../lib/tests/win32/Debug/libtests.lib /nologo /subsystem:console /map /debug @MACHINE@ /out:"../../../../Build/Debug/t_atomic.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "t_atomic - @PLATFORM@ Release" -# Name "t_atomic - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\t_atomic.c -# End Source File -# End Group -# End Target -# End Project diff --git a/bin/tests/atomic/win32/t_atomic.dsw b/bin/tests/atomic/win32/t_atomic.dsw deleted file mode 100644 index 132da3d3c8..0000000000 --- a/bin/tests/atomic/win32/t_atomic.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "t_atomic"=".\t_atomic.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/bin/tests/atomic/win32/t_atomic.mak.in b/bin/tests/atomic/win32/t_atomic.mak.in deleted file mode 100644 index 1f9fa64a4d..0000000000 --- a/bin/tests/atomic/win32/t_atomic.mak.in +++ /dev/null @@ -1,375 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on t_atomic.dsp -!IF "$(CFG)" == "" -CFG=t_atomic - @PLATFORM@ Debug -!MESSAGE No configuration specified. Defaulting to t_atomic - @PLATFORM@ Debug. -!ENDIF - -!IF "$(CFG)" != "t_atomic - @PLATFORM@ Release" && "$(CFG)" != "t_atomic - @PLATFORM@ Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "t_atomic.mak" CFG="t_atomic - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "t_atomic - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "t_atomic - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -CPP=cl.exe -RSC=rc.exe -LIBXML=@LIBXML2_LIB@ - -!IF "$(CFG)" == "t_atomic - @PLATFORM@ 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)" == "t_atomic - @PLATFORM@ Release" - -OUTDIR=.\Release -INTDIR=.\Release - -!IF "$(RECURSE)" == "0" - -ALL : "..\..\..\..\Build\Release\t_atomic.exe" - -!ELSE - -ALL : "libtests - @PLATFORM@ Release" "libisc - @PLATFORM@ Release" "libdns - @PLATFORM@ Release" "..\..\..\..\Build\Release\t_atomic.exe" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"libdns - @PLATFORM@ ReleaseCLEAN" "libisc - @PLATFORM@ ReleaseCLEAN" "libtests - @PLATFORM@ ReleaseCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\t_atomic.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "..\..\..\..\Build\Release\t_atomic.exe" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" /I "../../../../lib/tests/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\t_atomic.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\t_atomic.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Release/libisc.lib ../../../../lib/dns/win32/Release/libdns.lib ../../../../lib/tests/win32/Release/libtests.lib $(LIBXML) /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\t_atomic.pdb" @MACHINE@ /out:"../../../../Build/Release/t_atomic.exe" -LINK32_OBJS= \ - "$(INTDIR)\t_atomic.obj" \ - "..\..\..\..\lib\dns\win32\Release\libdns.lib" \ - "..\..\..\..\lib\isc\win32\Release\libisc.lib" \ - "..\..\..\..\lib\tests\win32\Release\libtests.lib" - -"..\..\..\..\Build\Release\t_atomic.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ELSEIF "$(CFG)" == "t_atomic - @PLATFORM@ Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : "..\..\..\..\Build\Debug\t_atomic.exe" "$(OUTDIR)\t_atomic.bsc" - -!ELSE - -ALL : "libtests - @PLATFORM@ Debug" "libisc - @PLATFORM@ Debug" "libdns - @PLATFORM@ Debug" "..\..\..\..\Build\Debug\t_atomic.exe" "$(OUTDIR)\t_atomic.bsc" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"libdns - @PLATFORM@ DebugCLEAN" "libisc - @PLATFORM@ DebugCLEAN" "libtests - @PLATFORM@ DebugCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\t_atomic.obj" - -@erase "$(INTDIR)\t_atomic.sbr" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\t_atomic.bsc" - -@erase "$(OUTDIR)\t_atomic.map" - -@erase "$(OUTDIR)\t_atomic.pdb" - -@erase "..\..\..\..\Build\Debug\t_atomic.exe" - -@erase "..\..\..\..\Build\Debug\t_atomic.ilk" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" /I "../../../../lib/tests/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\t_atomic.bsc" -BSC32_SBRS= \ - "$(INTDIR)\t_atomic.sbr" - -"$(OUTDIR)\t_atomic.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Debug/libisc.lib ../../../../lib/dns/win32/Debug/libdns.lib ../../../../lib/tests/win32/Debug/libtests.lib $(LIBXML) /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\t_atomic.pdb" /map:"$(INTDIR)\t_atomic.map" /debug @MACHINE@ /out:"../../../../Build/Debug/t_atomic.exe" /pdbtype:sept -LINK32_OBJS= \ - "$(INTDIR)\t_atomic.obj" \ - "..\..\..\..\lib\dns\win32\Debug\libdns.lib" \ - "..\..\..\..\lib\isc\win32\Debug\libisc.lib" \ - "..\..\..\..\lib\tests\win32\Debug\libtests.lib" - -"..\..\..\..\Build\Debug\t_atomic.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ENDIF - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("t_atomic.dep") -!INCLUDE "t_atomic.dep" -!ELSE -!MESSAGE Warning: cannot find "t_atomic.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "t_atomic - @PLATFORM@ Release" || "$(CFG)" == "t_atomic - @PLATFORM@ Debug" -SOURCE=..\t_atomic.c - -!IF "$(CFG)" == "t_atomic - @PLATFORM@ Release" - - -"$(INTDIR)\t_atomic.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "t_atomic - @PLATFORM@ Debug" - - -"$(INTDIR)\t_atomic.obj" "$(INTDIR)\t_atomic.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -!IF "$(CFG)" == "t_atomic - @PLATFORM@ Release" - -"libdns - @PLATFORM@ Release" : - cd "..\..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" - cd "..\..\..\bin\tests\atomic\win32" - -"libdns - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\atomic\win32" - -!ELSEIF "$(CFG)" == "t_atomic - @PLATFORM@ Debug" - -"libdns - @PLATFORM@ Debug" : - cd "..\..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" - cd "..\..\..\bin\tests\atomic\win32" - -"libdns - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\atomic\win32" - -!ENDIF - -!IF "$(CFG)" == "t_atomic - @PLATFORM@ Release" - -"libisc - @PLATFORM@ Release" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" - cd "..\..\..\bin\tests\atomic\win32" - -"libisc - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\atomic\win32" - -!ELSEIF "$(CFG)" == "t_atomic - @PLATFORM@ Debug" - -"libisc - @PLATFORM@ Debug" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" - cd "..\..\..\bin\tests\atomic\win32" - -"libisc - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\atomic\win32" - -!ENDIF - -!IF "$(CFG)" == "t_atomic - @PLATFORM@ Release" - -"libtests - @PLATFORM@ Release" : - cd "..\..\..\..\lib\tests\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Release" - cd "..\..\..\bin\tests\atomic\win32" - -"libtests - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\..\lib\tests\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\atomic\win32" - -!ELSEIF "$(CFG)" == "t_atomic - @PLATFORM@ Debug" - -"libtests - @PLATFORM@ Debug" : - cd "..\..\..\..\lib\tests\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Debug" - cd "..\..\..\bin\tests\atomic\win32" - -"libtests - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\..\lib\tests\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\atomic\win32" - -!ENDIF - - -!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 -1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest" -<< KEEP - -$(_VC_MANIFEST_BASENAME).auto.manifest : - type <<$@ - - - -<< KEEP diff --git a/bin/tests/db/win32/t_db.dsp.in b/bin/tests/db/win32/t_db.dsp.in deleted file mode 100644 index e9c079f60e..0000000000 --- a/bin/tests/db/win32/t_db.dsp.in +++ /dev/null @@ -1,95 +0,0 @@ -# Microsoft Developer Studio Project File - Name="t_db" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103 - -CFG=t_db - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "t_db.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "t_db.mak" CFG="t_db - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "t_db - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "t_db - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "t_db - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" /I "../../../../lib/isccfg/include" /I "../../../../lib/tests/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console @MACHINE@ -# ADD LINK32 @LIBXML2_LIB@ user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Release/libisc.lib ../../../../lib/dns/win32/Release/libdns.lib ../../../../lib/isccfg/win32/Release/libisccfg.lib ../../../../lib/tests/win32/Release/libtests.lib /nologo /subsystem:console @MACHINE@ /out:"../../../../Build/Release/t_db.exe" - -!ELSEIF "$(CFG)" == "t_db - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" /I "../../../../lib/isccfg/include" /I "../../../../lib/tests/include" /I "../../../../lib/bind9/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR /FD /GZ /c -# SUBTRACT CPP /X @COPTY@ -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console /debug @MACHINE@ /pdbtype:sept -# ADD LINK32 @LIBXML2_LIB@ user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Debug/libisc.lib ../../../../lib/dns/win32/Debug/libdns.lib ../../../../lib/isccfg/win32/Release/libisccfg.lib ../../../../lib/tests/win32/Debug/libtests.lib /nologo /subsystem:console /map /debug @MACHINE@ /out:"../../../../Build/Debug/t_db.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "t_db - @PLATFORM@ Release" -# Name "t_db - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\t_db.c -# End Source File -# End Group -# End Target -# End Project diff --git a/bin/tests/db/win32/t_db.dsw b/bin/tests/db/win32/t_db.dsw deleted file mode 100644 index 38d7b05679..0000000000 --- a/bin/tests/db/win32/t_db.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "t_db"=".\t_db.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/bin/tests/db/win32/t_db.mak.in b/bin/tests/db/win32/t_db.mak.in deleted file mode 100644 index b1b8379d30..0000000000 --- a/bin/tests/db/win32/t_db.mak.in +++ /dev/null @@ -1,403 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on t_db.dsp -!IF "$(CFG)" == "" -CFG=t_db - @PLATFORM@ Debug -!MESSAGE No configuration specified. Defaulting to t_db - @PLATFORM@ Debug. -!ENDIF - -!IF "$(CFG)" != "t_db - @PLATFORM@ Release" && "$(CFG)" != "t_db - @PLATFORM@ Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "t_db.mak" CFG="t_db - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "t_db - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "t_db - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -CPP=cl.exe -RSC=rc.exe -LIBXML=@LIBXML2_LIB@ - -!IF "$(CFG)" == "t_db - @PLATFORM@ 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)" == "t_db - @PLATFORM@ Release" - -OUTDIR=.\Release -INTDIR=.\Release - -!IF "$(RECURSE)" == "0" - -ALL : "..\..\..\..\Build\Release\t_db.exe" - -!ELSE - -ALL : "libtests - @PLATFORM@ Release" "libisccfg - @PLATFORM@ Release" "libisc - @PLATFORM@ Release" "libdns - @PLATFORM@ Release" "..\..\..\..\Build\Release\t_db.exe" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"libdns - @PLATFORM@ ReleaseCLEAN" "libisc - @PLATFORM@ ReleaseCLEAN" "libtests - @PLATFORM@ ReleaseCLEAN" "libisccfg - @PLATFORM@ ReleaseCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\t_db.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "..\..\..\..\Build\Release\t_db.exe" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" /I "../../../../lib/isccfg/include" /I "../../../../lib/tests/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\t_db.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\t_db.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Release/libisc.lib ../../../../lib/dns/win32/Release/libdns.lib ../../../../lib/isccfg/win32/Release/libisccfg.lib ../../../../lib/tests/win32/Release/libtests.lib $(LIBXML) /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\t_db.pdb" @MACHINE@ /out:"../../../../Build/Release/t_db.exe" -LINK32_OBJS= \ - "$(INTDIR)\t_db.obj" \ - "..\..\..\..\lib\dns\win32\Release\libdns.lib" \ - "..\..\..\..\lib\isc\win32\Release\libisc.lib" \ - "..\..\..\..\lib\isccfg\win32\Release\libisccfg.lib" \ - "..\..\..\..\lib\tests\win32\Release\libtests.lib" - -"..\..\..\..\Build\Release\t_db.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ELSEIF "$(CFG)" == "t_db - @PLATFORM@ Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : "..\..\..\..\Build\Debug\t_db.exe" "$(OUTDIR)\t_db.bsc" - -!ELSE - -ALL : "libtests - @PLATFORM@ Debug" "libisccfg - @PLATFORM@ Debug" "libisc - @PLATFORM@ Debug" "libdns - @PLATFORM@ Debug" "..\..\..\..\Build\Debug\t_db.exe" "$(OUTDIR)\t_db.bsc" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"libdns - @PLATFORM@ DebugCLEAN" "libisc - @PLATFORM@ DebugCLEAN" "libtests - @PLATFORM@ DebugCLEAN" "libisccfg - @PLATFORM@ DebugCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\t_db.obj" - -@erase "$(INTDIR)\t_db.sbr" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\t_db.bsc" - -@erase "$(OUTDIR)\t_db.map" - -@erase "$(OUTDIR)\t_db.pdb" - -@erase "..\..\..\..\Build\Debug\t_db.exe" - -@erase "..\..\..\..\Build\Debug\t_db.ilk" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" /I "../../../../lib/isccfg/include" /I "../../../../lib/tests/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\t_db.bsc" -BSC32_SBRS= \ - "$(INTDIR)\t_db.sbr" - -"$(OUTDIR)\t_db.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Debug/libisc.lib ../../../../lib/dns/win32/Debug/libdns.lib ../../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../../lib/tests/win32/Debug/libtests.lib $(LIBXML) /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\t_db.pdb" /map:"$(INTDIR)\t_db.map" /debug @MACHINE@ /out:"../../../../Build/Debug/t_db.exe" /pdbtype:sept -LINK32_OBJS= \ - "$(INTDIR)\t_db.obj" \ - "..\..\..\..\lib\dns\win32\Debug\libdns.lib" \ - "..\..\..\..\lib\isc\win32\Debug\libisc.lib" \ - "..\..\..\..\lib\isccfg\win32\Debug\libisccfg.lib" \ - "..\..\..\..\lib\tests\win32\Debug\libtests.lib" - -"..\..\..\..\Build\Debug\t_db.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ENDIF - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("t_db.dep") -!INCLUDE "t_db.dep" -!ELSE -!MESSAGE Warning: cannot find "t_db.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "t_db - @PLATFORM@ Release" || "$(CFG)" == "t_db - @PLATFORM@ Debug" -SOURCE=..\t_db.c - -!IF "$(CFG)" == "t_db - @PLATFORM@ Release" - - -"$(INTDIR)\t_db.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "t_db - @PLATFORM@ Debug" - - -"$(INTDIR)\t_db.obj" "$(INTDIR)\t_db.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -!IF "$(CFG)" == "t_db - @PLATFORM@ Release" - -"libdns - @PLATFORM@ Release" : - cd "..\..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" - cd "..\..\..\bin\tests\db\win32" - -"libdns - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\db\win32" - -!ELSEIF "$(CFG)" == "t_db - @PLATFORM@ Debug" - -"libdns - @PLATFORM@ Debug" : - cd "..\..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" - cd "..\..\..\bin\tests\db\win32" - -"libdns - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\db\win32" - -!ENDIF - -!IF "$(CFG)" == "t_db - @PLATFORM@ Release" - -"libisc - @PLATFORM@ Release" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" - cd "..\..\..\bin\tests\db\win32" - -"libisc - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\db\win32" - -!ELSEIF "$(CFG)" == "t_db - @PLATFORM@ Debug" - -"libisc - @PLATFORM@ Debug" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" - cd "..\..\..\bin\tests\db\win32" - -"libisc - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\db\win32" - -!ENDIF - -!IF "$(CFG)" == "t_db - @PLATFORM@ Release" - -"libisccfg - @PLATFORM@ Release" : - cd "..\..\..\..\lib\isccfg\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - @PLATFORM@ Release" - cd "..\..\..\bin\tests\db\win32" - -"libisccfg - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\..\lib\isccfg\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\db\win32" - -!ELSEIF "$(CFG)" == "t_db - @PLATFORM@ Debug" - -"libisccfg - @PLATFORM@ Debug" : - cd "..\..\..\..\lib\isccfg\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - @PLATFORM@ Debug" - cd "..\..\..\bin\tests\db\win32" - -"libisccfg - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\..\lib\isccfg\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\db\win32" - -!ENDIF - -!IF "$(CFG)" == "t_db - @PLATFORM@ Release" - -"libtests - @PLATFORM@ Release" : - cd "..\..\..\..\lib\tests\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Release" - cd "..\..\..\bin\tests\db\win32" - -"libtests - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\..\lib\tests\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\db\win32" - -!ELSEIF "$(CFG)" == "t_db - @PLATFORM@ Debug" - -"libtests - @PLATFORM@ Debug" : - cd "..\..\..\..\lib\tests\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Debug" - cd "..\..\..\bin\tests\db\win32" - -"libtests - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\..\lib\tests\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\db\win32" - -!ENDIF - - -!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 -1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest" -<< KEEP - -$(_VC_MANIFEST_BASENAME).auto.manifest : - type <<$@ - - - -<< KEEP diff --git a/bin/tests/dst/win32/t_dst.dsp.in b/bin/tests/dst/win32/t_dst.dsp.in deleted file mode 100644 index da0596c6d3..0000000000 --- a/bin/tests/dst/win32/t_dst.dsp.in +++ /dev/null @@ -1,95 +0,0 @@ -# Microsoft Developer Studio Project File - Name="t_dst" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103 - -CFG=t_dst - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "t_dst.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "t_dst.mak" CFG="t_dst - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "t_dst - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "t_dst - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "t_dst - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" /I "../../../../lib/tests/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console @MACHINE@ -# ADD LINK32 @LIBXML2_LIB@ user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Release/libisc.lib ../../../../lib/dns/win32/Release/libdns.lib ../../../../lib/tests/win32/Release/libtests.lib /nologo /subsystem:console @MACHINE@ /out:"../../../../Build/Release/t_dst.exe" - -!ELSEIF "$(CFG)" == "t_dst - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" /I "../../../../lib/tests/include" /I "../../../../lib/bind9/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR /FD /GZ /c -# SUBTRACT CPP /X @COPTY@ -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console /debug @MACHINE@ /pdbtype:sept -# ADD LINK32 @LIBXML2_LIB@ user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Debug/libisc.lib ../../../../lib/dns/win32/Debug/libdns.lib ../../../../lib/tests/win32/Debug/libtests.lib /nologo /subsystem:console /map /debug @MACHINE@ /out:"../../../../Build/Debug/t_dst.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "t_dst - @PLATFORM@ Release" -# Name "t_dst - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\t_dst.c -# End Source File -# End Group -# End Target -# End Project diff --git a/bin/tests/dst/win32/t_dst.dsw b/bin/tests/dst/win32/t_dst.dsw deleted file mode 100644 index 87a4b8f187..0000000000 --- a/bin/tests/dst/win32/t_dst.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "t_dst"=".\t_dst.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/bin/tests/dst/win32/t_dst.mak.in b/bin/tests/dst/win32/t_dst.mak.in deleted file mode 100644 index b8141c08d7..0000000000 --- a/bin/tests/dst/win32/t_dst.mak.in +++ /dev/null @@ -1,375 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on t_dst.dsp -!IF "$(CFG)" == "" -CFG=t_dst - @PLATFORM@ Debug -!MESSAGE No configuration specified. Defaulting to t_dst - @PLATFORM@ Debug. -!ENDIF - -!IF "$(CFG)" != "t_dst - @PLATFORM@ Release" && "$(CFG)" != "t_dst - @PLATFORM@ Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "t_dst.mak" CFG="t_dst - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "t_dst - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "t_dst - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -CPP=cl.exe -RSC=rc.exe -LIBXML=@LIBXML2_LIB@ - -!IF "$(CFG)" == "t_dst - @PLATFORM@ 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)" == "t_dst - @PLATFORM@ Release" - -OUTDIR=.\Release -INTDIR=.\Release - -!IF "$(RECURSE)" == "0" - -ALL : "..\..\..\..\Build\Release\t_dst.exe" - -!ELSE - -ALL : "libtests - @PLATFORM@ Release" "libisc - @PLATFORM@ Release" "libdns - @PLATFORM@ Release" "..\..\..\..\Build\Release\t_dst.exe" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"libdns - @PLATFORM@ ReleaseCLEAN" "libisc - @PLATFORM@ ReleaseCLEAN" "libtests - @PLATFORM@ ReleaseCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\t_dst.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "..\..\..\..\Build\Release\t_dst.exe" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" /I "../../../../lib/tests/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\t_dst.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\t_dst.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Release/libisc.lib ../../../../lib/dns/win32/Release/libdns.lib ../../../../lib/tests/win32/Release/libtests.lib $(LIBXML) /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\t_dst.pdb" @MACHINE@ /out:"../../../../Build/Release/t_dst.exe" -LINK32_OBJS= \ - "$(INTDIR)\t_dst.obj" \ - "..\..\..\..\lib\dns\win32\Release\libdns.lib" \ - "..\..\..\..\lib\isc\win32\Release\libisc.lib" \ - "..\..\..\..\lib\tests\win32\Release\libtests.lib" - -"..\..\..\..\Build\Release\t_dst.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ELSEIF "$(CFG)" == "t_dst - @PLATFORM@ Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : "..\..\..\..\Build\Debug\t_dst.exe" "$(OUTDIR)\t_dst.bsc" - -!ELSE - -ALL : "libtests - @PLATFORM@ Debug" "libisc - @PLATFORM@ Debug" "libdns - @PLATFORM@ Debug" "..\..\..\..\Build\Debug\t_dst.exe" "$(OUTDIR)\t_dst.bsc" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"libdns - @PLATFORM@ DebugCLEAN" "libisc - @PLATFORM@ DebugCLEAN" "libtests - @PLATFORM@ DebugCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\t_dst.obj" - -@erase "$(INTDIR)\t_dst.sbr" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\t_dst.bsc" - -@erase "$(OUTDIR)\t_dst.map" - -@erase "$(OUTDIR)\t_dst.pdb" - -@erase "..\..\..\..\Build\Debug\t_dst.exe" - -@erase "..\..\..\..\Build\Debug\t_dst.ilk" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" /I "../../../../lib/tests/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\t_dst.bsc" -BSC32_SBRS= \ - "$(INTDIR)\t_dst.sbr" - -"$(OUTDIR)\t_dst.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Debug/libisc.lib ../../../../lib/dns/win32/Debug/libdns.lib ../../../../lib/tests/win32/Debug/libtests.lib $(LIBXML) /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\t_dst.pdb" /map:"$(INTDIR)\t_dst.map" /debug @MACHINE@ /out:"../../../../Build/Debug/t_dst.exe" /pdbtype:sept -LINK32_OBJS= \ - "$(INTDIR)\t_dst.obj" \ - "..\..\..\..\lib\dns\win32\Debug\libdns.lib" \ - "..\..\..\..\lib\isc\win32\Debug\libisc.lib" \ - "..\..\..\..\lib\tests\win32\Debug\libtests.lib" - -"..\..\..\..\Build\Debug\t_dst.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ENDIF - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("t_dst.dep") -!INCLUDE "t_dst.dep" -!ELSE -!MESSAGE Warning: cannot find "t_dst.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "t_dst - @PLATFORM@ Release" || "$(CFG)" == "t_dst - @PLATFORM@ Debug" -SOURCE=..\t_dst.c - -!IF "$(CFG)" == "t_dst - @PLATFORM@ Release" - - -"$(INTDIR)\t_dst.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "t_dst - @PLATFORM@ Debug" - - -"$(INTDIR)\t_dst.obj" "$(INTDIR)\t_dst.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -!IF "$(CFG)" == "t_dst - @PLATFORM@ Release" - -"libdns - @PLATFORM@ Release" : - cd "..\..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" - cd "..\..\..\bin\tests\dst\win32" - -"libdns - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\dst\win32" - -!ELSEIF "$(CFG)" == "t_dst - @PLATFORM@ Debug" - -"libdns - @PLATFORM@ Debug" : - cd "..\..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" - cd "..\..\..\bin\tests\dst\win32" - -"libdns - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\dst\win32" - -!ENDIF - -!IF "$(CFG)" == "t_dst - @PLATFORM@ Release" - -"libisc - @PLATFORM@ Release" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" - cd "..\..\..\bin\tests\dst\win32" - -"libisc - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\dst\win32" - -!ELSEIF "$(CFG)" == "t_dst - @PLATFORM@ Debug" - -"libisc - @PLATFORM@ Debug" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" - cd "..\..\..\bin\tests\dst\win32" - -"libisc - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\dst\win32" - -!ENDIF - -!IF "$(CFG)" == "t_dst - @PLATFORM@ Release" - -"libtests - @PLATFORM@ Release" : - cd "..\..\..\..\lib\tests\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Release" - cd "..\..\..\bin\tests\dst\win32" - -"libtests - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\..\lib\tests\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\dst\win32" - -!ELSEIF "$(CFG)" == "t_dst - @PLATFORM@ Debug" - -"libtests - @PLATFORM@ Debug" : - cd "..\..\..\..\lib\tests\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Debug" - cd "..\..\..\bin\tests\dst\win32" - -"libtests - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\..\lib\tests\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\t_dst\win32" - -!ENDIF - - -!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 -1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest" -<< KEEP - -$(_VC_MANIFEST_BASENAME).auto.manifest : - type <<$@ - - - -<< KEEP diff --git a/bin/tests/gxba_test.c b/bin/tests/gxba_test.c deleted file mode 100644 index 32416146a0..0000000000 --- a/bin/tests/gxba_test.c +++ /dev/null @@ -1,90 +0,0 @@ -/* - * Copyright (C) 2000, 2001, 2004, 2005, 2007, 2015, 2016 Internet Systems Consortium, Inc. ("ISC") - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -/* $Id: gxba_test.c,v 1.13 2007/06/19 23:46:59 tbox Exp $ */ - -/*! \file */ -#include - -#include - -#include -#include - -#include - -static void -print_he(struct hostent *he, int error, const char *fun, const char *name) { - char **c; - int i; - - if (he != NULL) { - printf("%s(%s):\n", fun, name); - printf("\tname = %s\n", he->h_name); - printf("\taddrtype = %d\n", he->h_addrtype); - printf("\tlength = %d\n", he->h_length); - c = he->h_aliases; - i = 1; - while (*c != NULL) { - printf("\talias[%d] = %s\n", i, *c); - i++; - c++; - } - c = he->h_addr_list; - i = 1; - while (*c != NULL) { - char buf[128]; - inet_ntop(he->h_addrtype, *c, buf, sizeof(buf)); - printf("\taddress[%d] = %s\n", i, buf); - c++; - i++; - } - } else { - printf("%s(%s): error = %d (%s)\n", fun, name, error, - hstrerror(error)); - } -} - -int -main(int argc, char **argv) { - struct hostent *he; - int error; - struct in_addr in_addr; - struct in6_addr in6_addr; - void *addr; - int af; - size_t len; - - (void)argc; - - while (argv[1] != NULL) { - if (inet_pton(AF_INET, argv[1], &in_addr) == 1) { - af = AF_INET; - addr = &in_addr; - len = sizeof(in_addr); - } else if (inet_pton(AF_INET6, argv[1], &in6_addr) == 1) { - af = AF_INET6; - addr = &in6_addr; - len = sizeof(in6_addr); - } else { - printf("unable to convert \"%s\" to an address\n", - argv[1]); - argv++; - continue; - } - he = gethostbyaddr(addr, len, af); - print_he(he, h_errno, "gethostbyaddr", argv[1]); - - he = getipnodebyaddr(addr, len, af, &error); - print_he(he, error, "getipnodebyaddr", argv[1]); - if (he != NULL) - freehostent(he); - argv++; - } - return (0); -} diff --git a/bin/tests/gxbn_test.c b/bin/tests/gxbn_test.c deleted file mode 100644 index d19a97e7d7..0000000000 --- a/bin/tests/gxbn_test.c +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright (C) 2000, 2001, 2004, 2005, 2007, 2015, 2016 Internet Systems Consortium, Inc. ("ISC") - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -/* $Id: gxbn_test.c,v 1.16 2007/06/19 23:46:59 tbox Exp $ */ - -/*! \file */ -#include - -#include - -#include -#include - -#include - -static void -print_he(struct hostent *he, int error, const char *fun, const char *name) { - char **c; - int i; - - if (he != NULL) { - printf("%s(%s):\n", fun, name); - printf("\tname = %s\n", he->h_name); - printf("\taddrtype = %d\n", he->h_addrtype); - printf("\tlength = %d\n", he->h_length); - c = he->h_aliases; - i = 1; - while (*c != NULL) { - printf("\talias[%d] = %s\n", i, *c); - i++; - c++; - } - c = he->h_addr_list; - i = 1; - while (*c != NULL) { - char buf[128]; - inet_ntop(he->h_addrtype, *c, buf, sizeof(buf)); - printf("\taddress[%d] = %s\n", i, buf); - c++; - i++; - } - } else { - printf("%s(%s): error = %d (%s)\n", fun, name, error, - hstrerror(error)); - } -} - -int -main(int argc, char **argv) { - struct hostent *he; - int error; - - (void)argc; - - while (argv[1] != NULL) { - he = gethostbyname(argv[1]); - print_he(he, h_errno, "gethostbyname", argv[1]); - - he = getipnodebyname(argv[1], AF_INET6, AI_DEFAULT|AI_ALL, - &error); - print_he(he, error, "getipnodebyname", argv[1]); - if (he != NULL) - freehostent(he); - - he = getipnodebyname(argv[1], AF_INET6, AI_DEFAULT, - &error); - print_he(he, error, "getipnodebyname", argv[1]); - if (he != NULL) - freehostent(he); - argv++; - } - return (0); -} diff --git a/bin/tests/hashes/win32/t_hashes.dsp.in b/bin/tests/hashes/win32/t_hashes.dsp.in deleted file mode 100644 index f2b063f537..0000000000 --- a/bin/tests/hashes/win32/t_hashes.dsp.in +++ /dev/null @@ -1,95 +0,0 @@ -# Microsoft Developer Studio Project File - Name="t_hashes" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103 - -CFG=t_hashes - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "t_hashes.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "t_hashes.mak" CFG="t_hashes - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "t_hashes - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "t_hashes - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "t_hashes - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/tests/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console @MACHINE@ -# ADD LINK32 @LIBXML2_LIB@ user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Release/libisc.lib ../../../../lib/tests/win32/Release/libtests.lib /nologo /subsystem:console @MACHINE@ /out:"../../../../Build/Release/t_hashes.exe" - -!ELSEIF "$(CFG)" == "t_hashes - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/tests/include" /I "../../../../lib/bind9/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR /FD /GZ /c -# SUBTRACT CPP /X @COPTY@ -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console /debug @MACHINE@ /pdbtype:sept -# ADD LINK32 @LIBXML2_LIB@ user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Debug/libisc.lib ../../../../lib/tests/win32/Debug/libtests.lib /nologo /subsystem:console /map /debug @MACHINE@ /out:"../../../../Build/Debug/t_hashes.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "t_hashes - @PLATFORM@ Release" -# Name "t_hashes - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\t_hashes.c -# End Source File -# End Group -# End Target -# End Project diff --git a/bin/tests/hashes/win32/t_hashes.dsw b/bin/tests/hashes/win32/t_hashes.dsw deleted file mode 100644 index 95347f1a4e..0000000000 --- a/bin/tests/hashes/win32/t_hashes.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "t_hashes"=".\t_hashes.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/bin/tests/hashes/win32/t_hashes.mak.in b/bin/tests/hashes/win32/t_hashes.mak.in deleted file mode 100644 index 48007e9edf..0000000000 --- a/bin/tests/hashes/win32/t_hashes.mak.in +++ /dev/null @@ -1,347 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on t_hashes.dsp -!IF "$(CFG)" == "" -CFG=t_hashes - @PLATFORM@ Debug -!MESSAGE No configuration specified. Defaulting to t_hashes - @PLATFORM@ Debug. -!ENDIF - -!IF "$(CFG)" != "t_hashes - @PLATFORM@ Release" && "$(CFG)" != "t_hashes - @PLATFORM@ Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "t_hashes.mak" CFG="t_hashes - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "t_hashes - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "t_hashes - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -CPP=cl.exe -RSC=rc.exe -LIBXML=@LIBXML2_LIB@ - -!IF "$(CFG)" == "t_hashes - @PLATFORM@ 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)" == "t_hashes - @PLATFORM@ Release" - -OUTDIR=.\Release -INTDIR=.\Release - -!IF "$(RECURSE)" == "0" - -ALL : "..\..\..\..\Build\Release\t_hashes.exe" - -!ELSE - -ALL : "libtests - @PLATFORM@ Release" "libisc - @PLATFORM@ Release" "..\..\..\..\Build\Release\t_hashes.exe" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"libisc - @PLATFORM@ ReleaseCLEAN" "libtests - @PLATFORM@ ReleaseCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\t_hashes.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "..\..\..\..\Build\Release\t_hashes.exe" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/tests/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\t_hashes.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\t_hashes.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Release/libisc.lib ../../../../lib/tests/win32/Release/libtests.lib $(LIBXML) /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\t_hashes.pdb" @MACHINE@ /out:"../../../../Build/Release/t_hashes.exe" -LINK32_OBJS= \ - "$(INTDIR)\t_hashes.obj" \ - "..\..\..\..\lib\isc\win32\Release\libisc.lib" \ - "..\..\..\..\lib\tests\win32\Release\libtests.lib" - -"..\..\..\..\Build\Release\t_hashes.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ELSEIF "$(CFG)" == "t_hashes - @PLATFORM@ Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : "..\..\..\..\Build\Debug\t_hashes.exe" "$(OUTDIR)\t_hashes.bsc" - -!ELSE - -ALL : "libtests - @PLATFORM@ Debug" "libisc - @PLATFORM@ Debug" "..\..\..\..\Build\Debug\t_hashes.exe" "$(OUTDIR)\t_hashes.bsc" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"libisc - @PLATFORM@ DebugCLEAN" "libtests - @PLATFORM@ DebugCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\t_hashes.obj" - -@erase "$(INTDIR)\t_hashes.sbr" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\t_hashes.bsc" - -@erase "$(OUTDIR)\t_hashes.map" - -@erase "$(OUTDIR)\t_hashes.pdb" - -@erase "..\..\..\..\Build\Debug\t_hashes.exe" - -@erase "..\..\..\..\Build\Debug\t_hashes.ilk" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/tests/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\t_hashes.bsc" -BSC32_SBRS= \ - "$(INTDIR)\t_hashes.sbr" - -"$(OUTDIR)\t_hashes.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Debug/libisc.lib ../../../../lib/tests/win32/Debug/libtests.lib $(LIBXML) /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\t_hashes.pdb" /map:"$(INTDIR)\t_hashes.map" /debug @MACHINE@ /out:"../../../../Build/Debug/t_hashes.exe" /pdbtype:sept -LINK32_OBJS= \ - "$(INTDIR)\t_hashes.obj" \ - "..\..\..\..\lib\isc\win32\Debug\libisc.lib" \ - "..\..\..\..\lib\tests\win32\Debug\libtests.lib" - -"..\..\..\..\Build\Debug\t_hashes.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ENDIF - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("t_hashes.dep") -!INCLUDE "t_hashes.dep" -!ELSE -!MESSAGE Warning: cannot find "t_hashes.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "t_hashes - @PLATFORM@ Release" || "$(CFG)" == "t_hashes - @PLATFORM@ Debug" -SOURCE=..\t_hashes.c - -!IF "$(CFG)" == "t_hashes - @PLATFORM@ Release" - - -"$(INTDIR)\t_hashes.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "t_hashes - @PLATFORM@ Debug" - - -"$(INTDIR)\t_hashes.obj" "$(INTDIR)\t_hashes.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -!IF "$(CFG)" == "t_hashes - @PLATFORM@ Release" - -"libisc - @PLATFORM@ Release" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" - cd "..\..\..\bin\tests\hashes\win32" - -"libisc - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\hashes\win32" - -!ELSEIF "$(CFG)" == "t_hashes - @PLATFORM@ Debug" - -"libisc - @PLATFORM@ Debug" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" - cd "..\..\..\bin\tests\hashes\win32" - -"libisc - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\hashes\win32" - -!ENDIF - -!IF "$(CFG)" == "t_hashes - @PLATFORM@ Release" - -"libtests - @PLATFORM@ Release" : - cd "..\..\..\..\lib\tests\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Release" - cd "..\..\..\bin\tests\hashes\win32" - -"libtests - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\..\lib\tests\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\hashes\win32" - -!ELSEIF "$(CFG)" == "t_hashes - @PLATFORM@ Debug" - -"libtests - @PLATFORM@ Debug" : - cd "..\..\..\..\lib\tests\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Debug" - cd "..\..\..\bin\tests\hashes\win32" - -"libtests - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\..\lib\tests\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\hashes\win32" - -!ENDIF - - -!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 -1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest" -<< KEEP - -$(_VC_MANIFEST_BASENAME).auto.manifest : - type <<$@ - - - -<< KEEP diff --git a/bin/tests/lwres_test.c b/bin/tests/lwres_test.c deleted file mode 100644 index e904398793..0000000000 --- a/bin/tests/lwres_test.c +++ /dev/null @@ -1,296 +0,0 @@ -/* - * Copyright (C) 2000, 2001, 2004, 2005, 2007, 2015, 2016 Internet Systems Consortium, Inc. ("ISC") - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -/* $Id: lwres_test.c,v 1.31 2007/06/19 23:46:59 tbox Exp $ */ - -#include - -#include -#include -#include - -#include -#include -#include -#include - -#include - -#define USE_ISC_MEM - -static inline void -CHECK(int val, const char *msg) { - if (val != 0) { - fprintf(stderr, "%s returned %d\n", msg, val); - exit(1); - } -} - -static void -hexdump(const char *msg, void *base, size_t len) { - unsigned char *p; - unsigned int cnt; - - p = base; - cnt = 0; - - printf("*** %s (%lu bytes @ %p)\n", msg, (unsigned long)len, base); - - while (cnt < len) { - if (cnt % 16 == 0) - printf("%p: ", p); - else if (cnt % 8 == 0) - printf(" |"); - printf(" %02x", *p++); - cnt++; - - if (cnt % 16 == 0) - printf("\n"); - } - - if (cnt % 16 != 0) - printf("\n"); -} - -static const char *TESTSTRING = "This is a test. This is only a test. !!!"; -static lwres_context_t *ctx; - -static void -test_noop(void) { - int ret; - lwres_lwpacket_t pkt, pkt2; - lwres_nooprequest_t nooprequest, *nooprequest2; - lwres_noopresponse_t noopresponse, *noopresponse2; - lwres_buffer_t b; - - pkt.pktflags = 0; - pkt.serial = 0x11223344; - pkt.recvlength = 0x55667788; - pkt.result = 0; - - nooprequest.datalength = strlen(TESTSTRING); - /* XXXDCL maybe "nooprequest.data" should be const. */ - DE_CONST(TESTSTRING, nooprequest.data); - ret = lwres_nooprequest_render(ctx, &nooprequest, &pkt, &b); - CHECK(ret, "lwres_nooprequest_render"); - - hexdump("rendered noop request", b.base, b.used); - - /* - * Now, parse it into a new structure. - */ - lwres_buffer_first(&b); - ret = lwres_lwpacket_parseheader(&b, &pkt2); - CHECK(ret, "lwres_lwpacket_parseheader"); - - hexdump("parsed pkt2", &pkt2, sizeof(pkt2)); - - nooprequest2 = NULL; - ret = lwres_nooprequest_parse(ctx, &b, &pkt2, &nooprequest2); - CHECK(ret, "lwres_nooprequest_parse"); - - assert(nooprequest.datalength == nooprequest2->datalength); - assert(memcmp(nooprequest.data, nooprequest2->data, - nooprequest.datalength) == 0); - - lwres_nooprequest_free(ctx, &nooprequest2); - - lwres_context_freemem(ctx, b.base, b.length); - b.base = NULL; - b.length = 0; - - pkt.pktflags = 0; - pkt.serial = 0x11223344; - pkt.recvlength = 0x55667788; - pkt.result = 0xdeadbeef; - - noopresponse.datalength = strlen(TESTSTRING); - /* XXXDCL maybe "noopresponse.data" should be const. */ - DE_CONST(TESTSTRING, noopresponse.data); - ret = lwres_noopresponse_render(ctx, &noopresponse, &pkt, &b); - CHECK(ret, "lwres_noopresponse_render"); - - hexdump("rendered noop response", b.base, b.used); - - /* - * Now, parse it into a new structure. - */ - lwres_buffer_first(&b); - ret = lwres_lwpacket_parseheader(&b, &pkt2); - CHECK(ret, "lwres_lwpacket_parseheader"); - - hexdump("parsed pkt2", &pkt2, sizeof(pkt2)); - - noopresponse2 = NULL; - ret = lwres_noopresponse_parse(ctx, &b, &pkt2, &noopresponse2); - CHECK(ret, "lwres_noopresponse_parse"); - - assert(noopresponse.datalength == noopresponse2->datalength); - assert(memcmp(noopresponse.data, noopresponse2->data, - noopresponse.datalength) == 0); - - lwres_noopresponse_free(ctx, &noopresponse2); - - lwres_context_freemem(ctx, b.base, b.length); - b.base = NULL; - b.length = 0; -} - -static void -test_gabn(const char *target) { - lwres_gabnresponse_t *res; - lwres_addr_t *addr; - int ret; - unsigned int i; - char outbuf[64]; - - res = NULL; - ret = lwres_getaddrsbyname(ctx, target, - LWRES_ADDRTYPE_V4 | LWRES_ADDRTYPE_V6, - &res); - printf("gabn %s ret == %d\n", target, ret); - if (ret != 0) { - printf("FAILURE!\n"); - if (res != NULL) - lwres_gabnresponse_free(ctx, &res); - return; - } - - printf("Returned real name: (%u, %s)\n", - res->realnamelen, res->realname); - printf("%u aliases:\n", res->naliases); - for (i = 0; i < res->naliases; i++) - printf("\t(%u, %s)\n", res->aliaslen[i], res->aliases[i]); - printf("%u addresses:\n", res->naddrs); - addr = LWRES_LIST_HEAD(res->addrs); - for (i = 0; i < res->naddrs; i++) { - INSIST(addr != NULL); - - if (addr->family == LWRES_ADDRTYPE_V4) - (void)inet_ntop(AF_INET, addr->address, - outbuf, sizeof(outbuf)); - else - (void)inet_ntop(AF_INET6, addr->address, - outbuf, sizeof(outbuf)); - printf("\tAddr len %u family %08x %s\n", - addr->length, addr->family, outbuf); - addr = LWRES_LIST_NEXT(addr, link); - } - - lwres_gabnresponse_free(ctx, &res); -} - -static void -test_gnba(const char *target, lwres_uint32_t af) { - lwres_gnbaresponse_t *res; - int ret; - unsigned int i; - unsigned char addrbuf[16]; - unsigned int len; - - if (af == LWRES_ADDRTYPE_V4) { - len = 4; - ret = inet_pton(AF_INET, target, addrbuf); - assert(ret == 1); - } else { - len = 16; - ret = inet_pton(AF_INET6, target, addrbuf); - assert(ret == 1); - } - - res = NULL; - ret = lwres_getnamebyaddr(ctx, af, len, addrbuf, &res); - printf("gnba %s ret == %d\n", target, ret); - assert(ret == 0); - assert(res != NULL); - - printf("Returned real name: (%u, %s)\n", - res->realnamelen, res->realname); - printf("%u aliases:\n", res->naliases); - for (i = 0; i < res->naliases; i++) - printf("\t(%u, %s)\n", res->aliaslen[i], res->aliases[i]); - - lwres_gnbaresponse_free(ctx, &res); -} - -#ifdef USE_ISC_MEM -/* - * Wrappers around our memory management stuff, for the lwres functions. - */ -static void * -mem_alloc(void *arg, size_t size) { - return (isc_mem_get(arg, size)); -} - -static void -mem_free(void *arg, void *mem, size_t size) { - isc_mem_put(arg, mem, size); -} -#endif - -int -main(int argc, char *argv[]) { - int ret; -#ifdef USE_ISC_MEM - isc_mem_t *mem; - isc_result_t result; -#endif - - (void)argc; - (void)argv; - -#ifdef USE_ISC_MEM - mem = NULL; - result = isc_mem_create(0, 0, &mem); - INSIST(result == ISC_R_SUCCESS); -#endif - - ctx = NULL; -#ifdef USE_ISC_MEM - ret = lwres_context_create(&ctx, mem, mem_alloc, mem_free, 0); -#else - ret = lwres_context_create(&ctx, NULL, NULL, NULL, 0); -#endif - - CHECK(ret, "lwres_context_create"); - - ret = lwres_conf_parse(ctx, "/etc/resolv.conf"); - CHECK(ret, "lwres_conf_parse"); - - lwres_conf_print(ctx, stdout); - - test_noop(); - - /* - * The following comments about tests all assume your search path is - * nominum.com isc.org flame.org - * and ndots is the default of 1. - */ - test_gabn("alias-05.test"); /* exact, then search. */ - test_gabn("f.root-servers.net."); - test_gabn("poofball.flame.org."); - test_gabn("foo.ip6.int."); - test_gabn("notthereatall.flame.org"); /* exact, then search (!found)*/ - test_gabn("shell"); /* search (found in nominum.com), then exact */ - test_gabn("kechara"); /* search (found in flame.org), then exact */ - test_gabn("lkasdjlaksjdlkasjdlkasjdlkasjd"); /* search, exact(!found)*/ - - test_gnba("198.133.199.1", LWRES_ADDRTYPE_V4); - test_gnba("204.152.184.79", LWRES_ADDRTYPE_V4); - test_gnba("3ffe:8050:201:1860:42::1", LWRES_ADDRTYPE_V6); - - lwres_conf_clear(ctx); - lwres_context_destroy(&ctx); - -#ifdef USE_ISC_MEM - isc_mem_stats(mem, stdout); - isc_mem_destroy(&mem); -#endif - - return (0); -} diff --git a/bin/tests/lwresconf_test.c b/bin/tests/lwresconf_test.c deleted file mode 100644 index 3d8cf87308..0000000000 --- a/bin/tests/lwresconf_test.c +++ /dev/null @@ -1,90 +0,0 @@ -/* - * Copyright (C) 2000, 2001, 2004, 2007, 2015, 2016 Internet Systems Consortium, Inc. ("ISC") - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -/* $Id: lwresconf_test.c,v 1.13 2007/06/19 23:46:59 tbox Exp $ */ - -#include - -#include - -#include -#include -#include - -#include - -#define USE_ISC_MEM - -static inline void -CHECK(int val, const char *msg) { - if (val != 0) { - fprintf(stderr, "%s returned %d\n", msg, val); - exit(1); - } -} - -#ifdef USE_ISC_MEM -/* - * Wrappers around our memory management stuff, for the lwres functions. - */ -static void * -mem_alloc(void *arg, size_t size) { - return (isc_mem_get(arg, size)); -} - -static void -mem_free(void *arg, void *mem, size_t size) { - isc_mem_put(arg, mem, size); -} -#endif - -int -main(int argc, char *argv[]) { - lwres_context_t *ctx; - const char *file = "/etc/resolv.conf"; - int ret; -#ifdef USE_ISC_MEM - isc_mem_t *mem; - isc_result_t result; -#endif - - if (argc > 1) { - file = argv[1]; - } - -#ifdef USE_ISC_MEM - mem = NULL; - result = isc_mem_create(0, 0, &mem); - INSIST(result == ISC_R_SUCCESS); -#endif - - ctx = NULL; -#ifdef USE_ISC_MEM - ret = lwres_context_create(&ctx, mem, mem_alloc, mem_free, 0); -#else - ret = lwres_context_create(&ctx, NULL, NULL, NULL, 0); -#endif - CHECK(ret, "lwres_context_create"); - - lwres_conf_init(ctx); - if (lwres_conf_parse(ctx, file) == 0) { - lwres_conf_print(ctx, stderr); - } else { - perror("lwres_conf_parse"); - } - - lwres_conf_clear(ctx); - lwres_context_destroy(&ctx); - -#ifdef USE_ISC_MEM - isc_mem_stats(mem, stdout); - isc_mem_destroy(&mem); -#endif - - return (0); -} diff --git a/bin/tests/master/win32/t_master.dsp.in b/bin/tests/master/win32/t_master.dsp.in deleted file mode 100644 index 0a2a859fca..0000000000 --- a/bin/tests/master/win32/t_master.dsp.in +++ /dev/null @@ -1,95 +0,0 @@ -# Microsoft Developer Studio Project File - Name="t_master" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103 - -CFG=t_master - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "t_master.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "t_master.mak" CFG="t_master - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "t_master - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "t_master - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "t_master - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" /I "../../../../lib/tests/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console @MACHINE@ -# ADD LINK32 @LIBXML2_LIB@ user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Release/libisc.lib ../../../../lib/dns/win32/Release/libdns.lib ../../../../lib/tests/win32/Release/libtests.lib /nologo /subsystem:console @MACHINE@ /out:"../../../../Build/Release/t_master.exe" - -!ELSEIF "$(CFG)" == "t_master - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" /I "../../../../lib/tests/include" /I "../../../../lib/bind9/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR /FD /GZ /c -# SUBTRACT CPP /X @COPTY@ -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console /debug @MACHINE@ /pdbtype:sept -# ADD LINK32 @LIBXML2_LIB@ user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Debug/libisc.lib ../../../../lib/dns/win32/Debug/libdns.lib ../../../../lib/tests/win32/Debug/libtests.lib /nologo /subsystem:console /map /debug @MACHINE@ /out:"../../../../Build/Debug/t_master.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "t_master - @PLATFORM@ Release" -# Name "t_master - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\t_master.c -# End Source File -# End Group -# End Target -# End Project diff --git a/bin/tests/master/win32/t_master.dsw b/bin/tests/master/win32/t_master.dsw deleted file mode 100644 index 1d7ef5b9aa..0000000000 --- a/bin/tests/master/win32/t_master.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "t_master"=".\t_master.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/bin/tests/master/win32/t_master.mak.in b/bin/tests/master/win32/t_master.mak.in deleted file mode 100644 index cc88fa5375..0000000000 --- a/bin/tests/master/win32/t_master.mak.in +++ /dev/null @@ -1,375 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on t_master.dsp -!IF "$(CFG)" == "" -CFG=t_master - @PLATFORM@ Debug -!MESSAGE No configuration specified. Defaulting to t_master - @PLATFORM@ Debug. -!ENDIF - -!IF "$(CFG)" != "t_master - @PLATFORM@ Release" && "$(CFG)" != "t_master - @PLATFORM@ Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "t_master.mak" CFG="t_master - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "t_master - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "t_master - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -CPP=cl.exe -RSC=rc.exe -LIBXML=@LIBXML2_LIB@ - -!IF "$(CFG)" == "t_master - @PLATFORM@ 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)" == "t_master - @PLATFORM@ Release" - -OUTDIR=.\Release -INTDIR=.\Release - -!IF "$(RECURSE)" == "0" - -ALL : "..\..\..\..\Build\Release\t_master.exe" - -!ELSE - -ALL : "libtests - @PLATFORM@ Release" "libisc - @PLATFORM@ Release" "libdns - @PLATFORM@ Release" "..\..\..\..\Build\Release\t_master.exe" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"libdns - @PLATFORM@ ReleaseCLEAN" "libisc - @PLATFORM@ ReleaseCLEAN" "libtests - @PLATFORM@ ReleaseCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\t_master.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "..\..\..\..\Build\Release\t_master.exe" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" /I "../../../../lib/tests/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\t_master.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\t_master.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Release/libisc.lib ../../../../lib/dns/win32/Release/libdns.lib ../../../../lib/tests/win32/Release/libtests.lib $(LIBXML) /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\t_master.pdb" @MACHINE@ /out:"../../../../Build/Release/t_master.exe" -LINK32_OBJS= \ - "$(INTDIR)\t_master.obj" \ - "..\..\..\..\lib\dns\win32\Release\libdns.lib" \ - "..\..\..\..\lib\isc\win32\Release\libisc.lib" \ - "..\..\..\..\lib\tests\win32\Release\libtests.lib" - -"..\..\..\..\Build\Release\t_master.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ELSEIF "$(CFG)" == "t_master - @PLATFORM@ Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : "..\..\..\..\Build\Debug\t_master.exe" "$(OUTDIR)\t_master.bsc" - -!ELSE - -ALL : "libtests - @PLATFORM@ Debug" "libisc - @PLATFORM@ Debug" "libdns - @PLATFORM@ Debug" "..\..\..\..\Build\Debug\t_master.exe" "$(OUTDIR)\t_master.bsc" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"libdns - @PLATFORM@ DebugCLEAN" "libisc - @PLATFORM@ DebugCLEAN" "libtests - @PLATFORM@ DebugCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\t_master.obj" - -@erase "$(INTDIR)\t_master.sbr" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\t_master.bsc" - -@erase "$(OUTDIR)\t_master.map" - -@erase "$(OUTDIR)\t_master.pdb" - -@erase "..\..\..\..\Build\Debug\t_master.exe" - -@erase "..\..\..\..\Build\Debug\t_master.ilk" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" /I "../../../../lib/tests/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\t_master.bsc" -BSC32_SBRS= \ - "$(INTDIR)\t_master.sbr" - -"$(OUTDIR)\t_master.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Debug/libisc.lib ../../../../lib/dns/win32/Debug/libdns.lib ../../../../lib/tests/win32/Debug/libtests.lib $(LIBXML) /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\t_master.pdb" /map:"$(INTDIR)\t_master.map" /debug @MACHINE@ /out:"../../../../Build/Debug/t_master.exe" /pdbtype:sept -LINK32_OBJS= \ - "$(INTDIR)\t_master.obj" \ - "..\..\..\..\lib\dns\win32\Debug\libdns.lib" \ - "..\..\..\..\lib\isc\win32\Debug\libisc.lib" \ - "..\..\..\..\lib\tests\win32\Debug\libtests.lib" - -"..\..\..\..\Build\Debug\t_master.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ENDIF - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("t_master.dep") -!INCLUDE "t_master.dep" -!ELSE -!MESSAGE Warning: cannot find "t_master.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "t_master - @PLATFORM@ Release" || "$(CFG)" == "t_master - @PLATFORM@ Debug" -SOURCE=..\t_master.c - -!IF "$(CFG)" == "t_master - @PLATFORM@ Release" - - -"$(INTDIR)\t_master.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "t_master - @PLATFORM@ Debug" - - -"$(INTDIR)\t_master.obj" "$(INTDIR)\t_master.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -!IF "$(CFG)" == "t_master - @PLATFORM@ Release" - -"libdns - @PLATFORM@ Release" : - cd "..\..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" - cd "..\..\..\bin\tests\master\win32" - -"libdns - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\master\win32" - -!ELSEIF "$(CFG)" == "t_master - @PLATFORM@ Debug" - -"libdns - @PLATFORM@ Debug" : - cd "..\..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" - cd "..\..\..\bin\tests\master\win32" - -"libdns - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\master\win32" - -!ENDIF - -!IF "$(CFG)" == "t_master - @PLATFORM@ Release" - -"libisc - @PLATFORM@ Release" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" - cd "..\..\..\bin\tests\master\win32" - -"libisc - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\master\win32" - -!ELSEIF "$(CFG)" == "t_master - @PLATFORM@ Debug" - -"libisc - @PLATFORM@ Debug" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" - cd "..\..\..\bin\tests\master\win32" - -"libisc - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\master\win32" - -!ENDIF - -!IF "$(CFG)" == "t_master - @PLATFORM@ Release" - -"libtests - @PLATFORM@ Release" : - cd "..\..\..\..\lib\tests\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Release" - cd "..\..\..\bin\tests\master\win32" - -"libtests - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\..\lib\tests\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\master\win32" - -!ELSEIF "$(CFG)" == "t_master - @PLATFORM@ Debug" - -"libtests - @PLATFORM@ Debug" : - cd "..\..\..\..\lib\tests\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Debug" - cd "..\..\..\bin\tests\master\win32" - -"libtests - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\..\lib\tests\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\master\win32" - -!ENDIF - - -!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 -1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest" -<< KEEP - -$(_VC_MANIFEST_BASENAME).auto.manifest : - type <<$@ - - - -<< KEEP diff --git a/bin/tests/mem/win32/t_mem.dsp.in b/bin/tests/mem/win32/t_mem.dsp.in deleted file mode 100644 index 1707b18457..0000000000 --- a/bin/tests/mem/win32/t_mem.dsp.in +++ /dev/null @@ -1,95 +0,0 @@ -# Microsoft Developer Studio Project File - Name="t_mem" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103 - -CFG=t_mem - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "t_mem.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "t_mem.mak" CFG="t_mem - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "t_mem - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "t_mem - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "t_mem - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/tests/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console @MACHINE@ -# ADD LINK32 @LIBXML2_LIB@ user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Release/libisc.lib ../../../../lib/tests/win32/Release/libtests.lib /nologo /subsystem:console @MACHINE@ /out:"../../../../Build/Release/t_mem.exe" - -!ELSEIF "$(CFG)" == "t_mem - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/tests/include" /I "../../../../lib/bind9/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR /FD /GZ /c -# SUBTRACT CPP /X @COPTY@ -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console /debug @MACHINE@ /pdbtype:sept -# ADD LINK32 @LIBXML2_LIB@ user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Debug/libisc.lib ../../../../lib/tests/win32/Debug/libtests.lib /nologo /subsystem:console /map /debug @MACHINE@ /out:"../../../../Build/Debug/t_mem.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "t_mem - @PLATFORM@ Release" -# Name "t_mem - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\t_mem.c -# End Source File -# End Group -# End Target -# End Project diff --git a/bin/tests/mem/win32/t_mem.dsw b/bin/tests/mem/win32/t_mem.dsw deleted file mode 100644 index d65306868f..0000000000 --- a/bin/tests/mem/win32/t_mem.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "t_mem"=".\t_mem.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/bin/tests/mem/win32/t_mem.mak.in b/bin/tests/mem/win32/t_mem.mak.in deleted file mode 100644 index e93a6afef1..0000000000 --- a/bin/tests/mem/win32/t_mem.mak.in +++ /dev/null @@ -1,347 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on t_mem.dsp -!IF "$(CFG)" == "" -CFG=t_mem - @PLATFORM@ Debug -!MESSAGE No configuration specified. Defaulting to t_mem - @PLATFORM@ Debug. -!ENDIF - -!IF "$(CFG)" != "t_mem - @PLATFORM@ Release" && "$(CFG)" != "t_mem - @PLATFORM@ Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "t_mem.mak" CFG="t_mem - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "t_mem - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "t_mem - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -CPP=cl.exe -RSC=rc.exe -LIBXML=@LIBXML2_LIB@ - -!IF "$(CFG)" == "t_mem - @PLATFORM@ 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)" == "t_mem - @PLATFORM@ Release" - -OUTDIR=.\Release -INTDIR=.\Release - -!IF "$(RECURSE)" == "0" - -ALL : "..\..\..\..\Build\Release\t_mem.exe" - -!ELSE - -ALL : "libtests - @PLATFORM@ Release" "libisc - @PLATFORM@ Release" "..\..\..\..\Build\Release\t_mem.exe" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"libisc - @PLATFORM@ ReleaseCLEAN" "libtests - @PLATFORM@ ReleaseCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\t_mem.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "..\..\..\..\Build\Release\t_mem.exe" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/tests/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\t_mem.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\t_mem.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Release/libisc.lib ../../../../lib/tests/win32/Release/libtests.lib $(LIBXML) /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\t_mem.pdb" @MACHINE@ /out:"../../../../Build/Release/t_mem.exe" -LINK32_OBJS= \ - "$(INTDIR)\t_mem.obj" \ - "..\..\..\..\lib\isc\win32\Release\libisc.lib" \ - "..\..\..\..\lib\tests\win32\Release\libtests.lib" - -"..\..\..\..\Build\Release\t_mem.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ELSEIF "$(CFG)" == "t_mem - @PLATFORM@ Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : "..\..\..\..\Build\Debug\t_mem.exe" "$(OUTDIR)\t_mem.bsc" - -!ELSE - -ALL : "libtests - @PLATFORM@ Debug" "libisc - @PLATFORM@ Debug" "..\..\..\..\Build\Debug\t_mem.exe" "$(OUTDIR)\t_mem.bsc" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"libisc - @PLATFORM@ DebugCLEAN" "libtests - @PLATFORM@ DebugCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\t_mem.obj" - -@erase "$(INTDIR)\t_mem.sbr" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\t_mem.bsc" - -@erase "$(OUTDIR)\t_mem.map" - -@erase "$(OUTDIR)\t_mem.pdb" - -@erase "..\..\..\..\Build\Debug\t_mem.exe" - -@erase "..\..\..\..\Build\Debug\t_mem.ilk" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/tests/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\t_mem.bsc" -BSC32_SBRS= \ - "$(INTDIR)\t_mem.sbr" - -"$(OUTDIR)\t_mem.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Debug/libisc.lib ../../../../lib/tests/win32/Debug/libtests.lib $(LIBXML) /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\t_mem.pdb" /map:"$(INTDIR)\t_mem.map" /debug @MACHINE@ /out:"../../../../Build/Debug/t_mem.exe" /pdbtype:sept -LINK32_OBJS= \ - "$(INTDIR)\t_mem.obj" \ - "..\..\..\..\lib\isc\win32\Debug\libisc.lib" \ - "..\..\..\..\lib\tests\win32\Debug\libtests.lib" - -"..\..\..\..\Build\Debug\t_mem.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ENDIF - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("t_mem.dep") -!INCLUDE "t_mem.dep" -!ELSE -!MESSAGE Warning: cannot find "t_mem.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "t_mem - @PLATFORM@ Release" || "$(CFG)" == "t_mem - @PLATFORM@ Debug" -SOURCE=..\t_mem.c - -!IF "$(CFG)" == "t_mem - @PLATFORM@ Release" - - -"$(INTDIR)\t_mem.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "t_mem - @PLATFORM@ Debug" - - -"$(INTDIR)\t_mem.obj" "$(INTDIR)\t_mem.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -!IF "$(CFG)" == "t_mem - @PLATFORM@ Release" - -"libisc - @PLATFORM@ Release" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" - cd "..\..\..\bin\tests\mem\win32" - -"libisc - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\mem\win32" - -!ELSEIF "$(CFG)" == "t_mem - @PLATFORM@ Debug" - -"libisc - @PLATFORM@ Debug" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" - cd "..\..\..\bin\tests\mem\win32" - -"libisc - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\mem\win32" - -!ENDIF - -!IF "$(CFG)" == "t_mem - @PLATFORM@ Release" - -"libtests - @PLATFORM@ Release" : - cd "..\..\..\..\lib\tests\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Release" - cd "..\..\..\bin\tests\mem\win32" - -"libtests - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\..\lib\tests\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\mem\win32" - -!ELSEIF "$(CFG)" == "t_mem - @PLATFORM@ Debug" - -"libtests - @PLATFORM@ Debug" : - cd "..\..\..\..\lib\tests\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Debug" - cd "..\..\..\bin\tests\mem\win32" - -"libtests - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\..\lib\tests\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\mem\win32" - -!ENDIF - - -!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 -1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest" -<< KEEP - -$(_VC_MANIFEST_BASENAME).auto.manifest : - type <<$@ - - - -<< KEEP diff --git a/bin/tests/names/win32/t_names.dsp.in b/bin/tests/names/win32/t_names.dsp.in deleted file mode 100644 index 9aa407c107..0000000000 --- a/bin/tests/names/win32/t_names.dsp.in +++ /dev/null @@ -1,95 +0,0 @@ -# Microsoft Developer Studio Project File - Name="t_names" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103 - -CFG=t_names - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "t_names.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "t_names.mak" CFG="t_names - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "t_names - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "t_names - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "t_names - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" /I "../../../../lib/tests/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console @MACHINE@ -# ADD LINK32 @LIBXML2_LIB@ user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Release/libisc.lib ../../../../lib/dns/win32/Release/libdns.lib ../../../../lib/tests/win32/Release/libtests.lib /nologo /subsystem:console @MACHINE@ /out:"../../../../Build/Release/t_names.exe" - -!ELSEIF "$(CFG)" == "t_names - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" /I "../../../../lib/tests/include" /I "../../../../lib/bind9/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR /FD /GZ /c -# SUBTRACT CPP /X @COPTY@ -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console /debug @MACHINE@ /pdbtype:sept -# ADD LINK32 @LIBXML2_LIB@ user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Debug/libisc.lib ../../../../lib/dns/win32/Debug/libdns.lib ../../../../lib/tests/win32/Debug/libtests.lib /nologo /subsystem:console /map /debug @MACHINE@ /out:"../../../../Build/Debug/t_names.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "t_names - @PLATFORM@ Release" -# Name "t_names - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\t_names.c -# End Source File -# End Group -# End Target -# End Project diff --git a/bin/tests/names/win32/t_names.dsw b/bin/tests/names/win32/t_names.dsw deleted file mode 100644 index a0636f3788..0000000000 --- a/bin/tests/names/win32/t_names.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "t_names"=".\t_names.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/bin/tests/names/win32/t_names.mak.in b/bin/tests/names/win32/t_names.mak.in deleted file mode 100644 index b50a85dc34..0000000000 --- a/bin/tests/names/win32/t_names.mak.in +++ /dev/null @@ -1,375 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on t_names.dsp -!IF "$(CFG)" == "" -CFG=t_names - @PLATFORM@ Debug -!MESSAGE No configuration specified. Defaulting to t_names - @PLATFORM@ Debug. -!ENDIF - -!IF "$(CFG)" != "t_names - @PLATFORM@ Release" && "$(CFG)" != "t_names - @PLATFORM@ Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "t_names.mak" CFG="t_names - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "t_names - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "t_names - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -CPP=cl.exe -RSC=rc.exe -LIBXML=@LIBXML2_LIB@ - -!IF "$(CFG)" == "t_names - @PLATFORM@ 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)" == "t_names - @PLATFORM@ Release" - -OUTDIR=.\Release -INTDIR=.\Release - -!IF "$(RECURSE)" == "0" - -ALL : "..\..\..\..\Build\Release\t_names.exe" - -!ELSE - -ALL : "libtests - @PLATFORM@ Release" "libisc - @PLATFORM@ Release" "libdns - @PLATFORM@ Release" "..\..\..\..\Build\Release\t_names.exe" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"libdns - @PLATFORM@ ReleaseCLEAN" "libisc - @PLATFORM@ ReleaseCLEAN" "libtests - @PLATFORM@ ReleaseCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\t_names.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "..\..\..\..\Build\Release\t_names.exe" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" /I "../../../../lib/tests/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\t_names.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\t_names.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Release/libisc.lib ../../../../lib/dns/win32/Release/libdns.lib ../../../../lib/tests/win32/Release/libtests.lib $(LIBXML) /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\t_names.pdb" @MACHINE@ /out:"../../../../Build/Release/t_names.exe" -LINK32_OBJS= \ - "$(INTDIR)\t_names.obj" \ - "..\..\..\..\lib\dns\win32\Release\libdns.lib" \ - "..\..\..\..\lib\isc\win32\Release\libisc.lib" \ - "..\..\..\..\lib\tests\win32\Release\libtests.lib" - -"..\..\..\..\Build\Release\t_names.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ELSEIF "$(CFG)" == "t_names - @PLATFORM@ Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : "..\..\..\..\Build\Debug\t_names.exe" "$(OUTDIR)\t_names.bsc" - -!ELSE - -ALL : "libtests - @PLATFORM@ Debug" "libisc - @PLATFORM@ Debug" "libdns - @PLATFORM@ Debug" "..\..\..\..\Build\Debug\t_names.exe" "$(OUTDIR)\t_names.bsc" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"libdns - @PLATFORM@ DebugCLEAN" "libisc - @PLATFORM@ DebugCLEAN" "libtests - @PLATFORM@ DebugCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\t_names.obj" - -@erase "$(INTDIR)\t_names.sbr" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\t_names.bsc" - -@erase "$(OUTDIR)\t_names.map" - -@erase "$(OUTDIR)\t_names.pdb" - -@erase "..\..\..\..\Build\Debug\t_names.exe" - -@erase "..\..\..\..\Build\Debug\t_names.ilk" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" /I "../../../../lib/tests/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\t_names.bsc" -BSC32_SBRS= \ - "$(INTDIR)\t_names.sbr" - -"$(OUTDIR)\t_names.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Debug/libisc.lib ../../../../lib/dns/win32/Debug/libdns.lib ../../../../lib/tests/win32/Debug/libtests.lib $(LIBXML) /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\t_names.pdb" /map:"$(INTDIR)\t_names.map" /debug @MACHINE@ /out:"../../../../Build/Debug/t_names.exe" /pdbtype:sept -LINK32_OBJS= \ - "$(INTDIR)\t_names.obj" \ - "..\..\..\..\lib\dns\win32\Debug\libdns.lib" \ - "..\..\..\..\lib\isc\win32\Debug\libisc.lib" \ - "..\..\..\..\lib\tests\win32\Debug\libtests.lib" - -"..\..\..\..\Build\Debug\t_names.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ENDIF - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("t_names.dep") -!INCLUDE "t_names.dep" -!ELSE -!MESSAGE Warning: cannot find "t_names.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "t_names - @PLATFORM@ Release" || "$(CFG)" == "t_names - @PLATFORM@ Debug" -SOURCE=..\t_names.c - -!IF "$(CFG)" == "t_names - @PLATFORM@ Release" - - -"$(INTDIR)\t_names.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "t_names - @PLATFORM@ Debug" - - -"$(INTDIR)\t_names.obj" "$(INTDIR)\t_names.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -!IF "$(CFG)" == "t_names - @PLATFORM@ Release" - -"libdns - @PLATFORM@ Release" : - cd "..\..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" - cd "..\..\..\bin\tests\names\win32" - -"libdns - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\names\win32" - -!ELSEIF "$(CFG)" == "t_names - @PLATFORM@ Debug" - -"libdns - @PLATFORM@ Debug" : - cd "..\..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" - cd "..\..\..\bin\tests\names\win32" - -"libdns - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\names\win32" - -!ENDIF - -!IF "$(CFG)" == "t_names - @PLATFORM@ Release" - -"libisc - @PLATFORM@ Release" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" - cd "..\..\..\bin\tests\names\win32" - -"libisc - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\names\win32" - -!ELSEIF "$(CFG)" == "t_names - @PLATFORM@ Debug" - -"libisc - @PLATFORM@ Debug" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" - cd "..\..\..\bin\tests\names\win32" - -"libisc - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\names\win32" - -!ENDIF - -!IF "$(CFG)" == "t_names - @PLATFORM@ Release" - -"libtests - @PLATFORM@ Release" : - cd "..\..\..\..\lib\tests\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Release" - cd "..\..\..\bin\tests\names\win32" - -"libtests - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\..\lib\tests\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\names\win32" - -!ELSEIF "$(CFG)" == "t_names - @PLATFORM@ Debug" - -"libtests - @PLATFORM@ Debug" : - cd "..\..\..\..\lib\tests\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Debug" - cd "..\..\..\bin\tests\names\win32" - -"libtests - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\..\lib\tests\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\names\win32" - -!ENDIF - - -!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 -1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest" -<< KEEP - -$(_VC_MANIFEST_BASENAME).auto.manifest : - type <<$@ - - - -<< KEEP diff --git a/bin/tests/rbt/win32/t_rbt.dsp.in b/bin/tests/rbt/win32/t_rbt.dsp.in deleted file mode 100644 index 4d25a4260c..0000000000 --- a/bin/tests/rbt/win32/t_rbt.dsp.in +++ /dev/null @@ -1,95 +0,0 @@ -# Microsoft Developer Studio Project File - Name="t_rbt" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103 - -CFG=t_rbt - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "t_rbt.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "t_rbt.mak" CFG="t_rbt - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "t_rbt - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "t_rbt - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "t_rbt - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" /I "../../../../lib/tests/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console @MACHINE@ -# ADD LINK32 @LIBXML2_LIB@ user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Release/libisc.lib ../../../../lib/dns/win32/Release/libdns.lib ../../../../lib/tests/win32/Release/libtests.lib /nologo /subsystem:console @MACHINE@ /out:"../../../../Build/Release/t_rbt.exe" - -!ELSEIF "$(CFG)" == "t_rbt - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" /I "../../../../lib/tests/include" /I "../../../../lib/bind9/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR /FD /GZ /c -# SUBTRACT CPP /X @COPTY@ -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console /debug @MACHINE@ /pdbtype:sept -# ADD LINK32 @LIBXML2_LIB@ user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Debug/libisc.lib ../../../../lib/dns/win32/Debug/libdns.lib ../../../../lib/tests/win32/Debug/libtests.lib /nologo /subsystem:console /map /debug @MACHINE@ /out:"../../../../Build/Debug/t_rbt.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "t_rbt - @PLATFORM@ Release" -# Name "t_rbt - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\t_rbt.c -# End Source File -# End Group -# End Target -# End Project diff --git a/bin/tests/rbt/win32/t_rbt.dsw b/bin/tests/rbt/win32/t_rbt.dsw deleted file mode 100644 index 9d658b2930..0000000000 --- a/bin/tests/rbt/win32/t_rbt.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "t_rbt"=".\t_rbt.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/bin/tests/rbt/win32/t_rbt.mak.in b/bin/tests/rbt/win32/t_rbt.mak.in deleted file mode 100644 index 5f61e01930..0000000000 --- a/bin/tests/rbt/win32/t_rbt.mak.in +++ /dev/null @@ -1,375 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on t_rbt.dsp -!IF "$(CFG)" == "" -CFG=t_rbt - @PLATFORM@ Debug -!MESSAGE No configuration specified. Defaulting to t_rbt - @PLATFORM@ Debug. -!ENDIF - -!IF "$(CFG)" != "t_rbt - @PLATFORM@ Release" && "$(CFG)" != "t_rbt - @PLATFORM@ Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "t_rbt.mak" CFG="t_rbt - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "t_rbt - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "t_rbt - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -CPP=cl.exe -RSC=rc.exe -LIBXML=@LIBXML2_LIB@ - -!IF "$(CFG)" == "t_rbt - @PLATFORM@ 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)" == "t_rbt - @PLATFORM@ Release" - -OUTDIR=.\Release -INTDIR=.\Release - -!IF "$(RECURSE)" == "0" - -ALL : "..\..\..\..\Build\Release\t_rbt.exe" - -!ELSE - -ALL : "libtests - @PLATFORM@ Release" "libisc - @PLATFORM@ Release" "libdns - @PLATFORM@ Release" "..\..\..\..\Build\Release\t_rbt.exe" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"libdns - @PLATFORM@ ReleaseCLEAN" "libisc - @PLATFORM@ ReleaseCLEAN" "libtests - @PLATFORM@ ReleaseCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\t_rbt.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "..\..\..\..\Build\Release\t_rbt.exe" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" /I "../../../../lib/tests/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\t_rbt.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\t_rbt.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Release/libisc.lib ../../../../lib/dns/win32/Release/libdns.lib ../../../../lib/tests/win32/Release/libtests.lib $(LIBXML) /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\t_rbt.pdb" @MACHINE@ /out:"../../../../Build/Release/t_rbt.exe" -LINK32_OBJS= \ - "$(INTDIR)\t_rbt.obj" \ - "..\..\..\..\lib\dns\win32\Release\libdns.lib" \ - "..\..\..\..\lib\isc\win32\Release\libisc.lib" \ - "..\..\..\..\lib\tests\win32\Release\libtests.lib" - -"..\..\..\..\Build\Release\t_rbt.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ELSEIF "$(CFG)" == "t_rbt - @PLATFORM@ Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : "..\..\..\..\Build\Debug\t_rbt.exe" "$(OUTDIR)\t_rbt.bsc" - -!ELSE - -ALL : "libtests - @PLATFORM@ Debug" "libisc - @PLATFORM@ Debug" "libdns - @PLATFORM@ Debug" "..\..\..\..\Build\Debug\t_rbt.exe" "$(OUTDIR)\t_rbt.bsc" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"libdns - @PLATFORM@ DebugCLEAN" "libisc - @PLATFORM@ DebugCLEAN" "libtests - @PLATFORM@ DebugCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\t_rbt.obj" - -@erase "$(INTDIR)\t_rbt.sbr" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\t_rbt.bsc" - -@erase "$(OUTDIR)\t_rbt.map" - -@erase "$(OUTDIR)\t_rbt.pdb" - -@erase "..\..\..\..\Build\Debug\t_rbt.exe" - -@erase "..\..\..\..\Build\Debug\t_rbt.ilk" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" /I "../../../../lib/tests/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\t_rbt.bsc" -BSC32_SBRS= \ - "$(INTDIR)\t_rbt.sbr" - -"$(OUTDIR)\t_rbt.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Debug/libisc.lib ../../../../lib/dns/win32/Debug/libdns.lib ../../../../lib/tests/win32/Debug/libtests.lib $(LIBXML) /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\t_rbt.pdb" /map:"$(INTDIR)\t_rbt.map" /debug @MACHINE@ /out:"../../../../Build/Debug/t_rbt.exe" /pdbtype:sept -LINK32_OBJS= \ - "$(INTDIR)\t_rbt.obj" \ - "..\..\..\..\lib\dns\win32\Debug\libdns.lib" \ - "..\..\..\..\lib\isc\win32\Debug\libisc.lib" \ - "..\..\..\..\lib\tests\win32\Debug\libtests.lib" - -"..\..\..\..\Build\Debug\t_rbt.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ENDIF - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("t_rbt.dep") -!INCLUDE "t_rbt.dep" -!ELSE -!MESSAGE Warning: cannot find "t_rbt.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "t_rbt - @PLATFORM@ Release" || "$(CFG)" == "t_rbt - @PLATFORM@ Debug" -SOURCE=..\t_rbt.c - -!IF "$(CFG)" == "t_rbt - @PLATFORM@ Release" - - -"$(INTDIR)\t_rbt.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "t_rbt - @PLATFORM@ Debug" - - -"$(INTDIR)\t_rbt.obj" "$(INTDIR)\t_rbt.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -!IF "$(CFG)" == "t_rbt - @PLATFORM@ Release" - -"libdns - @PLATFORM@ Release" : - cd "..\..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" - cd "..\..\..\bin\tests\rbt\win32" - -"libdns - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\rbt\win32" - -!ELSEIF "$(CFG)" == "t_rbt - @PLATFORM@ Debug" - -"libdns - @PLATFORM@ Debug" : - cd "..\..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" - cd "..\..\..\bin\tests\rbt\win32" - -"libdns - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\rbt\win32" - -!ENDIF - -!IF "$(CFG)" == "t_rbt - @PLATFORM@ Release" - -"libisc - @PLATFORM@ Release" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" - cd "..\..\..\bin\tests\rbt\win32" - -"libisc - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\rbt\win32" - -!ELSEIF "$(CFG)" == "t_rbt - @PLATFORM@ Debug" - -"libisc - @PLATFORM@ Debug" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" - cd "..\..\..\bin\tests\rbt\win32" - -"libisc - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\rbt\win32" - -!ENDIF - -!IF "$(CFG)" == "t_rbt - @PLATFORM@ Release" - -"libtests - @PLATFORM@ Release" : - cd "..\..\..\..\lib\tests\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Release" - cd "..\..\..\bin\tests\rbt\win32" - -"libtests - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\..\lib\tests\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\rbt\win32" - -!ELSEIF "$(CFG)" == "t_rbt - @PLATFORM@ Debug" - -"libtests - @PLATFORM@ Debug" : - cd "..\..\..\..\lib\tests\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Debug" - cd "..\..\..\bin\tests\rbt\win32" - -"libtests - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\..\lib\tests\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\rbt\win32" - -!ENDIF - - -!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 -1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest" -<< KEEP - -$(_VC_MANIFEST_BASENAME).auto.manifest : - type <<$@ - - - -<< KEEP diff --git a/bin/tests/resolver/win32/t_resolver.dsp.in b/bin/tests/resolver/win32/t_resolver.dsp.in deleted file mode 100644 index 746889ea64..0000000000 --- a/bin/tests/resolver/win32/t_resolver.dsp.in +++ /dev/null @@ -1,95 +0,0 @@ -# Microsoft Developer Studio Project File - Name="t_resolver" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103 - -CFG=t_resolver - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "t_resolver.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "t_resolver.mak" CFG="t_resolver - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "t_resolver - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "t_resolver - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "t_resolver - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../../" @LIBXML2_INC@ @OPENSSL_INC@ @GEOIP_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" /I "../../../../lib/tests/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console @MACHINE@ -# ADD LINK32 @LIBXML2_LIB@ user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Release/libisc.lib ../../../../lib/dns/win32/Release/libdns.lib ../../../../lib/tests/win32/Release/libtests.lib /nologo /subsystem:console @MACHINE@ /out:"../../../../Build/Release/t_resolver.exe" - -!ELSEIF "$(CFG)" == "t_resolver - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../../" @LIBXML2_INC@ @OPENSSL_INC@ @GEOIP_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" /I "../../../../lib/tests/include" /I "../../../../lib/bind9/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR /FD /GZ /c -# SUBTRACT CPP /X @COPTY@ -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console /debug @MACHINE@ /pdbtype:sept -# ADD LINK32 @LIBXML2_LIB@ user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Debug/libisc.lib ../../../../lib/dns/win32/Debug/libdns.lib ../../../../lib/tests/win32/Debug/libtests.lib /nologo /subsystem:console /map /debug @MACHINE@ /out:"../../../../Build/Debug/t_resolver.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "t_resolver - @PLATFORM@ Release" -# Name "t_resolver - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\t_resolver.c -# End Source File -# End Group -# End Target -# End Project diff --git a/bin/tests/resolver/win32/t_resolver.dsw b/bin/tests/resolver/win32/t_resolver.dsw deleted file mode 100644 index e796af02fc..0000000000 --- a/bin/tests/resolver/win32/t_resolver.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "t_resolver"=".\t_resolver.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/bin/tests/resolver/win32/t_resolver.mak.in b/bin/tests/resolver/win32/t_resolver.mak.in deleted file mode 100644 index a9dcb7368d..0000000000 --- a/bin/tests/resolver/win32/t_resolver.mak.in +++ /dev/null @@ -1,375 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on t_resolver.dsp -!IF "$(CFG)" == "" -CFG=t_resolver - @PLATFORM@ Debug -!MESSAGE No configuration specified. Defaulting to t_resolver - @PLATFORM@ Debug. -!ENDIF - -!IF "$(CFG)" != "t_resolver - @PLATFORM@ Release" && "$(CFG)" != "t_resolver - @PLATFORM@ Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "t_resolver.mak" CFG="t_resolver - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "t_resolver - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "t_resolver - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -CPP=cl.exe -RSC=rc.exe -LIBXML=@LIBXML2_LIB@ - -!IF "$(CFG)" == "t_resolver - @PLATFORM@ 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)" == "t_resolver - @PLATFORM@ Release" - -OUTDIR=.\Release -INTDIR=.\Release - -!IF "$(RECURSE)" == "0" - -ALL : "..\..\..\..\Build\Release\t_resolver.exe" - -!ELSE - -ALL : "libtests - @PLATFORM@ Release" "libisc - @PLATFORM@ Release" "libdns - @PLATFORM@ Release" "..\..\..\..\Build\Release\t_resolver.exe" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"libdns - @PLATFORM@ ReleaseCLEAN" "libisc - @PLATFORM@ ReleaseCLEAN" "libtests - @PLATFORM@ ReleaseCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\t_resolver.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "..\..\..\..\Build\Release\t_resolver.exe" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../../" @LIBXML2_INC@ @OPENSSL_INC@ @GEOIP_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" /I "../../../../lib/tests/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\t_resolver.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\t_resolver.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Release/libisc.lib ../../../../lib/dns/win32/Release/libdns.lib ../../../../lib/tests/win32/Release/libtests.lib $(LIBXML) /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\t_resolver.pdb" @MACHINE@ /out:"../../../../Build/Release/t_resolver.exe" -LINK32_OBJS= \ - "$(INTDIR)\t_resolver.obj" \ - "..\..\..\..\lib\dns\win32\Release\libdns.lib" \ - "..\..\..\..\lib\isc\win32\Release\libisc.lib" \ - "..\..\..\..\lib\tests\win32\Release\libtests.lib" - -"..\..\..\..\Build\Release\t_resolver.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ELSEIF "$(CFG)" == "t_resolver - @PLATFORM@ Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : "..\..\..\..\Build\Debug\t_resolver.exe" "$(OUTDIR)\t_resolver.bsc" - -!ELSE - -ALL : "libtests - @PLATFORM@ Debug" "libisc - @PLATFORM@ Debug" "libdns - @PLATFORM@ Debug" "..\..\..\..\Build\Debug\t_resolver.exe" "$(OUTDIR)\t_resolver.bsc" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"libdns - @PLATFORM@ DebugCLEAN" "libisc - @PLATFORM@ DebugCLEAN" "libtests - @PLATFORM@ DebugCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\t_resolver.obj" - -@erase "$(INTDIR)\t_resolver.sbr" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\t_resolver.bsc" - -@erase "$(OUTDIR)\t_resolver.map" - -@erase "$(OUTDIR)\t_resolver.pdb" - -@erase "..\..\..\..\Build\Debug\t_resolver.exe" - -@erase "..\..\..\..\Build\Debug\t_resolver.ilk" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../../" @LIBXML2_INC@ @OPENSSL_INC@ @GEOIP_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" /I "../../../../lib/tests/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\t_resolver.bsc" -BSC32_SBRS= \ - "$(INTDIR)\t_resolver.sbr" - -"$(OUTDIR)\t_resolver.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Debug/libisc.lib ../../../../lib/dns/win32/Debug/libdns.lib ../../../../lib/tests/win32/Debug/libtests.lib $(LIBXML) /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\t_resolver.pdb" /map:"$(INTDIR)\t_resolver.map" /debug @MACHINE@ /out:"../../../../Build/Debug/t_resolver.exe" /pdbtype:sept -LINK32_OBJS= \ - "$(INTDIR)\t_resolver.obj" \ - "..\..\..\..\lib\dns\win32\Debug\libdns.lib" \ - "..\..\..\..\lib\isc\win32\Debug\libisc.lib" \ - "..\..\..\..\lib\tests\win32\Debug\libtests.lib" - -"..\..\..\..\Build\Debug\t_resolver.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ENDIF - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("t_resolver.dep") -!INCLUDE "t_resolver.dep" -!ELSE -!MESSAGE Warning: cannot find "t_resolver.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "t_resolver - @PLATFORM@ Release" || "$(CFG)" == "t_resolver - @PLATFORM@ Debug" -SOURCE=..\t_resolver.c - -!IF "$(CFG)" == "t_resolver - @PLATFORM@ Release" - - -"$(INTDIR)\t_resolver.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "t_resolver - @PLATFORM@ Debug" - - -"$(INTDIR)\t_resolver.obj" "$(INTDIR)\t_resolver.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -!IF "$(CFG)" == "t_resolver - @PLATFORM@ Release" - -"libdns - @PLATFORM@ Release" : - cd "..\..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" - cd "..\..\..\bin\tests\resolver\win32" - -"libdns - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\resolver\win32" - -!ELSEIF "$(CFG)" == "t_resolver - @PLATFORM@ Debug" - -"libdns - @PLATFORM@ Debug" : - cd "..\..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" - cd "..\..\..\bin\tests\resolver\win32" - -"libdns - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\resolver\win32" - -!ENDIF - -!IF "$(CFG)" == "t_resolver - @PLATFORM@ Release" - -"libisc - @PLATFORM@ Release" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" - cd "..\..\..\bin\tests\resolver\win32" - -"libisc - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\resolver\win32" - -!ELSEIF "$(CFG)" == "t_resolver - @PLATFORM@ Debug" - -"libisc - @PLATFORM@ Debug" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" - cd "..\..\..\bin\tests\resolver\win32" - -"libisc - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\resolver\win32" - -!ENDIF - -!IF "$(CFG)" == "t_resolver - @PLATFORM@ Release" - -"libtests - @PLATFORM@ Release" : - cd "..\..\..\..\lib\tests\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Release" - cd "..\..\..\bin\tests\resolver\win32" - -"libtests - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\..\lib\tests\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\resolver\win32" - -!ELSEIF "$(CFG)" == "t_resolver - @PLATFORM@ Debug" - -"libtests - @PLATFORM@ Debug" : - cd "..\..\..\..\lib\tests\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Debug" - cd "..\..\..\bin\tests\resolver\win32" - -"libtests - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\..\lib\tests\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\resolver\win32" - -!ENDIF - - -!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 -1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest" -<< KEEP - -$(_VC_MANIFEST_BASENAME).auto.manifest : - type <<$@ - - - -<< KEEP diff --git a/bin/tests/sockaddr/win32/t_sockaddr.dsp.in b/bin/tests/sockaddr/win32/t_sockaddr.dsp.in deleted file mode 100644 index d0f7921708..0000000000 --- a/bin/tests/sockaddr/win32/t_sockaddr.dsp.in +++ /dev/null @@ -1,95 +0,0 @@ -# Microsoft Developer Studio Project File - Name="t_sockaddr" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103 - -CFG=t_sockaddr - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "t_sockaddr.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "t_sockaddr.mak" CFG="t_sockaddr - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "t_sockaddr - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "t_sockaddr - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "t_sockaddr - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/tests/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console @MACHINE@ -# ADD LINK32 @LIBXML2_LIB@ user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Release/libisc.lib ../../../../lib/tests/win32/Release/libtests.lib /nologo /subsystem:console @MACHINE@ /out:"../../../../Build/Release/t_sockaddr.exe" - -!ELSEIF "$(CFG)" == "t_sockaddr - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/tests/include" /I "../../../../lib/bind9/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR /FD /GZ /c -# SUBTRACT CPP /X @COPTY@ -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console /debug @MACHINE@ /pdbtype:sept -# ADD LINK32 @LIBXML2_LIB@ user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Debug/libisc.lib ../../../../lib/tests/win32/Debug/libtests.lib /nologo /subsystem:console /map /debug @MACHINE@ /out:"../../../../Build/Debug/t_sockaddr.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "t_sockaddr - @PLATFORM@ Release" -# Name "t_sockaddr - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\t_sockaddr.c -# End Source File -# End Group -# End Target -# End Project diff --git a/bin/tests/sockaddr/win32/t_sockaddr.dsw b/bin/tests/sockaddr/win32/t_sockaddr.dsw deleted file mode 100644 index c3f454f4d5..0000000000 --- a/bin/tests/sockaddr/win32/t_sockaddr.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "t_sockaddr"=".\t_sockaddr.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/bin/tests/sockaddr/win32/t_sockaddr.mak.in b/bin/tests/sockaddr/win32/t_sockaddr.mak.in deleted file mode 100644 index 9ffc0ba069..0000000000 --- a/bin/tests/sockaddr/win32/t_sockaddr.mak.in +++ /dev/null @@ -1,347 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on t_sockaddr.dsp -!IF "$(CFG)" == "" -CFG=t_sockaddr - @PLATFORM@ Debug -!MESSAGE No configuration specified. Defaulting to t_sockaddr - @PLATFORM@ Debug. -!ENDIF - -!IF "$(CFG)" != "t_sockaddr - @PLATFORM@ Release" && "$(CFG)" != "t_sockaddr - @PLATFORM@ Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "t_sockaddr.mak" CFG="t_sockaddr - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "t_sockaddr - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "t_sockaddr - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -CPP=cl.exe -RSC=rc.exe -LIBXML=@LIBXML2_LIB@ - -!IF "$(CFG)" == "t_sockaddr - @PLATFORM@ 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)" == "t_sockaddr - @PLATFORM@ Release" - -OUTDIR=.\Release -INTDIR=.\Release - -!IF "$(RECURSE)" == "0" - -ALL : "..\..\..\..\Build\Release\t_sockaddr.exe" - -!ELSE - -ALL : "libtests - @PLATFORM@ Release" "libisc - @PLATFORM@ Release" "..\..\..\..\Build\Release\t_sockaddr.exe" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"libisc - @PLATFORM@ ReleaseCLEAN" "libtests - @PLATFORM@ ReleaseCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\t_sockaddr.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "..\..\..\..\Build\Release\t_sockaddr.exe" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/tests/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\t_sockaddr.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\t_sockaddr.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Release/libisc.lib ../../../../lib/tests/win32/Release/libtests.lib $(LIBXML) /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\t_sockaddr.pdb" @MACHINE@ /out:"../../../../Build/Release/t_sockaddr.exe" -LINK32_OBJS= \ - "$(INTDIR)\t_sockaddr.obj" \ - "..\..\..\..\lib\isc\win32\Release\libisc.lib" \ - "..\..\..\..\lib\tests\win32\Release\libtests.lib" - -"..\..\..\..\Build\Release\t_sockaddr.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ELSEIF "$(CFG)" == "t_sockaddr - @PLATFORM@ Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : "..\..\..\..\Build\Debug\t_sockaddr.exe" "$(OUTDIR)\t_sockaddr.bsc" - -!ELSE - -ALL : "libtests - @PLATFORM@ Debug" "libisc - @PLATFORM@ Debug" "..\..\..\..\Build\Debug\t_sockaddr.exe" "$(OUTDIR)\t_sockaddr.bsc" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"libisc - @PLATFORM@ DebugCLEAN" "libtests - @PLATFORM@ DebugCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\t_sockaddr.obj" - -@erase "$(INTDIR)\t_sockaddr.sbr" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\t_sockaddr.bsc" - -@erase "$(OUTDIR)\t_sockaddr.map" - -@erase "$(OUTDIR)\t_sockaddr.pdb" - -@erase "..\..\..\..\Build\Debug\t_sockaddr.exe" - -@erase "..\..\..\..\Build\Debug\t_sockaddr.ilk" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/tests/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\t_sockaddr.bsc" -BSC32_SBRS= \ - "$(INTDIR)\t_sockaddr.sbr" - -"$(OUTDIR)\t_sockaddr.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Debug/libisc.lib ../../../../lib/tests/win32/Debug/libtests.lib $(LIBXML) /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\t_sockaddr.pdb" /map:"$(INTDIR)\t_sockaddr.map" /debug @MACHINE@ /out:"../../../../Build/Debug/t_sockaddr.exe" /pdbtype:sept -LINK32_OBJS= \ - "$(INTDIR)\t_sockaddr.obj" \ - "..\..\..\..\lib\isc\win32\Debug\libisc.lib" \ - "..\..\..\..\lib\tests\win32\Debug\libtests.lib" - -"..\..\..\..\Build\Debug\t_sockaddr.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ENDIF - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("t_sockaddr.dep") -!INCLUDE "t_sockaddr.dep" -!ELSE -!MESSAGE Warning: cannot find "t_sockaddr.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "t_sockaddr - @PLATFORM@ Release" || "$(CFG)" == "t_sockaddr - @PLATFORM@ Debug" -SOURCE=..\t_sockaddr.c - -!IF "$(CFG)" == "t_sockaddr - @PLATFORM@ Release" - - -"$(INTDIR)\t_sockaddr.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "t_sockaddr - @PLATFORM@ Debug" - - -"$(INTDIR)\t_sockaddr.obj" "$(INTDIR)\t_sockaddr.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -!IF "$(CFG)" == "t_sockaddr - @PLATFORM@ Release" - -"libisc - @PLATFORM@ Release" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" - cd "..\..\..\bin\tests\sockaddr\win32" - -"libisc - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\sockaddr\win32" - -!ELSEIF "$(CFG)" == "t_sockaddr - @PLATFORM@ Debug" - -"libisc - @PLATFORM@ Debug" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" - cd "..\..\..\bin\tests\sockaddr\win32" - -"libisc - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\sockaddr\win32" - -!ENDIF - -!IF "$(CFG)" == "t_sockaddr - @PLATFORM@ Release" - -"libtests - @PLATFORM@ Release" : - cd "..\..\..\..\lib\tests\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Release" - cd "..\..\..\bin\tests\sockaddr\win32" - -"libtests - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\..\lib\tests\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\sockaddr\win32" - -!ELSEIF "$(CFG)" == "t_sockaddr - @PLATFORM@ Debug" - -"libtests - @PLATFORM@ Debug" : - cd "..\..\..\..\lib\tests\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Debug" - cd "..\..\..\bin\tests\sockaddr\win32" - -"libtests - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\..\lib\tests\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\sockaddr\win32" - -!ENDIF - - -!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 -1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest" -<< KEEP - -$(_VC_MANIFEST_BASENAME).auto.manifest : - type <<$@ - - - -<< KEEP diff --git a/bin/tests/system/Makefile.in b/bin/tests/system/Makefile.in index 8b454eb2d5..6370c67ba3 100644 --- a/bin/tests/system/Makefile.in +++ b/bin/tests/system/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2000, 2001, 2004, 2007, 2008, 2010-2016 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2000, 2001, 2004, 2007, 2008, 2010-2017 Internet Systems Consortium, Inc. ("ISC") # # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this @@ -12,7 +12,7 @@ VERSION=@BIND9_VERSION@ @BIND9_MAKE_INCLUDES@ -SUBDIRS = dlzexternal dyndb lwresd pipelined rndc rsabigexponent tkey +SUBDIRS = dlzexternal dyndb pipelined rndc rsabigexponent tkey CINCLUDES = ${ISC_INCLUDES} ${DNS_INCLUDES} diff --git a/bin/tests/system/README b/bin/tests/system/README index 1fda05dcd0..b7211b2e23 100644 --- a/bin/tests/system/README +++ b/bin/tests/system/README @@ -1,4 +1,4 @@ -Copyright (C) 2000, 2001, 2004, 2010, 2011, 2013, 2015, 2016 Internet Systems Consortium, Inc. ("ISC") +Copyright (C) 2000, 2001, 2004, 2010, 2011, 2013, 2015-2017 Internet Systems Consortium, Inc. ("ISC") This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with this @@ -14,7 +14,6 @@ involving a different DNS setup. They are: forward/ Forwarding tests glue/ Glue handling tests limits/ Tests of handling of large data (close to server limits) - lwresd/ Tests of the lightweight resolver library and daemon notify/ More NOTIFY tests nsupdate/ Dynamic update and IXFR tests resolver/ Regression tests for resolver bugs that have been fixed @@ -62,7 +61,7 @@ The tests can be run individually like this: To run all the tests, just type "make test". -When running system tests, named and lwresd can be run under +When running system tests, named can be run under Valgrind. The output from Valgrind are sent to per-process files that can be reviewed after the test has completed. To enable this, set the USE_VALGRIND environment variable to "helgrind" to run the Helgrind diff --git a/bin/tests/system/cleanall.sh b/bin/tests/system/cleanall.sh index f46150b412..a89c4aff0b 100644 --- a/bin/tests/system/cleanall.sh +++ b/bin/tests/system/cleanall.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2000, 2001, 2004, 2007, 2012, 2014-2016 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2000, 2001, 2004, 2007, 2012, 2014-2017 Internet Systems Consortium, Inc. ("ISC") # # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this @@ -17,7 +17,7 @@ SYSTEMTESTTOP=. find . -type f \( \ -name 'K*' -o -name '*~' -o -name 'core' -o -name '*.core' \ -o -name '*.log' -o -name '*.pid' -o -name '*.keyset' \ - -o -name named.run -o -name lwresd.run -o -name ans.run \ + -o -name named.run -o -name ans.run \ -o -name '*-valgrind-*.log' \) -print | xargs rm -f status=0 diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in index 3d73bd0e1b..0d63f129e8 100644 --- a/bin/tests/system/conf.sh.in +++ b/bin/tests/system/conf.sh.in @@ -18,9 +18,6 @@ TOP=${SYSTEMTESTTOP:=.}/../../.. TOP=`cd $TOP && pwd` NAMED=$TOP/bin/named/named -# We must use "named -l" instead of "lwresd" because argv[0] is lost -# if the program is libtoolized. -LWRESD="$TOP/bin/named/named -l" DIG=$TOP/bin/dig/dig DELV=$TOP/bin/delv/delv RNDC=$TOP/bin/rndc/rndc @@ -64,7 +61,6 @@ BIGKEY=$TOP/bin/tests/system/rsabigexponent/bigkey GENCHECK=$TOP/bin/tests/system/rndc/gencheck KEYCREATE=$TOP/bin/tests/system/tkey/keycreate KEYDELETE=$TOP/bin/tests/system/tkey/keydelete -LWTEST=$TOP/bin/tests/system/lwresd/lwtest MAKEJOURNAL=$TOP/bin/tests/makejournal PIPEQUERIES=$TOP/bin/tests/system/pipelined/pipequeries SAMPLEUPDATE=$TOP/lib/samples/sample-update @@ -79,7 +75,7 @@ SUBDIRS="acl additional addzone allow_query autosign builtin dns64 dnssec @DNSTAP@ dscp dsdigest dyndb ecdsa eddsa emptyzones fetchlimit filter-aaaa formerr geoip glue gost inline integrity ixfr keepalive @KEYMGR@ legacy limits - logfileconfig lwresd masterfile masterformat metadata mkeys + logfileconfig masterfile masterformat metadata mkeys names notify nslookup nsupdate nzd2nzf padding pending pipelined @PKCS11_TEST@ reclimit redirect resolver rndc rpz rpzrecurse rrchecker rrl rrsetorder rsabigexponent @@ -154,8 +150,6 @@ export KEYFRLAB export KEYGEN export KEYSETTOOL export KEYSIGNER -export LWRESD -export LWTEST export MAKEJOURNAL export MDIG export NAMED diff --git a/bin/tests/system/conf.sh.win32 b/bin/tests/system/conf.sh.win32 index f85723ddc5..960bb10c84 100644 --- a/bin/tests/system/conf.sh.win32 +++ b/bin/tests/system/conf.sh.win32 @@ -24,9 +24,6 @@ TOP=`cd $TOP && pwd` VSCONF=Debug NAMED=$TOP/Build/$VSCONF/named@EXEEXT@ -# We must use "named -l" instead of "lwresd" because argv[0] is lost -# if the program is libtoolized. -LWRESD="$TOP/Build/$VSCONF/named@EXEEXT@ -l" DIG=$TOP/Build/$VSCONF/dig@EXEEXT@ DELV=$TOP/Build/$VSCONF/delv@EXEEXT@ RNDC=$TOP/Build/$VSCONF/rndc@EXEEXT@ @@ -70,7 +67,6 @@ BIGKEY=$TOP/Build/$VSCONF/bigkey@EXEEXT@ GENCHECK=$TOP/Build/$VSCONF/gencheck@EXEEXT@ KEYCREATE=$TOP/Build/$VSCONF/keycreate@EXEEXT@ KEYDELETE=$TOP/Build/$VSCONF/keydelete@EXEEXT@ -LWTEST=$TOP/Build/$VSCONF/lwtest@EXEEXT@ MAKEJOURNAL=$TOP/Build/$VSCONF/makejournal@EXEEXT@ PIPEQUERIES=$TOP/Build/$VSCONF/pipequeries@EXEEXT@ # to port SAMPLEUPDATE=$TOP/lib/samples/sample-update @@ -85,7 +81,7 @@ SUBDIRS="acl additional addzone allow_query autosign builtin dns64 dnssec @DNSTAP@ dscp dsdigest dyndb ecdsa eddsa ednscompliance emptyzones fetchlimit filter-aaaa formerr forward geoip glue gost inline ixfr - keepalive @KEYMGR@ legacy limits logfileconfig lwresd masterfile + keepalive @KEYMGR@ legacy limits logfileconfig masterfile masterformat metadata mkeys names notify nslookup nsupdate nzd2nzf padding pending pipelined @PKCS11_TEST@ reclimit redirect resolver rndc rpz rpzrecurse rrchecker rrl @@ -158,8 +154,6 @@ export KEYFRLAB export KEYGEN export KEYSETTOOL export KEYSIGNER -export LWRESD -export LWTEST export MAKEJOURNAL export MDIG export NAMED diff --git a/bin/tests/system/feature-test.c b/bin/tests/system/feature-test.c index 3f7c7cb7f9..bf1928a071 100644 --- a/bin/tests/system/feature-test.c +++ b/bin/tests/system/feature-test.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2016, 2017 Internet Systems Consortium, Inc. ("ISC") * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -75,7 +75,7 @@ main(int argc, char **argv) { char hostname[MAXHOSTNAMELEN]; int n; #ifdef WIN32 - /* From lwres InitSocket() */ + /* From InitSocket() */ WORD wVersionRequested; WSADATA wsaData; int err; diff --git a/bin/tests/system/lwresd/Makefile.in b/bin/tests/system/lwresd/Makefile.in deleted file mode 100644 index 533becfbb5..0000000000 --- a/bin/tests/system/lwresd/Makefile.in +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright (C) 2000-2002, 2004, 2007, 2009, 2012, 2014-2016 Internet Systems Consortium, Inc. ("ISC") -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -# $Id: Makefile.in,v 1.22 2009/12/05 23:31:40 each Exp $ - -srcdir = @srcdir@ -VPATH = @srcdir@ -top_srcdir = @top_srcdir@ - -VERSION=@BIND9_VERSION@ - -@BIND9_MAKE_INCLUDES@ - -CINCLUDES = ${LWRES_INCLUDES} ${ISC_INCLUDES} - -CDEFINES = -CWARNINGS = - -LWRESLIBS = ../../../../lib/lwres/liblwres.@A@ -ISCLIBS = ../../../../lib/isc/libisc.@A@ @ISC_OPENSSL_LIBS@ - -LWRESDEPLIBS = ../../../../lib/lwres/liblwres.@A@ -ISCDEPLIBS = ../../../../lib/isc/libisc.@A@ - -DEPLIBS = ${LWRESDEPLIBS} ${ISCDEPLIBS} - -LIBS = ${LWRESLIBS} ${ISCLIBS} @LIBS@ - -TARGETS = lwtest@EXEEXT@ - -OBJS = lwtest.@O@ - -SRCS = lwtest.c - -@BIND9_MAKE_RULES@ - -all: lwtest@EXEEXT@ - -lwtest@EXEEXT@: ${OBJS} ${DEPLIBS} - ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ ${OBJS} ${LIBS} - -clean distclean:: - rm -f ${TARGETS} - diff --git a/bin/tests/system/lwresd/clean.sh b/bin/tests/system/lwresd/clean.sh deleted file mode 100644 index af8c45bf72..0000000000 --- a/bin/tests/system/lwresd/clean.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2008, 2012-2016 Internet Systems Consortium, Inc. ("ISC") -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -# -# Clean up after lwresd tests. -# -rm -f */named.memstats -rm -f */named.run -rm -f dig.out -rm -f lwresd1/lwresd.run.resolv -rm -f lwresd1/lwresd.run.lwresd -rm -f ns*/named.lock -rm -f lwresd*/lwresd.lock -rm -f lwresd*/lwresd.run diff --git a/bin/tests/system/lwresd/lwresd1/lwresd.conf b/bin/tests/system/lwresd/lwresd1/lwresd.conf deleted file mode 100644 index 64db59211a..0000000000 --- a/bin/tests/system/lwresd/lwresd1/lwresd.conf +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (C) 2000, 2001, 2004, 2007, 2016 Internet Systems Consortium, Inc. ("ISC") - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -/* $Id: lwresd.conf,v 1.8 2007/06/19 23:47:04 tbox Exp $ */ - -controls { /* empty */ }; - -options { - port 5300; - pid-file "lwresd.pid"; - forwarders {10.53.0.1;}; - forward only; -}; - -lwres { - listen-on {10.53.0.1 port 9210;}; - view "_default"; - search {example1.;}; - ndots 1; -}; diff --git a/bin/tests/system/lwresd/lwresd1/nosearch.conf b/bin/tests/system/lwresd/lwresd1/nosearch.conf deleted file mode 100644 index ec8d9eb8fa..0000000000 --- a/bin/tests/system/lwresd/lwresd1/nosearch.conf +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (C) 2016 Internet Systems Consortium, Inc. ("ISC") - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -/* $Id: lwresd.conf,v 1.8 2007/06/19 23:47:04 tbox Exp $ */ - -controls { /* empty */ }; - -options { - port 5300; - pid-file "lwresd.pid"; - forwarders {10.53.0.1;}; - forward only; -}; - -lwres { - listen-on {10.53.0.1 port 9210;}; - view "_default"; - ndots 1; -}; diff --git a/bin/tests/system/lwresd/lwresd1/resolv.conf b/bin/tests/system/lwresd/lwresd1/resolv.conf deleted file mode 100644 index 34e84e6fc5..0000000000 --- a/bin/tests/system/lwresd/lwresd1/resolv.conf +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright (C) 2000, 2001, 2004, 2007, 2012, 2016 Internet Systems Consortium, Inc. ("ISC") -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -# $Id: resolv.conf,v 1.11 2007/06/19 23:47:04 tbox Exp $ - -nameserver 10.53.0.1 -lwserver 10.53.0.1 -search example1. -ndots 1 diff --git a/bin/tests/system/lwresd/lwtest.c b/bin/tests/system/lwresd/lwtest.c deleted file mode 100644 index 402948b767..0000000000 --- a/bin/tests/system/lwresd/lwtest.c +++ /dev/null @@ -1,793 +0,0 @@ -/* - * Copyright (C) 2000-2002, 2004, 2007, 2008, 2012, 2013, 2015, 2016 Internet Systems Consortium, Inc. ("ISC") - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -/* $Id: lwtest.c,v 1.32 2008/04/02 02:37:42 marka Exp $ */ - -#include - -#include -#include - -#include -#include -#include -#include - -#include -#include -#include - -/* - * XXX getnameinfo errors, which don't appear to be standard. - */ -#define ENI_NOSERVNAME 1 -#define ENI_NOHOSTNAME 2 -#define ENI_MEMORY 3 -#define ENI_SYSTEM 4 -#define ENI_FAMILY 5 -#define ENI_SALEN 6 -#define ENI_NOSOCKET 7 - -static int fails = 0; - -static void -CHECK(lwres_result_t val, const char *msg) { - if (val != 0) { - printf("I:%s returned %d\n", msg, val); - exit(1); - } -} - -static unsigned char TESTSTRING[] = - "This is a test. This is only a test. !!!"; - -static lwres_context_t *ctx; - -static void -test_noop(void) { - lwres_result_t ret; - lwres_lwpacket_t pkt, pkt2; - lwres_nooprequest_t nooprequest, *nooprequest2; - lwres_noopresponse_t noopresponse, *noopresponse2; - lwres_buffer_t b; - - pkt.pktflags = 0; - pkt.serial = 0x11223344; - pkt.recvlength = 0x55667788; - pkt.result = 0; - - nooprequest.datalength = strlen((char *)TESTSTRING); - nooprequest.data = TESTSTRING; - ret = lwres_nooprequest_render(ctx, &nooprequest, &pkt, &b); - CHECK(ret, "lwres_nooprequest_render"); - - /* - * Now, parse it into a new structure. - */ - lwres_buffer_first(&b); - ret = lwres_lwpacket_parseheader(&b, &pkt2); - CHECK(ret, "lwres_lwpacket_parseheader"); - - nooprequest2 = NULL; - ret = lwres_nooprequest_parse(ctx, &b, &pkt2, &nooprequest2); - CHECK(ret, "lwres_nooprequest_parse"); - - assert(nooprequest.datalength == nooprequest2->datalength); - assert(memcmp(nooprequest.data, nooprequest2->data, - nooprequest.datalength) == 0); - - lwres_nooprequest_free(ctx, &nooprequest2); - - lwres_context_freemem(ctx, b.base, b.length); - b.base = NULL; - b.length = 0; - - pkt.pktflags = 0; - pkt.serial = 0x11223344; - pkt.recvlength = 0x55667788; - pkt.result = 0xdeadbeef; - - noopresponse.datalength = strlen((char *)TESTSTRING); - noopresponse.data = TESTSTRING; - ret = lwres_noopresponse_render(ctx, &noopresponse, &pkt, &b); - CHECK(ret, "lwres_noopresponse_render"); - - /* - * Now, parse it into a new structure. - */ - lwres_buffer_first(&b); - ret = lwres_lwpacket_parseheader(&b, &pkt2); - CHECK(ret, "lwres_lwpacket_parseheader"); - - noopresponse2 = NULL; - ret = lwres_noopresponse_parse(ctx, &b, &pkt2, &noopresponse2); - CHECK(ret, "lwres_noopresponse_parse"); - - assert(noopresponse.datalength == noopresponse2->datalength); - assert(memcmp(noopresponse.data, noopresponse2->data, - noopresponse.datalength) == 0); - - lwres_noopresponse_free(ctx, &noopresponse2); - - lwres_context_freemem(ctx, b.base, b.length); - b.base = NULL; - b.length = 0; -} - -static void -test_gabn(const char *target, lwres_result_t expected, const char *address, - lwres_uint32_t af) -{ - lwres_gabnresponse_t *res; - unsigned char addrbuf[16]; - lwres_addr_t *addr; - char outbuf[64]; - unsigned int len; - lwres_result_t ret; - - res = NULL; - ret = lwres_getaddrsbyname(ctx, target, - LWRES_ADDRTYPE_V4 | LWRES_ADDRTYPE_V6, - &res); - if (ret != expected) { - printf("I:gabn(%s) failed: %d\n", target, ret); - if (res != NULL) - lwres_gabnresponse_free(ctx, &res); - fails++; - return; - } - if (ret == LWRES_R_SUCCESS) { - if (af == LWRES_ADDRTYPE_V4) { - len = 4; - ret = inet_pton(AF_INET, address, addrbuf); - assert(ret == 1); - } else { - len = 16; - ret = inet_pton(AF_INET6, address, addrbuf); - assert(ret == 1); - } - addr = LWRES_LIST_HEAD(res->addrs); - if (addr == NULL) { - printf("I:gabn(%s) returned empty list\n", target); - fails++; - return; - } - while (addr != NULL) { - if (addr->family != af || addr->length != len || - memcmp(addr->address, addrbuf, len) == 0) - break; - addr = LWRES_LIST_NEXT(addr, link); - } - if (addr == NULL) { - addr = LWRES_LIST_HEAD(res->addrs); - if (addr->family == LWRES_ADDRTYPE_V4) - (void)inet_ntop(AF_INET, addr->address, - outbuf, sizeof(outbuf)); - else - (void)inet_ntop(AF_INET6, addr->address, - outbuf, sizeof(outbuf)); - printf("I:gabn(%s) returned %s, expected %s\n", - target, outbuf, address); - fails++; - return; - } - } - if (res != NULL) - lwres_gabnresponse_free(ctx, &res); -} - -static void -test_gnba(const char *target, lwres_uint32_t af, lwres_result_t expected, - const char *name) -{ - lwres_gnbaresponse_t *res; - lwres_result_t ret; - unsigned char addrbuf[16]; - unsigned int len; - - if (af == LWRES_ADDRTYPE_V4) { - len = 4; - ret = inet_pton(AF_INET, target, addrbuf); - assert(ret == 1); - } else { - len = 16; - ret = inet_pton(AF_INET6, target, addrbuf); - assert(ret == 1); - } - - res = NULL; - ret = lwres_getnamebyaddr(ctx, af, len, addrbuf, &res); - if (ret != expected) { - printf("I:gnba(%s) failed: %d\n", target, ret); - if (res != NULL) - lwres_gnbaresponse_free(ctx, &res); - fails++; - return; - } - if (ret == LWRES_R_SUCCESS && strcasecmp(res->realname, name) != 0) { - printf("I:gnba(%s) returned %s, expected %s\n", - target, res->realname, name); - fails++; - return; - } - if (res != NULL) - lwres_gnbaresponse_free(ctx, &res); -} - -static void -test_gethostbyname(const char *name, const char *address) { - struct hostent *hp; - unsigned char addrbuf[16]; - int ret; - - hp = gethostbyname(name); - if (hp == NULL) { - if (address == NULL && h_errno == HOST_NOT_FOUND) - return; - else if (h_errno != HOST_NOT_FOUND) { - printf("I:gethostbyname(%s) failed: %s\n", - name, hstrerror(h_errno)); - fails++; - return; - } else { - printf("I:gethostbyname(%s) returned not found\n", - name); - fails++; - return; - } - } else { - ret = inet_pton(AF_INET, address, addrbuf); - assert(ret == 1); - if (memcmp(hp->h_addr_list[0], addrbuf, hp->h_length) != 0) { - char outbuf[16]; - (void)inet_ntop(AF_INET, hp->h_addr_list[0], - outbuf, sizeof(outbuf)); - printf("I:gethostbyname(%s) returned %s, " - "expected %s\n", name, outbuf, address); - fails++; - return; - } - } -} - -static void -test_gethostbyname2(const char *name, const char *address, int af) { - struct hostent *hp; - unsigned char addrbuf[16]; - int len, ret; - - hp = gethostbyname2(name, af); - if (hp == NULL) { - if (address == NULL && h_errno == HOST_NOT_FOUND) - return; - else if (h_errno != HOST_NOT_FOUND) { - printf("I:gethostbyname(%s) failed: %s\n", - name, hstrerror(h_errno)); - fails++; - return; - } else { - printf("I:gethostbyname(%s) returned not found\n", - name); - fails++; - return; - } - } else { - if (af == AF_INET) - len = 4; - else - len = 16; - ret = inet_pton(af, address, addrbuf); - assert(ret == 1); - if (hp->h_addrtype != af) { - printf("I:gethostbyname(%s) returned wrong family\n", - name); - fails++; - return; - } - if (len != (int)hp->h_length || - memcmp(hp->h_addr_list[0], addrbuf, hp->h_length) != 0) - { - char outbuf[16]; - (void)inet_ntop(af, hp->h_addr_list[0], - outbuf, sizeof(outbuf)); - printf("I:gethostbyname(%s) returned %s, " - "expected %s\n", name, outbuf, address); - fails++; - return; - } - } -} - -static void -test_getipnodebyname(const char *name, const char *address, int af, - int v4map, int all) -{ - struct hostent *hp; - unsigned char addrbuf[16]; - int len, ret; - int error_num; - int flags = 0; - - if (v4map) - flags |= AI_V4MAPPED; - if (all) - flags |= AI_ALL; - - hp = getipnodebyname(name, af, flags, &error_num); - if (hp == NULL) { - if (address == NULL && error_num == HOST_NOT_FOUND) - return; - else if (error_num != HOST_NOT_FOUND) { - printf("I:getipnodebyname(%s) failed: %d\n", - name, error_num); - fails++; - return; - } else { - printf("I:getipnodebyname(%s) returned not found\n", - name); - fails++; - return; - } - } else { - if (af == AF_INET) - len = 4; - else - len = 16; - ret = inet_pton(af, address, addrbuf); - assert(ret == 1); - if (hp->h_addrtype != af) { - printf("I:getipnodebyname(%s) returned wrong family\n", - name); - freehostent(hp); - fails++; - return; - } - if (len != (int)hp->h_length || - memcmp(hp->h_addr_list[0], addrbuf, hp->h_length) != 0) - { - char outbuf[16]; - (void)inet_ntop(af, hp->h_addr_list[0], - outbuf, sizeof(outbuf)); - printf("I:getipnodebyname(%s) returned %s, " - "expected %s\n", name, outbuf, address); - freehostent(hp); - fails++; - return; - } - freehostent(hp); - } -} - -static void -test_gethostbyaddr(const char *address, int af, const char *name) { - struct hostent *hp; - char addrbuf[16]; - int len, ret; - - if (af == AF_INET) - len = 4; - else - len = 16; - ret = inet_pton(af, address, addrbuf); - assert(ret == 1); - - hp = gethostbyaddr(addrbuf, len, af); - - if (hp == NULL) { - if (name == NULL && h_errno == HOST_NOT_FOUND) - return; - else if (h_errno != HOST_NOT_FOUND) { - printf("I:gethostbyaddr(%s) failed: %s\n", - address, hstrerror(h_errno)); - fails++; - return; - } else { - printf("I:gethostbyaddr(%s) returned not found\n", - address); - fails++; - return; - } - } else { - if (name != NULL && strcmp(hp->h_name, name) != 0) { - printf("I:gethostbyname(%s) returned %s, " - "expected %s\n", address, hp->h_name, name); - fails++; - return; - } - } -} - -static void -test_getipnodebyaddr(const char *address, int af, const char *name) { - struct hostent *hp; - char addrbuf[16]; - int len, ret; - int error_num; - - if (af == AF_INET) - len = 4; - else - len = 16; - ret = inet_pton(af, address, addrbuf); - assert(ret == 1); - - hp = getipnodebyaddr(addrbuf, len, af, &error_num); - - if (hp == NULL) { - if (name == NULL && error_num == HOST_NOT_FOUND) - return; - else if (error_num != HOST_NOT_FOUND) { - printf("I:getipnodebyaddr(%s) failed: %d\n", - address, error_num); - fails++; - return; - } else { - printf("I:getipnodebyaddr(%s) returned not found\n", - address); - fails++; - return; - } - } else { - if (name != NULL && strcmp(hp->h_name, name) != 0) { - printf("I:getipnodebyaddr(%s) returned %s, " - "expected %s\n", address, hp->h_name, name); - freehostent(hp); - fails++; - return; - } - freehostent(hp); - } -} - -static void -test_getaddrinfo(const char *name, int af, int v4ok, int v6ok, - const char *address) -{ - unsigned int len; - int ret; - struct addrinfo *ai; - struct addrinfo hint; - unsigned char addrbuf[16]; - - if (v4ok == 1 && v6ok== 1) { - ret = getaddrinfo(name, NULL, NULL, &ai); - } else { - memset(&hint, 0, sizeof(hint)); - if (v4ok) - hint.ai_family = AF_INET; - else - hint.ai_family = AF_INET6; - ret = getaddrinfo(name, NULL, &hint, &ai); - } - if (ret != 0) { - if (address == NULL && ret == EAI_NODATA) - return; - else if (ret != EAI_NODATA) { - printf("I:getaddrinfo(%s,%d,%d) failed: %s\n", - name, v4ok, v6ok, gai_strerror(ret)); - fails++; - return; - } else { - printf("I:getaddrinfo(%s,%d,%d) returned not found\n", - name, v4ok, v6ok); - fails++; - return; - } - } else { - if (af == AF_INET) - len = sizeof(struct sockaddr_in); - else - len = sizeof(struct sockaddr_in6); - ret = inet_pton(af, address, addrbuf); - assert(ret == 1); - if (ai->ai_family != af) { - printf("I:getaddrinfo(%s) returned wrong family\n", - name); - fails++; - freeaddrinfo(ai); - return; - } - if (len != (unsigned int) ai->ai_addrlen) { - char outbuf[16]; - (void)inet_ntop(af, ai->ai_addr, - outbuf, sizeof(outbuf)); - printf("I:getaddrinfo(%s) returned %lub, " - "expected %ub\n", name, - (unsigned long)ai->ai_addrlen, len); - fails++; - freeaddrinfo(ai); - return; - } else if (af == AF_INET) { - struct sockaddr_in *sin; - sin = (struct sockaddr_in *) ai->ai_addr; - if (memcmp(&sin->sin_addr.s_addr, addrbuf, 4) != 0) { - char outbuf[16]; - (void)inet_ntop(af, &sin->sin_addr.s_addr, - outbuf, sizeof(outbuf)); - printf("I:getaddrinfo(%s) returned %s, " - "expected %s\n", name, outbuf, address); - fails++; - freeaddrinfo(ai); - return; - } - } else { - struct sockaddr_in6 *sin6; - sin6 = (struct sockaddr_in6 *) ai->ai_addr; - if (memcmp(sin6->sin6_addr.s6_addr, addrbuf, 16) != 0) - { - char outbuf[16]; - (void)inet_ntop(af, &sin6->sin6_addr.s6_addr, - outbuf, sizeof(outbuf)); - printf("I:getaddrinfo(%s) returned %s, " - "expected %s\n", name, outbuf, address); - fails++; - freeaddrinfo(ai); - return; - } - } - freeaddrinfo(ai); - } -} - -static void -test_getnameinfo(const char *address, int af, const char *name) { - int ret; - struct sockaddr_in sin; - struct sockaddr_in6 sin6; - struct sockaddr *sa; - int salen; - char host[1025]; - - if (af == AF_INET) { - memset(&sin, 0, sizeof(sin)); - ret = inet_pton(AF_INET, address, &sin.sin_addr.s_addr); - assert(ret == 1); - sin.sin_family = AF_INET; -#ifdef LWRES_PLATFORM_HAVESALEN - sin.sin_len = sizeof(sin); -#endif - sa = (struct sockaddr *) &sin; - salen = sizeof(sin); - } else { - memset(&sin6, 0, sizeof(sin6)); - ret = inet_pton(AF_INET6, address, sin6.sin6_addr.s6_addr); - assert(ret == 1); - sin6.sin6_family = AF_INET6; -#ifdef LWRES_PLATFORM_HAVESALEN - sin6.sin6_len = sizeof(sin6); -#endif - sa = (struct sockaddr *) &sin6; - salen = sizeof(sin6); - } - sa->sa_family = af; - - ret = getnameinfo(sa, salen, host, sizeof(host), NULL, 0, NI_NAMEREQD); - - if (ret != 0) { - if (name == NULL && ret == ENI_NOHOSTNAME) - return; - else if (ret != ENI_NOHOSTNAME) { - printf("I:getnameinfo(%s) failed: %d\n", - address, ret); - fails++; - return; - } else { - printf("I:getnameinfo(%s) returned not found\n", - address); - fails++; - return; - } - } else { - if (name == NULL) { - printf("I:getnameinfo(%s) returned %s, " - "expected NULL\n", address, host); - fails++; - return; - } else if (strcmp(host, name) != 0) { - printf("I:getnameinfo(%s) returned %s, expected %s\n", - address, host, name); - fails++; - return; - } - } -} - -static void -test_getrrsetbyname(const char *name, int rdclass, int rdtype, - unsigned int nrdatas, unsigned int nsigs, - int should_pass) -{ - int ret; - struct rrsetinfo *rrinfo = NULL; - ret = getrrsetbyname(name, rdclass, rdtype, 0, &rrinfo); - if (ret != 0 && should_pass == 1) { - printf("I:getrrsetbyname(%s, %d) failed\n", name, rdtype); - fails++; - return; - } else if (ret == 0 && should_pass == 0) { - printf("I:getrrsetbyname(%s, %d) unexpectedly succeeded\n", - name, rdtype); - fails++; - freerrset(rrinfo); - return; - } else if (ret != 0) - return; - if (rrinfo->rri_nrdatas != nrdatas) { - printf("I:getrrsetbyname(%s, %d): got %d rr, expected %d\n", - name, rdtype, rrinfo->rri_nrdatas, nrdatas); - fails++; - } - if (rrinfo->rri_nsigs != nsigs) { - printf("I:getrrsetbyname(%s, %d): got %d sig, expected %d\n", - name, rdtype, rrinfo->rri_nsigs, nsigs); - fails++; - } - freerrset(rrinfo); - return; -} - -int -main(int argc, char **argv) { - lwres_result_t ret; - int nosearch = 0; - - UNUSED(argc); - - lwres_udp_port = 9210; - lwres_resolv_conf = "resolv.conf"; - - if (argv[1] != NULL && strcmp(argv[1], "-nosearch") == 0) - nosearch = 1; - - ret = lwres_context_create(&ctx, NULL, NULL, NULL, 0); - CHECK(ret, "lwres_context_create"); - - ret = lwres_conf_parse(ctx, "resolv.conf"); - CHECK(ret, "lwres_conf_parse"); - - test_noop(); - - test_gabn("a.example1", LWRES_R_SUCCESS, "10.0.1.1", - LWRES_ADDRTYPE_V4); - test_gabn("a.example1.", LWRES_R_SUCCESS, "10.0.1.1", - LWRES_ADDRTYPE_V4); - test_gabn("a.example2", LWRES_R_SUCCESS, "10.0.2.1", - LWRES_ADDRTYPE_V4); - test_gabn("a.example2.", LWRES_R_SUCCESS, "10.0.2.1", - LWRES_ADDRTYPE_V4); - test_gabn("a.example3", LWRES_R_NOTFOUND, NULL, LWRES_ADDRTYPE_V4); - test_gabn("a.example3.", LWRES_R_NOTFOUND, NULL, LWRES_ADDRTYPE_V4); - if (nosearch) - test_gabn("a", LWRES_R_NOTFOUND, NULL, LWRES_ADDRTYPE_V4); - else - test_gabn("a", LWRES_R_SUCCESS, "10.0.1.1", LWRES_ADDRTYPE_V4); - test_gabn("a.", LWRES_R_NOTFOUND, NULL, LWRES_ADDRTYPE_V4); - - if (nosearch) - test_gabn("a2", LWRES_R_NOTFOUND, NULL, LWRES_ADDRTYPE_V4); - else - test_gabn("a2", LWRES_R_SUCCESS, "10.0.1.1", LWRES_ADDRTYPE_V4); - test_gabn("a3", LWRES_R_NOTFOUND, NULL, LWRES_ADDRTYPE_V4); - - test_gabn("b.example1", LWRES_R_SUCCESS, - "eeee:eeee:eeee:eeee:ffff:ffff:ffff:ffff", - LWRES_ADDRTYPE_V6); - test_gabn("b.example1.", LWRES_R_SUCCESS, - "eeee:eeee:eeee:eeee:ffff:ffff:ffff:ffff", - LWRES_ADDRTYPE_V6); - test_gabn("b.example2", LWRES_R_SUCCESS, - "eeee:eeee:eeee:eeee:ffff:ffff:ffff:ffff", - LWRES_ADDRTYPE_V6); - test_gabn("b.example2.", LWRES_R_SUCCESS, - "eeee:eeee:eeee:eeee:ffff:ffff:ffff:ffff", - LWRES_ADDRTYPE_V6); - test_gabn("b.example3", LWRES_R_NOTFOUND, NULL, LWRES_ADDRTYPE_V6); - test_gabn("b.example3.", LWRES_R_NOTFOUND, NULL, LWRES_ADDRTYPE_V6); - if (nosearch) - test_gabn("b", LWRES_R_NOTFOUND, NULL, LWRES_ADDRTYPE_V6); - else - test_gabn("b", LWRES_R_SUCCESS, - "eeee:eeee:eeee:eeee:ffff:ffff:ffff:ffff", - LWRES_ADDRTYPE_V6); - test_gabn("b.", LWRES_R_NOTFOUND, NULL, LWRES_ADDRTYPE_V6); - - test_gabn("d.example1", LWRES_R_NOTFOUND, NULL, LWRES_ADDRTYPE_V6); - - test_gabn("x", LWRES_R_SUCCESS, "10.1.10.1", LWRES_ADDRTYPE_V4); - test_gabn("x.", LWRES_R_SUCCESS, "10.1.10.1", LWRES_ADDRTYPE_V4); - - test_gnba("10.10.10.1", LWRES_ADDRTYPE_V4, LWRES_R_SUCCESS, - "ipv4.example"); - test_gnba("10.10.10.17", LWRES_ADDRTYPE_V4, LWRES_R_NOTFOUND, - NULL); - test_gnba("0123:4567:89ab:cdef:0123:4567:89ab:cdef", - LWRES_ADDRTYPE_V6, LWRES_R_SUCCESS, "ip6.int.example"); - test_gnba("0123:4567:89ab:cdef:0123:4567:89ab:cde0", - LWRES_ADDRTYPE_V6, LWRES_R_NOTFOUND, NULL); - test_gnba("1123:4567:89ab:cdef:0123:4567:89ab:cdef", - LWRES_ADDRTYPE_V6, LWRES_R_SUCCESS, "ip6.arpa.example"); - test_gnba("1123:4567:89ab:cdef:0123:4567:89ab:cde0", - LWRES_ADDRTYPE_V6, LWRES_R_NOTFOUND, NULL); - - test_gethostbyname("a.example1.", "10.0.1.1"); - test_gethostbyname("q.example1.", NULL); - - test_gethostbyname2("a.example1.", "10.0.1.1", AF_INET); - test_gethostbyname2("b.example1.", - "eeee:eeee:eeee:eeee:ffff:ffff:ffff:ffff", - AF_INET6); - test_gethostbyname2("q.example1.", NULL, AF_INET); - - test_getipnodebyname("a.example1.", "10.0.1.1", AF_INET, 0, 0); - test_getipnodebyname("b.example1.", - "eeee:eeee:eeee:eeee:ffff:ffff:ffff:ffff", - AF_INET6, 0, 0); - test_getipnodebyname("a.example1.", - "::ffff:10.0.1.1", AF_INET6, 1, 0); - test_getipnodebyname("a.example1.", - "::ffff:10.0.1.1", AF_INET6, 1, 1); - test_getipnodebyname("b.example1.", - "eeee:eeee:eeee:eeee:ffff:ffff:ffff:ffff", - AF_INET6, 1, 1); - test_getipnodebyname("q.example1.", NULL, AF_INET, 0, 0); - - test_gethostbyaddr("10.10.10.1", AF_INET, "ipv4.example"); - test_gethostbyaddr("10.10.10.17", AF_INET, NULL); - test_gethostbyaddr("0123:4567:89ab:cdef:0123:4567:89ab:cdef", - AF_INET6, "ip6.int.example"); - test_gethostbyaddr("1123:4567:89ab:cdef:0123:4567:89ab:cdef", - AF_INET6, "ip6.arpa.example"); - - test_getipnodebyaddr("10.10.10.1", AF_INET, "ipv4.example"); - test_getipnodebyaddr("10.10.10.17", AF_INET, NULL); - test_getipnodebyaddr("0123:4567:89ab:cdef:0123:4567:89ab:cdef", - AF_INET6, "ip6.int.example"); - test_getipnodebyaddr("1123:4567:89ab:cdef:0123:4567:89ab:cdef", - AF_INET6, "ip6.arpa.example"); - - test_getaddrinfo("a.example1.", AF_INET, 1, 1, "10.0.1.1"); - test_getaddrinfo("a.example1.", AF_INET, 1, 0, "10.0.1.1"); - test_getaddrinfo("a.example1.", AF_INET, 0, 1, NULL); - test_getaddrinfo("b.example1.", AF_INET6, 1, 1, - "eeee:eeee:eeee:eeee:ffff:ffff:ffff:ffff"); - test_getaddrinfo("b.example1.", AF_INET6, 1, 0, NULL); - test_getaddrinfo("b.example1.", AF_INET6, 0, 1, - "eeee:eeee:eeee:eeee:ffff:ffff:ffff:ffff"); - - test_getnameinfo("10.10.10.1", AF_INET, "ipv4.example"); - test_getnameinfo("10.10.10.17", AF_INET, NULL); - test_getnameinfo("0123:4567:89ab:cdef:0123:4567:89ab:cdef", - AF_INET6, "ip6.int.example"); - test_getnameinfo("1123:4567:89ab:cdef:0123:4567:89ab:cdef", - AF_INET6, "ip6.arpa.example"); - test_getnameinfo("1122:3344:5566:7788:99aa:bbcc:ddee:ff00", - AF_INET6, "dname.example1"); - - if (nosearch) - test_getrrsetbyname("a", 1, 1, 0, 0, 0); - else - test_getrrsetbyname("a", 1, 1, 1, 0, 1); - test_getrrsetbyname("a.example1.", 1, 1, 1, 0, 1); - test_getrrsetbyname("e.example1.", 1, 1, 1, 1, 1); - test_getrrsetbyname("e.example1.", 1, 255, 1, 1, 0); - test_getrrsetbyname("e.example1.", 1, 2, 1, 1, 1); - test_getrrsetbyname("e.example1.", 1, 46, 2, 0, 1); - test_getrrsetbyname("", 1, 1, 0, 0, 0); - - test_getrrsetbyname("123456789.123456789.123456789.123456789." - "123456789.123456789.123456789.123456789." - "123456789.123456789.123456789.123456789." - "123456789.123456789.123456789.123456789." - "123456789.123456789.123456789.123456789." - "123456789.123456789.123456789.123456789." - "123456789", 1, 1, 0, 0, 0); - - if (fails == 0) - printf("I:ok\n"); - return (fails); -} diff --git a/bin/tests/system/lwresd/ns1/10.10.10.in-addr.arpa.db b/bin/tests/system/lwresd/ns1/10.10.10.in-addr.arpa.db deleted file mode 100644 index 8324de3e51..0000000000 --- a/bin/tests/system/lwresd/ns1/10.10.10.in-addr.arpa.db +++ /dev/null @@ -1,20 +0,0 @@ -; Copyright (C) 2000, 2001, 2004, 2007, 2016 Internet Systems Consortium, Inc. ("ISC") -; -; This Source Code Form is subject to the terms of the Mozilla Public -; License, v. 2.0. If a copy of the MPL was not distributed with this -; file, You can obtain one at http://mozilla.org/MPL/2.0/. - -; $Id: 10.10.10.in-addr.arpa.db,v 1.10 2007/06/19 23:47:04 tbox Exp $ - -$TTL 300 ; 5 minutes -@ IN SOA mname1. . ( - 2000062001 ; serial - 20 ; refresh (20 seconds) - 20 ; retry (20 seconds) - 1814400 ; expire (3 weeks) - 3600 ; minimum (1 hour) - ) - NS ns -ns A 10.53.0.1 - -1 PTR ipv4.example. diff --git a/bin/tests/system/lwresd/ns1/e.example1.db b/bin/tests/system/lwresd/ns1/e.example1.db deleted file mode 100644 index 2d9587c4e9..0000000000 --- a/bin/tests/system/lwresd/ns1/e.example1.db +++ /dev/null @@ -1,54 +0,0 @@ -; File written on Wed Mar 5 10:20:40 2008 -; dnssec_signzone version 9.3.4-P1 -e.example1. 300 IN SOA mname1. . ( - 2002082210 ; serial - 20 ; refresh (20 seconds) - 20 ; retry (20 seconds) - 1814400 ; expire (3 weeks) - 3600 ; minimum (1 hour) - ) - 300 RRSIG SOA 5 2 300 20010101000000 ( - 20000101000000 14043 e.example1. - KtYwrnKM7Tu53BNf8XuTix53r9kDdCneJ1X7 - xklFbp4YjRKC3NhwVK9PFe0jdHOkIDMtrwxn - n7/Rp07xIyURqw== ) - 300 NS ns.e.example1. - 300 RRSIG NS 5 2 300 20010101000000 ( - 20000101000000 14043 e.example1. - KBPx3XmNl4swVPdwuUEFuzZedMSfsyK2a0Fu - o2wBnbCuS7G7DtfW9690lP/eTyixLOIwlFLQ - MrjN3+XgpkdgIw== ) - 300 A 10.0.1.1 - 300 RRSIG A 5 2 300 20010101000000 ( - 20000101000000 14043 e.example1. - KYlxMQUvv8DQtVgS23lNL5tFYmRppJ7vTgH3 - btvgKbyHxW/04ewRsgCa82iu3iJipdEhKM11 - ALkRNhqL7frnig== ) - 3600 NSEC ns.e.example1. A NS SOA RRSIG NSEC DNSKEY - 3600 RRSIG NSEC 5 2 3600 20010101000000 ( - 20000101000000 14043 e.example1. - azSgagb7bldM06qSZg8nDZWOY2FbqeZY0/T8 - nC+6VhCs7YTfNvXynLWmvmpqL7gVT6/O+Yi2 - 2lmdntld7GORrQ== ) - 300 DNSKEY 256 3 5 ( - AwEAAcvAUMfH7wA0z077fJaF7RMrxAFyvo0/ - 7aAL4d2/yA5TqTaUCVnJtE+XgGO34kH9mwae - we+Nyv2kRWDeLl6nhGk= - ) ; key id = 14043 - 300 RRSIG DNSKEY 5 2 300 20010101000000 ( - 20000101000000 14043 e.example1. - BQFWOHopXuBNdzcopkdl1YVKGF0QvIaYpywM - fcpG5gi+sy9EoTofQ1UGsLOjU3nFXCvJFG4K - 1gUhzEEti440/g== ) -ns.e.example1. 300 IN A 10.53.0.1 - 300 RRSIG A 5 3 300 20010101000000 ( - 20000101000000 14043 e.example1. - cYPzsWNQ/eL4h2lihKRjKT2jhGpOqV9woGJA - /Jstx2iethOAvYtgY22CsAbCUr/6E4bSgBZR - TMoC604cNdFzIw== ) - 3600 NSEC e.example1. A RRSIG NSEC - 3600 RRSIG NSEC 5 3 3600 20010101000000 ( - 20000101000000 14043 e.example1. - J8Md544zDLP4GjyAtkjH/rSFvpzXY/7bgJRS - YDoARwFQRmlrJvavXEjqElb2fTQqlNNz1cal - QROz/WJ3GLwOWw== ) diff --git a/bin/tests/system/lwresd/ns1/example1.db b/bin/tests/system/lwresd/ns1/example1.db deleted file mode 100644 index ad72c77846..0000000000 --- a/bin/tests/system/lwresd/ns1/example1.db +++ /dev/null @@ -1,26 +0,0 @@ -; Copyright (C) 2000-2004, 2007, 2008, 2016 Internet Systems Consortium, Inc. ("ISC") -; -; This Source Code Form is subject to the terms of the Mozilla Public -; License, v. 2.0. If a copy of the MPL was not distributed with this -; file, You can obtain one at http://mozilla.org/MPL/2.0/. - -; $Id: example1.db,v 1.19 2008/04/02 23:46:57 tbox Exp $ - -$TTL 300 ; 5 minutes -@ IN SOA mname1. . ( - 2002082210 ; serial - 20 ; refresh (20 seconds) - 20 ; retry (20 seconds) - 1814400 ; expire (3 weeks) - 3600 ; minimum (1 hour) - ) - NS ns -ns A 10.53.0.1 - -a A 10.0.1.1 -a2 CNAME a -a3 CNAME nowhere -b AAAA eeee:eeee:eeee:eeee:ffff:ffff:ffff:ffff -8.8.7.7 DNAME net -0.0.f.f.e.e.d.d.c.c.b.b.a.a.9.9.net PTR dname -e NS ns.e diff --git a/bin/tests/system/lwresd/ns1/example2.db b/bin/tests/system/lwresd/ns1/example2.db deleted file mode 100644 index 02a63cc6d7..0000000000 --- a/bin/tests/system/lwresd/ns1/example2.db +++ /dev/null @@ -1,21 +0,0 @@ -; Copyright (C) 2000-2002, 2004, 2007, 2016 Internet Systems Consortium, Inc. ("ISC") -; -; This Source Code Form is subject to the terms of the Mozilla Public -; License, v. 2.0. If a copy of the MPL was not distributed with this -; file, You can obtain one at http://mozilla.org/MPL/2.0/. - -; $Id: example2.db,v 1.10 2007/06/19 23:47:04 tbox Exp $ - -$TTL 300 ; 5 minutes -@ IN SOA mname1. . ( - 2000062001 ; serial - 20 ; refresh (20 seconds) - 20 ; retry (20 seconds) - 1814400 ; expire (3 weeks) - 3600 ; minimum (1 hour) - ) - NS ns -ns A 10.53.0.1 - -a A 10.0.2.1 -b AAAA eeee:eeee:eeee:eeee:ffff:ffff:ffff:ffff diff --git a/bin/tests/system/lwresd/ns1/ip6.arpa.db b/bin/tests/system/lwresd/ns1/ip6.arpa.db deleted file mode 100644 index 73f35c8a8f..0000000000 --- a/bin/tests/system/lwresd/ns1/ip6.arpa.db +++ /dev/null @@ -1,21 +0,0 @@ -; Copyright (C) 2000-2002, 2004, 2007, 2016 Internet Systems Consortium, Inc. ("ISC") -; -; This Source Code Form is subject to the terms of the Mozilla Public -; License, v. 2.0. If a copy of the MPL was not distributed with this -; file, You can obtain one at http://mozilla.org/MPL/2.0/. - -; $Id: ip6.arpa.db,v 1.11 2007/06/19 23:47:04 tbox Exp $ - -$TTL 300 ; 5 minutes -@ IN SOA mname1. . ( - 2002082300 ; serial - 20 ; refresh (20 seconds) - 20 ; retry (20 seconds) - 1814400 ; expire (3 weeks) - 3600 ; minimum (1 hour) - ) - NS ns -ns A 10.53.0.1 - -f.e.d.c.b.a.9.8.7.6.5.4.3.2.1.0.f.e.d.c.b.a.9.8.7.6.5.4.3.2.1.1 PTR ip6.arpa.example. -6.6.5.5.4.4.3.3.2.2.1.1 DNAME example1. diff --git a/bin/tests/system/lwresd/ns1/ip6.int.db b/bin/tests/system/lwresd/ns1/ip6.int.db deleted file mode 100644 index 376372ee79..0000000000 --- a/bin/tests/system/lwresd/ns1/ip6.int.db +++ /dev/null @@ -1,20 +0,0 @@ -; Copyright (C) 2000-2002, 2004, 2007, 2016 Internet Systems Consortium, Inc. ("ISC") -; -; This Source Code Form is subject to the terms of the Mozilla Public -; License, v. 2.0. If a copy of the MPL was not distributed with this -; file, You can obtain one at http://mozilla.org/MPL/2.0/. - -; $Id: ip6.int.db,v 1.11 2007/06/19 23:47:04 tbox Exp $ - -$TTL 300 ; 5 minutes -@ IN SOA mname1. . ( - 2002082300 ; serial - 20 ; refresh (20 seconds) - 20 ; retry (20 seconds) - 1814400 ; expire (3 weeks) - 3600 ; minimum (1 hour) - ) - NS ns -ns A 10.53.0.1 - -f.e.d.c.b.a.9.8.7.6.5.4.3.2.1.0.f.e.d.c.b.a.9.8.7.6.5.4.3.2.1.0 PTR ip6.int.example. diff --git a/bin/tests/system/lwresd/ns1/named.conf b/bin/tests/system/lwresd/ns1/named.conf deleted file mode 100644 index abb77e2fa6..0000000000 --- a/bin/tests/system/lwresd/ns1/named.conf +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (C) 2000, 2001, 2004, 2006-2008, 2016 Internet Systems Consortium, Inc. ("ISC") - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -/* $Id: named.conf,v 1.21 2008/04/02 23:46:57 tbox Exp $ */ - -controls { /* empty */ }; - -options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port 5300; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; - recursion no; - notify no; - dnssec-enable yes; - dnssec-validation yes; -}; - -zone "." { - type master; - file "root.db"; -}; - -zone "example1." { - type master; - file "example1.db"; -}; - -zone "e.example1." { - type master; - file "e.example1.db"; -}; - -zone "example2." { - type master; - file "example2.db"; -}; - -zone "10.10.10.in-addr.arpa." { - type master; - file "10.10.10.in-addr.arpa.db"; -}; - -zone "ip6.int." { - type master; - file "ip6.int.db"; -}; - -zone "ip6.arpa." { - type master; - file "ip6.arpa.db"; -}; diff --git a/bin/tests/system/lwresd/ns1/root.db b/bin/tests/system/lwresd/ns1/root.db deleted file mode 100644 index cb97138a07..0000000000 --- a/bin/tests/system/lwresd/ns1/root.db +++ /dev/null @@ -1,24 +0,0 @@ -; Copyright (C) 2000, 2001, 2004, 2007, 2016 Internet Systems Consortium, Inc. ("ISC") -; -; This Source Code Form is subject to the terms of the Mozilla Public -; License, v. 2.0. If a copy of the MPL was not distributed with this -; file, You can obtain one at http://mozilla.org/MPL/2.0/. - -; $Id: root.db,v 1.9 2007/06/19 23:47:04 tbox Exp $ - -$TTL 300 -. IN SOA gson.nominum.com. a.root.servers.nil. ( - 2000042100 ; serial - 600 ; refresh - 600 ; retry - 1200 ; expire - 600 ; minimum - ) -. NS a.root-servers.nil. -a.root-servers.nil. A 10.53.0.1 - -example1. NS ns.example1. -ns.example1. A 10.53.0.2 -example2. NS ns.example2. -ns.example2. A 10.53.0.2 -x A 10.1.10.1 diff --git a/bin/tests/system/lwresd/resolv.conf b/bin/tests/system/lwresd/resolv.conf deleted file mode 100644 index 34e84e6fc5..0000000000 --- a/bin/tests/system/lwresd/resolv.conf +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright (C) 2000, 2001, 2004, 2007, 2012, 2016 Internet Systems Consortium, Inc. ("ISC") -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -# $Id: resolv.conf,v 1.11 2007/06/19 23:47:04 tbox Exp $ - -nameserver 10.53.0.1 -lwserver 10.53.0.1 -search example1. -ndots 1 diff --git a/bin/tests/system/lwresd/tests.sh b/bin/tests/system/lwresd/tests.sh deleted file mode 100644 index 8b1984489c..0000000000 --- a/bin/tests/system/lwresd/tests.sh +++ /dev/null @@ -1,84 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2000, 2001, 2004, 2007, 2011-2014, 2016 Internet Systems Consortium, Inc. ("ISC") -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -# $Id: tests.sh,v 1.22 2012/02/03 23:46:58 tbox Exp $ - -SYSTEMTESTTOP=.. -. $SYSTEMTESTTOP/conf.sh - -status=0 -echo "I:waiting for nameserver to load" -for i in 0 1 2 3 4 5 6 7 8 9 -do - ret=0 - for zone in . example1 e.example1 example2 10.10.10.in-addr.arpa \ - ip6.int ip6.arpa - do - $DIG +tcp -p 5300 @10.53.0.1 soa $zone > dig.out - grep "status: NOERROR" dig.out > /dev/null || ret=1 - grep "ANSWER: 1," dig.out > /dev/null || ret=1 - done - test $ret = 0 && break - sleep 1 -done -if [ $ret != 0 ]; then echo "I:failed"; fi -status=`expr $status + $ret` - -echo "I:using resolv.conf" -ret=0 -for i in 0 1 2 3 4 5 6 7 8 9 -do - grep ' running$' lwresd1/lwresd.run > /dev/null && break - sleep 1 -done -$LWTEST || ret=1 -if [ $ret != 0 ]; then - echo "I:failed" -fi -status=`expr $status + $ret` - -$PERL $SYSTEMTESTTOP/stop.pl . lwresd1 - -mv lwresd1/lwresd.run lwresd1/lwresd.run.resolv - -$PERL $SYSTEMTESTTOP/start.pl . lwresd1 -- "-X lwresd.lock -m record,size,mctx -c lwresd.conf -d 99 -g" - -echo "I:using lwresd.conf" -ret=0 -for i in 0 1 2 3 4 5 6 7 8 9 -do - grep ' running$' lwresd1/lwresd.run > /dev/null && break - sleep 1 -done -$LWTEST || ret=1 -if [ $ret != 0 ]; then - echo "I:failed" -fi -status=`expr $status + $ret` - -$PERL $SYSTEMTESTTOP/stop.pl . lwresd1 - -mv lwresd1/lwresd.run lwresd1/lwresd.run.lwresd - -$PERL $SYSTEMTESTTOP/start.pl . lwresd1 -- "-X lwresd.lock -m record,size,mctx -c nosearch.conf -d 99 -g" - -echo "I:using nosearch.conf" -ret=0 -for i in 0 1 2 3 4 5 6 7 8 9 -do - grep ' running$' lwresd1/lwresd.run > /dev/null && break - sleep 1 -done -$LWTEST -nosearch || ret=1 -if [ $ret != 0 ]; then - echo "I:failed" -fi -status=`expr $status + $ret` - -echo "I:exit status: $status" -[ $status -eq 0 ] || exit 1 diff --git a/bin/tests/system/nsupdate/tests.sh b/bin/tests/system/nsupdate/tests.sh index 707ffe156e..8673a364e8 100755 --- a/bin/tests/system/nsupdate/tests.sh +++ b/bin/tests/system/nsupdate/tests.sh @@ -803,7 +803,7 @@ echo "I:ensure unresolvable server name is fatal in non-interactive mode ($n)" $NSUPDATE < nsupdate.out 2>&1 && ret=1 server unresolvable.. END -grep "couldn't get address for 'unresolvable..': not found" nsupdate.out > /dev/null || ret=1 +grep "couldn't get address for 'unresolvable..': failure" nsupdate.out > /dev/null || ret=1 grep "syntax error" nsupdate.out > /dev/null || ret=1 [ $ret = 0 ] || { echo I:failed; status=1; } @@ -813,7 +813,7 @@ echo "I:ensure unresolvable server name is not fatal in interactive mode ($n)" $NSUPDATE -i < nsupdate.out 2>&1 || ret=1 server unresolvable.. END -grep "couldn't get address for 'unresolvable..': not found" nsupdate.out > /dev/null || ret=1 +grep "couldn't get address for 'unresolvable..': failure" nsupdate.out > /dev/null || ret=1 [ $ret = 0 ] || { echo I:failed; status=1; } n=`expr $n + 1` diff --git a/bin/tests/system/start.pl b/bin/tests/system/start.pl index 9475e9bf11..e882d08d69 100644 --- a/bin/tests/system/start.pl +++ b/bin/tests/system/start.pl @@ -54,7 +54,6 @@ if ($server && !-d "$test/$server") { my $topdir = abs_path("$test/.."); my $testdir = abs_path("$test"); my $NAMED = $ENV{'NAMED'}; -my $LWRESD = $ENV{'LWRESD'}; my $DIG = $ENV{'DIG'}; my $PERL = $ENV{'PERL'}; my $PYTHON = $ENV{'PYTHON'}; @@ -76,13 +75,12 @@ if ($server) { closedir DIR; my @ns = grep /^ns[0-9]*$/, @files; - my @lwresd = grep /^lwresd[0-9]*$/, @files; my @ans = grep /^ans[0-9]*$/, @files; my $name; # Start the servers we found. &check_ports(); - foreach $name(@ns, @lwresd, @ans) { + foreach $name(@ns, @ans) { &start_server($name); &verify_server($name) if ($name =~ /^ns/); @@ -195,34 +193,6 @@ sub start_server { $command .= " >named.run 2>&1 &"; } $pid_file = "named.pid"; - } elsif ($server =~ /^lwresd/) { - $cleanup_files = "{lwresd.run}"; - if ($ENV{'USE_VALGRIND'}) { - $command = "valgrind -q --gen-suppressions=all --num-callers=48 --fullpath-after= --log-file=lwresd-valgrind-%p.log "; - if ($ENV{'USE_VALGRIND'} eq 'helgrind') { - $command .= "--tool=helgrind "; - } else { - $command .= "--tool=memcheck --track-origins=yes --leak-check=full "; - } - $command .= "$LWRESD -m none -M external "; - } else { - $command = "$LWRESD "; - } - if ($options) { - $command .= "$options"; - } else { - $command .= "-X lwresd.lock "; - $command .= "-m record,size,mctx "; - $command .= "-T clienttest "; - $command .= "-C resolv.conf -d 99 -g -U 4 "; - $command .= "-i lwresd.pid -P 9210 -p 5300"; - } - if ($restart) { - $command .= " >>lwresd.run 2>&1 &"; - } else { - $command .= " >lwresd.run 2>&1 &"; - } - $pid_file = "lwresd.pid"; } elsif ($server =~ /^ans/) { $cleanup_files = "{ans.run}"; if (-e "$testdir/$server/ans.py") { diff --git a/bin/tests/system/stop.pl b/bin/tests/system/stop.pl index a2cd5b5ae6..8f3ea2dec9 100644 --- a/bin/tests/system/stop.pl +++ b/bin/tests/system/stop.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl -w # -# Copyright (C) 2001, 2004-2007, 2012, 2016 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2001, 2004-2007, 2012, 2016, 2017 Internet Systems Consortium, Inc. ("ISC") # # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this @@ -58,10 +58,9 @@ if (defined $server) { closedir DIR; my @ns = grep /^ns[0-9]*$/, @files; - my @lwresd = grep /^lwresd[0-9]*$/, @files; my @ans = grep /^ans[0-9]*$/, @files; - push @servers, @ns, @lwresd, @ans; + push @servers, @ns, @ans; } @@ -98,8 +97,6 @@ sub server_pid_file { my $pid_file; if ($server =~ /^ns/) { $pid_file = "named.pid"; - } elsif ($server =~ /^lwresd/) { - $pid_file = "lwresd.pid"; } elsif ($server =~ /^ans/) { $pid_file = "ans.pid"; } else { diff --git a/bin/tests/system/win32/bigkey.dsp.in b/bin/tests/system/win32/bigkey.dsp.in deleted file mode 100644 index 18f44789d0..0000000000 --- a/bin/tests/system/win32/bigkey.dsp.in +++ /dev/null @@ -1,95 +0,0 @@ -# Microsoft Developer Studio Project File - Name="bigkey" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103 - -CFG=bigkey - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "bigkey.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "bigkey.mak" CFG="bigkey - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "bigkey - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "bigkey - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "bigkey - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" @CRYPTO@ /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console @MACHINE@ -# ADD LINK32 @LIBXML2_LIB@ @OPENSSL_LIB@ user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Release/libisc.lib ../../../../lib/dns/win32/Release/libdns.lib /nologo /subsystem:console @MACHINE@ /out:"../../../../Build/Release/bigkey.exe" - -!ELSEIF "$(CFG)" == "bigkey - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" @CRYPTO@ /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR /FD /GZ /c -# SUBTRACT CPP /X @COPTY@ -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console /debug @MACHINE@ /pdbtype:sept -# ADD LINK32 @LIBXML2_LIB@ @OPENSSL_LIB@ user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Debug/libisc.lib ../../../../lib/dns/win32/Debug/libdns.lib /nologo /subsystem:console /map /debug @MACHINE@ /out:"../../../../Build/Debug/bigkey.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "bigkey - @PLATFORM@ Release" -# Name "bigkey - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\rsabigexponent\bigkey.c -# End Source File -# End Group -# End Target -# End Project diff --git a/bin/tests/system/win32/bigkey.dsw b/bin/tests/system/win32/bigkey.dsw deleted file mode 100644 index d288997ffc..0000000000 --- a/bin/tests/system/win32/bigkey.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "bigkey"=".\bigkey.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/bin/tests/system/win32/bigkey.mak.in b/bin/tests/system/win32/bigkey.mak.in deleted file mode 100644 index 5ea956d4f5..0000000000 --- a/bin/tests/system/win32/bigkey.mak.in +++ /dev/null @@ -1,346 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on bigkey.dsp -!IF "$(CFG)" == "" -CFG=bigkey - @PLATFORM@ Debug -!MESSAGE No configuration specified. Defaulting to bigkey - @PLATFORM@ Debug. -!ENDIF - -!IF "$(CFG)" != "bigkey - @PLATFORM@ Release" && "$(CFG)" != "bigkey - @PLATFORM@ Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "bigkey.mak" CFG="bigkey - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "bigkey - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "bigkey - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -CPP=cl.exe -RSC=rc.exe -LIBXML=@LIBXML2_LIB@ - -!IF "$(CFG)" == "bigkey - @PLATFORM@ 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)" == "bigkey - @PLATFORM@ Release" - -OUTDIR=.\Release -INTDIR=.\Release - -!IF "$(RECURSE)" == "0" - -ALL : "..\..\..\..\Build\Release\bigkey.exe" - -!ELSE - -ALL : "libisc - @PLATFORM@ Release" "libdns - @PLATFORM@ Release" "..\..\..\..\Build\Release\bigkey.exe" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"libdns - @PLATFORM@ ReleaseCLEAN" "libisc - @PLATFORM@ ReleaseCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\bigkey.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "..\..\..\..\Build\Release\bigkey.exe" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" @CRYPTO@ /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\bigkey.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\bigkey.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Release/libisc.lib ../../../../lib/dns/win32/Release/libdns.lib $(LIBXML) @OPENSSL_LIB@ /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\bigkey.pdb" @MACHINE@ /out:"../../../../Build/Release/bigkey.exe" -LINK32_OBJS= \ - "$(INTDIR)\bigkey.obj" \ - "..\..\..\..\lib\isc\win32\Release\libisc.lib" \ - "..\..\..\..\lib\isc\win32\Release\libdns.lib" - -"..\..\..\..\Build\Release\bigkey.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ELSEIF "$(CFG)" == "bigkey - @PLATFORM@ Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : "..\..\..\..\Build\Debug\bigkey.exe" "$(OUTDIR)\bigkey.bsc" - -!ELSE - -ALL : "libisc - @PLATFORM@ Debug" "libdns - @PLATFORM@ Debug" "..\..\..\..\Build\Debug\bigkey.exe" "$(OUTDIR)\bigkey.bsc" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"libdns - @PLATFORM@ DebugCLEAN" "libisc - @PLATFORM@ DebugCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\bigkey.obj" - -@erase "$(INTDIR)\bigkey.sbr" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\bigkey.bsc" - -@erase "$(OUTDIR)\bigkey.map" - -@erase "$(OUTDIR)\bigkey.pdb" - -@erase "..\..\..\..\Build\Debug\bigkey.exe" - -@erase "..\..\..\..\Build\Debug\bigkey.ilk" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" @CRYPTO@ /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\bigkey.bsc" -BSC32_SBRS= \ - "$(INTDIR)\bigkey.sbr" - -"$(OUTDIR)\bigkey.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Debug/libisc.lib ../../../../lib/dns/win32/Debug/libdns.lib $(LIBXML) @OPENSSL_LIB@ /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\bigkey.pdb" /map:"$(INTDIR)\bigkey.map" /debug @MACHINE@ /out:"../../../../Build/Debug/bigkey.exe" /pdbtype:sept -LINK32_OBJS= \ - "$(INTDIR)\bigkey.obj" \ - "..\..\..\..\lib\isc\win32\Debug\libisc.lib" \ - "..\..\..\..\lib\isc\win32\Debug\libdns.lib" - -"..\..\..\..\Build\Debug\bigkey.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ENDIF - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("bigkey.dep") -!INCLUDE "bigkey.dep" -!ELSE -!MESSAGE Warning: cannot find "bigkey.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "bigkey - @PLATFORM@ Release" || "$(CFG)" == "bigkey - @PLATFORM@ Debug" -SOURCE=..\rsabigexponent\bigkey.c - -!IF "$(CFG)" == "bigkey - @PLATFORM@ Release" - - -"$(INTDIR)\bigkey.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "bigkey - @PLATFORM@ Debug" - - -"$(INTDIR)\bigkey.obj" "$(INTDIR)\bigkey.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -!IF "$(CFG)" == "bigkey - @PLATFORM@ Release" - -"libdns - @PLATFORM@ Release" : - cd "..\..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" - cd "..\..\..\bin\tests\system\win32" - -"libdns - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\system\win32" - -!ELSEIF "$(CFG)" == "bigkey - @PLATFORM@ Debug" - -"libdns - @PLATFORM@ Debug" : - cd "..\..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" - cd "..\..\..\bin\tests\system\win32" - -"libdns - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\system\win32" - -!ENDIF - -!IF "$(CFG)" == "bigkey - @PLATFORM@ Release" - -"libisc - @PLATFORM@ Release" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" - cd "..\..\..\bin\tests\system\win32" - -"libisc - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\system\win32" - -!ELSEIF "$(CFG)" == "bigkey - @PLATFORM@ Debug" - -"libisc - @PLATFORM@ Debug" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" - cd "..\..\..\bin\tests\system\win32" - -"libisc - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\system\win32" - -!ENDIF - -!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 -1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest" -<< KEEP - -$(_VC_MANIFEST_BASENAME).auto.manifest : - type <<$@ - - - -<< KEEP diff --git a/bin/tests/system/win32/feature-test.dsp.in b/bin/tests/system/win32/feature-test.dsp.in deleted file mode 100644 index 4c9136c295..0000000000 --- a/bin/tests/system/win32/feature-test.dsp.in +++ /dev/null @@ -1,95 +0,0 @@ -# Microsoft Developer Studio Project File - Name="feature-test" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103 - -CFG=feature-test - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "feature-test.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "feature-test.mak" CFG="feature-test - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "feature-test - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "feature-test - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "feature-test - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console @MACHINE@ -# ADD LINK32 user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Release/libisc.lib /nologo /subsystem:console @MACHINE@ /out:"../../../../Build/Release/feature-test.exe" - -!ELSEIF "$(CFG)" == "feature-test - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR /FD /GZ /c -# SUBTRACT CPP /X @COPTY@ -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console /debug @MACHINE@ /pdbtype:sept -# ADD LINK32 user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Debug/libisc.lib /nologo /subsystem:console /map /debug @MACHINE@ /out:"../../../../Build/Debug/feature-test.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "feature-test - @PLATFORM@ Release" -# Name "feature-test - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\feature-test.c -# End Source File -# End Group -# End Target -# End Project diff --git a/bin/tests/system/win32/feature-test.dsw b/bin/tests/system/win32/feature-test.dsw deleted file mode 100644 index efe3eb1343..0000000000 --- a/bin/tests/system/win32/feature-test.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "feature-test"=".\feature-test.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/bin/tests/system/win32/feature-test.mak.in b/bin/tests/system/win32/feature-test.mak.in deleted file mode 100644 index 33ac54f346..0000000000 --- a/bin/tests/system/win32/feature-test.mak.in +++ /dev/null @@ -1,318 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on feature-test.dsp -!IF "$(CFG)" == "" -CFG=feature-test - @PLATFORM@ Debug -!MESSAGE No configuration specified. Defaulting to feature-test - @PLATFORM@ Debug. -!ENDIF - -!IF "$(CFG)" != "feature-test - @PLATFORM@ Release" && "$(CFG)" != "feature-test - @PLATFORM@ Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "feature-test.mak" CFG="feature-test - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "feature-test - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "feature-test - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -CPP=cl.exe -RSC=rc.exe -LIBXML=@LIBXML2_LIB@ - -!IF "$(CFG)" == "feature-test - @PLATFORM@ 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)" == "feature-test - @PLATFORM@ Release" - -OUTDIR=.\Release -INTDIR=.\Release - -!IF "$(RECURSE)" == "0" - -ALL : "..\..\..\..\Build\Release\feature-test.exe" - -!ELSE - -ALL : "libisc - @PLATFORM@ Release" "..\..\..\..\Build\Release\feature-test.exe" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"libisc - @PLATFORM@ ReleaseCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\feature-test.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "..\..\..\..\Build\Release\feature-test.exe" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\feature-test.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\feature-test.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Release/libisc.lib $(LIBXML) /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\feature-test.pdb" @MACHINE@ /out:"../../../../Build/Release/feature-test.exe" -LINK32_OBJS= \ - "$(INTDIR)\feature-test.obj" \ - "..\..\..\..\lib\isc\win32\Release\libisc.lib" - -"..\..\..\..\Build\Release\feature-test.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ELSEIF "$(CFG)" == "feature-test - @PLATFORM@ Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : "..\..\..\..\Build\Debug\feature-test.exe" "$(OUTDIR)\feature-test.bsc" - -!ELSE - -ALL : "libisc - @PLATFORM@ Debug" "..\..\..\..\Build\Debug\feature-test.exe" "$(OUTDIR)\feature-test.bsc" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"libisc - @PLATFORM@ DebugCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\feature-test.obj" - -@erase "$(INTDIR)\feature-test.sbr" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\feature-test.bsc" - -@erase "$(OUTDIR)\feature-test.map" - -@erase "$(OUTDIR)\feature-test.pdb" - -@erase "..\..\..\..\Build\Debug\feature-test.exe" - -@erase "..\..\..\..\Build\Debug\feature-test.ilk" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\feature-test.bsc" -BSC32_SBRS= \ - "$(INTDIR)\feature-test.sbr" - -"$(OUTDIR)\feature-test.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Debug/libisc.lib $(LIBXML) /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\feature-test.pdb" /map:"$(INTDIR)\feature-test.map" /debug @MACHINE@ /out:"../../../../Build/Debug/feature-test.exe" /pdbtype:sept -LINK32_OBJS= \ - "$(INTDIR)\feature-test.obj" \ - "..\..\..\..\lib\isc\win32\Debug\libisc.lib" - -"..\..\..\..\Build\Debug\feature-test.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ENDIF - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("feature-test.dep") -!INCLUDE "feature-test.dep" -!ELSE -!MESSAGE Warning: cannot find "feature-test.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "feature-test - @PLATFORM@ Release" || "$(CFG)" == "feature-test - @PLATFORM@ Debug" -SOURCE=..\feature-test.c - -!IF "$(CFG)" == "feature-test - @PLATFORM@ Release" - - -"$(INTDIR)\feature-test.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "feature-test - @PLATFORM@ Debug" - - -"$(INTDIR)\feature-test.obj" "$(INTDIR)\feature-test.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -!IF "$(CFG)" == "feature-test - @PLATFORM@ Release" - -"libisc - @PLATFORM@ Release" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" - cd "..\..\..\bin\tests\system\win32" - -"libisc - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\system\win32" - -!ELSEIF "$(CFG)" == "feature-test - @PLATFORM@ Debug" - -"libisc - @PLATFORM@ Debug" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" - cd "..\..\..\bin\tests\system\win32" - -"libisc - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\system\win32" - -!ENDIF - -!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 -1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest" -<< KEEP - -$(_VC_MANIFEST_BASENAME).auto.manifest : - type <<$@ - - - -<< KEEP diff --git a/bin/tests/system/win32/gencheck.dsp.in b/bin/tests/system/win32/gencheck.dsp.in deleted file mode 100644 index 8e8005fd8e..0000000000 --- a/bin/tests/system/win32/gencheck.dsp.in +++ /dev/null @@ -1,95 +0,0 @@ -# Microsoft Developer Studio Project File - Name="gencheck" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103 - -CFG=gencheck - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "gencheck.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "gencheck.mak" CFG="gencheck - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "gencheck - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "gencheck - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "gencheck - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console @MACHINE@ -# ADD LINK32 @LIBXML2_LIB@ user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Release/libisc.lib /nologo /subsystem:console @MACHINE@ /out:"../../../../Build/Release/gencheck.exe" - -!ELSEIF "$(CFG)" == "gencheck - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR /FD /GZ /c -# SUBTRACT CPP /X @COPTY@ -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console /debug @MACHINE@ /pdbtype:sept -# ADD LINK32 @LIBXML2_LIB@ user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Debug/libisc.lib /nologo /subsystem:console /map /debug @MACHINE@ /out:"../../../../Build/Debug/gencheck.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "gencheck - @PLATFORM@ Release" -# Name "gencheck - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\rndc\gencheck.c -# End Source File -# End Group -# End Target -# End Project diff --git a/bin/tests/system/win32/gencheck.dsw b/bin/tests/system/win32/gencheck.dsw deleted file mode 100644 index ac74995718..0000000000 --- a/bin/tests/system/win32/gencheck.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "gencheck"=".\gencheck.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/bin/tests/system/win32/gencheck.mak.in b/bin/tests/system/win32/gencheck.mak.in deleted file mode 100644 index 016f2904b4..0000000000 --- a/bin/tests/system/win32/gencheck.mak.in +++ /dev/null @@ -1,318 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on gencheck.dsp -!IF "$(CFG)" == "" -CFG=gencheck - @PLATFORM@ Debug -!MESSAGE No configuration specified. Defaulting to gencheck - @PLATFORM@ Debug. -!ENDIF - -!IF "$(CFG)" != "gencheck - @PLATFORM@ Release" && "$(CFG)" != "gencheck - @PLATFORM@ Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "gencheck.mak" CFG="gencheck - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "gencheck - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "gencheck - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -CPP=cl.exe -RSC=rc.exe -LIBXML=@LIBXML2_LIB@ - -!IF "$(CFG)" == "gencheck - @PLATFORM@ 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)" == "gencheck - @PLATFORM@ Release" - -OUTDIR=.\Release -INTDIR=.\Release - -!IF "$(RECURSE)" == "0" - -ALL : "..\..\..\..\Build\Release\gencheck.exe" - -!ELSE - -ALL : "libisc - @PLATFORM@ Release" "..\..\..\..\Build\Release\gencheck.exe" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"libisc - @PLATFORM@ ReleaseCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\gencheck.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "..\..\..\..\Build\Release\gencheck.exe" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\gencheck.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\gencheck.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Release/libisc.lib $(LIBXML) /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\gencheck.pdb" @MACHINE@ /out:"../../../../Build/Release/gencheck.exe" -LINK32_OBJS= \ - "$(INTDIR)\gencheck.obj" \ - "..\..\..\..\lib\isc\win32\Release\libisc.lib" - -"..\..\..\..\Build\Release\gencheck.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ELSEIF "$(CFG)" == "gencheck - @PLATFORM@ Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : "..\..\..\..\Build\Debug\gencheck.exe" "$(OUTDIR)\gencheck.bsc" - -!ELSE - -ALL : "libisc - @PLATFORM@ Debug" "..\..\..\..\Build\Debug\gencheck.exe" "$(OUTDIR)\gencheck.bsc" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"libisc - @PLATFORM@ DebugCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\gencheck.obj" - -@erase "$(INTDIR)\gencheck.sbr" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\gencheck.bsc" - -@erase "$(OUTDIR)\gencheck.map" - -@erase "$(OUTDIR)\gencheck.pdb" - -@erase "..\..\..\..\Build\Debug\gencheck.exe" - -@erase "..\..\..\..\Build\Debug\gencheck.ilk" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\gencheck.bsc" -BSC32_SBRS= \ - "$(INTDIR)\gencheck.sbr" - -"$(OUTDIR)\gencheck.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Debug/libisc.lib $(LIBXML) /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\gencheck.pdb" /map:"$(INTDIR)\gencheck.map" /debug @MACHINE@ /out:"../../../../Build/Debug/gencheck.exe" /pdbtype:sept -LINK32_OBJS= \ - "$(INTDIR)\gencheck.obj" \ - "..\..\..\..\lib\isc\win32\Debug\libisc.lib" - -"..\..\..\..\Build\Debug\gencheck.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ENDIF - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("gencheck.dep") -!INCLUDE "gencheck.dep" -!ELSE -!MESSAGE Warning: cannot find "gencheck.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "gencheck - @PLATFORM@ Release" || "$(CFG)" == "gencheck - @PLATFORM@ Debug" -SOURCE=..\rndc\gencheck.c - -!IF "$(CFG)" == "gencheck - @PLATFORM@ Release" - - -"$(INTDIR)\gencheck.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "gencheck - @PLATFORM@ Debug" - - -"$(INTDIR)\gencheck.obj" "$(INTDIR)\gencheck.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -!IF "$(CFG)" == "gencheck - @PLATFORM@ Release" - -"libisc - @PLATFORM@ Release" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" - cd "..\..\..\bin\tests\system\win32" - -"libisc - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\system\win32" - -!ELSEIF "$(CFG)" == "gencheck - @PLATFORM@ Debug" - -"libisc - @PLATFORM@ Debug" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" - cd "..\..\..\bin\tests\system\win32" - -"libisc - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\system\win32" - -!ENDIF - -!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 -1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest" -<< KEEP - -$(_VC_MANIFEST_BASENAME).auto.manifest : - type <<$@ - - - -<< KEEP diff --git a/bin/tests/system/win32/keycreate.dsp.in b/bin/tests/system/win32/keycreate.dsp.in deleted file mode 100644 index c83b68255f..0000000000 --- a/bin/tests/system/win32/keycreate.dsp.in +++ /dev/null @@ -1,95 +0,0 @@ -# Microsoft Developer Studio Project File - Name="keycreate" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103 - -CFG=keycreate - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "keycreate.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "keycreate.mak" CFG="keycreate - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "keycreate - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "keycreate - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "keycreate - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" @CRYPTO@ /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console @MACHINE@ -# ADD LINK32 @LIBXML2_LIB@ @OPENSSL_LIB@ user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Release/libisc.lib ../../../../lib/dns/win32/Release/libdns.lib /nologo /subsystem:console @MACHINE@ /out:"../../../../Build/Release/keycreate.exe" - -!ELSEIF "$(CFG)" == "keycreate - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" @CRYPTO@ /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR /FD /GZ /c -# SUBTRACT CPP /X @COPTY@ -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console /debug @MACHINE@ /pdbtype:sept -# ADD LINK32 @LIBXML2_LIB@ @OPENSSL_LIB@ user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Debug/libisc.lib ../../../../lib/dns/win32/Debug/libdns.lib /nologo /subsystem:console /map /debug @MACHINE@ /out:"../../../../Build/Debug/keycreate.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "keycreate - @PLATFORM@ Release" -# Name "keycreate - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\tkey\keycreate.c -# End Source File -# End Group -# End Target -# End Project diff --git a/bin/tests/system/win32/keycreate.dsw b/bin/tests/system/win32/keycreate.dsw deleted file mode 100644 index 32674a3364..0000000000 --- a/bin/tests/system/win32/keycreate.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "keycreate"=".\keycreate.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/bin/tests/system/win32/keycreate.mak.in b/bin/tests/system/win32/keycreate.mak.in deleted file mode 100644 index 260d3dac2e..0000000000 --- a/bin/tests/system/win32/keycreate.mak.in +++ /dev/null @@ -1,346 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on keycreate.dsp -!IF "$(CFG)" == "" -CFG=keycreate - @PLATFORM@ Debug -!MESSAGE No configuration specified. Defaulting to keycreate - @PLATFORM@ Debug. -!ENDIF - -!IF "$(CFG)" != "keycreate - @PLATFORM@ Release" && "$(CFG)" != "keycreate - @PLATFORM@ Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "keycreate.mak" CFG="keycreate - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "keycreate - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "keycreate - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -CPP=cl.exe -RSC=rc.exe -LIBXML=@LIBXML2_LIB@ - -!IF "$(CFG)" == "keycreate - @PLATFORM@ 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)" == "keycreate - @PLATFORM@ Release" - -OUTDIR=.\Release -INTDIR=.\Release - -!IF "$(RECURSE)" == "0" - -ALL : "..\..\..\..\Build\Release\keycreate.exe" - -!ELSE - -ALL : "libisc - @PLATFORM@ Release" "libdns - @PLATFORM@ Release" "..\..\..\..\Build\Release\keycreate.exe" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"libdns - @PLATFORM@ ReleaseCLEAN" "libisc - @PLATFORM@ ReleaseCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\keycreate.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "..\..\..\..\Build\Release\keycreate.exe" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" @CRYPTO@ /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\keycreate.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\keycreate.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Release/libisc.lib ../../../../lib/dns/win32/Release/libdns.lib $(LIBXML) @OPENSSL_LIB@ /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\keycreate.pdb" @MACHINE@ /out:"../../../../Build/Release/keycreate.exe" -LINK32_OBJS= \ - "$(INTDIR)\keycreate.obj" \ - "..\..\..\..\lib\isc\win32\Release\libisc.lib" \ - "..\..\..\..\lib\isc\win32\Release\libdns.lib" - -"..\..\..\..\Build\Release\keycreate.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ELSEIF "$(CFG)" == "keycreate - @PLATFORM@ Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : "..\..\..\..\Build\Debug\keycreate.exe" "$(OUTDIR)\keycreate.bsc" - -!ELSE - -ALL : "libisc - @PLATFORM@ Debug" "libdns - @PLATFORM@ Debug" "..\..\..\..\Build\Debug\keycreate.exe" "$(OUTDIR)\keycreate.bsc" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"libdns - @PLATFORM@ DebugCLEAN" "libisc - @PLATFORM@ DebugCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\keycreate.obj" - -@erase "$(INTDIR)\keycreate.sbr" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\keycreate.bsc" - -@erase "$(OUTDIR)\keycreate.map" - -@erase "$(OUTDIR)\keycreate.pdb" - -@erase "..\..\..\..\Build\Debug\keycreate.exe" - -@erase "..\..\..\..\Build\Debug\keycreate.ilk" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" @CRYPTO@ /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\keycreate.bsc" -BSC32_SBRS= \ - "$(INTDIR)\keycreate.sbr" - -"$(OUTDIR)\keycreate.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Debug/libisc.lib ../../../../lib/dns/win32/Debug/libdns.lib $(LIBXML) @OPENSSL_LIB@ /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\keycreate.pdb" /map:"$(INTDIR)\keycreate.map" /debug @MACHINE@ /out:"../../../../Build/Debug/keycreate.exe" /pdbtype:sept -LINK32_OBJS= \ - "$(INTDIR)\keycreate.obj" \ - "..\..\..\..\lib\isc\win32\Debug\libisc.lib" \ - "..\..\..\..\lib\isc\win32\Debug\libdns.lib" - -"..\..\..\..\Build\Debug\keycreate.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ENDIF - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("keycreate.dep") -!INCLUDE "keycreate.dep" -!ELSE -!MESSAGE Warning: cannot find "keycreate.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "keycreate - @PLATFORM@ Release" || "$(CFG)" == "keycreate - @PLATFORM@ Debug" -SOURCE=..\tkey\keycreate.c - -!IF "$(CFG)" == "keycreate - @PLATFORM@ Release" - - -"$(INTDIR)\keycreate.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "keycreate - @PLATFORM@ Debug" - - -"$(INTDIR)\keycreate.obj" "$(INTDIR)\keycreate.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -!IF "$(CFG)" == "keycreate - @PLATFORM@ Release" - -"libdns - @PLATFORM@ Release" : - cd "..\..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" - cd "..\..\..\bin\tests\system\win32" - -"libdns - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\system\win32" - -!ELSEIF "$(CFG)" == "keycreate - @PLATFORM@ Debug" - -"libdns - @PLATFORM@ Debug" : - cd "..\..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" - cd "..\..\..\bin\tests\system\win32" - -"libdns - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\system\win32" - -!ENDIF - -!IF "$(CFG)" == "keycreate - @PLATFORM@ Release" - -"libisc - @PLATFORM@ Release" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" - cd "..\..\..\bin\tests\system\win32" - -"libisc - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\system\win32" - -!ELSEIF "$(CFG)" == "keycreate - @PLATFORM@ Debug" - -"libisc - @PLATFORM@ Debug" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" - cd "..\..\..\bin\tests\system\win32" - -"libisc - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\system\win32" - -!ENDIF - -!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 -1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest" -<< KEEP - -$(_VC_MANIFEST_BASENAME).auto.manifest : - type <<$@ - - - -<< KEEP diff --git a/bin/tests/system/win32/keydelete.dsp.in b/bin/tests/system/win32/keydelete.dsp.in deleted file mode 100644 index 277e2fb68f..0000000000 --- a/bin/tests/system/win32/keydelete.dsp.in +++ /dev/null @@ -1,95 +0,0 @@ -# Microsoft Developer Studio Project File - Name="keydelete" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103 - -CFG=keydelete - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "keydelete.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "keydelete.mak" CFG="keydelete - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "keydelete - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "keydelete - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "keydelete - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" @CRYPTO@ /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console @MACHINE@ -# ADD LINK32 @LIBXML2_LIB@ @OPENSSL_LIB@ user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Release/libisc.lib ../../../../lib/dns/win32/Release/libdns.lib /nologo /subsystem:console @MACHINE@ /out:"../../../../Build/Release/keydelete.exe" - -!ELSEIF "$(CFG)" == "keydelete - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" @CRYPTO@ /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR /FD /GZ /c -# SUBTRACT CPP /X @COPTY@ -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console /debug @MACHINE@ /pdbtype:sept -# ADD LINK32 @LIBXML2_LIB@ @OPENSSL_LIB@ user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Debug/libisc.lib ../../../../lib/dns/win32/Debug/libdns.lib /nologo /subsystem:console /map /debug @MACHINE@ /out:"../../../../Build/Debug/keydelete.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "keydelete - @PLATFORM@ Release" -# Name "keydelete - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\tkey\keydelete.c -# End Source File -# End Group -# End Target -# End Project diff --git a/bin/tests/system/win32/keydelete.dsw b/bin/tests/system/win32/keydelete.dsw deleted file mode 100644 index 4cec0e0511..0000000000 --- a/bin/tests/system/win32/keydelete.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "keydelete"=".\keydelete.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/bin/tests/system/win32/keydelete.mak.in b/bin/tests/system/win32/keydelete.mak.in deleted file mode 100644 index 19e630090e..0000000000 --- a/bin/tests/system/win32/keydelete.mak.in +++ /dev/null @@ -1,346 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on keydelete.dsp -!IF "$(CFG)" == "" -CFG=keydelete - @PLATFORM@ Debug -!MESSAGE No configuration specified. Defaulting to keydelete - @PLATFORM@ Debug. -!ENDIF - -!IF "$(CFG)" != "keydelete - @PLATFORM@ Release" && "$(CFG)" != "keydelete - @PLATFORM@ Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "keydelete.mak" CFG="keydelete - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "keydelete - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "keydelete - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -CPP=cl.exe -RSC=rc.exe -LIBXML=@LIBXML2_LIB@ - -!IF "$(CFG)" == "keydelete - @PLATFORM@ 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)" == "keydelete - @PLATFORM@ Release" - -OUTDIR=.\Release -INTDIR=.\Release - -!IF "$(RECURSE)" == "0" - -ALL : "..\..\..\..\Build\Release\keydelete.exe" - -!ELSE - -ALL : "libisc - @PLATFORM@ Release" "libdns - @PLATFORM@ Release" "..\..\..\..\Build\Release\keydelete.exe" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"libdns - @PLATFORM@ ReleaseCLEAN" "libisc - @PLATFORM@ ReleaseCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\keydelete.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "..\..\..\..\Build\Release\keydelete.exe" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" @CRYPTO@ /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\keydelete.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\keydelete.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Release/libisc.lib ../../../../lib/dns/win32/Release/libdns.lib $(LIBXML) @OPENSSL_LIB@ /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\keydelete.pdb" @MACHINE@ /out:"../../../../Build/Release/keydelete.exe" -LINK32_OBJS= \ - "$(INTDIR)\keydelete.obj" \ - "..\..\..\..\lib\isc\win32\Release\libisc.lib" \ - "..\..\..\..\lib\isc\win32\Release\libdns.lib" - -"..\..\..\..\Build\Release\keydelete.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ELSEIF "$(CFG)" == "keydelete - @PLATFORM@ Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : "..\..\..\..\Build\Debug\keydelete.exe" "$(OUTDIR)\keydelete.bsc" - -!ELSE - -ALL : "libisc - @PLATFORM@ Debug" "libdns - @PLATFORM@ Debug" "..\..\..\..\Build\Debug\keydelete.exe" "$(OUTDIR)\keydelete.bsc" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"libdns - @PLATFORM@ DebugCLEAN" "libisc - @PLATFORM@ DebugCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\keydelete.obj" - -@erase "$(INTDIR)\keydelete.sbr" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\keydelete.bsc" - -@erase "$(OUTDIR)\keydelete.map" - -@erase "$(OUTDIR)\keydelete.pdb" - -@erase "..\..\..\..\Build\Debug\keydelete.exe" - -@erase "..\..\..\..\Build\Debug\keydelete.ilk" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" @CRYPTO@ /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\keydelete.bsc" -BSC32_SBRS= \ - "$(INTDIR)\keydelete.sbr" - -"$(OUTDIR)\keydelete.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Debug/libisc.lib ../../../../lib/dns/win32/Debug/libdns.lib $(LIBXML) @OPENSSL_LIB@ /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\keydelete.pdb" /map:"$(INTDIR)\keydelete.map" /debug @MACHINE@ /out:"../../../../Build/Debug/keydelete.exe" /pdbtype:sept -LINK32_OBJS= \ - "$(INTDIR)\keydelete.obj" \ - "..\..\..\..\lib\isc\win32\Debug\libisc.lib" \ - "..\..\..\..\lib\isc\win32\Debug\libdns.lib" - -"..\..\..\..\Build\Debug\keydelete.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ENDIF - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("keydelete.dep") -!INCLUDE "keydelete.dep" -!ELSE -!MESSAGE Warning: cannot find "keydelete.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "keydelete - @PLATFORM@ Release" || "$(CFG)" == "keydelete - @PLATFORM@ Debug" -SOURCE=..\tkey\keydelete.c - -!IF "$(CFG)" == "keydelete - @PLATFORM@ Release" - - -"$(INTDIR)\keydelete.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "keydelete - @PLATFORM@ Debug" - - -"$(INTDIR)\keydelete.obj" "$(INTDIR)\keydelete.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -!IF "$(CFG)" == "keydelete - @PLATFORM@ Release" - -"libdns - @PLATFORM@ Release" : - cd "..\..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" - cd "..\..\..\bin\tests\system\win32" - -"libdns - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\system\win32" - -!ELSEIF "$(CFG)" == "keydelete - @PLATFORM@ Debug" - -"libdns - @PLATFORM@ Debug" : - cd "..\..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" - cd "..\..\..\bin\tests\system\win32" - -"libdns - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\system\win32" - -!ENDIF - -!IF "$(CFG)" == "keydelete - @PLATFORM@ Release" - -"libisc - @PLATFORM@ Release" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" - cd "..\..\..\bin\tests\system\win32" - -"libisc - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\system\win32" - -!ELSEIF "$(CFG)" == "keydelete - @PLATFORM@ Debug" - -"libisc - @PLATFORM@ Debug" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" - cd "..\..\..\bin\tests\system\win32" - -"libisc - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\system\win32" - -!ENDIF - -!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 -1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest" -<< KEEP - -$(_VC_MANIFEST_BASENAME).auto.manifest : - type <<$@ - - - -<< KEEP diff --git a/bin/tests/system/win32/lwtest.dsp.in b/bin/tests/system/win32/lwtest.dsp.in deleted file mode 100644 index 2facc3406d..0000000000 --- a/bin/tests/system/win32/lwtest.dsp.in +++ /dev/null @@ -1,95 +0,0 @@ -# Microsoft Developer Studio Project File - Name="lwtest" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103 - -CFG=lwtest - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "lwtest.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "lwtest.mak" CFG="lwtest - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "lwtest - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "lwtest - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "lwtest - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/lwres/win32/include" /I "../../../../lib/lwres/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console @MACHINE@ -# ADD LINK32 @LIBXML2_LIB@ user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Release/libisc.lib ../../../../lib/lwres/win32/Release/liblwres.lib /nologo /subsystem:console @MACHINE@ /out:"../../../../Build/Release/lwtest.exe" - -!ELSEIF "$(CFG)" == "lwtest - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/lwres/win32/include" /I "../../../../lib/lwres/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR /FD /GZ /c -# SUBTRACT CPP /X @COPTY@ -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console /debug @MACHINE@ /pdbtype:sept -# ADD LINK32 @LIBXML2_LIB@ user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Debug/libisc.lib ../../../../lib/lwres/win32/Debug/liblwres.lib /nologo /subsystem:console /map /debug @MACHINE@ /out:"../../../../Build/Debug/lwtest.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "lwtest - @PLATFORM@ Release" -# Name "lwtest - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\lwresd\lwtest.c -# End Source File -# End Group -# End Target -# End Project diff --git a/bin/tests/system/win32/lwtest.dsw b/bin/tests/system/win32/lwtest.dsw deleted file mode 100644 index 6301f1af3a..0000000000 --- a/bin/tests/system/win32/lwtest.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "lwtest"=".\lwtest.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/bin/tests/system/win32/lwtest.mak.in b/bin/tests/system/win32/lwtest.mak.in deleted file mode 100644 index 1e31f419f4..0000000000 --- a/bin/tests/system/win32/lwtest.mak.in +++ /dev/null @@ -1,346 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on lwtest.dsp -!IF "$(CFG)" == "" -CFG=lwtest - @PLATFORM@ Debug -!MESSAGE No configuration specified. Defaulting to lwtest - @PLATFORM@ Debug. -!ENDIF - -!IF "$(CFG)" != "lwtest - @PLATFORM@ Release" && "$(CFG)" != "lwtest - @PLATFORM@ Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "lwtest.mak" CFG="lwtest - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "lwtest - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "lwtest - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -CPP=cl.exe -RSC=rc.exe -LIBXML=@LIBXML2_LIB@ - -!IF "$(CFG)" == "lwtest - @PLATFORM@ 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)" == "lwtest - @PLATFORM@ Release" - -OUTDIR=.\Release -INTDIR=.\Release - -!IF "$(RECURSE)" == "0" - -ALL : "..\..\..\..\Build\Release\lwtest.exe" - -!ELSE - -ALL : "libisc - @PLATFORM@ Release" "liblwres - @PLATFORM@ Release" "..\..\..\..\Build\Release\lwtest.exe" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"liblwres - @PLATFORM@ ReleaseCLEAN" "libisc - @PLATFORM@ ReleaseCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\lwtest.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "..\..\..\..\Build\Release\lwtest.exe" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/lwres/win32/include" /I "../../../../lib/lwres/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\lwtest.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\lwtest.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Release/libisc.lib ../../../../lib/lwres/win32/Release/liblwres.lib $(LIBXML) /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\lwtest.pdb" @MACHINE@ /out:"../../../../Build/Release/lwtest.exe" -LINK32_OBJS= \ - "$(INTDIR)\lwtest.obj" \ - "..\..\..\..\lib\isc\win32\Release\libisc.lib" \ - "..\..\..\..\lib\lwres\win32\Release\liblwres.lib" - -"..\..\..\..\Build\Release\lwtest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ELSEIF "$(CFG)" == "lwtest - @PLATFORM@ Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : "..\..\..\..\Build\Debug\lwtest.exe" "$(OUTDIR)\lwtest.bsc" - -!ELSE - -ALL : "libisc - @PLATFORM@ Debug" "liblwres - @PLATFORM@ Debug" "..\..\..\..\Build\Debug\lwtest.exe" "$(OUTDIR)\lwtest.bsc" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"libisc - @PLATFORM@ DebugCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\lwtest.obj" - -@erase "$(INTDIR)\lwtest.sbr" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\lwtest.bsc" - -@erase "$(OUTDIR)\lwtest.map" - -@erase "$(OUTDIR)\lwtest.pdb" - -@erase "..\..\..\..\Build\Debug\lwtest.exe" - -@erase "..\..\..\..\Build\Debug\lwtest.ilk" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/lwres/win32/include" /I "../../../../lib/lwres/include"/D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\lwtest.bsc" -BSC32_SBRS= \ - "$(INTDIR)\lwtest.sbr" - -"$(OUTDIR)\lwtest.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Debug/libisc.lib ../../../../lib/lwres/win32/Debug/liblwres.lib $(LIBXML) /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\lwtest.pdb" /map:"$(INTDIR)\lwtest.map" /debug @MACHINE@ /out:"../../../../Build/Debug/lwtest.exe" /pdbtype:sept -LINK32_OBJS= \ - "$(INTDIR)\lwtest.obj" \ - "..\..\..\..\lib\isc\win32\Debug\libisc.lib" \ - "..\..\..\..\lib\lwres\win32\Debug\liblwres.lib" - -"..\..\..\..\Build\Debug\lwtest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ENDIF - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("lwtest.dep") -!INCLUDE "lwtest.dep" -!ELSE -!MESSAGE Warning: cannot find "lwtest.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "lwtest - @PLATFORM@ Release" || "$(CFG)" == "lwtest - @PLATFORM@ Debug" -SOURCE=..\lwresd\lwtest.c - -!IF "$(CFG)" == "lwtest - @PLATFORM@ Release" - - -"$(INTDIR)\lwtest.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "lwtest - @PLATFORM@ Debug" - - -"$(INTDIR)\lwtest.obj" "$(INTDIR)\lwtest.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -!IF "$(CFG)" == "lwtest - @PLATFORM@ Release" - -"liblwres - @PLATFORM@ Release" : - cd "..\..\..\..\lib\lwres\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - @PLATFORM@ Release" - cd "..\..\..\bin\tests\system\win32" - -"liblwres - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\..\lib\lwres\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\system\win32" - -!ELSEIF "$(CFG)" == "lwtest - @PLATFORM@ Debug" - -"liblwres - @PLATFORM@ Debug" : - cd "..\..\..\..\lib\lwres\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - @PLATFORM@ Debug" - cd "..\..\..\bin\tests\system\win32" - -"liblwres - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\..\lib\lwres\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\system\win32" - -!ENDIF - -!IF "$(CFG)" == "lwtest - @PLATFORM@ Release" - -"libisc - @PLATFORM@ Release" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" - cd "..\..\..\bin\tests\system\win32" - -"libisc - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\system\win32" - -!ELSEIF "$(CFG)" == "lwtest - @PLATFORM@ Debug" - -"libisc - @PLATFORM@ Debug" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" - cd "..\..\..\bin\tests\system\win32" - -"libisc - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\system\win32" - -!ENDIF - -!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 -1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest" -<< KEEP - -$(_VC_MANIFEST_BASENAME).auto.manifest : - type <<$@ - - - -<< KEEP diff --git a/bin/tests/system/win32/lwtest.vcxproj.filters.in b/bin/tests/system/win32/lwtest.vcxproj.filters.in deleted file mode 100644 index b50ca1440b..0000000000 --- a/bin/tests/system/win32/lwtest.vcxproj.filters.in +++ /dev/null @@ -1,22 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Source Files - - - \ No newline at end of file diff --git a/bin/tests/system/win32/lwtest.vcxproj.in b/bin/tests/system/win32/lwtest.vcxproj.in deleted file mode 100644 index 4a32dfc391..0000000000 --- a/bin/tests/system/win32/lwtest.vcxproj.in +++ /dev/null @@ -1,110 +0,0 @@ - - - - - Debug - @PLATFORM@ - - - Release - @PLATFORM@ - - - - {5D7D17B1-18A2-4468-BC26-D9F9800E76D2} - Win32Proj - lwtest - - - - Application - true - MultiByte - - - Application - false - true - MultiByte - - - - - - - - - - - - - true - ..\..\..\..\Build\$(Configuration)\ - .\$(Configuration)\ - - - false - ..\..\..\..\Build\$(Configuration)\ - .\$(Configuration)\ - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - .\$(Configuration)\$(TargetName).pch - .\$(Configuration)\ - .\$(Configuration)\ - $(OutDir)$(TargetName).pdb - true - .\;..\..\..\..\;@LIBXML2_INC@..\..\..\..\lib\isc\win32;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;..\..\..\..\lib\lwres\win32\include;..\..\..\..\lib\lwres\include;%(AdditionalIncludeDirectories) - CompileAsC - - - Console - true - ..\..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) - ..\..\..\..\lib\isc\win32\$(Configuration);..\..\..\..\lib\lwres\win32\$(Configuration);%(AdditionalLibraryDirectories) - @LIBXML2_LIB@libisc.lib;liblwres.lib;ws2_32.lib;%(AdditionalDependencies) - - - - - Level3 - - - MaxSpeed - true - @INTRINSIC@ - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - OnlyExplicitInline - false - true - .\$(Configuration)\$(TargetName).pch - .\$(Configuration)\ - .\$(Configuration)\ - $(OutDir)$(TargetName).pdb - .\;..\..\..\..\;@LIBXML2_INC@..\..\..\..\lib\isc\win32;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;..\..\..\..\lib\lwres\win32\include;..\..\..\..\lib\lwres\include;%(AdditionalIncludeDirectories) - CompileAsC - - - Console - false - true - true - ..\..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) - Default - ..\..\..\..\lib\isc\win32\$(Configuration);..\..\..\..\lib\lwres\win32\$(Configuration);%(AdditionalLibraryDirectories) - @LIBXML2_LIB@libisc.lib;liblwres.lib;ws2_32.lib;%(AdditionalDependencies) - - - - - - - - - diff --git a/bin/tests/system/win32/pipequeries.dsp.in b/bin/tests/system/win32/pipequeries.dsp.in deleted file mode 100644 index 6d63416878..0000000000 --- a/bin/tests/system/win32/pipequeries.dsp.in +++ /dev/null @@ -1,95 +0,0 @@ -# Microsoft Developer Studio Project File - Name="pipequeries" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103 - -CFG=pipequeries - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "pipequeries.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "pipequeries.mak" CFG="pipequeries - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "pipequeries - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "pipequeries - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "pipequeries - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" @CRYPTO@ /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console @MACHINE@ -# ADD LINK32 @LIBXML2_LIB@ @OPENSSL_LIB@ user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Release/libisc.lib ../../../../lib/dns/win32/Release/libdns.lib /nologo /subsystem:console @MACHINE@ /out:"../../../../Build/Release/pipequeries.exe" - -!ELSEIF "$(CFG)" == "pipequeries - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" @CRYPTO@ /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR /FD /GZ /c -# SUBTRACT CPP /X @COPTY@ -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console /debug @MACHINE@ /pdbtype:sept -# ADD LINK32 @LIBXML2_LIB@ @OPENSSL_LIB@ user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Debug/libisc.lib ../../../../lib/dns/win32/Debug/libdns.lib /nologo /subsystem:console /map /debug @MACHINE@ /out:"../../../../Build/Debug/pipequeries.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "pipequeries - @PLATFORM@ Release" -# Name "pipequeries - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\pipelined\pipequeries.c -# End Source File -# End Group -# End Target -# End Project diff --git a/bin/tests/system/win32/pipequeries.dsw b/bin/tests/system/win32/pipequeries.dsw deleted file mode 100644 index 65e1e04667..0000000000 --- a/bin/tests/system/win32/pipequeries.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "pipequeries"=".\pipequeries.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/bin/tests/system/win32/pipequeries.mak.in b/bin/tests/system/win32/pipequeries.mak.in deleted file mode 100644 index 3f11a32dbe..0000000000 --- a/bin/tests/system/win32/pipequeries.mak.in +++ /dev/null @@ -1,346 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on pipequeries.dsp -!IF "$(CFG)" == "" -CFG=pipequeries - @PLATFORM@ Debug -!MESSAGE No configuration specified. Defaulting to pipequeries - @PLATFORM@ Debug. -!ENDIF - -!IF "$(CFG)" != "pipequeries - @PLATFORM@ Release" && "$(CFG)" != "pipequeries - @PLATFORM@ Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "pipequeries.mak" CFG="pipequeries - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "pipequeries - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "pipequeries - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -CPP=cl.exe -RSC=rc.exe -LIBXML=@LIBXML2_LIB@ - -!IF "$(CFG)" == "pipequeries - @PLATFORM@ 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)" == "pipequeries - @PLATFORM@ Release" - -OUTDIR=.\Release -INTDIR=.\Release - -!IF "$(RECURSE)" == "0" - -ALL : "..\..\..\..\Build\Release\pipequeries.exe" - -!ELSE - -ALL : "libisc - @PLATFORM@ Release" "libdns - @PLATFORM@ Release" "..\..\..\..\Build\Release\pipequeries.exe" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"libdns - @PLATFORM@ ReleaseCLEAN" "libisc - @PLATFORM@ ReleaseCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\pipequeries.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "..\..\..\..\Build\Release\pipequeries.exe" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" @CRYPTO@ /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\pipequeries.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\pipequeries.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Release/libisc.lib ../../../../lib/dns/win32/Release/libdns.lib $(LIBXML) @OPENSSL_LIB@ /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\pipequeries.pdb" @MACHINE@ /out:"../../../../Build/Release/pipequeries.exe" -LINK32_OBJS= \ - "$(INTDIR)\pipequeries.obj" \ - "..\..\..\..\lib\isc\win32\Release\libisc.lib" \ - "..\..\..\..\lib\isc\win32\Release\libdns.lib" - -"..\..\..\..\Build\Release\pipequeries.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ELSEIF "$(CFG)" == "pipequeries - @PLATFORM@ Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : "..\..\..\..\Build\Debug\pipequeries.exe" "$(OUTDIR)\pipequeries.bsc" - -!ELSE - -ALL : "libisc - @PLATFORM@ Debug" "libdns - @PLATFORM@ Debug" "..\..\..\..\Build\Debug\pipequeries.exe" "$(OUTDIR)\pipequeries.bsc" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"libdns - @PLATFORM@ DebugCLEAN" "libisc - @PLATFORM@ DebugCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\pipequeries.obj" - -@erase "$(INTDIR)\pipequeries.sbr" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\pipequeries.bsc" - -@erase "$(OUTDIR)\pipequeries.map" - -@erase "$(OUTDIR)\pipequeries.pdb" - -@erase "..\..\..\..\Build\Debug\pipequeries.exe" - -@erase "..\..\..\..\Build\Debug\pipequeries.ilk" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" @CRYPTO@ /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\pipequeries.bsc" -BSC32_SBRS= \ - "$(INTDIR)\pipequeries.sbr" - -"$(OUTDIR)\pipequeries.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Debug/libisc.lib ../../../../lib/dns/win32/Debug/libdns.lib $(LIBXML) @OPENSSL_LIB@ /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\pipequeries.pdb" /map:"$(INTDIR)\pipequeries.map" /debug @MACHINE@ /out:"../../../../Build/Debug/pipequeries.exe" /pdbtype:sept -LINK32_OBJS= \ - "$(INTDIR)\pipequeries.obj" \ - "..\..\..\..\lib\isc\win32\Debug\libisc.lib" \ - "..\..\..\..\lib\isc\win32\Debug\libdns.lib" - -"..\..\..\..\Build\Debug\pipequeries.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ENDIF - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("pipequeries.dep") -!INCLUDE "pipequeries.dep" -!ELSE -!MESSAGE Warning: cannot find "pipequeries.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "pipequeries - @PLATFORM@ Release" || "$(CFG)" == "pipequeries - @PLATFORM@ Debug" -SOURCE=..\pipelined\pipequeries.c - -!IF "$(CFG)" == "pipequeries - @PLATFORM@ Release" - - -"$(INTDIR)\pipequeries.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "pipequeries - @PLATFORM@ Debug" - - -"$(INTDIR)\pipequeries.obj" "$(INTDIR)\pipequeries.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -!IF "$(CFG)" == "pipequeries - @PLATFORM@ Release" - -"libdns - @PLATFORM@ Release" : - cd "..\..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" - cd "..\..\..\bin\tests\system\win32" - -"libdns - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\system\win32" - -!ELSEIF "$(CFG)" == "pipequeries - @PLATFORM@ Debug" - -"libdns - @PLATFORM@ Debug" : - cd "..\..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" - cd "..\..\..\bin\tests\system\win32" - -"libdns - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\system\win32" - -!ENDIF - -!IF "$(CFG)" == "pipequeries - @PLATFORM@ Release" - -"libisc - @PLATFORM@ Release" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" - cd "..\..\..\bin\tests\system\win32" - -"libisc - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\system\win32" - -!ELSEIF "$(CFG)" == "pipequeries - @PLATFORM@ Debug" - -"libisc - @PLATFORM@ Debug" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" - cd "..\..\..\bin\tests\system\win32" - -"libisc - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\system\win32" - -!ENDIF - -!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 -1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest" -<< KEEP - -$(_VC_MANIFEST_BASENAME).auto.manifest : - type <<$@ - - - -<< KEEP diff --git a/bin/tests/tasks/win32/t_tasks.dsp.in b/bin/tests/tasks/win32/t_tasks.dsp.in deleted file mode 100644 index 9800ac2387..0000000000 --- a/bin/tests/tasks/win32/t_tasks.dsp.in +++ /dev/null @@ -1,95 +0,0 @@ -# Microsoft Developer Studio Project File - Name="t_tasks" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103 - -CFG=t_tasks - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "t_tasks.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "t_tasks.mak" CFG="t_tasks - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "t_tasks - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "t_tasks - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "t_tasks - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/tests/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console @MACHINE@ -# ADD LINK32 @LIBXML2_LIB@ user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Release/libisc.lib ../../../../lib/tests/win32/Release/libtests.lib /nologo /subsystem:console @MACHINE@ /out:"../../../../Build/Release/t_tasks.exe" - -!ELSEIF "$(CFG)" == "t_tasks - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/tests/include" /I "../../../../lib/bind9/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR /FD /GZ /c -# SUBTRACT CPP /X @COPTY@ -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console /debug @MACHINE@ /pdbtype:sept -# ADD LINK32 @LIBXML2_LIB@ user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Debug/libisc.lib ../../../../lib/tests/win32/Debug/libtests.lib /nologo /subsystem:console /map /debug @MACHINE@ /out:"../../../../Build/Debug/t_tasks.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "t_tasks - @PLATFORM@ Release" -# Name "t_tasks - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\t_tasks.c -# End Source File -# End Group -# End Target -# End Project diff --git a/bin/tests/tasks/win32/t_tasks.dsw b/bin/tests/tasks/win32/t_tasks.dsw deleted file mode 100644 index af48cf7fdd..0000000000 --- a/bin/tests/tasks/win32/t_tasks.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "t_tasks"=".\t_tasks.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/bin/tests/tasks/win32/t_tasks.mak.in b/bin/tests/tasks/win32/t_tasks.mak.in deleted file mode 100644 index 2de167e762..0000000000 --- a/bin/tests/tasks/win32/t_tasks.mak.in +++ /dev/null @@ -1,347 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on t_tasks.dsp -!IF "$(CFG)" == "" -CFG=t_tasks - @PLATFORM@ Debug -!MESSAGE No configuration specified. Defaulting to t_tasks - @PLATFORM@ Debug. -!ENDIF - -!IF "$(CFG)" != "t_tasks - @PLATFORM@ Release" && "$(CFG)" != "t_tasks - @PLATFORM@ Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "t_tasks.mak" CFG="t_tasks - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "t_tasks - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "t_tasks - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -CPP=cl.exe -RSC=rc.exe -LIBXML=@LIBXML2_LIB@ - -!IF "$(CFG)" == "t_tasks - @PLATFORM@ 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)" == "t_tasks - @PLATFORM@ Release" - -OUTDIR=.\Release -INTDIR=.\Release - -!IF "$(RECURSE)" == "0" - -ALL : "..\..\..\..\Build\Release\t_tasks.exe" - -!ELSE - -ALL : "libtests - @PLATFORM@ Release" "libisc - @PLATFORM@ Release" "..\..\..\..\Build\Release\t_tasks.exe" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"libisc - @PLATFORM@ ReleaseCLEAN" "libtests - @PLATFORM@ ReleaseCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\t_tasks.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "..\..\..\..\Build\Release\t_tasks.exe" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/tests/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\t_tasks.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\t_tasks.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Release/libisc.lib ../../../../lib/tests/win32/Release/libtests.lib $(LIBXML) /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\t_tasks.pdb" @MACHINE@ /out:"../../../../Build/Release/t_tasks.exe" -LINK32_OBJS= \ - "$(INTDIR)\t_tasks.obj" \ - "..\..\..\..\lib\isc\win32\Release\libisc.lib" \ - "..\..\..\..\lib\tests\win32\Release\libtests.lib" - -"..\..\..\..\Build\Release\t_tasks.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ELSEIF "$(CFG)" == "t_tasks - @PLATFORM@ Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : "..\..\..\..\Build\Debug\t_tasks.exe" "$(OUTDIR)\t_tasks.bsc" - -!ELSE - -ALL : "libtests - @PLATFORM@ Debug" "libisc - @PLATFORM@ Debug" "..\..\..\..\Build\Debug\t_tasks.exe" "$(OUTDIR)\t_tasks.bsc" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"libisc - @PLATFORM@ DebugCLEAN" "libtests - @PLATFORM@ DebugCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\t_tasks.obj" - -@erase "$(INTDIR)\t_tasks.sbr" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\t_tasks.bsc" - -@erase "$(OUTDIR)\t_tasks.map" - -@erase "$(OUTDIR)\t_tasks.pdb" - -@erase "..\..\..\..\Build\Debug\t_tasks.exe" - -@erase "..\..\..\..\Build\Debug\t_tasks.ilk" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/tests/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\t_tasks.bsc" -BSC32_SBRS= \ - "$(INTDIR)\t_tasks.sbr" - -"$(OUTDIR)\t_tasks.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Debug/libisc.lib ../../../../lib/tests/win32/Debug/libtests.lib $(LIBXML) /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\t_tasks.pdb" /map:"$(INTDIR)\t_tasks.map" /debug @MACHINE@ /out:"../../../../Build/Debug/t_tasks.exe" /pdbtype:sept -LINK32_OBJS= \ - "$(INTDIR)\t_tasks.obj" \ - "..\..\..\..\lib\isc\win32\Debug\libisc.lib" \ - "..\..\..\..\lib\tests\win32\Debug\libtests.lib" - -"..\..\..\..\Build\Debug\t_tasks.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ENDIF - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("t_tasks.dep") -!INCLUDE "t_tasks.dep" -!ELSE -!MESSAGE Warning: cannot find "t_tasks.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "t_tasks - @PLATFORM@ Release" || "$(CFG)" == "t_tasks - @PLATFORM@ Debug" -SOURCE=..\t_tasks.c - -!IF "$(CFG)" == "t_tasks - @PLATFORM@ Release" - - -"$(INTDIR)\t_tasks.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "t_tasks - @PLATFORM@ Debug" - - -"$(INTDIR)\t_tasks.obj" "$(INTDIR)\t_tasks.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -!IF "$(CFG)" == "t_tasks - @PLATFORM@ Release" - -"libisc - @PLATFORM@ Release" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" - cd "..\..\..\bin\tests\tasks\win32" - -"libisc - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\tasks\win32" - -!ELSEIF "$(CFG)" == "t_tasks - @PLATFORM@ Debug" - -"libisc - @PLATFORM@ Debug" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" - cd "..\..\..\bin\tests\tasks\win32" - -"libisc - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\tasks\win32" - -!ENDIF - -!IF "$(CFG)" == "t_tasks - @PLATFORM@ Release" - -"libtests - @PLATFORM@ Release" : - cd "..\..\..\..\lib\tests\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Release" - cd "..\..\..\bin\tests\tasks\win32" - -"libtests - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\..\lib\tests\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\tasks\win32" - -!ELSEIF "$(CFG)" == "t_tasks - @PLATFORM@ Debug" - -"libtests - @PLATFORM@ Debug" : - cd "..\..\..\..\lib\tests\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Debug" - cd "..\..\..\bin\tests\tasks\win32" - -"libtests - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\..\lib\tests\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\tasks\win32" - -!ENDIF - - -!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 -1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest" -<< KEEP - -$(_VC_MANIFEST_BASENAME).auto.manifest : - type <<$@ - - - -<< KEEP diff --git a/bin/tests/timers/win32/t_timers.dsp.in b/bin/tests/timers/win32/t_timers.dsp.in deleted file mode 100644 index aadadb8bb1..0000000000 --- a/bin/tests/timers/win32/t_timers.dsp.in +++ /dev/null @@ -1,95 +0,0 @@ -# Microsoft Developer Studio Project File - Name="t_timers" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103 - -CFG=t_timers - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "t_timers.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "t_timers.mak" CFG="t_timers - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "t_timers - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "t_timers - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "t_timers - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/tests/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console @MACHINE@ -# ADD LINK32 @LIBXML2_LIB@ user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Release/libisc.lib ../../../../lib/tests/win32/Release/libtests.lib /nologo /subsystem:console @MACHINE@ /out:"../../../../Build/Release/t_timers.exe" - -!ELSEIF "$(CFG)" == "t_timers - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/tests/include" /I "../../../../lib/bind9/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR /FD /GZ /c -# SUBTRACT CPP /X @COPTY@ -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console /debug @MACHINE@ /pdbtype:sept -# ADD LINK32 @LIBXML2_LIB@ user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Debug/libisc.lib ../../../../lib/tests/win32/Debug/libtests.lib /nologo /subsystem:console /map /debug @MACHINE@ /out:"../../../../Build/Debug/t_timers.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "t_timers - @PLATFORM@ Release" -# Name "t_timers - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\t_timers.c -# End Source File -# End Group -# End Target -# End Project diff --git a/bin/tests/timers/win32/t_timers.dsw b/bin/tests/timers/win32/t_timers.dsw deleted file mode 100644 index 8f39dd551b..0000000000 --- a/bin/tests/timers/win32/t_timers.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "t_timers"=".\t_timers.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/bin/tests/timers/win32/t_timers.mak.in b/bin/tests/timers/win32/t_timers.mak.in deleted file mode 100644 index b804e0da46..0000000000 --- a/bin/tests/timers/win32/t_timers.mak.in +++ /dev/null @@ -1,347 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on t_timers.dsp -!IF "$(CFG)" == "" -CFG=t_timers - @PLATFORM@ Debug -!MESSAGE No configuration specified. Defaulting to t_timers - @PLATFORM@ Debug. -!ENDIF - -!IF "$(CFG)" != "t_timers - @PLATFORM@ Release" && "$(CFG)" != "t_timers - @PLATFORM@ Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "t_timers.mak" CFG="t_timers - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "t_timers - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "t_timers - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -CPP=cl.exe -RSC=rc.exe -LIBXML=@LIBXML2_LIB@ - -!IF "$(CFG)" == "t_timers - @PLATFORM@ 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)" == "t_timers - @PLATFORM@ Release" - -OUTDIR=.\Release -INTDIR=.\Release - -!IF "$(RECURSE)" == "0" - -ALL : "..\..\..\..\Build\Release\t_timers.exe" - -!ELSE - -ALL : "libtests - @PLATFORM@ Release" "libisc - @PLATFORM@ Release" "..\..\..\..\Build\Release\t_timers.exe" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"libisc - @PLATFORM@ ReleaseCLEAN" "libtests - @PLATFORM@ ReleaseCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\t_timers.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "..\..\..\..\Build\Release\t_timers.exe" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/tests/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\t_timers.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\t_timers.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Release/libisc.lib ../../../../lib/tests/win32/Release/libtests.lib $(LIBXML) /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\t_timers.pdb" @MACHINE@ /out:"../../../../Build/Release/t_timers.exe" -LINK32_OBJS= \ - "$(INTDIR)\t_timers.obj" \ - "..\..\..\..\lib\isc\win32\Release\libisc.lib" \ - "..\..\..\..\lib\tests\win32\Release\libtests.lib" - -"..\..\..\..\Build\Release\t_timers.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ELSEIF "$(CFG)" == "t_timers - @PLATFORM@ Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : "..\..\..\..\Build\Debug\t_timers.exe" "$(OUTDIR)\t_timers.bsc" - -!ELSE - -ALL : "libtests - @PLATFORM@ Debug" "libisc - @PLATFORM@ Debug" "..\..\..\..\Build\Debug\t_timers.exe" "$(OUTDIR)\t_timers.bsc" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"libisc - @PLATFORM@ DebugCLEAN" "libtests - @PLATFORM@ DebugCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\t_timers.obj" - -@erase "$(INTDIR)\t_timers.sbr" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\t_timers.bsc" - -@erase "$(OUTDIR)\t_timers.map" - -@erase "$(OUTDIR)\t_timers.pdb" - -@erase "..\..\..\..\Build\Debug\t_timers.exe" - -@erase "..\..\..\..\Build\Debug\t_timers.ilk" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/tests/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\t_timers.bsc" -BSC32_SBRS= \ - "$(INTDIR)\t_timers.sbr" - -"$(OUTDIR)\t_timers.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Debug/libisc.lib ../../../../lib/tests/win32/Debug/libtests.lib $(LIBXML) /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\t_timers.pdb" /map:"$(INTDIR)\t_timers.map" /debug @MACHINE@ /out:"../../../../Build/Debug/t_timers.exe" /pdbtype:sept -LINK32_OBJS= \ - "$(INTDIR)\t_timers.obj" \ - "..\..\..\..\lib\isc\win32\Debug\libisc.lib" \ - "..\..\..\..\lib\tests\win32\Debug\libtests.lib" - -"..\..\..\..\Build\Debug\t_timers.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ENDIF - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("t_timers.dep") -!INCLUDE "t_timers.dep" -!ELSE -!MESSAGE Warning: cannot find "t_timers.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "t_timers - @PLATFORM@ Release" || "$(CFG)" == "t_timers - @PLATFORM@ Debug" -SOURCE=..\t_timers.c - -!IF "$(CFG)" == "t_timers - @PLATFORM@ Release" - - -"$(INTDIR)\t_timers.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "t_timers - @PLATFORM@ Debug" - - -"$(INTDIR)\t_timers.obj" "$(INTDIR)\t_timers.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -!IF "$(CFG)" == "t_timers - @PLATFORM@ Release" - -"libisc - @PLATFORM@ Release" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" - cd "..\..\..\bin\tests\timers\win32" - -"libisc - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\timers\win32" - -!ELSEIF "$(CFG)" == "t_timers - @PLATFORM@ Debug" - -"libisc - @PLATFORM@ Debug" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" - cd "..\..\..\bin\tests\timers\win32" - -"libisc - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\timers\win32" - -!ENDIF - -!IF "$(CFG)" == "t_timers - @PLATFORM@ Release" - -"libtests - @PLATFORM@ Release" : - cd "..\..\..\..\lib\tests\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Release" - cd "..\..\..\bin\tests\timers\win32" - -"libtests - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\..\lib\tests\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\timers\win32" - -!ELSEIF "$(CFG)" == "t_timers - @PLATFORM@ Debug" - -"libtests - @PLATFORM@ Debug" : - cd "..\..\..\..\lib\tests\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Debug" - cd "..\..\..\bin\tests\timers\win32" - -"libtests - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\..\lib\tests\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\timers\win32" - -!ENDIF - - -!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 -1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest" -<< KEEP - -$(_VC_MANIFEST_BASENAME).auto.manifest : - type <<$@ - - - -<< KEEP diff --git a/bin/tests/virtual-time/cleanall.sh b/bin/tests/virtual-time/cleanall.sh index 109e7664a4..c6abb503d9 100644 --- a/bin/tests/virtual-time/cleanall.sh +++ b/bin/tests/virtual-time/cleanall.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2010, 2012, 2016 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2010, 2012, 2016, 2017 Internet Systems Consortium, Inc. ("ISC") # # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this @@ -19,7 +19,7 @@ SYSTEMTESTTOP=. find . -type f \( \ -name 'K*' -o -name '*~' -o -name '*.core' -o -name '*.log' \ -o -name '*.pid' -o -name '*.keyset' -o -name named.run \ - -o -name lwresd.run -o -name ans.run \) -print | xargs rm -f + -o -name ans.run \) -print | xargs rm -f status=0 diff --git a/bin/tests/virtual-time/conf.sh.in b/bin/tests/virtual-time/conf.sh.in index 98c8b9ebf8..09f575d5c6 100644 --- a/bin/tests/virtual-time/conf.sh.in +++ b/bin/tests/virtual-time/conf.sh.in @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2010, 2012, 2016 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2010, 2012, 2016, 2017 Internet Systems Consortium, Inc. ("ISC") # # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this @@ -20,9 +20,6 @@ TOP=${SYSTEMTESTTOP:=.}/../../.. TOP=`cd $TOP && pwd` NAMED=$TOP/bin/named/named -# We must use "named -l" instead of "lwresd" because argv[0] is lost -# if the program is libtoolized. -LWRESD="$TOP/bin/named/named -l" DIG=$TOP/bin/dig/dig RNDC=$TOP/bin/rndc/rndc NSUPDATE=$TOP/bin/nsupdate/nsupdate @@ -40,5 +37,5 @@ SUBDIRS="slave autosign-zsk autosign-ksk" # PERL will be an empty string if no perl interpreter was found. PERL=@PERL@ -export NAMED LWRESD DIG NSUPDATE KEYGEN SIGNER KEYSIGNER KEYSETTOOL PERL \ +export NAMED DIG NSUPDATE KEYGEN SIGNER KEYSIGNER KEYSETTOOL PERL \ SUBDIRS RNDC CHECKZONE diff --git a/bin/tests/win32/backtrace_test.dsp.in b/bin/tests/win32/backtrace_test.dsp.in deleted file mode 100644 index 732cba59d9..0000000000 --- a/bin/tests/win32/backtrace_test.dsp.in +++ /dev/null @@ -1,103 +0,0 @@ -# Microsoft Developer Studio Project File - Name="backtrace_test" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103 - -CFG=backtrace_test - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "backtrace_test.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "backtrace_test.mak" CFG="backtrace_test - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "backtrace_test - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "backtrace_test - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "backtrace_test - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console @MACHINE@ -# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/backtrace_test.exe" - -!ELSEIF "$(CFG)" == "backtrace_test - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c -# SUBTRACT CPP /X @COPTY@ -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console /debug @MACHINE@ /pdbtype:sept -# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/backtrace_test.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "backtrace_test - @PLATFORM@ Release" -# Name "backtrace_test - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE="..\backtrace_test.c" -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/bin/tests/win32/backtrace_test.dsw b/bin/tests/win32/backtrace_test.dsw deleted file mode 100644 index e97246aefa..0000000000 --- a/bin/tests/win32/backtrace_test.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "backtrace_test"=".\backtrace_test.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/bin/tests/win32/backtrace_test.mak.in b/bin/tests/win32/backtrace_test.mak.in deleted file mode 100644 index 23348eb114..0000000000 --- a/bin/tests/win32/backtrace_test.mak.in +++ /dev/null @@ -1,299 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on backtrace_test.dsp -!IF "$(CFG)" == "" -CFG=backtrace_test - @PLATFORM@ Debug -!MESSAGE No configuration specified. Defaulting to backtrace_test - @PLATFORM@ Debug. -!ENDIF - -!IF "$(CFG)" != "backtrace_test - @PLATFORM@ Release" && "$(CFG)" != "backtrace_test - @PLATFORM@ Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "backtrace_test.mak" CFG="backtrace_test - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "backtrace_test - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "backtrace_test - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -!IF "$(CFG)" == "backtrace_test - @PLATFORM@ 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)" == "backtrace_test - @PLATFORM@ Release" - -OUTDIR=.\Release -INTDIR=.\Release - -ALL : "..\..\..\Build\Release\backtrace_test.exe" - - -CLEAN : - -@erase "$(INTDIR)\backtrace_test.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "..\..\..\Build\Release\backtrace_test.exe" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\backtrace_test.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\backtrace_test.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\backtrace_test.pdb" @MACHINE@ /out:"../../../Build/Release/backtrace_test.exe" -LINK32_OBJS= \ - "$(INTDIR)\backtrace_test.obj" - -"..\..\..\Build\Release\backtrace_test.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ELSEIF "$(CFG)" == "backtrace_test - @PLATFORM@ Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -ALL : "..\..\..\Build\Debug\backtrace_test.exe" "$(OUTDIR)\backtrace_test.bsc" - - -CLEAN : - -@erase "$(INTDIR)\backtrace_test.obj" - -@erase "$(INTDIR)\backtrace_test.sbr" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\backtrace_test.pdb" - -@erase "$(OUTDIR)\backtrace_test.bsc" - -@erase "..\..\..\Build\Debug\backtrace_test.exe" - -@erase "..\..\..\Build\Debug\backtrace_test.ilk" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\backtrace_test.bsc" -BSC32_SBRS= \ - "$(INTDIR)\backtrace_test.sbr" - -"$(OUTDIR)\backtrace_test.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\backtrace_test.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/backtrace_test.exe" /pdbtype:sept -LINK32_OBJS= \ - "$(INTDIR)\backtrace_test.obj" - -"..\..\..\Build\Debug\backtrace_test.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ENDIF - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("backtrace_test.dep") -!INCLUDE "backtrace_test.dep" -!ELSE -!MESSAGE Warning: cannot find "backtrace_test.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "backtrace_test - @PLATFORM@ Release" || "$(CFG)" == "backtrace_test - @PLATFORM@ Debug" -SOURCE="..\backtrace_test.c" - -!IF "$(CFG)" == "backtrace_test - @PLATFORM@ Release" - - -"$(INTDIR)\backtrace_test.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "backtrace_test - @PLATFORM@ Debug" - - -"$(INTDIR)\backtrace_test.obj" "$(INTDIR)\backtrace_test.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -!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 -1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest" -<< KEEP - -$(_VC_MANIFEST_BASENAME).auto.manifest : - type <<$@ - - - -<< KEEP diff --git a/bin/tests/win32/inter_test.dsp.in b/bin/tests/win32/inter_test.dsp.in deleted file mode 100644 index afdb63e5c6..0000000000 --- a/bin/tests/win32/inter_test.dsp.in +++ /dev/null @@ -1,103 +0,0 @@ -# Microsoft Developer Studio Project File - Name="inter_test" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103 - -CFG=inter_test - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "inter_test.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "inter_test.mak" CFG="inter_test - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "inter_test - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "inter_test - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "inter_test - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console @MACHINE@ -# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/inter_test.exe" - -!ELSEIF "$(CFG)" == "inter_test - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c -# SUBTRACT CPP /X @COPTY@ -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console /debug @MACHINE@ /pdbtype:sept -# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/inter_test.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "inter_test - @PLATFORM@ Release" -# Name "inter_test - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE="..\inter_test.c" -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/bin/tests/win32/inter_test.dsw b/bin/tests/win32/inter_test.dsw deleted file mode 100644 index a67da2ebf3..0000000000 --- a/bin/tests/win32/inter_test.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "inter_test"=".\inter_test.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/bin/tests/win32/inter_test.mak.in b/bin/tests/win32/inter_test.mak.in deleted file mode 100644 index b13e31bc7a..0000000000 --- a/bin/tests/win32/inter_test.mak.in +++ /dev/null @@ -1,299 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on inter_test.dsp -!IF "$(CFG)" == "" -CFG=inter_test - @PLATFORM@ Debug -!MESSAGE No configuration specified. Defaulting to inter_test - @PLATFORM@ Debug. -!ENDIF - -!IF "$(CFG)" != "inter_test - @PLATFORM@ Release" && "$(CFG)" != "inter_test - @PLATFORM@ Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "inter_test.mak" CFG="inter_test - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "inter_test - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "inter_test - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -!IF "$(CFG)" == "inter_test - @PLATFORM@ 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)" == "inter_test - @PLATFORM@ Release" - -OUTDIR=.\Release -INTDIR=.\Release - -ALL : "..\..\..\Build\Release\inter_test.exe" - - -CLEAN : - -@erase "$(INTDIR)\inter_test.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "..\..\..\Build\Release\inter_test.exe" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\inter_test.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\inter_test.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\inter_test.pdb" @MACHINE@ /out:"../../../Build/Release/inter_test.exe" -LINK32_OBJS= \ - "$(INTDIR)\inter_test.obj" - -"..\..\..\Build\Release\inter_test.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ELSEIF "$(CFG)" == "inter_test - @PLATFORM@ Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -ALL : "..\..\..\Build\Debug\inter_test.exe" "$(OUTDIR)\inter_test.bsc" - - -CLEAN : - -@erase "$(INTDIR)\inter_test.obj" - -@erase "$(INTDIR)\inter_test.sbr" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\inter_test.pdb" - -@erase "$(OUTDIR)\inter_test.bsc" - -@erase "..\..\..\Build\Debug\inter_test.exe" - -@erase "..\..\..\Build\Debug\inter_test.ilk" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\inter_test.bsc" -BSC32_SBRS= \ - "$(INTDIR)\inter_test.sbr" - -"$(OUTDIR)\inter_test.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\inter_test.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/inter_test.exe" /pdbtype:sept -LINK32_OBJS= \ - "$(INTDIR)\inter_test.obj" - -"..\..\..\Build\Debug\inter_test.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ENDIF - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("inter_test.dep") -!INCLUDE "inter_test.dep" -!ELSE -!MESSAGE Warning: cannot find "inter_test.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "inter_test - @PLATFORM@ Release" || "$(CFG)" == "inter_test - @PLATFORM@ Debug" -SOURCE="..\inter_test.c" - -!IF "$(CFG)" == "inter_test - @PLATFORM@ Release" - - -"$(INTDIR)\inter_test.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "inter_test - @PLATFORM@ Debug" - - -"$(INTDIR)\inter_test.obj" "$(INTDIR)\inter_test.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -!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 -1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest" -<< KEEP - -$(_VC_MANIFEST_BASENAME).auto.manifest : - type <<$@ - - - -<< KEEP diff --git a/bin/tests/win32/makejournal.dsp.in b/bin/tests/win32/makejournal.dsp.in deleted file mode 100644 index fc04c620fe..0000000000 --- a/bin/tests/win32/makejournal.dsp.in +++ /dev/null @@ -1,103 +0,0 @@ -# Microsoft Developer Studio Project File - Name="makejournal" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103 - -CFG=makejournal - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "makejournal.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "makejournal.mak" CFG="makejournal - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "makejournal - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "makejournal - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "makejournal - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console @MACHINE@ -# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/makejournal.exe" - -!ELSEIF "$(CFG)" == "makejournal - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c -# SUBTRACT CPP /X @COPTY@ -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console /debug @MACHINE@ /pdbtype:sept -# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/makejournal.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "makejournal - @PLATFORM@ Release" -# Name "makejournal - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE="..\makejournal.c" -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/bin/tests/win32/makejournal.dsw b/bin/tests/win32/makejournal.dsw deleted file mode 100644 index e8b53f1135..0000000000 --- a/bin/tests/win32/makejournal.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "makejournal"=".\makejournal.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/bin/tests/win32/makejournal.mak.in b/bin/tests/win32/makejournal.mak.in deleted file mode 100644 index 00802d66f6..0000000000 --- a/bin/tests/win32/makejournal.mak.in +++ /dev/null @@ -1,299 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on makejournal.dsp -!IF "$(CFG)" == "" -CFG=makejournal - @PLATFORM@ Debug -!MESSAGE No configuration specified. Defaulting to makejournal - @PLATFORM@ Debug. -!ENDIF - -!IF "$(CFG)" != "makejournal - @PLATFORM@ Release" && "$(CFG)" != "makejournal - @PLATFORM@ Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "makejournal.mak" CFG="makejournal - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "makejournal - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "makejournal - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -!IF "$(CFG)" == "makejournal - @PLATFORM@ 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)" == "makejournal - @PLATFORM@ Release" - -OUTDIR=.\Release -INTDIR=.\Release - -ALL : "..\..\..\Build\Release\makejournal.exe" - - -CLEAN : - -@erase "$(INTDIR)\makejournal.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "..\..\..\Build\Release\makejournal.exe" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\makejournal.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\makejournal.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\makejournal.pdb" @MACHINE@ /out:"../../../Build/Release/makejournal.exe" -LINK32_OBJS= \ - "$(INTDIR)\makejournal.obj" - -"..\..\..\Build\Release\makejournal.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ELSEIF "$(CFG)" == "makejournal - @PLATFORM@ Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -ALL : "..\..\..\Build\Debug\makejournal.exe" "$(OUTDIR)\makejournal.bsc" - - -CLEAN : - -@erase "$(INTDIR)\makejournal.obj" - -@erase "$(INTDIR)\makejournal.sbr" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\makejournal.pdb" - -@erase "$(OUTDIR)\makejournal.bsc" - -@erase "..\..\..\Build\Debug\makejournal.exe" - -@erase "..\..\..\Build\Debug\makejournal.ilk" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\makejournal.bsc" -BSC32_SBRS= \ - "$(INTDIR)\makejournal.sbr" - -"$(OUTDIR)\makejournal.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\makejournal.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/makejournal.exe" /pdbtype:sept -LINK32_OBJS= \ - "$(INTDIR)\makejournal.obj" - -"..\..\..\Build\Debug\makejournal.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ENDIF - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("makejournal.dep") -!INCLUDE "makejournal.dep" -!ELSE -!MESSAGE Warning: cannot find "makejournal.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "makejournal - @PLATFORM@ Release" || "$(CFG)" == "makejournal - @PLATFORM@ Debug" -SOURCE="..\makejournal.c" - -!IF "$(CFG)" == "makejournal - @PLATFORM@ Release" - - -"$(INTDIR)\makejournal.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "makejournal - @PLATFORM@ Debug" - - -"$(INTDIR)\makejournal.obj" "$(INTDIR)\makejournal.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -!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 -1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest" -<< KEEP - -$(_VC_MANIFEST_BASENAME).auto.manifest : - type <<$@ - - - -<< KEEP diff --git a/bin/tests/win32/rwlock_test.dsp.in b/bin/tests/win32/rwlock_test.dsp.in deleted file mode 100644 index e852c6f983..0000000000 --- a/bin/tests/win32/rwlock_test.dsp.in +++ /dev/null @@ -1,103 +0,0 @@ -# Microsoft Developer Studio Project File - Name="rwlock_test" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103 - -CFG=rwlock_test - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "rwlock_test.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "rwlock_test.mak" CFG="rwlock_test - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "rwlock_test - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "rwlock_test - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "rwlock_test - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console @MACHINE@ -# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/rwlock_test.exe" - -!ELSEIF "$(CFG)" == "rwlock_test - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c -# SUBTRACT CPP /X @COPTY@ -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console /debug @MACHINE@ /pdbtype:sept -# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/rwlock_test.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "rwlock_test - @PLATFORM@ Release" -# Name "rwlock_test - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE="..\rwlock_test.c" -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/bin/tests/win32/rwlock_test.dsw b/bin/tests/win32/rwlock_test.dsw deleted file mode 100644 index 6c200a2c9d..0000000000 --- a/bin/tests/win32/rwlock_test.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "rwlock_test"=".\rwlock_test.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/bin/tests/win32/rwlock_test.mak.in b/bin/tests/win32/rwlock_test.mak.in deleted file mode 100644 index bed1f3101b..0000000000 --- a/bin/tests/win32/rwlock_test.mak.in +++ /dev/null @@ -1,299 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on rwlock_test.dsp -!IF "$(CFG)" == "" -CFG=rwlock_test - @PLATFORM@ Debug -!MESSAGE No configuration specified. Defaulting to rwlock_test - @PLATFORM@ Debug. -!ENDIF - -!IF "$(CFG)" != "rwlock_test - @PLATFORM@ Release" && "$(CFG)" != "rwlock_test - @PLATFORM@ Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "rwlock_test.mak" CFG="rwlock_test - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "rwlock_test - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "rwlock_test - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -!IF "$(CFG)" == "rwlock_test - @PLATFORM@ 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)" == "rwlock_test - @PLATFORM@ Release" - -OUTDIR=.\Release -INTDIR=.\Release - -ALL : "..\..\..\Build\Release\rwlock_test.exe" - - -CLEAN : - -@erase "$(INTDIR)\rwlock_test.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "..\..\..\Build\Release\rwlock_test.exe" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\rwlock_test.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\rwlock_test.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\rwlock_test.pdb" @MACHINE@ /out:"../../../Build/Release/rwlock_test.exe" -LINK32_OBJS= \ - "$(INTDIR)\rwlock_test.obj" - -"..\..\..\Build\Release\rwlock_test.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ELSEIF "$(CFG)" == "rwlock_test - @PLATFORM@ Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -ALL : "..\..\..\Build\Debug\rwlock_test.exe" "$(OUTDIR)\rwlock_test.bsc" - - -CLEAN : - -@erase "$(INTDIR)\rwlock_test.obj" - -@erase "$(INTDIR)\rwlock_test.sbr" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\rwlock_test.pdb" - -@erase "$(OUTDIR)\rwlock_test.bsc" - -@erase "..\..\..\Build\Debug\rwlock_test.exe" - -@erase "..\..\..\Build\Debug\rwlock_test.ilk" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\rwlock_test.bsc" -BSC32_SBRS= \ - "$(INTDIR)\rwlock_test.sbr" - -"$(OUTDIR)\rwlock_test.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\rwlock_test.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/rwlock_test.exe" /pdbtype:sept -LINK32_OBJS= \ - "$(INTDIR)\rwlock_test.obj" - -"..\..\..\Build\Debug\rwlock_test.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ENDIF - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("rwlock_test.dep") -!INCLUDE "rwlock_test.dep" -!ELSE -!MESSAGE Warning: cannot find "rwlock_test.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "rwlock_test - @PLATFORM@ Release" || "$(CFG)" == "rwlock_test - @PLATFORM@ Debug" -SOURCE="..\rwlock_test.c" - -!IF "$(CFG)" == "rwlock_test - @PLATFORM@ Release" - - -"$(INTDIR)\rwlock_test.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "rwlock_test - @PLATFORM@ Debug" - - -"$(INTDIR)\rwlock_test.obj" "$(INTDIR)\rwlock_test.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -!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 -1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest" -<< KEEP - -$(_VC_MANIFEST_BASENAME).auto.manifest : - type <<$@ - - - -<< KEEP diff --git a/bin/tests/win32/shutdown_test.dsp.in b/bin/tests/win32/shutdown_test.dsp.in deleted file mode 100644 index c304d2431a..0000000000 --- a/bin/tests/win32/shutdown_test.dsp.in +++ /dev/null @@ -1,103 +0,0 @@ -# Microsoft Developer Studio Project File - Name="shutdown_test" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103 - -CFG=shutdown_test - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "shutdown_test.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "shutdown_test.mak" CFG="shutdown_test - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "shutdown_test - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "shutdown_test - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "shutdown_test - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console @MACHINE@ -# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/shutdown_test.exe" - -!ELSEIF "$(CFG)" == "shutdown_test - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c -# SUBTRACT CPP /X @COPTY@ -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console /debug @MACHINE@ /pdbtype:sept -# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/shutdown_test.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "shutdown_test - @PLATFORM@ Release" -# Name "shutdown_test - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE="..\shutdown_test.c" -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/bin/tests/win32/shutdown_test.dsw b/bin/tests/win32/shutdown_test.dsw deleted file mode 100644 index 6dedad423a..0000000000 --- a/bin/tests/win32/shutdown_test.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "shutdown_test"=".\shutdown_test.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/bin/tests/win32/shutdown_test.mak.in b/bin/tests/win32/shutdown_test.mak.in deleted file mode 100644 index c5d9efcd67..0000000000 --- a/bin/tests/win32/shutdown_test.mak.in +++ /dev/null @@ -1,299 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on shutdown_test.dsp -!IF "$(CFG)" == "" -CFG=shutdown_test - @PLATFORM@ Debug -!MESSAGE No configuration specified. Defaulting to shutdown_test - @PLATFORM@ Debug. -!ENDIF - -!IF "$(CFG)" != "shutdown_test - @PLATFORM@ Release" && "$(CFG)" != "shutdown_test - @PLATFORM@ Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "shutdown_test.mak" CFG="shutdown_test - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "shutdown_test - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "shutdown_test - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -!IF "$(CFG)" == "shutdown_test - @PLATFORM@ 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)" == "shutdown_test - @PLATFORM@ Release" - -OUTDIR=.\Release -INTDIR=.\Release - -ALL : "..\..\..\Build\Release\shutdown_test.exe" - - -CLEAN : - -@erase "$(INTDIR)\shutdown_test.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "..\..\..\Build\Release\shutdown_test.exe" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\shutdown_test.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\shutdown_test.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\shutdown_test.pdb" @MACHINE@ /out:"../../../Build/Release/shutdown_test.exe" -LINK32_OBJS= \ - "$(INTDIR)\shutdown_test.obj" - -"..\..\..\Build\Release\shutdown_test.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ELSEIF "$(CFG)" == "shutdown_test - @PLATFORM@ Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -ALL : "..\..\..\Build\Debug\shutdown_test.exe" "$(OUTDIR)\shutdown_test.bsc" - - -CLEAN : - -@erase "$(INTDIR)\shutdown_test.obj" - -@erase "$(INTDIR)\shutdown_test.sbr" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\shutdown_test.pdb" - -@erase "$(OUTDIR)\shutdown_test.bsc" - -@erase "..\..\..\Build\Debug\shutdown_test.exe" - -@erase "..\..\..\Build\Debug\shutdown_test.ilk" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\shutdown_test.bsc" -BSC32_SBRS= \ - "$(INTDIR)\shutdown_test.sbr" - -"$(OUTDIR)\shutdown_test.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\shutdown_test.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/shutdown_test.exe" /pdbtype:sept -LINK32_OBJS= \ - "$(INTDIR)\shutdown_test.obj" - -"..\..\..\Build\Debug\shutdown_test.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ENDIF - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("shutdown_test.dep") -!INCLUDE "shutdown_test.dep" -!ELSE -!MESSAGE Warning: cannot find "shutdown_test.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "shutdown_test - @PLATFORM@ Release" || "$(CFG)" == "shutdown_test - @PLATFORM@ Debug" -SOURCE="..\shutdown_test.c" - -!IF "$(CFG)" == "shutdown_test - @PLATFORM@ Release" - - -"$(INTDIR)\shutdown_test.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "shutdown_test - @PLATFORM@ Debug" - - -"$(INTDIR)\shutdown_test.obj" "$(INTDIR)\shutdown_test.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -!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 -1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest" -<< KEEP - -$(_VC_MANIFEST_BASENAME).auto.manifest : - type <<$@ - - - -<< KEEP diff --git a/bin/tests/win32/sock_test.dsp.in b/bin/tests/win32/sock_test.dsp.in deleted file mode 100644 index 713aff095a..0000000000 --- a/bin/tests/win32/sock_test.dsp.in +++ /dev/null @@ -1,103 +0,0 @@ -# Microsoft Developer Studio Project File - Name="sock_test" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103 - -CFG=sock_test - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "sock_test.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "sock_test.mak" CFG="sock_test - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "sock_test - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "sock_test - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "sock_test - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console @MACHINE@ -# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/sock_test.exe" - -!ELSEIF "$(CFG)" == "sock_test - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c -# SUBTRACT CPP /X @COPTY@ -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console /debug @MACHINE@ /pdbtype:sept -# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/sock_test.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "sock_test - @PLATFORM@ Release" -# Name "sock_test - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE="..\sock_test.c" -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/bin/tests/win32/sock_test.dsw b/bin/tests/win32/sock_test.dsw deleted file mode 100644 index 5241c6ec8b..0000000000 --- a/bin/tests/win32/sock_test.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "sock_test"=".\sock_test.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/bin/tests/win32/sock_test.mak.in b/bin/tests/win32/sock_test.mak.in deleted file mode 100644 index d92c0e8e38..0000000000 --- a/bin/tests/win32/sock_test.mak.in +++ /dev/null @@ -1,299 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on sock_test.dsp -!IF "$(CFG)" == "" -CFG=sock_test - @PLATFORM@ Debug -!MESSAGE No configuration specified. Defaulting to sock_test - @PLATFORM@ Debug. -!ENDIF - -!IF "$(CFG)" != "sock_test - @PLATFORM@ Release" && "$(CFG)" != "sock_test - @PLATFORM@ Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "sock_test.mak" CFG="sock_test - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "sock_test - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "sock_test - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -!IF "$(CFG)" == "sock_test - @PLATFORM@ 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)" == "sock_test - @PLATFORM@ Release" - -OUTDIR=.\Release -INTDIR=.\Release - -ALL : "..\..\..\Build\Release\sock_test.exe" - - -CLEAN : - -@erase "$(INTDIR)\sock_test.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "..\..\..\Build\Release\sock_test.exe" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\sock_test.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\sock_test.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\sock_test.pdb" @MACHINE@ /out:"../../../Build/Release/sock_test.exe" -LINK32_OBJS= \ - "$(INTDIR)\sock_test.obj" - -"..\..\..\Build\Release\sock_test.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ELSEIF "$(CFG)" == "sock_test - @PLATFORM@ Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -ALL : "..\..\..\Build\Debug\sock_test.exe" "$(OUTDIR)\sock_test.bsc" - - -CLEAN : - -@erase "$(INTDIR)\sock_test.obj" - -@erase "$(INTDIR)\sock_test.sbr" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\sock_test.pdb" - -@erase "$(OUTDIR)\sock_test.bsc" - -@erase "..\..\..\Build\Debug\sock_test.exe" - -@erase "..\..\..\Build\Debug\sock_test.ilk" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\sock_test.bsc" -BSC32_SBRS= \ - "$(INTDIR)\sock_test.sbr" - -"$(OUTDIR)\sock_test.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\sock_test.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/sock_test.exe" /pdbtype:sept -LINK32_OBJS= \ - "$(INTDIR)\sock_test.obj" - -"..\..\..\Build\Debug\sock_test.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ENDIF - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("sock_test.dep") -!INCLUDE "sock_test.dep" -!ELSE -!MESSAGE Warning: cannot find "sock_test.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "sock_test - @PLATFORM@ Release" || "$(CFG)" == "sock_test - @PLATFORM@ Debug" -SOURCE="..\sock_test.c" - -!IF "$(CFG)" == "sock_test - @PLATFORM@ Release" - - -"$(INTDIR)\sock_test.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "sock_test - @PLATFORM@ Debug" - - -"$(INTDIR)\sock_test.obj" "$(INTDIR)\sock_test.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -!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 -1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest" -<< KEEP - -$(_VC_MANIFEST_BASENAME).auto.manifest : - type <<$@ - - - -<< KEEP diff --git a/bin/tests/win32/task_test.dsp.in b/bin/tests/win32/task_test.dsp.in deleted file mode 100644 index 9e5f9f82e4..0000000000 --- a/bin/tests/win32/task_test.dsp.in +++ /dev/null @@ -1,103 +0,0 @@ -# Microsoft Developer Studio Project File - Name="task_test" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103 - -CFG=task_test - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "task_test.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "task_test.mak" CFG="task_test - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "task_test - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "task_test - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "task_test - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console @MACHINE@ -# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/task_test.exe" - -!ELSEIF "$(CFG)" == "task_test - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c -# SUBTRACT CPP /X @COPTY@ -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console /debug @MACHINE@ /pdbtype:sept -# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/task_test.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "task_test - @PLATFORM@ Release" -# Name "task_test - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE="..\task_test.c" -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/bin/tests/win32/task_test.dsw b/bin/tests/win32/task_test.dsw deleted file mode 100644 index af453dc2f0..0000000000 --- a/bin/tests/win32/task_test.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "task_test"=".\task_test.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/bin/tests/win32/task_test.mak.in b/bin/tests/win32/task_test.mak.in deleted file mode 100644 index 3ac4bb5e20..0000000000 --- a/bin/tests/win32/task_test.mak.in +++ /dev/null @@ -1,299 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on task_test.dsp -!IF "$(CFG)" == "" -CFG=task_test - @PLATFORM@ Debug -!MESSAGE No configuration specified. Defaulting to task_test - @PLATFORM@ Debug. -!ENDIF - -!IF "$(CFG)" != "task_test - @PLATFORM@ Release" && "$(CFG)" != "task_test - @PLATFORM@ Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "task_test.mak" CFG="task_test - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "task_test - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "task_test - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -!IF "$(CFG)" == "task_test - @PLATFORM@ 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)" == "task_test - @PLATFORM@ Release" - -OUTDIR=.\Release -INTDIR=.\Release - -ALL : "..\..\..\Build\Release\task_test.exe" - - -CLEAN : - -@erase "$(INTDIR)\task_test.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "..\..\..\Build\Release\task_test.exe" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\task_test.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\task_test.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\task_test.pdb" @MACHINE@ /out:"../../../Build/Release/task_test.exe" -LINK32_OBJS= \ - "$(INTDIR)\task_test.obj" - -"..\..\..\Build\Release\task_test.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ELSEIF "$(CFG)" == "task_test - @PLATFORM@ Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -ALL : "..\..\..\Build\Debug\task_test.exe" "$(OUTDIR)\task_test.bsc" - - -CLEAN : - -@erase "$(INTDIR)\task_test.obj" - -@erase "$(INTDIR)\task_test.sbr" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\task_test.pdb" - -@erase "$(OUTDIR)\task_test.bsc" - -@erase "..\..\..\Build\Debug\task_test.exe" - -@erase "..\..\..\Build\Debug\task_test.ilk" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\task_test.bsc" -BSC32_SBRS= \ - "$(INTDIR)\task_test.sbr" - -"$(OUTDIR)\task_test.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\task_test.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/task_test.exe" /pdbtype:sept -LINK32_OBJS= \ - "$(INTDIR)\task_test.obj" - -"..\..\..\Build\Debug\task_test.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ENDIF - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("task_test.dep") -!INCLUDE "task_test.dep" -!ELSE -!MESSAGE Warning: cannot find "task_test.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "task_test - @PLATFORM@ Release" || "$(CFG)" == "task_test - @PLATFORM@ Debug" -SOURCE="..\task_test.c" - -!IF "$(CFG)" == "task_test - @PLATFORM@ Release" - - -"$(INTDIR)\task_test.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "task_test - @PLATFORM@ Debug" - - -"$(INTDIR)\task_test.obj" "$(INTDIR)\task_test.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -!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 -1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest" -<< KEEP - -$(_VC_MANIFEST_BASENAME).auto.manifest : - type <<$@ - - - -<< KEEP diff --git a/bin/tests/win32/timer_test.dsp.in b/bin/tests/win32/timer_test.dsp.in deleted file mode 100644 index 861489355d..0000000000 --- a/bin/tests/win32/timer_test.dsp.in +++ /dev/null @@ -1,103 +0,0 @@ -# Microsoft Developer Studio Project File - Name="timer_test" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103 - -CFG=timer_test - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "timer_test.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "timer_test.mak" CFG="timer_test - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "timer_test - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "timer_test - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "timer_test - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console @MACHINE@ -# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/timer_test.exe" - -!ELSEIF "$(CFG)" == "timer_test - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c -# SUBTRACT CPP /X @COPTY@ -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console /debug @MACHINE@ /pdbtype:sept -# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/timer_test.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "timer_test - @PLATFORM@ Release" -# Name "timer_test - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE="..\timer_test.c" -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/bin/tests/win32/timer_test.dsw b/bin/tests/win32/timer_test.dsw deleted file mode 100644 index 8db7e2aab9..0000000000 --- a/bin/tests/win32/timer_test.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "timer_test"=".\timer_test.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/bin/tests/win32/timer_test.mak.in b/bin/tests/win32/timer_test.mak.in deleted file mode 100644 index c11438b371..0000000000 --- a/bin/tests/win32/timer_test.mak.in +++ /dev/null @@ -1,299 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on timer_test.dsp -!IF "$(CFG)" == "" -CFG=timer_test - @PLATFORM@ Debug -!MESSAGE No configuration specified. Defaulting to timer_test - @PLATFORM@ Debug. -!ENDIF - -!IF "$(CFG)" != "timer_test - @PLATFORM@ Release" && "$(CFG)" != "timer_test - @PLATFORM@ Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "timer_test.mak" CFG="timer_test - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "timer_test - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "timer_test - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -!IF "$(CFG)" == "timer_test - @PLATFORM@ 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)" == "timer_test - @PLATFORM@ Release" - -OUTDIR=.\Release -INTDIR=.\Release - -ALL : "..\..\..\Build\Release\timer_test.exe" - - -CLEAN : - -@erase "$(INTDIR)\timer_test.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "..\..\..\Build\Release\timer_test.exe" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\timer_test.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\timer_test.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\timer_test.pdb" @MACHINE@ /out:"../../../Build/Release/timer_test.exe" -LINK32_OBJS= \ - "$(INTDIR)\timer_test.obj" - -"..\..\..\Build\Release\timer_test.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ELSEIF "$(CFG)" == "timer_test - @PLATFORM@ Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -ALL : "..\..\..\Build\Debug\timer_test.exe" "$(OUTDIR)\timer_test.bsc" - - -CLEAN : - -@erase "$(INTDIR)\timer_test.obj" - -@erase "$(INTDIR)\timer_test.sbr" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\timer_test.pdb" - -@erase "$(OUTDIR)\timer_test.bsc" - -@erase "..\..\..\Build\Debug\timer_test.exe" - -@erase "..\..\..\Build\Debug\timer_test.ilk" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\timer_test.bsc" -BSC32_SBRS= \ - "$(INTDIR)\timer_test.sbr" - -"$(OUTDIR)\timer_test.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\timer_test.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/timer_test.exe" /pdbtype:sept -LINK32_OBJS= \ - "$(INTDIR)\timer_test.obj" - -"..\..\..\Build\Debug\timer_test.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ENDIF - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("timer_test.dep") -!INCLUDE "timer_test.dep" -!ELSE -!MESSAGE Warning: cannot find "timer_test.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "timer_test - @PLATFORM@ Release" || "$(CFG)" == "timer_test - @PLATFORM@ Debug" -SOURCE="..\timer_test.c" - -!IF "$(CFG)" == "timer_test - @PLATFORM@ Release" - - -"$(INTDIR)\timer_test.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "timer_test - @PLATFORM@ Debug" - - -"$(INTDIR)\timer_test.obj" "$(INTDIR)\timer_test.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -!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 -1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest" -<< KEEP - -$(_VC_MANIFEST_BASENAME).auto.manifest : - type <<$@ - - - -<< KEEP diff --git a/bin/tools/Makefile.in b/bin/tools/Makefile.in index ce4441c11c..4f29a735f9 100644 --- a/bin/tools/Makefile.in +++ b/bin/tools/Makefile.in @@ -12,8 +12,7 @@ VERSION=@BIND9_VERSION@ @BIND9_MAKE_INCLUDES@ -CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} \ - ${ISCCFG_INCLUDES} ${LWRES_INCLUDES} \ +CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCFG_INCLUDES} \ ${OMAPI_INCLUDES} ${BIND9_INCLUDES} @DST_OPENSSL_INC@ CDEFINES = @CRYPTO@ -DVERSION=\"${VERSION}\" @@ -24,13 +23,11 @@ BIND9LIBS = ../../lib/bind9/libbind9.@A@ ISCLIBS = ../../lib/isc/libisc.@A@ @DNS_CRYPTO_LIBS@ ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@ -LWRESLIBS = ../../lib/lwres/liblwres.@A@ DNSDEPLIBS = ../../lib/dns/libdns.@A@ BIND9DEPLIBS = ../../lib/bind9/libbind9.@A@ ISCDEPLIBS = ../../lib/isc/libisc.@A@ ISCCFGDEPLIBS = ../../lib/isccfg/libisccfg.@A@ -LWRESDEPLIBS = ../../lib/lwres/liblwres.@A@ LIBS = ${ISCLIBS} @LIBS@ NOSYMLIBS = ${ISCNOSYMLIBS} @LIBS@ diff --git a/bin/tools/win32/arpaname.dsp.in b/bin/tools/win32/arpaname.dsp.in deleted file mode 100644 index 1871a32fb7..0000000000 --- a/bin/tools/win32/arpaname.dsp.in +++ /dev/null @@ -1,103 +0,0 @@ -# Microsoft Developer Studio Project File - Name="arpaname" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103 - -CFG=arpaname - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "arpaname.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "arpaname.mak" CFG="arpaname - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "arpaname - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "arpaname - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "arpaname - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console @MACHINE@ -# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/arpaname.exe" - -!ELSEIF "$(CFG)" == "arpaname - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c -# SUBTRACT CPP /X @COPTY@ -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console /debug @MACHINE@ /pdbtype:sept -# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/arpaname.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "arpaname - @PLATFORM@ Release" -# Name "arpaname - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE="..\arpaname.c" -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/bin/tools/win32/arpaname.dsw b/bin/tools/win32/arpaname.dsw deleted file mode 100644 index 9fff8199c8..0000000000 --- a/bin/tools/win32/arpaname.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "arpaname"=".\arpaname.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/bin/tools/win32/arpaname.mak.in b/bin/tools/win32/arpaname.mak.in deleted file mode 100644 index 7de36d8057..0000000000 --- a/bin/tools/win32/arpaname.mak.in +++ /dev/null @@ -1,299 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on arpaname.dsp -!IF "$(CFG)" == "" -CFG=arpaname - @PLATFORM@ Debug -!MESSAGE No configuration specified. Defaulting to arpaname - @PLATFORM@ Debug. -!ENDIF - -!IF "$(CFG)" != "arpaname - @PLATFORM@ Release" && "$(CFG)" != "arpaname - @PLATFORM@ Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "arpaname.mak" CFG="arpaname - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "arpaname - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "arpaname - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -!IF "$(CFG)" == "arpaname - @PLATFORM@ 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)" == "arpaname - @PLATFORM@ Release" - -OUTDIR=.\Release -INTDIR=.\Release - -ALL : "..\..\..\Build\Release\arpaname.exe" - - -CLEAN : - -@erase "$(INTDIR)\arpaname.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "..\..\..\Build\Release\arpaname.exe" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\arpaname.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\arpaname.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\arpaname.pdb" @MACHINE@ /out:"../../../Build/Release/arpaname.exe" -LINK32_OBJS= \ - "$(INTDIR)\arpaname.obj" - -"..\..\..\Build\Release\arpaname.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ELSEIF "$(CFG)" == "arpaname - @PLATFORM@ Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -ALL : "..\..\..\Build\Debug\arpaname.exe" "$(OUTDIR)\arpaname.bsc" - - -CLEAN : - -@erase "$(INTDIR)\arpaname.obj" - -@erase "$(INTDIR)\arpaname.sbr" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\arpaname.pdb" - -@erase "$(OUTDIR)\arpaname.bsc" - -@erase "..\..\..\Build\Debug\arpaname.exe" - -@erase "..\..\..\Build\Debug\arpaname.ilk" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\arpaname.bsc" -BSC32_SBRS= \ - "$(INTDIR)\arpaname.sbr" - -"$(OUTDIR)\arpaname.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\arpaname.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/arpaname.exe" /pdbtype:sept -LINK32_OBJS= \ - "$(INTDIR)\arpaname.obj" - -"..\..\..\Build\Debug\arpaname.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ENDIF - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("arpaname.dep") -!INCLUDE "arpaname.dep" -!ELSE -!MESSAGE Warning: cannot find "arpaname.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "arpaname - @PLATFORM@ Release" || "$(CFG)" == "arpaname - @PLATFORM@ Debug" -SOURCE="..\arpaname.c" - -!IF "$(CFG)" == "arpaname - @PLATFORM@ Release" - - -"$(INTDIR)\arpaname.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "arpaname - @PLATFORM@ Debug" - - -"$(INTDIR)\arpaname.obj" "$(INTDIR)\arpaname.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -!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 -1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest" -<< KEEP - -$(_VC_MANIFEST_BASENAME).auto.manifest : - type <<$@ - - - -<< KEEP diff --git a/bin/tools/win32/genrandom.dsp.in b/bin/tools/win32/genrandom.dsp.in deleted file mode 100644 index 6358eb3ddc..0000000000 --- a/bin/tools/win32/genrandom.dsp.in +++ /dev/null @@ -1,103 +0,0 @@ -# Microsoft Developer Studio Project File - Name="genrandom" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103 - -CFG=genrandom - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "genrandom.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "genrandom.mak" CFG="genrandom - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "genrandom - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "genrandom - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "genrandom - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console @MACHINE@ -# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/genrandom.exe" - -!ELSEIF "$(CFG)" == "genrandom - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c -# SUBTRACT CPP /X @COPTY@ -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console /debug @MACHINE@ /pdbtype:sept -# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/genrandom.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "genrandom - @PLATFORM@ Release" -# Name "genrandom - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE="..\genrandom.c" -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/bin/tools/win32/genrandom.dsw b/bin/tools/win32/genrandom.dsw deleted file mode 100644 index b497a5e546..0000000000 --- a/bin/tools/win32/genrandom.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "genrandom"=".\genrandom.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/bin/tools/win32/genrandom.mak.in b/bin/tools/win32/genrandom.mak.in deleted file mode 100644 index a5d951a053..0000000000 --- a/bin/tools/win32/genrandom.mak.in +++ /dev/null @@ -1,299 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on genrandom.dsp -!IF "$(CFG)" == "" -CFG=genrandom - @PLATFORM@ Debug -!MESSAGE No configuration specified. Defaulting to genrandom - @PLATFORM@ Debug. -!ENDIF - -!IF "$(CFG)" != "genrandom - @PLATFORM@ Release" && "$(CFG)" != "genrandom - @PLATFORM@ Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "genrandom.mak" CFG="genrandom - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "genrandom - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "genrandom - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -!IF "$(CFG)" == "genrandom - @PLATFORM@ 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)" == "genrandom - @PLATFORM@ Release" - -OUTDIR=.\Release -INTDIR=.\Release - -ALL : "..\..\..\Build\Release\genrandom.exe" - - -CLEAN : - -@erase "$(INTDIR)\genrandom.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "..\..\..\Build\Release\genrandom.exe" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\genrandom.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\genrandom.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\genrandom.pdb" @MACHINE@ /out:"../../../Build/Release/genrandom.exe" -LINK32_OBJS= \ - "$(INTDIR)\genrandom.obj" \ - -"..\..\..\Build\Release\genrandom.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ELSEIF "$(CFG)" == "genrandom - @PLATFORM@ Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -ALL : "..\..\..\Build\Debug\genrandom.exe" "$(OUTDIR)\genrandom.bsc" - - -CLEAN : - -@erase "$(INTDIR)\genrandom.obj" - -@erase "$(INTDIR)\genrandom.sbr" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\genrandom.pdb" - -@erase "$(OUTDIR)\genrandom.bsc" - -@erase "..\..\..\Build\Debug\genrandom.exe" - -@erase "..\..\..\Build\Debug\genrandom.ilk" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\genrandom.bsc" -BSC32_SBRS= \ - "$(INTDIR)\genrandom.sbr" - -"$(OUTDIR)\genrandom.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\genrandom.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/genrandom.exe" /pdbtype:sept -LINK32_OBJS= \ - "$(INTDIR)\genrandom.obj" - -"..\..\..\Build\Debug\genrandom.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ENDIF - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("genrandom.dep") -!INCLUDE "genrandom.dep" -!ELSE -!MESSAGE Warning: cannot find "genrandom.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "genrandom - @PLATFORM@ Release" || "$(CFG)" == "genrandom - @PLATFORM@ Debug" -SOURCE="..\genrandom.c" - -!IF "$(CFG)" == "genrandom - @PLATFORM@ Release" - - -"$(INTDIR)\genrandom.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "genrandom - @PLATFORM@ Debug" - - -"$(INTDIR)\genrandom.obj" "$(INTDIR)\genrandom.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -!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 -1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest" -<< KEEP - -$(_VC_MANIFEST_BASENAME).auto.manifest : - type <<$@ - - - -<< KEEP diff --git a/bin/tools/win32/ischmacfixup.dsp.in b/bin/tools/win32/ischmacfixup.dsp.in deleted file mode 100755 index 82e9ee872d..0000000000 --- a/bin/tools/win32/ischmacfixup.dsp.in +++ /dev/null @@ -1,103 +0,0 @@ -# Microsoft Developer Studio Project File - Name="ischmacfixup" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103 - -CFG=ischmacfixup - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "ischmacfixup.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "ischmacfixup.mak" CFG="ischmacfixup - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "ischmacfixup - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "ischmacfixup - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "ischmacfixup - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" @CRYPTO@ /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console @MACHINE@ -# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/isc-hmac-fixup.exe" - -!ELSEIF "$(CFG)" == "ischmacfixup - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" @CRYPTO@ /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c -# SUBTRACT CPP /X @COPTY@ -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console /debug @MACHINE@ /pdbtype:sept -# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/isc-hmac-fixup.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "ischmacfixup - @PLATFORM@ Release" -# Name "ischmacfixup - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE="..\isc-hmac-fixup.c" -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/bin/tools/win32/ischmacfixup.dsw b/bin/tools/win32/ischmacfixup.dsw deleted file mode 100755 index 81d41f1c7f..0000000000 --- a/bin/tools/win32/ischmacfixup.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "ischmacfixup"=".\ischmacfixup.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/bin/tools/win32/ischmacfixup.mak.in b/bin/tools/win32/ischmacfixup.mak.in deleted file mode 100755 index 7488cafcc4..0000000000 --- a/bin/tools/win32/ischmacfixup.mak.in +++ /dev/null @@ -1,299 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on ischmacfixup.dsp -!IF "$(CFG)" == "" -CFG=ischmacfixup - @PLATFORM@ Debug -!MESSAGE No configuration specified. Defaulting to ischmacfixup - @PLATFORM@ Debug. -!ENDIF - -!IF "$(CFG)" != "ischmacfixup - @PLATFORM@ Release" && "$(CFG)" != "ischmacfixup - @PLATFORM@ Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "ischmacfixup.mak" CFG="ischmacfixup - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "ischmacfixup - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "ischmacfixup - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -!IF "$(CFG)" == "ischmacfixup - @PLATFORM@ 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)" == "ischmacfixup - @PLATFORM@ Release" - -OUTDIR=.\Release -INTDIR=.\Release - -ALL : "..\..\..\Build\Release\isc-hmac-fixup.exe" - - -CLEAN : - -@erase "$(INTDIR)\isc-hmac-fixup.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "..\..\..\Build\Release\isc-hmac-fixup.exe" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" @CRYPTO@ /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\isc-hmac-fixup.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\isc-hmac-fixup.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\isc-hmac-fixup.pdb" @MACHINE@ /out:"../../../Build/Release/isc-hmac-fixup.exe" -LINK32_OBJS= \ - "$(INTDIR)\isc-hmac-fixup.obj" - -"..\..\..\Build\Release\isc-hmac-fixup.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ELSEIF "$(CFG)" == "ischmacfixup - @PLATFORM@ Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -ALL : "..\..\..\Build\Debug\isc-hmac-fixup.exe" "$(OUTDIR)\isc-hmac-fixup.bsc" - - -CLEAN : - -@erase "$(INTDIR)\isc-hmac-fixup.obj" - -@erase "$(INTDIR)\isc-hmac-fixup.sbr" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\isc-hmac-fixup.pdb" - -@erase "$(OUTDIR)\isc-hmac-fixup.bsc" - -@erase "..\..\..\Build\Debug\isc-hmac-fixup.exe" - -@erase "..\..\..\Build\Debug\isc-hmac-fixup.ilk" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" @CRYPTO@ /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\isc-hmac-fixup.bsc" -BSC32_SBRS= \ - "$(INTDIR)\isc-hmac-fixup.sbr" - -"$(OUTDIR)\isc-hmac-fixup.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\isc-hmac-fixup.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/isc-hmac-fixup.exe" /pdbtype:sept -LINK32_OBJS= \ - "$(INTDIR)\isc-hmac-fixup.obj" - -"..\..\..\Build\Debug\isc-hmac-fixup.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ENDIF - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("isc-hmac-fixup.dep") -!INCLUDE "isc-hmac-fixup.dep" -!ELSE -!MESSAGE Warning: cannot find "isc-hmac-fixup.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "ischmacfixup - @PLATFORM@ Release" || "$(CFG)" == "ischmacfixup - @PLATFORM@ Debug" -SOURCE="..\isc-hmac-fixup.c" - -!IF "$(CFG)" == "ischmacfixup - @PLATFORM@ Release" - - -"$(INTDIR)\isc-hmac-fixup.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "ischmacfixup - @PLATFORM@ Debug" - - -"$(INTDIR)\isc-hmac-fixup.obj" "$(INTDIR)\isc-hmac-fixup.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -!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 -1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest" -<< KEEP - -$(_VC_MANIFEST_BASENAME).auto.manifest : - type <<$@ - - - -<< KEEP diff --git a/bin/tools/win32/journalprint.dsp.in b/bin/tools/win32/journalprint.dsp.in deleted file mode 100644 index 268737bf06..0000000000 --- a/bin/tools/win32/journalprint.dsp.in +++ /dev/null @@ -1,103 +0,0 @@ -# Microsoft Developer Studio Project File - Name="journalprint" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103 - -CFG=journalprint - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "journalprint.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "journalprint.mak" CFG="journalprint - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "journalprint - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "journalprint - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "journalprint - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console @MACHINE@ -# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/named-journalprint.exe" - -!ELSEIF "$(CFG)" == "journalprint - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c -# SUBTRACT CPP /X @COPTY@ -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console /debug @MACHINE@ /pdbtype:sept -# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/named-journalprint.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "journalprint - @PLATFORM@ Release" -# Name "journalprint - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE="..\named-journalprint.c" -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/bin/tools/win32/journalprint.dsw b/bin/tools/win32/journalprint.dsw deleted file mode 100644 index d241beb9ac..0000000000 --- a/bin/tools/win32/journalprint.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "journalprint"=".\journalprint.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/bin/tools/win32/journalprint.mak.in b/bin/tools/win32/journalprint.mak.in deleted file mode 100644 index d21aca1e64..0000000000 --- a/bin/tools/win32/journalprint.mak.in +++ /dev/null @@ -1,299 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on journalprint.dsp -!IF "$(CFG)" == "" -CFG=journalprint - @PLATFORM@ Debug -!MESSAGE No configuration specified. Defaulting to journalprint - @PLATFORM@ Debug. -!ENDIF - -!IF "$(CFG)" != "journalprint - @PLATFORM@ Release" && "$(CFG)" != "journalprint - @PLATFORM@ Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "journalprint.mak" CFG="journalprint - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "journalprint - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "journalprint - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -!IF "$(CFG)" == "journalprint - @PLATFORM@ 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)" == "journalprint - @PLATFORM@ Release" - -OUTDIR=.\Release -INTDIR=.\Release - -ALL : "..\..\..\Build\Release\named-journalprint.exe" - - -CLEAN : - -@erase "$(INTDIR)\named-journalprint.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "..\..\..\Build\Release\named-journalprint.exe" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\journalprint.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\journalprint.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\named-journalprint.pdb" @MACHINE@ /out:"../../../Build/Release/named-journalprint.exe" -LINK32_OBJS= \ - "$(INTDIR)\named-journalprint.obj" - -"..\..\..\Build\Release\named-journalprint.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ELSEIF "$(CFG)" == "journalprint - @PLATFORM@ Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -ALL : "..\..\..\Build\Debug\named-journalprint.exe" "$(OUTDIR)\journalprint.bsc" - - -CLEAN : - -@erase "$(INTDIR)\named-journalprint.obj" - -@erase "$(INTDIR)\named-journalprint.sbr" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\named-journalprint.pdb" - -@erase "$(OUTDIR)\journalprint.bsc" - -@erase "..\..\..\Build\Debug\named-journalprint.exe" - -@erase "..\..\..\Build\Debug\named-journalprint.ilk" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\journalprint.bsc" -BSC32_SBRS= \ - "$(INTDIR)\named-journalprint.sbr" - -"$(OUTDIR)\journalprint.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\named-journalprint.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/named-journalprint.exe" /pdbtype:sept -LINK32_OBJS= \ - "$(INTDIR)\named-journalprint.obj" - -"..\..\..\Build\Debug\named-journalprint.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ENDIF - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("journalprint.dep") -!INCLUDE "journalprint.dep" -!ELSE -!MESSAGE Warning: cannot find "journalprint.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "journalprint - @PLATFORM@ Release" || "$(CFG)" == "journalprint - @PLATFORM@ Debug" -SOURCE="..\named-journalprint.c" - -!IF "$(CFG)" == "journalprint - @PLATFORM@ Release" - - -"$(INTDIR)\named-journalprint.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "journalprint - @PLATFORM@ Debug" - - -"$(INTDIR)\named-journalprint.obj" "$(INTDIR)\named-journalprint.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -!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 -1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest" -<< KEEP - -$(_VC_MANIFEST_BASENAME).auto.manifest : - type <<$@ - - - -<< KEEP diff --git a/bin/tools/win32/mdig.dsp.in b/bin/tools/win32/mdig.dsp.in deleted file mode 100644 index e2f00f83f1..0000000000 --- a/bin/tools/win32/mdig.dsp.in +++ /dev/null @@ -1,103 +0,0 @@ -# Microsoft Developer Studio Project File - Name="mdig" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103 - -CFG=mdig - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "mdig.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "mdig.mak" CFG="mdig - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "mdig - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "mdig - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "mdig - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" @CRYPTO@ /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console @MACHINE@ -# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/bind9/win32/Release/libbind9.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/mdig.exe" - -!ELSEIF "$(CFG)" == "mdig - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" @CRYPTO@ /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c -# SUBTRACT CPP /X @COPTY@ -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console /debug @MACHINE@ /pdbtype:sept -# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/bind9/win32/Debug/libbind9.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/mdig.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "mdig - @PLATFORM@ Release" -# Name "mdig - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE="..\mdig.c" -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/bin/tools/win32/mdig.dsw b/bin/tools/win32/mdig.dsw deleted file mode 100644 index b8b26d119b..0000000000 --- a/bin/tools/win32/mdig.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "mdig"=".\mdig.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/bin/tools/win32/mdig.mak.in b/bin/tools/win32/mdig.mak.in deleted file mode 100644 index 0478d03afe..0000000000 --- a/bin/tools/win32/mdig.mak.in +++ /dev/null @@ -1,299 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on mdig.dsp -!IF "$(CFG)" == "" -CFG=mdig - @PLATFORM@ Debug -!MESSAGE No configuration specified. Defaulting to mdig - @PLATFORM@ Debug. -!ENDIF - -!IF "$(CFG)" != "mdig - @PLATFORM@ Release" && "$(CFG)" != "mdig - @PLATFORM@ Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "mdig.mak" CFG="mdig - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "mdig - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "mdig - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -!IF "$(CFG)" == "mdig - @PLATFORM@ 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)" == "mdig - @PLATFORM@ Release" - -OUTDIR=.\Release -INTDIR=.\Release - -ALL : "..\..\..\Build\Release\mdig.exe" - - -CLEAN : - -@erase "$(INTDIR)\mdig.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "..\..\..\Build\Release\mdig.exe" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" @CRYPTO@ /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\mdig.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\mdig.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/bind9/win32/Release/libbind9.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\mdig.pdb" @MACHINE@ /out:"../../../Build/Release/mdig.exe" -LINK32_OBJS= \ - "$(INTDIR)\mdig.obj" - -"..\..\..\Build\Release\mdig.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ELSEIF "$(CFG)" == "mdig - @PLATFORM@ Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -ALL : "..\..\..\Build\Debug\mdig.exe" "$(OUTDIR)\mdig.bsc" - - -CLEAN : - -@erase "$(INTDIR)\mdig.obj" - -@erase "$(INTDIR)\mdig.sbr" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\mdig.pdb" - -@erase "$(OUTDIR)\mdig.bsc" - -@erase "..\..\..\Build\Debug\mdig.exe" - -@erase "..\..\..\Build\Debug\mdig.ilk" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" @CRYPTO@ /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\mdig.bsc" -BSC32_SBRS= \ - "$(INTDIR)\mdig.sbr" - -"$(OUTDIR)\mdig.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/bind9/win32/Debug/libbind9.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\mdig.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/mdig.exe" /pdbtype:sept -LINK32_OBJS= \ - "$(INTDIR)\mdig.obj" - -"..\..\..\Build\Debug\mdig.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ENDIF - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("mdig.dep") -!INCLUDE "mdig.dep" -!ELSE -!MESSAGE Warning: cannot find "mdig.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "mdig - @PLATFORM@ Release" || "$(CFG)" == "mdig - @PLATFORM@ Debug" -SOURCE="..\mdig.c" - -!IF "$(CFG)" == "mdig - @PLATFORM@ Release" - - -"$(INTDIR)\mdig.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "mdig - @PLATFORM@ Debug" - - -"$(INTDIR)\mdig.obj" "$(INTDIR)\mdig.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -!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 -1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest" -<< KEEP - -$(_VC_MANIFEST_BASENAME).auto.manifest : - type <<$@ - - - -<< KEEP diff --git a/bin/tools/win32/nsec3hash.dsp.in b/bin/tools/win32/nsec3hash.dsp.in deleted file mode 100644 index 22648cd4a0..0000000000 --- a/bin/tools/win32/nsec3hash.dsp.in +++ /dev/null @@ -1,103 +0,0 @@ -# Microsoft Developer Studio Project File - Name="nsec3hash" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103 - -CFG=nsec3hash - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "nsec3hash.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "nsec3hash.mak" CFG="nsec3hash - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "nsec3hash - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "nsec3hash - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "nsec3hash - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" @CRYPTO@ /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console @MACHINE@ -# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/nsec3hash.exe" - -!ELSEIF "$(CFG)" == "nsec3hash - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" @CRYPTO@ /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c -# SUBTRACT CPP /X @COPTY@ -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console /debug @MACHINE@ /pdbtype:sept -# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/nsec3hash.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "nsec3hash - @PLATFORM@ Release" -# Name "nsec3hash - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE="..\nsec3hash.c" -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/bin/tools/win32/nsec3hash.dsw b/bin/tools/win32/nsec3hash.dsw deleted file mode 100644 index a64ba419ed..0000000000 --- a/bin/tools/win32/nsec3hash.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "nsec3hash"=".\nsec3hash.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/bin/tools/win32/nsec3hash.mak.in b/bin/tools/win32/nsec3hash.mak.in deleted file mode 100644 index af5cf00dbb..0000000000 --- a/bin/tools/win32/nsec3hash.mak.in +++ /dev/null @@ -1,299 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on nsec3hash.dsp -!IF "$(CFG)" == "" -CFG=nsec3hash - @PLATFORM@ Debug -!MESSAGE No configuration specified. Defaulting to nsec3hash - @PLATFORM@ Debug. -!ENDIF - -!IF "$(CFG)" != "nsec3hash - @PLATFORM@ Release" && "$(CFG)" != "nsec3hash - @PLATFORM@ Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "nsec3hash.mak" CFG="nsec3hash - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "nsec3hash - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "nsec3hash - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -!IF "$(CFG)" == "nsec3hash - @PLATFORM@ 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)" == "nsec3hash - @PLATFORM@ Release" - -OUTDIR=.\Release -INTDIR=.\Release - -ALL : "..\..\..\Build\Release\nsec3hash.exe" - - -CLEAN : - -@erase "$(INTDIR)\nsec3hash.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "..\..\..\Build\Release\nsec3hash.exe" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" @CRYPTO@ /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\nsec3hash.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\nsec3hash.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\nsec3hash.pdb" @MACHINE@ /out:"../../../Build/Release/nsec3hash.exe" -LINK32_OBJS= \ - "$(INTDIR)\nsec3hash.obj" - -"..\..\..\Build\Release\nsec3hash.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ELSEIF "$(CFG)" == "nsec3hash - @PLATFORM@ Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -ALL : "..\..\..\Build\Debug\nsec3hash.exe" "$(OUTDIR)\nsec3hash.bsc" - - -CLEAN : - -@erase "$(INTDIR)\nsec3hash.obj" - -@erase "$(INTDIR)\nsec3hash.sbr" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\nsec3hash.pdb" - -@erase "$(OUTDIR)\nsec3hash.bsc" - -@erase "..\..\..\Build\Debug\nsec3hash.exe" - -@erase "..\..\..\Build\Debug\nsec3hash.ilk" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" @CRYPTO@ /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\nsec3hash.bsc" -BSC32_SBRS= \ - "$(INTDIR)\nsec3hash.sbr" - -"$(OUTDIR)\nsec3hash.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\nsec3hash.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/nsec3hash.exe" /pdbtype:sept -LINK32_OBJS= \ - "$(INTDIR)\nsec3hash.obj" - -"..\..\..\Build\Debug\nsec3hash.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ENDIF - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("nsec3hash.dep") -!INCLUDE "nsec3hash.dep" -!ELSE -!MESSAGE Warning: cannot find "nsec3hash.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "nsec3hash - @PLATFORM@ Release" || "$(CFG)" == "nsec3hash - @PLATFORM@ Debug" -SOURCE="..\nsec3hash.c" - -!IF "$(CFG)" == "nsec3hash - @PLATFORM@ Release" - - -"$(INTDIR)\nsec3hash.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "nsec3hash - @PLATFORM@ Debug" - - -"$(INTDIR)\nsec3hash.obj" "$(INTDIR)\nsec3hash.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -!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 -1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest" -<< KEEP - -$(_VC_MANIFEST_BASENAME).auto.manifest : - type <<$@ - - - -<< KEEP diff --git a/bin/tools/win32/rrchecker.dsp.in b/bin/tools/win32/rrchecker.dsp.in deleted file mode 100644 index 058f46e8ae..0000000000 --- a/bin/tools/win32/rrchecker.dsp.in +++ /dev/null @@ -1,103 +0,0 @@ -# Microsoft Developer Studio Project File - Name="rrchecker" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103 - -CFG=rrchecker - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "rrchecker.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "rrchecker.mak" CFG="rrchecker - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "rrchecker - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "rrchecker - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "rrchecker - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console @MACHINE@ -# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/named-rrchecker.exe" - -!ELSEIF "$(CFG)" == "rrchecker - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c -# SUBTRACT CPP /X @COPTY@ -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console /debug @MACHINE@ /pdbtype:sept -# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/named-rrchecker.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "rrchecker - @PLATFORM@ Release" -# Name "rrchecker - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE="..\named-rrchecker.c" -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/bin/tools/win32/rrchecker.dsw b/bin/tools/win32/rrchecker.dsw deleted file mode 100644 index f5c652f55c..0000000000 --- a/bin/tools/win32/rrchecker.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "rrchecker"=".\rrchecker.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/bin/tools/win32/rrchecker.mak.in b/bin/tools/win32/rrchecker.mak.in deleted file mode 100644 index 3811c389d8..0000000000 --- a/bin/tools/win32/rrchecker.mak.in +++ /dev/null @@ -1,299 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on rrchecker.dsp -!IF "$(CFG)" == "" -CFG=rrchecker - @PLATFORM@ Debug -!MESSAGE No configuration specified. Defaulting to rrchecker - @PLATFORM@ Debug. -!ENDIF - -!IF "$(CFG)" != "rrchecker - @PLATFORM@ Release" && "$(CFG)" != "rrchecker - @PLATFORM@ Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "rrchecker.mak" CFG="rrchecker - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "rrchecker - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "rrchecker - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -!IF "$(CFG)" == "rrchecker - @PLATFORM@ 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)" == "rrchecker - @PLATFORM@ Release" - -OUTDIR=.\Release -INTDIR=.\Release - -ALL : "..\..\..\Build\Release\named-rrchecker.exe" - - -CLEAN : - -@erase "$(INTDIR)\named-rrchecker.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "..\..\..\Build\Release\named-rrchecker.exe" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\named-rrchecker.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\named-rrchecker.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\named-rrchecker.pdb" @MACHINE@ /out:"../../../Build/Release/named-rrchecker.exe" -LINK32_OBJS= \ - "$(INTDIR)\named-rrchecker.obj" - -"..\..\..\Build\Release\named-rrchecker.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ELSEIF "$(CFG)" == "rrchecker - @PLATFORM@ Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -ALL : "..\..\..\Build\Debug\named-rrchecker.exe" "$(OUTDIR)\named-rrchecker.bsc" - - -CLEAN : - -@erase "$(INTDIR)\named-rrchecker.obj" - -@erase "$(INTDIR)\named-rrchecker.sbr" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\named-rrchecker.pdb" - -@erase "$(OUTDIR)\named-rrchecker.bsc" - -@erase "..\..\..\Build\Debug\named-rrchecker.exe" - -@erase "..\..\..\Build\Debug\named-rrchecker.ilk" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\named-rrchecker.bsc" -BSC32_SBRS= \ - "$(INTDIR)\named-rrchecker.sbr" - -"$(OUTDIR)\named-rrchecker.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\named-rrchecker.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/named-rrchecker.exe" /pdbtype:sept -LINK32_OBJS= \ - "$(INTDIR)\named-rrchecker.obj" - -"..\..\..\Build\Debug\named-rrchecker.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ENDIF - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("rrchecker.dep") -!INCLUDE "rrchecker.dep" -!ELSE -!MESSAGE Warning: cannot find "rrchecker.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "rrchecker - @PLATFORM@ Release" || "$(CFG)" == "rrchecker - @PLATFORM@ Debug" -SOURCE="..\named-rrchecker.c" - -!IF "$(CFG)" == "rrchecker - @PLATFORM@ Release" - - -"$(INTDIR)\named-rrchecker.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "rrchecker - @PLATFORM@ Debug" - - -"$(INTDIR)\named-rrchecker.obj" "$(INTDIR)\named-rrchecker.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -!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 -1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest" -<< KEEP - -$(_VC_MANIFEST_BASENAME).auto.manifest : - type <<$@ - - - -<< KEEP diff --git a/bin/win32/BINDInstall/BINDInstall.dsp.in b/bin/win32/BINDInstall/BINDInstall.dsp.in deleted file mode 100644 index 11d2dfad4d..0000000000 --- a/bin/win32/BINDInstall/BINDInstall.dsp.in +++ /dev/null @@ -1,177 +0,0 @@ -# Microsoft Developer Studio Project File - Name="BINDInstall" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Application" 0x0101 - -CFG=BINDInstall - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "BINDInstall.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "BINDInstall.mak" CFG="BINDInstall - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "BINDInstall - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Application") -!MESSAGE "BINDInstall - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "BINDInstall - @PLATFORM@ Release" - -# PROP BASE Use_MFC 5 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 6 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Yu"stdafx.h" /FD /c -# ADD CPP /nologo /MT /W3 @COPTX@ @COPTI@ /O2 /I "..\..\.." /I "..\include" /I "..\..\..\include" /I "..\..\named\win32\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" @CRYPTO@ @USE_GSSAPI@ @USE_PYTHON@ /Yu"stdafx.h" /FD /TP /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 /nologo /subsystem:windows @MACHINE@ -# ADD LINK32 version.lib netapi32.lib /nologo /subsystem:windows /pdb:none @MACHINE@ /out:"..\..\..\Build\Release\BINDInstall.exe" - -!ELSEIF "$(CFG)" == "BINDInstall - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 5 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 6 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /Yu"stdafx.h" /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm @COPTX@ @COPTI@ /Zi /Od /I "..\..\.." /I "..\include" /I "..\..\..\include" /I "..\..\named\win32\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" @CRYPTO@ @USE_GSSAPI@ @USE_PYTHON@ /FR /Yu"stdafx.h" /FD /TP /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 /nologo /subsystem:windows /debug @MACHINE@ /pdbtype:sept -# ADD LINK32 version.lib netapi32.lib /nologo /subsystem:windows /pdb:none /debug @MACHINE@ /out:"..\..\..\Build\Debug\BINDInstall.exe" - -!ENDIF - -# Begin Target - -# Name "BINDInstall - @PLATFORM@ Release" -# Name "BINDInstall - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\AccountInfo.cpp -# End Source File -# Begin Source File - -SOURCE=.\BINDInstall.cpp -# End Source File -# Begin Source File - -SOURCE=.\BINDInstallDlg.cpp -# End Source File -# Begin Source File - -SOURCE=.\DirBrowse.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\lib\isc\win32\ntgroups.c -# SUBTRACT CPP @COPTY@ /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=.\StdAfx.cpp -# ADD CPP /Yc"stdafx.h" -# End Source File -# Begin Source File - -SOURCE=.\VersionInfo.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\Accountinfo.h -# End Source File -# Begin Source File - -SOURCE=.\BINDInstall.h -# End Source File -# Begin Source File - -SOURCE=.\BINDInstallDlg.h -# End Source File -# Begin Source File - -SOURCE=.\DirBrowse.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\lib\isc\win32\include\isc\ntgroups.h -# End Source File -# Begin Source File - -SOURCE=.\Resource.h -# End Source File -# Begin Source File - -SOURCE=.\StdAfx.h -# End Source File -# Begin Source File - -SOURCE=.\VersionInfo.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# Begin Source File - -SOURCE=.\res\BINDInstall.ico -# End Source File -# Begin Source File - -SOURCE=.\res\BINDInstall.rc2 -# End Source File -# End Group -# Begin Source File - -SOURCE=.\BINDInstall.rc -# End Source File -# End Target -# End Project diff --git a/bin/win32/BINDInstall/BINDInstall.dsw b/bin/win32/BINDInstall/BINDInstall.dsw deleted file mode 100644 index d16a45cc61..0000000000 --- a/bin/win32/BINDInstall/BINDInstall.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "BINDInstall"=.\BINDInstall.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/bin/win32/BINDInstall/BINDInstall.mak.in b/bin/win32/BINDInstall/BINDInstall.mak.in deleted file mode 100644 index 5b53ea2356..0000000000 --- a/bin/win32/BINDInstall/BINDInstall.mak.in +++ /dev/null @@ -1,428 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on BINDInstall.dsp -!IF "$(CFG)" == "" -CFG=BINDInstall - @PLATFORM@ Debug -!MESSAGE No configuration specified. Defaulting to BINDInstall - @PLATFORM@ Debug. -!ENDIF - -!IF "$(CFG)" != "BINDInstall - @PLATFORM@ Release" && "$(CFG)" != "BINDInstall - @PLATFORM@ Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "BINDInstall.mak" CFG="BINDInstall - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "BINDInstall - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Application") -!MESSAGE "BINDInstall - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "BINDInstall - @PLATFORM@ 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)" == "BINDInstall - @PLATFORM@ Release" - -OUTDIR=.\Release -INTDIR=.\Release - -ALL : "..\..\..\Build\Release\BINDInstall.exe" - - -CLEAN : - -@erase "$(INTDIR)\AccountInfo.obj" - -@erase "$(INTDIR)\BINDInstall.obj" - -@erase "$(INTDIR)\BINDInstall.pch" - -@erase "$(INTDIR)\BINDInstall.res" - -@erase "$(INTDIR)\BINDInstallDlg.obj" - -@erase "$(INTDIR)\DirBrowse.obj" - -@erase "$(INTDIR)\ntgroups.obj" - -@erase "$(INTDIR)\StdAfx.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\VersionInfo.obj" - -@erase "..\..\..\Build\Release\BINDInstall.exe" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MT /W3 @COPTX@ @COPTI@ /O2 /I "..\..\.." /I "..\include" /I "..\..\..\include" /I "..\..\named\win32\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" @CRYPTO@ @USE_GSSAPI@ @USE_PYTHON@ /Fp"$(INTDIR)\BINDInstall.pch" /Yu"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /TP /c -MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 -RSC_PROJ=/l 0x409 /fo"$(INTDIR)\BINDInstall.res" /d "NDEBUG" -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\BINDInstall.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=version.lib netapi32.lib /nologo /subsystem:windows /pdb:none @MACHINE@ /out:"..\..\..\Build\Release\BINDInstall.exe" -LINK32_OBJS= \ - "$(INTDIR)\AccountInfo.obj" \ - "$(INTDIR)\BINDInstall.obj" \ - "$(INTDIR)\BINDInstallDlg.obj" \ - "$(INTDIR)\DirBrowse.obj" \ - "$(INTDIR)\ntgroups.obj" \ - "$(INTDIR)\StdAfx.obj" \ - "$(INTDIR)\VersionInfo.obj" \ - "$(INTDIR)\BINDInstall.res" - -"..\..\..\Build\Release\BINDInstall.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ELSEIF "$(CFG)" == "BINDInstall - @PLATFORM@ Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -ALL : "..\..\..\Build\Debug\BINDInstall.exe" "$(OUTDIR)\BINDInstall.bsc" - - -CLEAN : - -@erase "$(INTDIR)\AccountInfo.obj" - -@erase "$(INTDIR)\AccountInfo.sbr" - -@erase "$(INTDIR)\BINDInstall.obj" - -@erase "$(INTDIR)\BINDInstall.pch" - -@erase "$(INTDIR)\BINDInstall.res" - -@erase "$(INTDIR)\BINDInstall.sbr" - -@erase "$(INTDIR)\BINDInstallDlg.obj" - -@erase "$(INTDIR)\BINDInstallDlg.sbr" - -@erase "$(INTDIR)\DirBrowse.obj" - -@erase "$(INTDIR)\DirBrowse.sbr" - -@erase "$(INTDIR)\ntgroups.obj" - -@erase "$(INTDIR)\ntgroups.sbr" - -@erase "$(INTDIR)\StdAfx.obj" - -@erase "$(INTDIR)\StdAfx.sbr" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(INTDIR)\VersionInfo.obj" - -@erase "$(INTDIR)\VersionInfo.sbr" - -@erase "$(OUTDIR)\BINDInstall.bsc" - -@erase "..\..\..\Build\Debug\BINDInstall.exe" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MTd /W3 /Gm @COPTX@ @COPTI@ /Zi /Od /I "..\..\.." /I "..\include" /I "..\..\..\include" /I "..\..\named\win32\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" @CRYPTO@ @USE_GSSAPI@ @USE_PYTHON@ /FR"$(INTDIR)\\" /Fp"$(INTDIR)\BINDInstall.pch" /Yu"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /TP /GZ /c -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 -RSC_PROJ=/l 0x409 /fo"$(INTDIR)\BINDInstall.res" /d "_DEBUG" -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\BINDInstall.bsc" -BSC32_SBRS= \ - "$(INTDIR)\AccountInfo.sbr" \ - "$(INTDIR)\BINDInstall.sbr" \ - "$(INTDIR)\BINDInstallDlg.sbr" \ - "$(INTDIR)\DirBrowse.sbr" \ - "$(INTDIR)\ntgroups.sbr" \ - "$(INTDIR)\StdAfx.sbr" \ - "$(INTDIR)\VersionInfo.sbr" - -"$(OUTDIR)\BINDInstall.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -LINK32_FLAGS=version.lib netapi32.lib /nologo /subsystem:windows /pdb:none /debug @MACHINE@ /out:"..\..\..\Build\Debug\BINDInstall.exe" -LINK32_OBJS= \ - "$(INTDIR)\AccountInfo.obj" \ - "$(INTDIR)\BINDInstall.obj" \ - "$(INTDIR)\BINDInstallDlg.obj" \ - "$(INTDIR)\DirBrowse.obj" \ - "$(INTDIR)\ntgroups.obj" \ - "$(INTDIR)\StdAfx.obj" \ - "$(INTDIR)\VersionInfo.obj" \ - "$(INTDIR)\BINDInstall.res" - -"..\..\..\Build\Debug\BINDInstall.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ENDIF - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("BINDInstall.dep") -!INCLUDE "BINDInstall.dep" -!ELSE -!MESSAGE Warning: cannot find "BINDInstall.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "BINDInstall - @PLATFORM@ Release" || "$(CFG)" == "BINDInstall - @PLATFORM@ Debug" -SOURCE=.\AccountInfo.cpp - -!IF "$(CFG)" == "BINDInstall - @PLATFORM@ Release" - - -"$(INTDIR)\AccountInfo.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\BINDInstall.pch" - - -!ELSEIF "$(CFG)" == "BINDInstall - @PLATFORM@ Debug" - - -"$(INTDIR)\AccountInfo.obj" "$(INTDIR)\AccountInfo.sbr" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\BINDInstall.pch" - - -!ENDIF - -SOURCE=.\BINDInstall.cpp - -!IF "$(CFG)" == "BINDInstall - @PLATFORM@ Release" - - -"$(INTDIR)\BINDInstall.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\BINDInstall.pch" - - -!ELSEIF "$(CFG)" == "BINDInstall - @PLATFORM@ Debug" - - -"$(INTDIR)\BINDInstall.obj" "$(INTDIR)\BINDInstall.sbr" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\BINDInstall.pch" - - -!ENDIF - -SOURCE=.\BINDInstallDlg.cpp - -!IF "$(CFG)" == "BINDInstall - @PLATFORM@ Release" - - -"$(INTDIR)\BINDInstallDlg.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\BINDInstall.pch" - - -!ELSEIF "$(CFG)" == "BINDInstall - @PLATFORM@ Debug" - - -"$(INTDIR)\BINDInstallDlg.obj" "$(INTDIR)\BINDInstallDlg.sbr" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\BINDInstall.pch" - - -!ENDIF - -SOURCE=.\DirBrowse.cpp - -!IF "$(CFG)" == "BINDInstall - @PLATFORM@ Release" - - -"$(INTDIR)\DirBrowse.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\BINDInstall.pch" - - -!ELSEIF "$(CFG)" == "BINDInstall - @PLATFORM@ Debug" - - -"$(INTDIR)\DirBrowse.obj" "$(INTDIR)\DirBrowse.sbr" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\BINDInstall.pch" - - -!ENDIF - -SOURCE=..\..\..\lib\isc\win32\ntgroups.c - -!IF "$(CFG)" == "BINDInstall - @PLATFORM@ Release" - -CPP_SWITCHES=/nologo /MT /W3 @COPTX@ @COPTI@ /O2 /I "..\include" /I "..\..\..\include" /I "..\..\named\win32\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" @CRYPTO@ @USE_GSSAPI@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /TP /c - -"$(INTDIR)\ntgroups.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) @<< - $(CPP_SWITCHES) $(SOURCE) -<< - - -!ELSEIF "$(CFG)" == "BINDInstall - @PLATFORM@ Debug" - -CPP_SWITCHES=/nologo /MTd /W3 /Gm @COPTX@ @COPTI@ /Zi /Od /I "..\include" /I "..\..\..\include" /I "..\..\named\win32\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" @CRYPTO@ @USE_GSSAPI@ /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /TP /GZ /c - -"$(INTDIR)\ntgroups.obj" "$(INTDIR)\ntgroups.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) @<< - $(CPP_SWITCHES) $(SOURCE) -<< - - -!ENDIF - -SOURCE=.\StdAfx.cpp - -!IF "$(CFG)" == "BINDInstall - @PLATFORM@ Release" - -CPP_SWITCHES=/nologo /MT /W3 @COPTX@ @COPTI@ /O2 /I "..\include" /I "..\..\..\include" /I "..\..\named\win32\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" @CRYPTO@ @USE_GSSAPI@ /Fp"$(INTDIR)\BINDInstall.pch" /Yc"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /TP /c - -"$(INTDIR)\StdAfx.obj" "$(INTDIR)\BINDInstall.pch" : $(SOURCE) "$(INTDIR)" - $(CPP) @<< - $(CPP_SWITCHES) $(SOURCE) -<< - - -!ELSEIF "$(CFG)" == "BINDInstall - @PLATFORM@ Debug" - -CPP_SWITCHES=/nologo /MTd /W3 /Gm @COPTX@ @COPTI@ /Zi /Od /I "..\include" /I "..\..\..\include" /I "..\..\named\win32\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" @CRYPTO@ @USE_GSSAPI@ /FR"$(INTDIR)\\" /Fp"$(INTDIR)\BINDInstall.pch" /Yc"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /TP /GZ /c - -"$(INTDIR)\StdAfx.obj" "$(INTDIR)\StdAfx.sbr" "$(INTDIR)\BINDInstall.pch" : $(SOURCE) "$(INTDIR)" - $(CPP) @<< - $(CPP_SWITCHES) $(SOURCE) -<< - - -!ENDIF - -SOURCE=.\VersionInfo.cpp - -!IF "$(CFG)" == "BINDInstall - @PLATFORM@ Release" - - -"$(INTDIR)\VersionInfo.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\BINDInstall.pch" - - -!ELSEIF "$(CFG)" == "BINDInstall - @PLATFORM@ Debug" - - -"$(INTDIR)\VersionInfo.obj" "$(INTDIR)\VersionInfo.sbr" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\BINDInstall.pch" - - -!ENDIF - -SOURCE=.\BINDInstall.rc - -"$(INTDIR)\BINDInstall.res" : $(SOURCE) "$(INTDIR)" - $(RSC) $(RSC_PROJ) $(SOURCE) - - - -!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 -1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest" -<< KEEP - -$(_VC_MANIFEST_BASENAME).auto.manifest : - type <<$@ - - - -<< KEEP diff --git a/bin/win32/BINDInstall/BINDInstallDlg.cpp b/bin/win32/BINDInstall/BINDInstallDlg.cpp index d35b050c03..c633785adc 100644 --- a/bin/win32/BINDInstall/BINDInstallDlg.cpp +++ b/bin/win32/BINDInstall/BINDInstallDlg.cpp @@ -135,7 +135,6 @@ const FileData installFiles[] = {"libisccfg.dll", FileData::BinDir, FileData::Critical, FALSE, TRUE}, {"libisccc.dll", FileData::BinDir, FileData::Critical, FALSE, TRUE}, {"libdns.dll", FileData::BinDir, FileData::Critical, FALSE, TRUE}, - {"liblwres.dll", FileData::BinDir, FileData::Critical, FALSE, TRUE}, {"libirs.dll", FileData::BinDir, FileData::Critical, FALSE, TRUE}, #ifdef OPENSSL {"libeay32.dll", FileData::BinDir, FileData::Critical, FALSE, TRUE}, diff --git a/configure b/configure index f8ebd0815e..a8d2dede96 100755 --- a/configure +++ b/configure @@ -669,7 +669,7 @@ BIND9_DESCRIPTION BIND9_PRODUCT BIND9_IRS_BUILDINCLUDE BIND9_BIND9_BUILDINCLUDE -BIND9_LWRES_BUILDINCLUDE +BIND9_NS_BUILDINCLUDE BIND9_DNS_BUILDINCLUDE BIND9_ISCCFG_BUILDINCLUDE BIND9_ISCCC_BUILDINCLUDE @@ -722,20 +722,16 @@ ISC_PLATFORM_HAVEIFNAMETOINDEX ISC_PLATFORM_HAVESTRINGSH ISC_PLATFORM_BRACEPTHREADONCEINIT IRS_PLATFORM_USEDECLSPEC -LWRES_PLATFORM_USEDECLSPEC ISC_PLATFORM_USEDECLSPEC ISC_PLATFORM_RLIMITTYPE ISC_PLATFORM_HAVESTATNSEC ISC_PLATFORM_HAVESYSUNH -LWRES_PLATFORM_QUADFORMAT ISC_PLATFORM_QUADFORMAT DST_EXTRA_SRCS DST_EXTRA_OBJS USE_ISC_SPNEGO ISC_EXTRA_SRCS ISC_EXTRA_OBJS -LWRES_PLATFORM_NEEDVSNPRINTF -LWRES_PLATFORM_NEEDSPRINTF ISC_PLATFORM_NEEDVSNPRINTF ISC_PLATFORM_NEEDSPRINTF ISC_PLATFORM_NEEDFPRINTF @@ -743,38 +739,22 @@ ISC_PLATFORM_NEEDPRINTF READLINE_LIB ISC_PLATFORM_NEEDSTRCASESTR ISC_PLATFORM_NEEDSTRLCAT -LWRES_PLATFORM_NEEDSTRLCPY ISC_PLATFORM_NEEDSTRLCPY GENRANDOMLIB -LWRES_PLATFORM_NEEDSTRTOUL ISC_PLATFORM_NEEDSTRTOUL ISC_PLATFORM_NEEDMEMMOVE ISC_PLATFORM_NEEDSTRSEP ISC_IRS_GETNAMEINFOSOCKLEN -ISC_LWRES_GETNAMEINFOPROTO -ISC_LWRES_GETADDRINFOPROTO -ISC_LWRES_GETIPNODEPROTO -ISC_LWRES_NEEDHERRNO -ISC_LWRES_GETHOSTBYADDRVOID -ISC_LWRES_ENDNETENTINT -ISC_LWRES_SETNETENTINT -ISC_LWRES_GETNETBYADDRINADDR -ISC_LWRES_ENDHOSTENTINT -ISC_LWRES_SETHOSTENTINT -ISC_LWRES_NEEDRRSETINFO ISC_IRS_NEEDADDRINFO -ISC_LWRES_NEEDADDRINFO ISC_PLATFORM_HAVETFO ISC_PLATFORM_NEEDPORTT ISC_PLATFORM_MSGHDRFLAVOR -LWRES_PLATFORM_HAVESALEN ISC_PLATFORM_HAVESALEN ISC_PLATFORM_NEEDPTON ISC_PLATFORM_NEEDNTOP ISC_PLATFORM_HAVEIF_LADDRCONF ISC_PLATFORM_HAVEIF_LADDRREQ ISC_PLATFORM_HAVESCOPEID -LWRES_HAVE_SIN6_SCOPE_ID ISC_IPV6_C ISC_ISCIPV6_O ISC_IPV6_O @@ -782,17 +762,11 @@ ISC_IPV6_H ISC_PLATFORM_HAVESOCKADDRSTORAGE ISC_PLATFORM_FIXIN6ISADDR ISC_PLATFORM_HAVEIN6PKTINFO -LWRES_PLATFORM_NEEDIN6ADDRLOOPBACK ISC_PLATFORM_NEEDIN6ADDRLOOPBACK -LWRES_PLATFORM_NEEDIN6ADDRANY ISC_PLATFORM_NEEDIN6ADDRANY -LWRES_PLATFORM_HAVEINADDR6 ISC_PLATFORM_HAVEINADDR6 -LWRES_PLATFORM_NEEDNETINET6IN6H ISC_PLATFORM_NEEDNETINET6IN6H -LWRES_PLATFORM_NEEDNETINETIN6H ISC_PLATFORM_NEEDNETINETIN6H -LWRES_PLATFORM_HAVEIPV6 ISC_PLATFORM_HAVEIPV6 BIND9_CO_RULE LIBTOOL_IN_MAIN @@ -871,7 +845,6 @@ ISC_PLATFORM_HAVEGSSAPI KRB5_CONFIG GEOIPLINKOBJS GEOIPLINKSRCS -LWRES_PLATFORM_NEEDSYSSELECTH ISC_PLATFORM_NEEDSYSSELECTH ISC_PLATFORM_HAVEDEVPOLL ISC_PLATFORM_HAVEEPOLL @@ -962,6 +935,7 @@ infodir docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -989,8 +963,8 @@ LIBISCCFG_API LIBDNS_API LIBDNS_MAPAPI LIBBIND9_API -LIBLWRES_API LIBIRS_API +LIBNS_API DLZ_DRIVER_RULES' ac_user_opts=' enable_option_checking @@ -1119,6 +1093,7 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1371,6 +1346,15 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1508,7 +1492,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1661,6 +1645,7 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -13620,14 +13605,12 @@ if ac_fn_c_try_compile "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } ISC_PLATFORM_NEEDSYSSELECTH="#undef ISC_PLATFORM_NEEDSYSSELECTH" - LWRES_PLATFORM_NEEDSYSSELECTH="#undef LWRES_PLATFORM_NEEDSYSSELECTH" else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } case $ac_cv_header_sys_select_h in yes) ISC_PLATFORM_NEEDSYSSELECTH="#define ISC_PLATFORM_NEEDSYSSELECTH 1" - LWRES_PLATFORM_NEEDSYSSELECTH="#define LWRES_PLATFORM_NEEDSYSSELECTH 1" ;; no) as_fn_error $? "need either working unistd.h or sys/select.h" "$LINENO" 5 @@ -13641,7 +13624,6 @@ no) case $ac_cv_header_sys_select_h in yes) ISC_PLATFORM_NEEDSYSSELECTH="#define ISC_PLATFORM_NEEDSYSSELECTH 1" - LWRES_PLATFORM_NEEDSYSSELECTH="#define LWRES_PLATFORM_NEEDSYSSELECTH 1" ;; no) as_fn_error $? "need either unistd.h or sys/select.h" "$LINENO" 5 @@ -13651,7 +13633,6 @@ no) esac - # # Find the machine's endian flavor. # @@ -18250,12 +18231,10 @@ esac case "$host" in *-bsdi4.[01]*) ISC_PLATFORM_NEEDNETINET6IN6H="#define ISC_PLATFORM_NEEDNETINET6IN6H 1" - LWRES_PLATFORM_NEEDNETINET6IN6H="#define LWRES_PLATFORM_NEEDNETINET6IN6H 1" isc_netinet6in6_hack="#include " ;; *) ISC_PLATFORM_NEEDNETINET6IN6H="#undef ISC_PLATFORM_NEEDNETINET6IN6H" - LWRES_PLATFORM_NEEDNETINET6IN6H="#undef LWRES_PLATFORM_NEEDNETINET6IN6H" isc_netinet6in6_hack="" ;; esac @@ -18268,13 +18247,11 @@ case "$host" in *-sco-sysv*uw*|*-*-sysv*UnixWare*|*-*-sysv*OpenUNIX*) # UnixWare ISC_PLATFORM_NEEDNETINETIN6H="#define ISC_PLATFORM_NEEDNETINETIN6H 1" - LWRES_PLATFORM_NEEDNETINETIN6H="#define LWRES_PLATFORM_NEEDNETINETIN6H 1" ISC_PLATFORM_FIXIN6ISADDR="#define ISC_PLATFORM_FIXIN6ISADDR 1" isc_netinetin6_hack="#include " ;; *) ISC_PLATFORM_NEEDNETINETIN6H="#undef ISC_PLATFORM_NEEDNETINETIN6H" - LWRES_PLATFORM_NEEDNETINETIN6H="#undef LWRES_PLATFORM_NEEDNETINETIN6H" ISC_PLATFORM_FIXIN6ISADDR="#undef ISC_PLATFORM_FIXIN6ISADDR" isc_netinetin6_hack="" ;; @@ -18286,7 +18263,6 @@ esac case "$found_ipv6" in yes) ISC_PLATFORM_HAVEIPV6="#define ISC_PLATFORM_HAVEIPV6 1" - LWRES_PLATFORM_HAVEIPV6="#define LWRES_PLATFORM_HAVEIPV6 1" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for in6_addr" >&5 $as_echo_n "checking for in6_addr... " >&6; } @@ -18311,13 +18287,11 @@ if ac_fn_c_try_compile "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } ISC_PLATFORM_HAVEINADDR6="#undef ISC_PLATFORM_HAVEINADDR6" - LWRES_PLATFORM_HAVEINADDR6="#undef LWRES_PLATFORM_HAVEINADDR6" isc_in_addr6_hack="" else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } ISC_PLATFORM_HAVEINADDR6="#define ISC_PLATFORM_HAVEINADDR6 1" - LWRES_PLATFORM_HAVEINADDR6="#define LWRES_PLATFORM_HAVEINADDR6 1" isc_in_addr6_hack="#define in6_addr in_addr6" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -18346,12 +18320,10 @@ if ac_fn_c_try_link "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } ISC_PLATFORM_NEEDIN6ADDRANY="#undef ISC_PLATFORM_NEEDIN6ADDRANY" - LWRES_PLATFORM_NEEDIN6ADDRANY="#undef LWRES_PLATFORM_NEEDIN6ADDRANY" else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } ISC_PLATFORM_NEEDIN6ADDRANY="#define ISC_PLATFORM_NEEDIN6ADDRANY 1" - LWRES_PLATFORM_NEEDIN6ADDRANY="#define LWRES_PLATFORM_NEEDIN6ADDRANY 1" fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -18380,12 +18352,10 @@ if ac_fn_c_try_link "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } ISC_PLATFORM_NEEDIN6ADDRLOOPBACK="#undef ISC_PLATFORM_NEEDIN6ADDRLOOPBACK" - LWRES_PLATFORM_NEEDIN6ADDRLOOPBACK="#undef LWRES_PLATFORM_NEEDIN6ADDRLOOPBACK" else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } ISC_PLATFORM_NEEDIN6ADDRLOOPBACK="#define ISC_PLATFORM_NEEDIN6ADDRLOOPBACK 1" - LWRES_PLATFORM_NEEDIN6ADDRLOOPBACK="#define LWRES_PLATFORM_NEEDIN6ADDRLOOPBACK 1" fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -18413,15 +18383,12 @@ if ac_fn_c_try_compile "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } ISC_PLATFORM_HAVESCOPEID="#define ISC_PLATFORM_HAVESCOPEID 1" - result="#define LWRES_HAVE_SIN6_SCOPE_ID 1" else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } ISC_PLATFORM_HAVESCOPEID="#undef ISC_PLATFORM_HAVESCOPEID" - result="#undef LWRES_HAVE_SIN6_SCOPE_ID" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - LWRES_HAVE_SIN6_SCOPE_ID="$result" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for in6_pktinfo" >&5 $as_echo_n "checking for in6_pktinfo... " >&6; } @@ -18455,11 +18422,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ;; no) ISC_PLATFORM_HAVEIPV6="#undef ISC_PLATFORM_HAVEIPV6" - LWRES_PLATFORM_HAVEIPV6="#undef LWRES_PLATFORM_HAVEIPV6" ISC_PLATFORM_NEEDIN6ADDRANY="#undef ISC_PLATFORM_NEEDIN6ADDRANY" - LWRES_PLATFORM_NEEDIN6ADDRANY="#undef LWRES_PLATFORM_NEEDIN6ADDRANY" ISC_PLATFORM_HAVEIN6PKTINFO="#undef ISC_PLATFORM_HAVEIN6PKTINFO" - LWRES_HAVE_SIN6_SCOPE_ID="#define LWRES_HAVE_SIN6_SCOPE_ID 1" ISC_PLATFORM_HAVESCOPEID="#define ISC_PLATFORM_HAVESCOPEID 1" ISC_IPV6_H="ipv6.h" ISC_IPV6_O="ipv6.$O" @@ -18509,13 +18473,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - - - - - - - @@ -18691,17 +18648,14 @@ if ac_fn_c_try_compile "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } ISC_PLATFORM_HAVESALEN="#define ISC_PLATFORM_HAVESALEN 1" - LWRES_PLATFORM_HAVESALEN="#define LWRES_PLATFORM_HAVESALEN 1" else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } ISC_PLATFORM_HAVESALEN="#undef ISC_PLATFORM_HAVESALEN" - LWRES_PLATFORM_HAVESALEN="#undef LWRES_PLATFORM_HAVESALEN" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - # # Look for a 4.4BSD or 4.3BSD struct msghdr # @@ -18812,233 +18766,17 @@ _ACEOF if ac_fn_c_try_compile "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - ISC_LWRES_NEEDADDRINFO="#undef ISC_LWRES_NEEDADDRINFO" ISC_IRS_NEEDADDRINFO="#undef ISC_IRS_NEEDADDRINFO" $as_echo "#define HAVE_ADDRINFO 1" >>confdefs.h else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - ISC_LWRES_NEEDADDRINFO="#define ISC_LWRES_NEEDADDRINFO 1" ISC_IRS_NEEDADDRINFO="#define ISC_IRS_NEEDADDRINFO 1" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -# -# Check for rrsetinfo -# -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct rrsetinfo" >&5 -$as_echo_n "checking for struct rrsetinfo... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#include -int -main () -{ -struct rrsetinfo r; return (0); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - ISC_LWRES_NEEDRRSETINFO="#undef ISC_LWRES_NEEDRRSETINFO" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - ISC_LWRES_NEEDRRSETINFO="#define ISC_LWRES_NEEDRRSETINFO 1" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for int sethostent" >&5 -$as_echo_n "checking for int sethostent... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#include -int -main () -{ -int i = sethostent(0); return(0); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - ISC_LWRES_SETHOSTENTINT="#define ISC_LWRES_SETHOSTENTINT 1" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - ISC_LWRES_SETHOSTENTINT="#undef ISC_LWRES_SETHOSTENTINT" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for int endhostent" >&5 -$as_echo_n "checking for int endhostent... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#include -int -main () -{ -int i = endhostent(); return(0); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - ISC_LWRES_ENDHOSTENTINT="#define ISC_LWRES_ENDHOSTENTINT 1" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - ISC_LWRES_ENDHOSTENTINT="#undef ISC_LWRES_ENDHOSTENTINT" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for getnetbyaddr(in_addr_t, ...)" >&5 -$as_echo_n "checking for getnetbyaddr(in_addr_t, ...)... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#include -struct netent *getnetbyaddr(in_addr_t, int); -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - ISC_LWRES_GETNETBYADDRINADDR="#define ISC_LWRES_GETNETBYADDRINADDR 1" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - ISC_LWRES_GETNETBYADDRINADDR="#undef ISC_LWRES_GETNETBYADDRINADDR" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for int setnetent" >&5 -$as_echo_n "checking for int setnetent... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#include -int -main () -{ -int i = setnetent(0); return(0); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - ISC_LWRES_SETNETENTINT="#define ISC_LWRES_SETNETENTINT 1" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - ISC_LWRES_SETNETENTINT="#undef ISC_LWRES_SETNETENTINT" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for int endnetent" >&5 -$as_echo_n "checking for int endnetent... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#include -int -main () -{ -int i = endnetent(); return(0); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - ISC_LWRES_ENDNETENTINT="#define ISC_LWRES_ENDNETENTINT 1" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - ISC_LWRES_ENDNETENTINT="#undef ISC_LWRES_ENDNETENTINT" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyaddr(const void *, size_t, ...)" >&5 -$as_echo_n "checking for gethostbyaddr(const void *, size_t, ...)... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#include -struct hostent *gethostbyaddr(const void *, size_t, int); -int -main () -{ -return(0); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - ISC_LWRES_GETHOSTBYADDRVOID="#define ISC_LWRES_GETHOSTBYADDRVOID 1" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - ISC_LWRES_GETHOSTBYADDRVOID="#undef ISC_LWRES_GETHOSTBYADDRVOID" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for h_errno in netdb.h" >&5 -$as_echo_n "checking for h_errno in netdb.h... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#include -int -main () -{ -h_errno = 1; return(0); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - ISC_LWRES_NEEDHERRNO="#undef ISC_LWRES_NEEDHERRNO" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - ISC_LWRES_NEEDHERRNO="#define ISC_LWRES_NEEDHERRNO 1" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - - # # Sadly, the definitions of system-supplied getnameinfo(3) vary. Try to catch # known variations here: @@ -19175,27 +18913,10 @@ $as_echo "#define IRS_GAISTRERROR_RETURN_T const char *" >>confdefs.h fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -ac_fn_c_check_func "$LINENO" "getipnodebyname" "ac_cv_func_getipnodebyname" -if test "x$ac_cv_func_getipnodebyname" = xyes; then : - ISC_LWRES_GETIPNODEPROTO="#undef ISC_LWRES_GETIPNODEPROTO" -else - ISC_LWRES_GETIPNODEPROTO="#define ISC_LWRES_GETIPNODEPROTO 1" -fi - -ac_fn_c_check_func "$LINENO" "getnameinfo" "ac_cv_func_getnameinfo" -if test "x$ac_cv_func_getnameinfo" = xyes; then : - ISC_LWRES_GETNAMEINFOPROTO="#undef ISC_LWRES_GETNAMEINFOPROTO" -else - ISC_LWRES_GETNAMEINFOPROTO="#define ISC_LWRES_GETNAMEINFOPROTO 1" -fi - ac_fn_c_check_func "$LINENO" "getaddrinfo" "ac_cv_func_getaddrinfo" if test "x$ac_cv_func_getaddrinfo" = xyes; then : - ISC_LWRES_GETADDRINFOPROTO="#undef ISC_LWRES_GETADDRINFOPROTO" - $as_echo "#define HAVE_GETADDRINFO 1" >>confdefs.h + $as_echo "#define HAVE_GETADDRINFO 1" >>confdefs.h -else - ISC_LWRES_GETADDRINFOPROTO="#define ISC_LWRES_GETADDRINFOPROTO 1" fi ac_fn_c_check_func "$LINENO" "gai_strerror" "ac_cv_func_gai_strerror" @@ -19206,9 +18927,6 @@ fi - - - # Check whether --enable-getifaddrs was given. if test "${enable_getifaddrs+set}" = set; then : enableval=$enable_getifaddrs; want_getifaddrs="$enableval" @@ -19324,30 +19042,24 @@ fi ac_fn_c_check_func "$LINENO" "strtoul" "ac_cv_func_strtoul" if test "x$ac_cv_func_strtoul" = xyes; then : ISC_PLATFORM_NEEDSTRTOUL="#undef ISC_PLATFORM_NEEDSTRTOUL" - LWRES_PLATFORM_NEEDSTRTOUL="#undef LWRES_PLATFORM_NEEDSTRTOUL" GENRANDOMLIB="" else ISC_PLATFORM_NEEDSTRTOUL="#define ISC_PLATFORM_NEEDSTRTOUL 1" - LWRES_PLATFORM_NEEDSTRTOUL="#define LWRES_PLATFORM_NEEDSTRTOUL 1" GENRANDOMLIB='${ISCLIBS}' fi - ac_fn_c_check_func "$LINENO" "strlcpy" "ac_cv_func_strlcpy" if test "x$ac_cv_func_strlcpy" = xyes; then : ISC_PLATFORM_NEEDSTRLCPY="#undef ISC_PLATFORM_NEEDSTRLCPY" - LWRES_PLATFORM_NEEDSTRLCPY="#undef LWRES_PLATFORM_NEEDSTRLCPY" else ISC_PLATFORM_NEEDSTRLCPY="#define ISC_PLATFORM_NEEDSTRLCPY 1" - LWRES_PLATFORM_NEEDSTRLCPY="#define LWRES_PLATFORM_NEEDSTRLCPY 1" fi - ac_fn_c_check_func "$LINENO" "strlcat" "ac_cv_func_strlcat" if test "x$ac_cv_func_strlcat" = xyes; then : ISC_PLATFORM_NEEDSTRLCAT="#undef ISC_PLATFORM_NEEDSTRLCAT" @@ -19514,7 +19226,6 @@ ISC_PLATFORM_NEEDPRINTF='#undef ISC_PLATFORM_NEEDPRINTF' ISC_PLATFORM_NEEDFPRINTF='#undef ISC_PLATFORM_NEEDFPRINTF' ISC_PLATFORM_NEEDSPRINTF='#undef ISC_PLATFORM_NEEDSPRINTF' ISC_PLATFORM_NEEDVSNPRINTF='#undef ISC_PLATFORM_NEEDVSNPRINTF' -LWRES_PLATFORM_NEEDVSNPRINTF='#undef LWRES_PLATFORM_NEEDVSNPRINTF' { $as_echo "$as_me:${as_lineno-$LINENO}: checking sprintf return type" >&5 $as_echo_n "checking sprintf return type... " >&6; } @@ -19537,7 +19248,6 @@ $as_echo "char *" >&6; } ISC_PRINT_OBJS="print.$O" ISC_PRINT_SRCS="print.c" ISC_PLATFORM_NEEDSPRINTF="#define ISC_PLATFORM_NEEDSPRINTF" -LWRES_PLATFORM_NEEDSPRINTF="#define LWRES_PLATFORM_NEEDSPRINTF" else { $as_echo "$as_me:${as_lineno-$LINENO}: result: int" >&5 @@ -19552,7 +19262,6 @@ else ISC_PRINT_OBJS="print.$O" ISC_PRINT_SRCS="print.c" ISC_PLATFORM_NEEDVSNPRINTF="#define ISC_PLATFORM_NEEDVSNPRINTF 1" - LWRES_PLATFORM_NEEDVSNPRINTF="#define LWRES_PLATFORM_NEEDVSNPRINTF 1" fi @@ -19587,7 +19296,6 @@ $as_echo "no" >&6; } ISC_PLATFORM_NEEDFPRINTF='#define ISC_PLATFORM_NEEDFPRINTF 1' ISC_PLATFORM_NEEDFSRINTF='#define ISC_PLATFORM_NEEDSPRINTF 1' ISC_PLATFORM_NEEDVSNPRINTF="#define ISC_PLATFORM_NEEDVSNPRINTF 1" - LWRES_PLATFORM_NEEDVSNPRINTF="#define LWRES_PLATFORM_NEEDVSNPRINTF 1" fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -19599,8 +19307,6 @@ fi - - ISC_EXTRA_OBJS="$ISC_EXTRA_OBJS $ISC_PRINT_OBJS" ISC_EXTRA_SRCS="$ISC_EXTRA_SRCS $ISC_PRINT_SRCS" @@ -19662,7 +19368,6 @@ if test "$cross_compiling" = yes; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: assuming target platform uses ll" >&5 $as_echo "assuming target platform uses ll" >&6; } ISC_PLATFORM_QUADFORMAT='#define ISC_PLATFORM_QUADFORMAT "ll"' - LWRES_PLATFORM_QUADFORMAT='#define LWRES_PLATFORM_QUADFORMAT "ll"' else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -19682,12 +19387,10 @@ if ac_fn_c_try_run "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: ll" >&5 $as_echo "ll" >&6; } ISC_PLATFORM_QUADFORMAT='#define ISC_PLATFORM_QUADFORMAT "ll"' - LWRES_PLATFORM_QUADFORMAT='#define LWRES_PLATFORM_QUADFORMAT "ll"' else { $as_echo "$as_me:${as_lineno-$LINENO}: result: l" >&5 $as_echo "l" >&6; } ISC_PLATFORM_QUADFORMAT='#define ISC_PLATFORM_QUADFORMAT "l"' - LWRES_PLATFORM_QUADFORMAT='#define LWRES_PLATFORM_QUADFORMAT "l"' fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -19696,7 +19399,6 @@ fi - # # Security Stuff # @@ -20143,8 +19845,6 @@ esac ISC_PLATFORM_USEDECLSPEC="#undef ISC_PLATFORM_USEDECLSPEC" -LWRES_PLATFORM_USEDECLSPEC="#undef LWRES_PLATFORM_USEDECLSPEC" - IRS_PLATFORM_USEDECLSPEC="#undef IRS_PLATFORM_USEDECLSPEC" # @@ -22373,7 +22073,7 @@ if test "X$srcdir" != "X"; then BIND9_ISCCC_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/isccc/include" BIND9_ISCCFG_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/isccfg/include" BIND9_DNS_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/dns/include" - BIND9_LWRES_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/lwres/include" + BIND9_NS_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/ns/include" BIND9_BIND9_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/bind9/include" BIND9_IRS_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/irs/include" else @@ -22381,7 +22081,7 @@ else BIND9_ISCCC_BUILDINCLUDE="" BIND9_ISCCFG_BUILDINCLUDE="" BIND9_DNS_BUILDINCLUDE="" - BIND9_LWRES_BUILDINCLUDE="" + BIND9_NS_BUILDINCLUDE="" BIND9_BIND9_BUILDINCLUDE="" BIND9_IRS_BUILDINCLUDE="" fi @@ -22447,11 +22147,11 @@ LIBDNS_MAPAPI="$srcdir/lib/dns/mapapi" LIBBIND9_API="$srcdir/lib/bind9/api" -LIBLWRES_API="$srcdir/lib/lwres/api" - - LIBIRS_API="$srcdir/lib/irs/api" + +LIBNS_API="$srcdir/lib/ns/api" + # # Configure any DLZ drivers. # @@ -23628,7 +23328,7 @@ ac_config_commands="$ac_config_commands chmod" # elsewhere if there's a good reason for doing so. # -ac_config_files="$ac_config_files make/Makefile make/mkdep Makefile bin/Makefile bin/check/Makefile bin/confgen/Makefile bin/confgen/unix/Makefile bin/delv/Makefile bin/dig/Makefile bin/dnssec/Makefile bin/named/Makefile bin/named/unix/Makefile bin/nsupdate/Makefile bin/pkcs11/Makefile bin/python/Makefile bin/python/isc/Makefile bin/python/isc/utils.py bin/python/isc/tests/Makefile bin/python/dnssec-checkds.py bin/python/dnssec-coverage.py bin/python/dnssec-keymgr.py bin/python/isc/__init__.py bin/python/isc/checkds.py bin/python/isc/coverage.py bin/python/isc/dnskey.py bin/python/isc/eventlist.py bin/python/isc/keydict.py bin/python/isc/keyevent.py bin/python/isc/keymgr.py bin/python/isc/keyseries.py bin/python/isc/keyzone.py bin/python/isc/policy.py bin/python/isc/rndc.py bin/python/isc/tests/dnskey_test.py bin/python/isc/tests/policy_test.py bin/rndc/Makefile bin/tests/Makefile bin/tests/atomic/Makefile bin/tests/db/Makefile bin/tests/dst/Makefile bin/tests/dst/Kdh.+002+18602.key bin/tests/dst/Kdh.+002+18602.private bin/tests/dst/Kdh.+002+48957.key bin/tests/dst/Kdh.+002+48957.private bin/tests/dst/Ktest.+001+00002.key bin/tests/dst/Ktest.+001+54622.key bin/tests/dst/Ktest.+001+54622.private bin/tests/dst/Ktest.+003+23616.key bin/tests/dst/Ktest.+003+23616.private bin/tests/dst/Ktest.+003+49667.key bin/tests/dst/dst_2_data bin/tests/dst/t2_data_1 bin/tests/dst/t2_data_2 bin/tests/dst/t2_dsasig bin/tests/dst/t2_rsasig bin/tests/hashes/Makefile bin/tests/headerdep_test.sh bin/tests/master/Makefile bin/tests/mem/Makefile bin/tests/names/Makefile bin/tests/net/Makefile bin/tests/pkcs11/Makefile bin/tests/pkcs11/benchmarks/Makefile bin/tests/rbt/Makefile bin/tests/resolver/Makefile bin/tests/sockaddr/Makefile bin/tests/system/Makefile bin/tests/system/conf.sh bin/tests/system/dlz/prereq.sh bin/tests/system/dlzexternal/Makefile bin/tests/system/dlzexternal/ns1/named.conf bin/tests/system/dyndb/Makefile bin/tests/system/dyndb/driver/Makefile bin/tests/system/inline/checkdsa.sh bin/tests/system/lwresd/Makefile bin/tests/system/pipelined/Makefile bin/tests/system/rndc/Makefile bin/tests/system/rsabigexponent/Makefile bin/tests/system/tkey/Makefile bin/tests/tasks/Makefile bin/tests/timers/Makefile bin/tests/virtual-time/Makefile bin/tests/virtual-time/conf.sh bin/tools/Makefile contrib/scripts/check-secure-delegation.pl contrib/scripts/zone-edit.sh doc/Makefile doc/arm/Makefile doc/arm/noteversion.xml doc/arm/pkgversion.xml doc/arm/releaseinfo.xml doc/doxygen/Doxyfile doc/doxygen/Makefile doc/doxygen/doxygen-input-filter doc/misc/Makefile doc/tex/Makefile doc/tex/armstyle.sty doc/xsl/Makefile doc/xsl/isc-docbook-chunk.xsl doc/xsl/isc-docbook-html.xsl doc/xsl/isc-manpage.xsl doc/xsl/isc-notes-html.xsl isc-config.sh lib/Makefile lib/bind9/Makefile lib/bind9/include/Makefile lib/bind9/include/bind9/Makefile lib/dns/Makefile lib/dns/include/Makefile lib/dns/include/dns/Makefile lib/dns/include/dst/Makefile lib/dns/tests/Makefile lib/irs/Makefile lib/irs/include/Makefile lib/irs/include/irs/Makefile lib/irs/include/irs/netdb.h lib/irs/include/irs/platform.h lib/irs/tests/Makefile lib/isc/$arch/Makefile lib/isc/$arch/include/Makefile lib/isc/$arch/include/isc/Makefile lib/isc/$thread_dir/Makefile lib/isc/$thread_dir/include/Makefile lib/isc/$thread_dir/include/isc/Makefile lib/isc/Makefile lib/isc/include/Makefile lib/isc/include/isc/Makefile lib/isc/include/isc/platform.h lib/isc/include/pk11/Makefile lib/isc/include/pkcs11/Makefile lib/isc/tests/Makefile lib/isc/nls/Makefile lib/isc/unix/Makefile lib/isc/unix/include/Makefile lib/isc/unix/include/isc/Makefile lib/isc/unix/include/pkcs11/Makefile lib/isccc/Makefile lib/isccc/include/Makefile lib/isccc/include/isccc/Makefile lib/isccfg/Makefile lib/isccfg/include/Makefile lib/isccfg/include/isccfg/Makefile lib/isccfg/tests/Makefile lib/lwres/Makefile lib/lwres/include/Makefile lib/lwres/include/lwres/Makefile lib/lwres/include/lwres/netdb.h lib/lwres/include/lwres/platform.h lib/lwres/man/Makefile lib/lwres/tests/Makefile lib/lwres/unix/Makefile lib/lwres/unix/include/Makefile lib/lwres/unix/include/lwres/Makefile lib/tests/Makefile lib/tests/include/Makefile lib/tests/include/tests/Makefile lib/samples/Makefile lib/samples/Makefile-postinstall unit/Makefile unit/unittest.sh" +ac_config_files="$ac_config_files make/Makefile make/mkdep Makefile bin/Makefile bin/check/Makefile bin/confgen/Makefile bin/confgen/unix/Makefile bin/delv/Makefile bin/dig/Makefile bin/dnssec/Makefile bin/named/Makefile bin/named/unix/Makefile bin/nsupdate/Makefile bin/pkcs11/Makefile bin/python/Makefile bin/python/isc/Makefile bin/python/isc/utils.py bin/python/isc/tests/Makefile bin/python/dnssec-checkds.py bin/python/dnssec-coverage.py bin/python/dnssec-keymgr.py bin/python/isc/__init__.py bin/python/isc/checkds.py bin/python/isc/coverage.py bin/python/isc/dnskey.py bin/python/isc/eventlist.py bin/python/isc/keydict.py bin/python/isc/keyevent.py bin/python/isc/keymgr.py bin/python/isc/keyseries.py bin/python/isc/keyzone.py bin/python/isc/policy.py bin/python/isc/rndc.py bin/python/isc/tests/dnskey_test.py bin/python/isc/tests/policy_test.py bin/rndc/Makefile bin/tests/Makefile bin/tests/atomic/Makefile bin/tests/db/Makefile bin/tests/dst/Makefile bin/tests/dst/Kdh.+002+18602.key bin/tests/dst/Kdh.+002+18602.private bin/tests/dst/Kdh.+002+48957.key bin/tests/dst/Kdh.+002+48957.private bin/tests/dst/Ktest.+001+00002.key bin/tests/dst/Ktest.+001+54622.key bin/tests/dst/Ktest.+001+54622.private bin/tests/dst/Ktest.+003+23616.key bin/tests/dst/Ktest.+003+23616.private bin/tests/dst/Ktest.+003+49667.key bin/tests/dst/dst_2_data bin/tests/dst/t2_data_1 bin/tests/dst/t2_data_2 bin/tests/dst/t2_dsasig bin/tests/dst/t2_rsasig bin/tests/hashes/Makefile bin/tests/headerdep_test.sh bin/tests/master/Makefile bin/tests/mem/Makefile bin/tests/names/Makefile bin/tests/net/Makefile bin/tests/pkcs11/Makefile bin/tests/pkcs11/benchmarks/Makefile bin/tests/rbt/Makefile bin/tests/resolver/Makefile bin/tests/sockaddr/Makefile bin/tests/system/Makefile bin/tests/system/conf.sh bin/tests/system/dlz/prereq.sh bin/tests/system/dlzexternal/Makefile bin/tests/system/dlzexternal/ns1/named.conf bin/tests/system/dyndb/Makefile bin/tests/system/dyndb/driver/Makefile bin/tests/system/inline/checkdsa.sh bin/tests/system/pipelined/Makefile bin/tests/system/rndc/Makefile bin/tests/system/rsabigexponent/Makefile bin/tests/system/tkey/Makefile bin/tests/tasks/Makefile bin/tests/timers/Makefile bin/tests/virtual-time/Makefile bin/tests/virtual-time/conf.sh bin/tools/Makefile contrib/scripts/check-secure-delegation.pl contrib/scripts/zone-edit.sh doc/Makefile doc/arm/Makefile doc/arm/noteversion.xml doc/arm/pkgversion.xml doc/arm/releaseinfo.xml doc/doxygen/Doxyfile doc/doxygen/Makefile doc/doxygen/doxygen-input-filter doc/misc/Makefile doc/tex/Makefile doc/tex/armstyle.sty doc/xsl/Makefile doc/xsl/isc-docbook-chunk.xsl doc/xsl/isc-docbook-html.xsl doc/xsl/isc-manpage.xsl doc/xsl/isc-notes-html.xsl isc-config.sh lib/Makefile lib/bind9/Makefile lib/bind9/include/Makefile lib/bind9/include/bind9/Makefile lib/dns/Makefile lib/dns/include/Makefile lib/dns/include/dns/Makefile lib/dns/include/dst/Makefile lib/dns/tests/Makefile lib/irs/Makefile lib/irs/include/Makefile lib/irs/include/irs/Makefile lib/irs/include/irs/netdb.h lib/irs/include/irs/platform.h lib/irs/tests/Makefile lib/isc/$arch/Makefile lib/isc/$arch/include/Makefile lib/isc/$arch/include/isc/Makefile lib/isc/$thread_dir/Makefile lib/isc/$thread_dir/include/Makefile lib/isc/$thread_dir/include/isc/Makefile lib/isc/Makefile lib/isc/include/Makefile lib/isc/include/isc/Makefile lib/isc/include/isc/platform.h lib/isc/include/pk11/Makefile lib/isc/include/pkcs11/Makefile lib/isc/tests/Makefile lib/isc/nls/Makefile lib/isc/unix/Makefile lib/isc/unix/include/Makefile lib/isc/unix/include/isc/Makefile lib/isc/unix/include/pkcs11/Makefile lib/isccc/Makefile lib/isccc/include/Makefile lib/isccc/include/isccc/Makefile lib/isccfg/Makefile lib/isccfg/include/Makefile lib/isccfg/include/isccfg/Makefile lib/isccfg/tests/Makefile lib/ns/Makefile lib/ns/include/Makefile lib/ns/include/ns/Makefile lib/ns/tests/Makefile lib/tests/Makefile lib/tests/include/Makefile lib/tests/include/tests/Makefile lib/samples/Makefile lib/samples/Makefile-postinstall unit/Makefile unit/unittest.sh" # @@ -24696,7 +24396,6 @@ do "bin/tests/system/dyndb/Makefile") CONFIG_FILES="$CONFIG_FILES bin/tests/system/dyndb/Makefile" ;; "bin/tests/system/dyndb/driver/Makefile") CONFIG_FILES="$CONFIG_FILES bin/tests/system/dyndb/driver/Makefile" ;; "bin/tests/system/inline/checkdsa.sh") CONFIG_FILES="$CONFIG_FILES bin/tests/system/inline/checkdsa.sh" ;; - "bin/tests/system/lwresd/Makefile") CONFIG_FILES="$CONFIG_FILES bin/tests/system/lwresd/Makefile" ;; "bin/tests/system/pipelined/Makefile") CONFIG_FILES="$CONFIG_FILES bin/tests/system/pipelined/Makefile" ;; "bin/tests/system/rndc/Makefile") CONFIG_FILES="$CONFIG_FILES bin/tests/system/rndc/Makefile" ;; "bin/tests/system/rsabigexponent/Makefile") CONFIG_FILES="$CONFIG_FILES bin/tests/system/rsabigexponent/Makefile" ;; @@ -24765,16 +24464,10 @@ do "lib/isccfg/include/Makefile") CONFIG_FILES="$CONFIG_FILES lib/isccfg/include/Makefile" ;; "lib/isccfg/include/isccfg/Makefile") CONFIG_FILES="$CONFIG_FILES lib/isccfg/include/isccfg/Makefile" ;; "lib/isccfg/tests/Makefile") CONFIG_FILES="$CONFIG_FILES lib/isccfg/tests/Makefile" ;; - "lib/lwres/Makefile") CONFIG_FILES="$CONFIG_FILES lib/lwres/Makefile" ;; - "lib/lwres/include/Makefile") CONFIG_FILES="$CONFIG_FILES lib/lwres/include/Makefile" ;; - "lib/lwres/include/lwres/Makefile") CONFIG_FILES="$CONFIG_FILES lib/lwres/include/lwres/Makefile" ;; - "lib/lwres/include/lwres/netdb.h") CONFIG_FILES="$CONFIG_FILES lib/lwres/include/lwres/netdb.h" ;; - "lib/lwres/include/lwres/platform.h") CONFIG_FILES="$CONFIG_FILES lib/lwres/include/lwres/platform.h" ;; - "lib/lwres/man/Makefile") CONFIG_FILES="$CONFIG_FILES lib/lwres/man/Makefile" ;; - "lib/lwres/tests/Makefile") CONFIG_FILES="$CONFIG_FILES lib/lwres/tests/Makefile" ;; - "lib/lwres/unix/Makefile") CONFIG_FILES="$CONFIG_FILES lib/lwres/unix/Makefile" ;; - "lib/lwres/unix/include/Makefile") CONFIG_FILES="$CONFIG_FILES lib/lwres/unix/include/Makefile" ;; - "lib/lwres/unix/include/lwres/Makefile") CONFIG_FILES="$CONFIG_FILES lib/lwres/unix/include/lwres/Makefile" ;; + "lib/ns/Makefile") CONFIG_FILES="$CONFIG_FILES lib/ns/Makefile" ;; + "lib/ns/include/Makefile") CONFIG_FILES="$CONFIG_FILES lib/ns/include/Makefile" ;; + "lib/ns/include/ns/Makefile") CONFIG_FILES="$CONFIG_FILES lib/ns/include/ns/Makefile" ;; + "lib/ns/tests/Makefile") CONFIG_FILES="$CONFIG_FILES lib/ns/tests/Makefile" ;; "lib/tests/Makefile") CONFIG_FILES="$CONFIG_FILES lib/tests/Makefile" ;; "lib/tests/include/Makefile") CONFIG_FILES="$CONFIG_FILES lib/tests/include/Makefile" ;; "lib/tests/include/tests/Makefile") CONFIG_FILES="$CONFIG_FILES lib/tests/include/tests/Makefile" ;; diff --git a/configure.in b/configure.in index 4d422998cf..2d6fbb8b78 100644 --- a/configure.in +++ b/configure.in @@ -735,13 +735,11 @@ AC_TRY_COMPILE([ #include ], [fd_set read_set; return (0);], [AC_MSG_RESULT(yes) - ISC_PLATFORM_NEEDSYSSELECTH="#undef ISC_PLATFORM_NEEDSYSSELECTH" - LWRES_PLATFORM_NEEDSYSSELECTH="#undef LWRES_PLATFORM_NEEDSYSSELECTH"], + ISC_PLATFORM_NEEDSYSSELECTH="#undef ISC_PLATFORM_NEEDSYSSELECTH"], [AC_MSG_RESULT(no) case $ac_cv_header_sys_select_h in yes) ISC_PLATFORM_NEEDSYSSELECTH="#define ISC_PLATFORM_NEEDSYSSELECTH 1" - LWRES_PLATFORM_NEEDSYSSELECTH="#define LWRES_PLATFORM_NEEDSYSSELECTH 1" ;; no) AC_MSG_ERROR([need either working unistd.h or sys/select.h]) @@ -753,7 +751,6 @@ no) case $ac_cv_header_sys_select_h in yes) ISC_PLATFORM_NEEDSYSSELECTH="#define ISC_PLATFORM_NEEDSYSSELECTH 1" - LWRES_PLATFORM_NEEDSYSSELECTH="#define LWRES_PLATFORM_NEEDSYSSELECTH 1" ;; no) AC_MSG_ERROR([need either unistd.h or sys/select.h]) @@ -762,7 +759,6 @@ no) ;; esac AC_SUBST(ISC_PLATFORM_NEEDSYSSELECTH) -AC_SUBST(LWRES_PLATFORM_NEEDSYSSELECTH) # # Find the machine's endian flavor. @@ -3039,12 +3035,10 @@ changequote({, }) case "$host" in *-bsdi4.[01]*) ISC_PLATFORM_NEEDNETINET6IN6H="#define ISC_PLATFORM_NEEDNETINET6IN6H 1" - LWRES_PLATFORM_NEEDNETINET6IN6H="#define LWRES_PLATFORM_NEEDNETINET6IN6H 1" isc_netinet6in6_hack="#include " ;; *) ISC_PLATFORM_NEEDNETINET6IN6H="#undef ISC_PLATFORM_NEEDNETINET6IN6H" - LWRES_PLATFORM_NEEDNETINET6IN6H="#undef LWRES_PLATFORM_NEEDNETINET6IN6H" isc_netinet6in6_hack="" ;; esac @@ -3057,13 +3051,11 @@ case "$host" in *-sco-sysv*uw*|*-*-sysv*UnixWare*|*-*-sysv*OpenUNIX*) # UnixWare ISC_PLATFORM_NEEDNETINETIN6H="#define ISC_PLATFORM_NEEDNETINETIN6H 1" - LWRES_PLATFORM_NEEDNETINETIN6H="#define LWRES_PLATFORM_NEEDNETINETIN6H 1" ISC_PLATFORM_FIXIN6ISADDR="#define ISC_PLATFORM_FIXIN6ISADDR 1" isc_netinetin6_hack="#include " ;; *) ISC_PLATFORM_NEEDNETINETIN6H="#undef ISC_PLATFORM_NEEDNETINETIN6H" - LWRES_PLATFORM_NEEDNETINETIN6H="#undef LWRES_PLATFORM_NEEDNETINETIN6H" ISC_PLATFORM_FIXIN6ISADDR="#undef ISC_PLATFORM_FIXIN6ISADDR" isc_netinetin6_hack="" ;; @@ -3075,7 +3067,6 @@ esac case "$found_ipv6" in yes) ISC_PLATFORM_HAVEIPV6="#define ISC_PLATFORM_HAVEIPV6 1" - LWRES_PLATFORM_HAVEIPV6="#define LWRES_PLATFORM_HAVEIPV6 1" AC_MSG_CHECKING(for in6_addr) AC_TRY_COMPILE([ @@ -3088,11 +3079,9 @@ $isc_netinet6in6_hack [struct in6_addr in6; return (0);], [AC_MSG_RESULT(yes) ISC_PLATFORM_HAVEINADDR6="#undef ISC_PLATFORM_HAVEINADDR6" - LWRES_PLATFORM_HAVEINADDR6="#undef LWRES_PLATFORM_HAVEINADDR6" isc_in_addr6_hack=""], [AC_MSG_RESULT(no) ISC_PLATFORM_HAVEINADDR6="#define ISC_PLATFORM_HAVEINADDR6 1" - LWRES_PLATFORM_HAVEINADDR6="#define LWRES_PLATFORM_HAVEINADDR6 1" isc_in_addr6_hack="#define in6_addr in_addr6"]) AC_MSG_CHECKING(for in6addr_any) @@ -3106,11 +3095,9 @@ $isc_in_addr6_hack ], [struct in6_addr in6; in6 = in6addr_any; return (in6.s6_addr[0]);], [AC_MSG_RESULT(yes) - ISC_PLATFORM_NEEDIN6ADDRANY="#undef ISC_PLATFORM_NEEDIN6ADDRANY" - LWRES_PLATFORM_NEEDIN6ADDRANY="#undef LWRES_PLATFORM_NEEDIN6ADDRANY"], + ISC_PLATFORM_NEEDIN6ADDRANY="#undef ISC_PLATFORM_NEEDIN6ADDRANY"], [AC_MSG_RESULT(no) - ISC_PLATFORM_NEEDIN6ADDRANY="#define ISC_PLATFORM_NEEDIN6ADDRANY 1" - LWRES_PLATFORM_NEEDIN6ADDRANY="#define LWRES_PLATFORM_NEEDIN6ADDRANY 1"]) + ISC_PLATFORM_NEEDIN6ADDRANY="#define ISC_PLATFORM_NEEDIN6ADDRANY 1"]) AC_MSG_CHECKING(for in6addr_loopback) AC_TRY_LINK([ @@ -3123,11 +3110,9 @@ $isc_in_addr6_hack ], [struct in6_addr in6; in6 = in6addr_loopback; return (in6.s6_addr[0]);], [AC_MSG_RESULT(yes) - ISC_PLATFORM_NEEDIN6ADDRLOOPBACK="#undef ISC_PLATFORM_NEEDIN6ADDRLOOPBACK" - LWRES_PLATFORM_NEEDIN6ADDRLOOPBACK="#undef LWRES_PLATFORM_NEEDIN6ADDRLOOPBACK"], + ISC_PLATFORM_NEEDIN6ADDRLOOPBACK="#undef ISC_PLATFORM_NEEDIN6ADDRLOOPBACK"], [AC_MSG_RESULT(no) - ISC_PLATFORM_NEEDIN6ADDRLOOPBACK="#define ISC_PLATFORM_NEEDIN6ADDRLOOPBACK 1" - LWRES_PLATFORM_NEEDIN6ADDRLOOPBACK="#define LWRES_PLATFORM_NEEDIN6ADDRLOOPBACK 1"]) + ISC_PLATFORM_NEEDIN6ADDRLOOPBACK="#define ISC_PLATFORM_NEEDIN6ADDRLOOPBACK 1"]) AC_MSG_CHECKING(for sin6_scope_id in struct sockaddr_in6) AC_TRY_COMPILE([ @@ -3139,12 +3124,9 @@ $isc_netinet6in6_hack ], [struct sockaddr_in6 xyzzy; xyzzy.sin6_scope_id = 0; return (0);], [AC_MSG_RESULT(yes) - ISC_PLATFORM_HAVESCOPEID="#define ISC_PLATFORM_HAVESCOPEID 1" - result="#define LWRES_HAVE_SIN6_SCOPE_ID 1"], + ISC_PLATFORM_HAVESCOPEID="#define ISC_PLATFORM_HAVESCOPEID 1"], [AC_MSG_RESULT(no) - ISC_PLATFORM_HAVESCOPEID="#undef ISC_PLATFORM_HAVESCOPEID" - result="#undef LWRES_HAVE_SIN6_SCOPE_ID"]) - LWRES_HAVE_SIN6_SCOPE_ID="$result" + ISC_PLATFORM_HAVESCOPEID="#undef ISC_PLATFORM_HAVESCOPEID"]) AC_MSG_CHECKING(for in6_pktinfo) AC_TRY_COMPILE([ @@ -3162,11 +3144,8 @@ $isc_netinet6in6_hack ;; no) ISC_PLATFORM_HAVEIPV6="#undef ISC_PLATFORM_HAVEIPV6" - LWRES_PLATFORM_HAVEIPV6="#undef LWRES_PLATFORM_HAVEIPV6" ISC_PLATFORM_NEEDIN6ADDRANY="#undef ISC_PLATFORM_NEEDIN6ADDRANY" - LWRES_PLATFORM_NEEDIN6ADDRANY="#undef LWRES_PLATFORM_NEEDIN6ADDRANY" ISC_PLATFORM_HAVEIN6PKTINFO="#undef ISC_PLATFORM_HAVEIN6PKTINFO" - LWRES_HAVE_SIN6_SCOPE_ID="#define LWRES_HAVE_SIN6_SCOPE_ID 1" ISC_PLATFORM_HAVESCOPEID="#define ISC_PLATFORM_HAVESCOPEID 1" ISC_IPV6_H="ipv6.h" ISC_IPV6_O="ipv6.$O" @@ -3189,17 +3168,11 @@ ISC_PLATFORM_HAVESOCKADDRSTORAGE="#define ISC_PLATFORM_HAVESOCKADDRSTORAGE 1"], ISC_PLATFORM_HAVESOCKADDRSTORAGE="#undef ISC_PLATFORM_HAVESOCKADDRSTORAGE"]) AC_SUBST(ISC_PLATFORM_HAVEIPV6) -AC_SUBST(LWRES_PLATFORM_HAVEIPV6) AC_SUBST(ISC_PLATFORM_NEEDNETINETIN6H) -AC_SUBST(LWRES_PLATFORM_NEEDNETINETIN6H) AC_SUBST(ISC_PLATFORM_NEEDNETINET6IN6H) -AC_SUBST(LWRES_PLATFORM_NEEDNETINET6IN6H) AC_SUBST(ISC_PLATFORM_HAVEINADDR6) -AC_SUBST(LWRES_PLATFORM_HAVEINADDR6) AC_SUBST(ISC_PLATFORM_NEEDIN6ADDRANY) -AC_SUBST(LWRES_PLATFORM_NEEDIN6ADDRANY) AC_SUBST(ISC_PLATFORM_NEEDIN6ADDRLOOPBACK) -AC_SUBST(LWRES_PLATFORM_NEEDIN6ADDRLOOPBACK) AC_SUBST(ISC_PLATFORM_HAVEIN6PKTINFO) AC_SUBST(ISC_PLATFORM_FIXIN6ISADDR) AC_SUBST(ISC_PLATFORM_HAVESOCKADDRSTORAGE) @@ -3207,7 +3180,6 @@ AC_SUBST(ISC_IPV6_H) AC_SUBST(ISC_IPV6_O) AC_SUBST(ISC_ISCIPV6_O) AC_SUBST(ISC_IPV6_C) -AC_SUBST(LWRES_HAVE_SIN6_SCOPE_ID) AC_SUBST(ISC_PLATFORM_HAVESCOPEID) AC_MSG_CHECKING([for struct if_laddrreq]) @@ -3301,13 +3273,10 @@ AC_TRY_COMPILE([ #include ], [struct sockaddr sa; sa.sa_len = 0; return (0);], [AC_MSG_RESULT(yes) - ISC_PLATFORM_HAVESALEN="#define ISC_PLATFORM_HAVESALEN 1" - LWRES_PLATFORM_HAVESALEN="#define LWRES_PLATFORM_HAVESALEN 1"], + ISC_PLATFORM_HAVESALEN="#define ISC_PLATFORM_HAVESALEN 1"], [AC_MSG_RESULT(no) - ISC_PLATFORM_HAVESALEN="#undef ISC_PLATFORM_HAVESALEN" - LWRES_PLATFORM_HAVESALEN="#undef LWRES_PLATFORM_HAVESALEN"]) + ISC_PLATFORM_HAVESALEN="#undef ISC_PLATFORM_HAVESALEN"]) AC_SUBST(ISC_PLATFORM_HAVESALEN) -AC_SUBST(LWRES_PLATFORM_HAVESALEN) # # Look for a 4.4BSD or 4.3BSD struct msghdr @@ -3363,100 +3332,12 @@ AC_TRY_COMPILE([ #include ], [struct addrinfo a; return (0);], [AC_MSG_RESULT(yes) - ISC_LWRES_NEEDADDRINFO="#undef ISC_LWRES_NEEDADDRINFO" ISC_IRS_NEEDADDRINFO="#undef ISC_IRS_NEEDADDRINFO" AC_DEFINE(HAVE_ADDRINFO)], [AC_MSG_RESULT(no) - ISC_LWRES_NEEDADDRINFO="#define ISC_LWRES_NEEDADDRINFO 1" ISC_IRS_NEEDADDRINFO="#define ISC_IRS_NEEDADDRINFO 1"]) -AC_SUBST(ISC_LWRES_NEEDADDRINFO) AC_SUBST(ISC_IRS_NEEDADDRINFO) -# -# Check for rrsetinfo -# -AC_MSG_CHECKING(for struct rrsetinfo) -AC_TRY_COMPILE([ -#include ], -[struct rrsetinfo r; return (0);], - [AC_MSG_RESULT(yes) - ISC_LWRES_NEEDRRSETINFO="#undef ISC_LWRES_NEEDRRSETINFO"], - [AC_MSG_RESULT(no) - ISC_LWRES_NEEDRRSETINFO="#define ISC_LWRES_NEEDRRSETINFO 1"]) -AC_SUBST(ISC_LWRES_NEEDRRSETINFO) - -AC_MSG_CHECKING(for int sethostent) -AC_TRY_COMPILE([ -#include ], -[int i = sethostent(0); return(0);], - [AC_MSG_RESULT(yes) - ISC_LWRES_SETHOSTENTINT="#define ISC_LWRES_SETHOSTENTINT 1"], - [AC_MSG_RESULT(no) - ISC_LWRES_SETHOSTENTINT="#undef ISC_LWRES_SETHOSTENTINT"]) -AC_SUBST(ISC_LWRES_SETHOSTENTINT) - -AC_MSG_CHECKING(for int endhostent) -AC_TRY_COMPILE([ -#include ], -[int i = endhostent(); return(0);], - [AC_MSG_RESULT(yes) - ISC_LWRES_ENDHOSTENTINT="#define ISC_LWRES_ENDHOSTENTINT 1"], - [AC_MSG_RESULT(no) - ISC_LWRES_ENDHOSTENTINT="#undef ISC_LWRES_ENDHOSTENTINT"]) -AC_SUBST(ISC_LWRES_ENDHOSTENTINT) - -AC_MSG_CHECKING(for getnetbyaddr(in_addr_t, ...)) -AC_TRY_COMPILE([ -#include -struct netent *getnetbyaddr(in_addr_t, int);], -[], - [AC_MSG_RESULT(yes) - ISC_LWRES_GETNETBYADDRINADDR="#define ISC_LWRES_GETNETBYADDRINADDR 1"], - [AC_MSG_RESULT(no) - ISC_LWRES_GETNETBYADDRINADDR="#undef ISC_LWRES_GETNETBYADDRINADDR"]) -AC_SUBST(ISC_LWRES_GETNETBYADDRINADDR) - -AC_MSG_CHECKING(for int setnetent) -AC_TRY_COMPILE([ -#include ], -[int i = setnetent(0); return(0);], - [AC_MSG_RESULT(yes) - ISC_LWRES_SETNETENTINT="#define ISC_LWRES_SETNETENTINT 1"], - [AC_MSG_RESULT(no) - ISC_LWRES_SETNETENTINT="#undef ISC_LWRES_SETNETENTINT"]) -AC_SUBST(ISC_LWRES_SETNETENTINT) - -AC_MSG_CHECKING(for int endnetent) -AC_TRY_COMPILE([ -#include ], -[int i = endnetent(); return(0);], - [AC_MSG_RESULT(yes) - ISC_LWRES_ENDNETENTINT="#define ISC_LWRES_ENDNETENTINT 1"], - [AC_MSG_RESULT(no) - ISC_LWRES_ENDNETENTINT="#undef ISC_LWRES_ENDNETENTINT"]) -AC_SUBST(ISC_LWRES_ENDNETENTINT) - -AC_MSG_CHECKING(for gethostbyaddr(const void *, size_t, ...)) -AC_TRY_COMPILE([ -#include -struct hostent *gethostbyaddr(const void *, size_t, int);], -[return(0);], - [AC_MSG_RESULT(yes) - ISC_LWRES_GETHOSTBYADDRVOID="#define ISC_LWRES_GETHOSTBYADDRVOID 1"], - [AC_MSG_RESULT(no) - ISC_LWRES_GETHOSTBYADDRVOID="#undef ISC_LWRES_GETHOSTBYADDRVOID"]) -AC_SUBST(ISC_LWRES_GETHOSTBYADDRVOID) - -AC_MSG_CHECKING(for h_errno in netdb.h) -AC_TRY_COMPILE([ -#include ], -[h_errno = 1; return(0);], - [AC_MSG_RESULT(yes) - ISC_LWRES_NEEDHERRNO="#undef ISC_LWRES_NEEDHERRNO"], - [AC_MSG_RESULT(no) - ISC_LWRES_NEEDHERRNO="#define ISC_LWRES_NEEDHERRNO 1"]) -AC_SUBST(ISC_LWRES_NEEDHERRNO) - # # Sadly, the definitions of system-supplied getnameinfo(3) vary. Try to catch # known variations here: @@ -3519,20 +3400,8 @@ char *gai_strerror(int ecode);], [AC_MSG_RESULT(not match any subspecies; assume standard definition) AC_DEFINE([IRS_GAISTRERROR_RETURN_T], [const char *])]) -AC_CHECK_FUNC(getipnodebyname, - [ISC_LWRES_GETIPNODEPROTO="#undef ISC_LWRES_GETIPNODEPROTO"], - [ISC_LWRES_GETIPNODEPROTO="#define ISC_LWRES_GETIPNODEPROTO 1"]) -AC_CHECK_FUNC(getnameinfo, - [ISC_LWRES_GETNAMEINFOPROTO="#undef ISC_LWRES_GETNAMEINFOPROTO"], - [ISC_LWRES_GETNAMEINFOPROTO="#define ISC_LWRES_GETNAMEINFOPROTO 1"]) -AC_CHECK_FUNC(getaddrinfo, - [ISC_LWRES_GETADDRINFOPROTO="#undef ISC_LWRES_GETADDRINFOPROTO" - AC_DEFINE(HAVE_GETADDRINFO)], - [ISC_LWRES_GETADDRINFOPROTO="#define ISC_LWRES_GETADDRINFOPROTO 1"]) +AC_CHECK_FUNC(getaddrinfo, AC_DEFINE(HAVE_GETADDRINFO)) AC_CHECK_FUNC(gai_strerror, AC_DEFINE(HAVE_GAISTRERROR)) -AC_SUBST(ISC_LWRES_GETIPNODEPROTO) -AC_SUBST(ISC_LWRES_GETADDRINFOPROTO) -AC_SUBST(ISC_LWRES_GETNAMEINFOPROTO) AC_SUBST(ISC_IRS_GETNAMEINFOSOCKLEN) AC_ARG_ENABLE(getifaddrs, @@ -3599,22 +3468,16 @@ AC_SUBST(ISC_PLATFORM_NEEDMEMMOVE) AC_CHECK_FUNC(strtoul, [ISC_PLATFORM_NEEDSTRTOUL="#undef ISC_PLATFORM_NEEDSTRTOUL" - LWRES_PLATFORM_NEEDSTRTOUL="#undef LWRES_PLATFORM_NEEDSTRTOUL" GENRANDOMLIB=""], [ISC_PLATFORM_NEEDSTRTOUL="#define ISC_PLATFORM_NEEDSTRTOUL 1" - LWRES_PLATFORM_NEEDSTRTOUL="#define LWRES_PLATFORM_NEEDSTRTOUL 1" GENRANDOMLIB='${ISCLIBS}']) AC_SUBST(ISC_PLATFORM_NEEDSTRTOUL) -AC_SUBST(LWRES_PLATFORM_NEEDSTRTOUL) AC_SUBST(GENRANDOMLIB) AC_CHECK_FUNC(strlcpy, - [ISC_PLATFORM_NEEDSTRLCPY="#undef ISC_PLATFORM_NEEDSTRLCPY" - LWRES_PLATFORM_NEEDSTRLCPY="#undef LWRES_PLATFORM_NEEDSTRLCPY"], - [ISC_PLATFORM_NEEDSTRLCPY="#define ISC_PLATFORM_NEEDSTRLCPY 1" - LWRES_PLATFORM_NEEDSTRLCPY="#define LWRES_PLATFORM_NEEDSTRLCPY 1"]) + [ISC_PLATFORM_NEEDSTRLCPY="#undef ISC_PLATFORM_NEEDSTRLCPY"], + [ISC_PLATFORM_NEEDSTRLCPY="#define ISC_PLATFORM_NEEDSTRLCPY 1"]) AC_SUBST(ISC_PLATFORM_NEEDSTRLCPY) -AC_SUBST(LWRES_PLATFORM_NEEDSTRLCPY) AC_CHECK_FUNC(strlcat, [ISC_PLATFORM_NEEDSTRLCAT="#undef ISC_PLATFORM_NEEDSTRLCAT"], @@ -3692,7 +3555,6 @@ ISC_PLATFORM_NEEDPRINTF='#undef ISC_PLATFORM_NEEDPRINTF' ISC_PLATFORM_NEEDFPRINTF='#undef ISC_PLATFORM_NEEDFPRINTF' ISC_PLATFORM_NEEDSPRINTF='#undef ISC_PLATFORM_NEEDSPRINTF' ISC_PLATFORM_NEEDVSNPRINTF='#undef ISC_PLATFORM_NEEDVSNPRINTF' -LWRES_PLATFORM_NEEDVSNPRINTF='#undef LWRES_PLATFORM_NEEDVSNPRINTF' AC_MSG_CHECKING(sprintf return type) AC_TRY_COMPILE([ @@ -3703,14 +3565,12 @@ AC_TRY_COMPILE([ ISC_PRINT_OBJS="print.$O" ISC_PRINT_SRCS="print.c" ISC_PLATFORM_NEEDSPRINTF="#define ISC_PLATFORM_NEEDSPRINTF" -LWRES_PLATFORM_NEEDSPRINTF="#define LWRES_PLATFORM_NEEDSPRINTF" ],[AC_MSG_RESULT(int)]) AC_CHECK_FUNC(vsnprintf, [], [ISC_PRINT_OBJS="print.$O" ISC_PRINT_SRCS="print.c" - ISC_PLATFORM_NEEDVSNPRINTF="#define ISC_PLATFORM_NEEDVSNPRINTF 1" - LWRES_PLATFORM_NEEDVSNPRINTF="#define LWRES_PLATFORM_NEEDVSNPRINTF 1"]) + ISC_PLATFORM_NEEDVSNPRINTF="#define ISC_PLATFORM_NEEDVSNPRINTF 1"]) AC_MSG_CHECKING(printf for %z support) AC_TRY_RUN([ @@ -3730,16 +3590,13 @@ main() { ISC_PLATFORM_NEEDPRINTF='#define ISC_PLATFORM_NEEDPRINTF 1' ISC_PLATFORM_NEEDFPRINTF='#define ISC_PLATFORM_NEEDFPRINTF 1' ISC_PLATFORM_NEEDFSRINTF='#define ISC_PLATFORM_NEEDSPRINTF 1' - ISC_PLATFORM_NEEDVSNPRINTF="#define ISC_PLATFORM_NEEDVSNPRINTF 1" - LWRES_PLATFORM_NEEDVSNPRINTF="#define LWRES_PLATFORM_NEEDVSNPRINTF 1"], + ISC_PLATFORM_NEEDVSNPRINTF="#define ISC_PLATFORM_NEEDVSNPRINTF 1"], [AC_MSG_RESULT(assuming target platform supports %z)]) AC_SUBST(ISC_PLATFORM_NEEDPRINTF) AC_SUBST(ISC_PLATFORM_NEEDFPRINTF) AC_SUBST(ISC_PLATFORM_NEEDSPRINTF) AC_SUBST(ISC_PLATFORM_NEEDVSNPRINTF) -AC_SUBST(LWRES_PLATFORM_NEEDSPRINTF) -AC_SUBST(LWRES_PLATFORM_NEEDVSNPRINTF) ISC_EXTRA_OBJS="$ISC_EXTRA_OBJS $ISC_PRINT_OBJS" ISC_EXTRA_SRCS="$ISC_EXTRA_SRCS $ISC_PRINT_SRCS" @@ -3799,16 +3656,12 @@ main() { } ], [AC_MSG_RESULT(ll) - ISC_PLATFORM_QUADFORMAT='#define ISC_PLATFORM_QUADFORMAT "ll"' - LWRES_PLATFORM_QUADFORMAT='#define LWRES_PLATFORM_QUADFORMAT "ll"'], + ISC_PLATFORM_QUADFORMAT='#define ISC_PLATFORM_QUADFORMAT "ll"'], [AC_MSG_RESULT(l) - ISC_PLATFORM_QUADFORMAT='#define ISC_PLATFORM_QUADFORMAT "l"' - LWRES_PLATFORM_QUADFORMAT='#define LWRES_PLATFORM_QUADFORMAT "l"'], + ISC_PLATFORM_QUADFORMAT='#define ISC_PLATFORM_QUADFORMAT "l"'], [AC_MSG_RESULT(assuming target platform uses ll) - ISC_PLATFORM_QUADFORMAT='#define ISC_PLATFORM_QUADFORMAT "ll"' - LWRES_PLATFORM_QUADFORMAT='#define LWRES_PLATFORM_QUADFORMAT "ll"']) + ISC_PLATFORM_QUADFORMAT='#define ISC_PLATFORM_QUADFORMAT "ll"']) AC_SUBST(ISC_PLATFORM_QUADFORMAT) -AC_SUBST(LWRES_PLATFORM_QUADFORMAT) # @@ -3977,8 +3830,6 @@ esac # AC_SUBST(ISC_PLATFORM_USEDECLSPEC) ISC_PLATFORM_USEDECLSPEC="#undef ISC_PLATFORM_USEDECLSPEC" -AC_SUBST(LWRES_PLATFORM_USEDECLSPEC) -LWRES_PLATFORM_USEDECLSPEC="#undef LWRES_PLATFORM_USEDECLSPEC" AC_SUBST(IRS_PLATFORM_USEDECLSPEC) IRS_PLATFORM_USEDECLSPEC="#undef IRS_PLATFORM_USEDECLSPEC" @@ -4853,7 +4704,7 @@ AC_SUBST(BIND9_ISC_BUILDINCLUDE) AC_SUBST(BIND9_ISCCC_BUILDINCLUDE) AC_SUBST(BIND9_ISCCFG_BUILDINCLUDE) AC_SUBST(BIND9_DNS_BUILDINCLUDE) -AC_SUBST(BIND9_LWRES_BUILDINCLUDE) +AC_SUBST(BIND9_NS_BUILDINCLUDE) AC_SUBST(BIND9_BIND9_BUILDINCLUDE) AC_SUBST(BIND9_IRS_BUILDINCLUDE) if test "X$srcdir" != "X"; then @@ -4861,7 +4712,7 @@ if test "X$srcdir" != "X"; then BIND9_ISCCC_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/isccc/include" BIND9_ISCCFG_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/isccfg/include" BIND9_DNS_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/dns/include" - BIND9_LWRES_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/lwres/include" + BIND9_NS_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/ns/include" BIND9_BIND9_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/bind9/include" BIND9_IRS_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/irs/include" else @@ -4869,7 +4720,7 @@ else BIND9_ISCCC_BUILDINCLUDE="" BIND9_ISCCFG_BUILDINCLUDE="" BIND9_DNS_BUILDINCLUDE="" - BIND9_LWRES_BUILDINCLUDE="" + BIND9_NS_BUILDINCLUDE="" BIND9_BIND9_BUILDINCLUDE="" BIND9_IRS_BUILDINCLUDE="" fi @@ -4934,12 +4785,12 @@ LIBDNS_MAPAPI="$srcdir/lib/dns/mapapi" AC_SUBST_FILE(LIBBIND9_API) LIBBIND9_API="$srcdir/lib/bind9/api" -AC_SUBST_FILE(LIBLWRES_API) -LIBLWRES_API="$srcdir/lib/lwres/api" - AC_SUBST_FILE(LIBIRS_API) LIBIRS_API="$srcdir/lib/irs/api" +AC_SUBST_FILE(LIBNS_API) +LIBNS_API="$srcdir/lib/ns/api" + # # Configure any DLZ drivers. # @@ -5322,7 +5173,6 @@ AC_CONFIG_FILES([ bin/tests/system/dyndb/Makefile bin/tests/system/dyndb/driver/Makefile bin/tests/system/inline/checkdsa.sh - bin/tests/system/lwresd/Makefile bin/tests/system/pipelined/Makefile bin/tests/system/rndc/Makefile bin/tests/system/rsabigexponent/Makefile @@ -5391,16 +5241,10 @@ AC_CONFIG_FILES([ lib/isccfg/include/Makefile lib/isccfg/include/isccfg/Makefile lib/isccfg/tests/Makefile - lib/lwres/Makefile - lib/lwres/include/Makefile - lib/lwres/include/lwres/Makefile - lib/lwres/include/lwres/netdb.h - lib/lwres/include/lwres/platform.h - lib/lwres/man/Makefile - lib/lwres/tests/Makefile - lib/lwres/unix/Makefile - lib/lwres/unix/include/Makefile - lib/lwres/unix/include/lwres/Makefile + lib/ns/Makefile + lib/ns/include/Makefile + lib/ns/include/ns/Makefile + lib/ns/tests/Makefile lib/tests/Makefile lib/tests/include/Makefile lib/tests/include/tests/Makefile diff --git a/contrib/dlz/drivers/dlz_bdb_driver.c b/contrib/dlz/drivers/dlz_bdb_driver.c index f68bd9e0cb..7fd283e4c0 100644 --- a/contrib/dlz/drivers/dlz_bdb_driver.c +++ b/contrib/dlz/drivers/dlz_bdb_driver.c @@ -622,7 +622,7 @@ bdb_create(const char *dlzname, unsigned int argc, char *argv[], } /* allocate and zero memory for driver structure */ - db = isc_mem_get(ns_g_mctx, sizeof(bdb_instance_t)); + db = isc_mem_get(named_g_mctx, sizeof(bdb_instance_t)); if (db == NULL) { isc_log_write(dns_lctx, DNS_LOGCATEGORY_DATABASE, DNS_LOGMODULE_DLZ, ISC_LOG_ERROR, @@ -633,7 +633,7 @@ bdb_create(const char *dlzname, unsigned int argc, char *argv[], memset(db, 0, sizeof(bdb_instance_t)); /* attach to the memory context */ - isc_mem_attach(ns_g_mctx, &db->mctx); + isc_mem_attach(named_g_mctx, &db->mctx); /* create BDB environment * Basically BDB allocates and assigns memory to db->dbenv @@ -768,7 +768,7 @@ dlz_bdb_init(void) { DNS_SDLZFLAG_RELATIVEOWNER | DNS_SDLZFLAG_RELATIVERDATA | DNS_SDLZFLAG_THREADSAFE, - ns_g_mctx, &dlz_bdb); + named_g_mctx, &dlz_bdb); if (result != ISC_R_SUCCESS) { UNEXPECTED_ERROR(__FILE__, __LINE__, "dns_sdlzregister() failed: %s", diff --git a/contrib/dlz/drivers/dlz_bdbhpt_driver.c b/contrib/dlz/drivers/dlz_bdbhpt_driver.c index 8fbdf7fe99..420be63026 100644 --- a/contrib/dlz/drivers/dlz_bdbhpt_driver.c +++ b/contrib/dlz/drivers/dlz_bdbhpt_driver.c @@ -712,7 +712,7 @@ bdbhpt_create(const char *dlzname, unsigned int argc, char *argv[], } /* allocate and zero memory for driver structure */ - db = isc_mem_get(ns_g_mctx, sizeof(bdbhpt_instance_t)); + db = isc_mem_get(named_g_mctx, sizeof(bdbhpt_instance_t)); if (db == NULL) { isc_log_write(dns_lctx, DNS_LOGCATEGORY_DATABASE, DNS_LOGMODULE_DLZ, ISC_LOG_ERROR, @@ -723,7 +723,7 @@ bdbhpt_create(const char *dlzname, unsigned int argc, char *argv[], memset(db, 0, sizeof(bdbhpt_instance_t)); /* attach to the memory context */ - isc_mem_attach(ns_g_mctx, &db->mctx); + isc_mem_attach(named_g_mctx, &db->mctx); /* * create bdbhpt environment @@ -833,7 +833,7 @@ dlz_bdbhpt_init(void) { DNS_SDLZFLAG_RELATIVEOWNER | DNS_SDLZFLAG_RELATIVERDATA | DNS_SDLZFLAG_THREADSAFE, - ns_g_mctx, &dlz_bdbhpt); + named_g_mctx, &dlz_bdbhpt); if (result != ISC_R_SUCCESS) { UNEXPECTED_ERROR(__FILE__, __LINE__, "dns_sdlzregister() failed: %s", diff --git a/contrib/dlz/drivers/dlz_filesystem_driver.c b/contrib/dlz/drivers/dlz_filesystem_driver.c index e8fbe5b80d..0073ad044f 100644 --- a/contrib/dlz/drivers/dlz_filesystem_driver.c +++ b/contrib/dlz/drivers/dlz_filesystem_driver.c @@ -163,7 +163,7 @@ create_path_helper(char *out, const char *in, config_data_t *cd) { char *tmpPtr; int i; - tmpString = isc_mem_strdup(ns_g_mctx, in); + tmpString = isc_mem_strdup(named_g_mctx, in); if (tmpString == NULL) return (ISC_R_NOMEMORY); @@ -207,7 +207,7 @@ create_path_helper(char *out, const char *in, config_data_t *cd) { i += cd->splitcnt; } - isc_mem_free(ns_g_mctx, tmpString); + isc_mem_free(named_g_mctx, tmpString); return (ISC_R_SUCCESS); } @@ -277,7 +277,7 @@ create_path(const char *zone, const char *host, const char *client, if (cd->splitcnt > 0) pathsize += len/cd->splitcnt; - tmpPath = isc_mem_allocate(ns_g_mctx , pathsize * sizeof(char)); + tmpPath = isc_mem_allocate(named_g_mctx , pathsize * sizeof(char)); if (tmpPath == NULL) { /* write error message */ isc_log_write(dns_lctx, DNS_LOGCATEGORY_DATABASE, @@ -349,7 +349,7 @@ create_path(const char *zone, const char *host, const char *client, /* free tmpPath memory */ if (tmpPath != NULL && result != ISC_R_SUCCESS) - isc_mem_free(ns_g_mctx, tmpPath); + isc_mem_free(named_g_mctx, tmpPath); /* free tmpPath memory */ return (result); @@ -487,7 +487,7 @@ process_dir(isc_dir_t *dir, void *passback, config_data_t *cd, */ if (dir_list != NULL) { direntry = - isc_mem_get(ns_g_mctx, + isc_mem_get(named_g_mctx, sizeof(dir_entry_t)); if (direntry == NULL) return (ISC_R_NOMEMORY); @@ -616,7 +616,7 @@ fs_allowzonexfr(void *driverarg, void *dbdata, const char *name, result = ISC_R_NOTFOUND; complete_AXFR: - isc_mem_free(ns_g_mctx, path); + isc_mem_free(named_g_mctx, path); return (result); } @@ -644,7 +644,7 @@ fs_allnodes(const char *zone, void *driverarg, void *dbdata, cd = (config_data_t *) dbdata; /* allocate memory for list */ - dir_list = isc_mem_get(ns_g_mctx, sizeof(dlist_t)); + dir_list = isc_mem_get(named_g_mctx, sizeof(dlist_t)); if (dir_list == NULL) { result = ISC_R_NOTFOUND; goto complete_allnds; @@ -727,14 +727,14 @@ fs_allnodes(const char *zone, void *driverarg, void *dbdata, dir_entry = ISC_LIST_HEAD(*dir_list); while (dir_entry != NULL) { next_de = ISC_LIST_NEXT(dir_entry, link); - isc_mem_put(ns_g_mctx, dir_entry, sizeof(dir_entry_t)); + isc_mem_put(named_g_mctx, dir_entry, sizeof(dir_entry_t)); dir_entry = next_de; } /* end while */ - isc_mem_put(ns_g_mctx, dir_list, sizeof(dlist_t)); + isc_mem_put(named_g_mctx, dir_list, sizeof(dlist_t)); } if (basepath != NULL) - isc_mem_free(ns_g_mctx, basepath); + isc_mem_free(named_g_mctx, basepath); return (result); } @@ -777,7 +777,7 @@ fs_findzone(void *driverarg, void *dbdata, const char *name, complete_FZ: - isc_mem_free(ns_g_mctx, path); + isc_mem_free(named_g_mctx, path); return (result); } @@ -852,7 +852,7 @@ fs_lookup(const char *zone, const char *name, void *driverarg, complete_lkup: - isc_mem_free(ns_g_mctx, path); + isc_mem_free(named_g_mctx, path); return (result); } @@ -903,7 +903,7 @@ fs_create(const char *dlzname, unsigned int argc, char *argv[], pathsep = '/'; /* allocate memory for our config data */ - cd = isc_mem_get(ns_g_mctx, sizeof(config_data_t)); + cd = isc_mem_get(named_g_mctx, sizeof(config_data_t)); if (cd == NULL) goto no_mem; @@ -913,19 +913,19 @@ fs_create(const char *dlzname, unsigned int argc, char *argv[], cd->pathsep = pathsep; /* get and store our base directory */ - cd->basedir = isc_mem_strdup(ns_g_mctx, argv[1]); + cd->basedir = isc_mem_strdup(named_g_mctx, argv[1]); if (cd->basedir == NULL) goto no_mem; cd->basedirsize = strlen(cd->basedir); /* get and store our data sub-dir */ - cd->datadir = isc_mem_strdup(ns_g_mctx, argv[2]); + cd->datadir = isc_mem_strdup(named_g_mctx, argv[2]); if (cd->datadir == NULL) goto no_mem; cd->datadirsize = strlen(cd->datadir); /* get and store our zone xfr sub-dir */ - cd->xfrdir = isc_mem_strdup(ns_g_mctx, argv[3]); + cd->xfrdir = isc_mem_strdup(named_g_mctx, argv[3]); if (cd->xfrdir == NULL) goto no_mem; cd->xfrdirsize = strlen(cd->xfrdir); @@ -943,7 +943,7 @@ fs_create(const char *dlzname, unsigned int argc, char *argv[], cd->separator = *argv[5]; /* attach config data to memory context */ - isc_mem_attach(ns_g_mctx, &cd->mctx); + isc_mem_attach(named_g_mctx, &cd->mctx); /* pass back config data */ *dbdata = cd; @@ -983,13 +983,13 @@ fs_destroy(void *driverarg, void *dbdata) * allocated */ if (cd->basedir != NULL) - isc_mem_free(ns_g_mctx, cd->basedir); + isc_mem_free(named_g_mctx, cd->basedir); if (cd->datadir != NULL) - isc_mem_free(ns_g_mctx, cd->datadir); + isc_mem_free(named_g_mctx, cd->datadir); if (cd->xfrdir != NULL) - isc_mem_free(ns_g_mctx, cd->xfrdir); + isc_mem_free(named_g_mctx, cd->xfrdir); /* hold memory context to use later */ mctx = cd->mctx; @@ -1036,7 +1036,7 @@ dlz_fs_init(void) result = dns_sdlzregister("filesystem", &dlz_fs_methods, NULL, DNS_SDLZFLAG_RELATIVEOWNER | DNS_SDLZFLAG_RELATIVERDATA, - ns_g_mctx, &dlz_fs); + named_g_mctx, &dlz_fs); if (result != ISC_R_SUCCESS) { UNEXPECTED_ERROR(__FILE__, __LINE__, "dns_sdlzregister() failed: %s", diff --git a/contrib/dlz/drivers/dlz_ldap_driver.c b/contrib/dlz/drivers/dlz_ldap_driver.c index 2b2dcf85ef..c03b1c8ab0 100644 --- a/contrib/dlz/drivers/dlz_ldap_driver.c +++ b/contrib/dlz/drivers/dlz_ldap_driver.c @@ -271,7 +271,7 @@ ldap_destroy_dblist(db_list_t *dblist) { destroy_sqldbinstance(dbi); } /* release memory for the list structure */ - isc_mem_put(ns_g_mctx, dblist, sizeof(db_list_t)); + isc_mem_put(named_g_mctx, dblist, sizeof(db_list_t)); } /*% @@ -371,7 +371,7 @@ ldap_process_results(LDAP *dbc, LDAPMessage *msg, char ** attrs, } /* end for (j = 0; attrs[j] != NULL, j++) loop */ /* allocate memory for data string */ - data = isc_mem_allocate(ns_g_mctx, len + 1); + data = isc_mem_allocate(named_g_mctx, len + 1); if (data == NULL) { isc_log_write(dns_lctx, DNS_LOGCATEGORY_DATABASE, DNS_LOGMODULE_DLZ, ISC_LOG_ERROR, @@ -428,12 +428,12 @@ ldap_process_results(LDAP *dbc, LDAPMessage *msg, char ** attrs, break; case 1: j++; - type = isc_mem_strdup(ns_g_mctx, vals[0]); + type = isc_mem_strdup(named_g_mctx, vals[0]); break; case 2: j++; if (allnodes) - host = isc_mem_strdup(ns_g_mctx, + host = isc_mem_strdup(named_g_mctx, vals[0]); else strcpy(data, vals[0]); @@ -518,10 +518,10 @@ ldap_process_results(LDAP *dbc, LDAPMessage *msg, char ** attrs, } /* free memory for type, data and host for next loop */ - isc_mem_free(ns_g_mctx, type); - isc_mem_free(ns_g_mctx, data); + isc_mem_free(named_g_mctx, type); + isc_mem_free(named_g_mctx, data); if (host != NULL) - isc_mem_free(ns_g_mctx, host); + isc_mem_free(named_g_mctx, host); /* get the next entry to process */ entry = ldap_next_entry(dbc, entry); @@ -532,11 +532,11 @@ ldap_process_results(LDAP *dbc, LDAPMessage *msg, char ** attrs, if (vals != NULL) ldap_value_free(vals); if (host != NULL) - isc_mem_free(ns_g_mctx, host); + isc_mem_free(named_g_mctx, host); if (type != NULL) - isc_mem_free(ns_g_mctx, type); + isc_mem_free(named_g_mctx, type); if (data != NULL) - isc_mem_free(ns_g_mctx, data); + isc_mem_free(named_g_mctx, data); return (result); } @@ -590,7 +590,7 @@ ldap_get_results(const char *zone, const char *record, /* set fields */ if (zone != NULL) { - dbi->zone = isc_mem_strdup(ns_g_mctx, zone); + dbi->zone = isc_mem_strdup(named_g_mctx, zone); if (dbi->zone == NULL) { result = ISC_R_NOMEMORY; goto cleanup; @@ -599,7 +599,7 @@ ldap_get_results(const char *zone, const char *record, dbi->zone = NULL; } if (record != NULL) { - dbi->record = isc_mem_strdup(ns_g_mctx, record); + dbi->record = isc_mem_strdup(named_g_mctx, record); if (dbi->record == NULL) { result = ISC_R_NOMEMORY; goto cleanup; @@ -608,7 +608,7 @@ ldap_get_results(const char *zone, const char *record, dbi->record = NULL; } if (client != NULL) { - dbi->client = isc_mem_strdup(ns_g_mctx, client); + dbi->client = isc_mem_strdup(named_g_mctx, client); if (dbi->client == NULL) { result = ISC_R_NOMEMORY; goto cleanup; @@ -630,7 +630,7 @@ ldap_get_results(const char *zone, const char *record, result = ISC_R_NOTIMPLEMENTED; goto cleanup; } else { - querystring = build_querystring(ns_g_mctx, + querystring = build_querystring(named_g_mctx, dbi->allnodes_q); } break; @@ -640,7 +640,7 @@ ldap_get_results(const char *zone, const char *record, result = ISC_R_NOTIMPLEMENTED; goto cleanup; } else { - querystring = build_querystring(ns_g_mctx, + querystring = build_querystring(named_g_mctx, dbi->allowxfr_q); } break; @@ -650,7 +650,7 @@ ldap_get_results(const char *zone, const char *record, result = ISC_R_NOTIMPLEMENTED; goto cleanup; } else { - querystring = build_querystring(ns_g_mctx, + querystring = build_querystring(named_g_mctx, dbi->authority_q); } break; @@ -664,7 +664,7 @@ ldap_get_results(const char *zone, const char *record, result = ISC_R_FAILURE; goto cleanup; } else { - querystring = build_querystring(ns_g_mctx, + querystring = build_querystring(named_g_mctx, dbi->findzone_q); } break; @@ -678,7 +678,7 @@ ldap_get_results(const char *zone, const char *record, result = ISC_R_FAILURE; goto cleanup; } else { - querystring = build_querystring(ns_g_mctx, + querystring = build_querystring(named_g_mctx, dbi->lookup_q); } break; @@ -838,11 +838,11 @@ ldap_get_results(const char *zone, const char *record, /* cleanup */ if (dbi->zone != NULL) - isc_mem_free(ns_g_mctx, dbi->zone); + isc_mem_free(named_g_mctx, dbi->zone); if (dbi->record != NULL) - isc_mem_free(ns_g_mctx, dbi->record); + isc_mem_free(named_g_mctx, dbi->record); if (dbi->client != NULL) - isc_mem_free(ns_g_mctx, dbi->client); + isc_mem_free(named_g_mctx, dbi->client); #ifdef ISC_PLATFORM_USETHREADS @@ -853,7 +853,7 @@ ldap_get_results(const char *zone, const char *record, /* release query string */ if (querystring != NULL) - isc_mem_free(ns_g_mctx, querystring ); + isc_mem_free(named_g_mctx, querystring ); /* return result */ return (result); @@ -1053,7 +1053,7 @@ dlz_ldap_create(const char *dlzname, unsigned int argc, char *argv[], } /* allocate memory for LDAP instance */ - ldap_inst = isc_mem_get(ns_g_mctx, sizeof(ldap_instance_t)); + ldap_inst = isc_mem_get(named_g_mctx, sizeof(ldap_instance_t)); if (ldap_inst == NULL) return (ISC_R_NOMEMORY); memset(ldap_inst, 0, sizeof(ldap_instance_t)); @@ -1061,17 +1061,17 @@ dlz_ldap_create(const char *dlzname, unsigned int argc, char *argv[], /* store info needed to automatically re-connect. */ ldap_inst->protocol = protocol; ldap_inst->method = method; - ldap_inst->hosts = isc_mem_strdup(ns_g_mctx, argv[6]); + ldap_inst->hosts = isc_mem_strdup(named_g_mctx, argv[6]); if (ldap_inst->hosts == NULL) { result = ISC_R_NOMEMORY; goto cleanup; } - ldap_inst->user = isc_mem_strdup(ns_g_mctx, argv[4]); + ldap_inst->user = isc_mem_strdup(named_g_mctx, argv[4]); if (ldap_inst->user == NULL) { result = ISC_R_NOMEMORY; goto cleanup; } - ldap_inst->cred = isc_mem_strdup(ns_g_mctx, argv[5]); + ldap_inst->cred = isc_mem_strdup(named_g_mctx, argv[5]); if (ldap_inst->cred == NULL) { result = ISC_R_NOMEMORY; goto cleanup; @@ -1079,7 +1079,7 @@ dlz_ldap_create(const char *dlzname, unsigned int argc, char *argv[], #ifdef ISC_PLATFORM_USETHREADS /* allocate memory for database connection list */ - ldap_inst->db = isc_mem_get(ns_g_mctx, sizeof(db_list_t)); + ldap_inst->db = isc_mem_get(named_g_mctx, sizeof(db_list_t)); if (ldap_inst->db == NULL) { result = ISC_R_NOMEMORY; goto cleanup; @@ -1099,22 +1099,22 @@ dlz_ldap_create(const char *dlzname, unsigned int argc, char *argv[], /* how many queries were passed in from config file? */ switch(argc) { case 9: - result = build_sqldbinstance(ns_g_mctx, NULL, NULL, + result = build_sqldbinstance(named_g_mctx, NULL, NULL, NULL, argv[7], argv[8], NULL, &dbi); break; case 10: - result = build_sqldbinstance(ns_g_mctx, NULL, NULL, + result = build_sqldbinstance(named_g_mctx, NULL, NULL, argv[9], argv[7], argv[8], NULL, &dbi); break; case 11: - result = build_sqldbinstance(ns_g_mctx, argv[10], NULL, + result = build_sqldbinstance(named_g_mctx, argv[10], NULL, argv[9], argv[7], argv[8], NULL, &dbi); break; case 12: - result = build_sqldbinstance(ns_g_mctx, argv[10], + result = build_sqldbinstance(named_g_mctx, argv[10], argv[11], argv[9], argv[7], argv[8], NULL, &dbi); @@ -1262,18 +1262,18 @@ dlz_ldap_destroy(void *driverarg, void *dbdata) { #endif /* ISC_PLATFORM_USETHREADS */ if (((ldap_instance_t *)dbdata)->hosts != NULL) - isc_mem_free(ns_g_mctx, + isc_mem_free(named_g_mctx, ((ldap_instance_t *)dbdata)->hosts); if (((ldap_instance_t *)dbdata)->user != NULL) - isc_mem_free(ns_g_mctx, + isc_mem_free(named_g_mctx, ((ldap_instance_t *)dbdata)->user); if (((ldap_instance_t *)dbdata)->cred != NULL) - isc_mem_free(ns_g_mctx, + isc_mem_free(named_g_mctx, ((ldap_instance_t *)dbdata)->cred); - isc_mem_put(ns_g_mctx, dbdata, sizeof(ldap_instance_t)); + isc_mem_put(named_g_mctx, dbdata, sizeof(ldap_instance_t)); } } @@ -1311,7 +1311,7 @@ dlz_ldap_init(void) { result = dns_sdlzregister("ldap", &dlz_ldap_methods, NULL, DNS_SDLZFLAG_RELATIVEOWNER | DNS_SDLZFLAG_RELATIVERDATA, - ns_g_mctx, &dlz_ldap); + named_g_mctx, &dlz_ldap); if (result != ISC_R_SUCCESS) { UNEXPECTED_ERROR(__FILE__, __LINE__, "dns_sdlzregister() failed: %s", diff --git a/contrib/dlz/drivers/dlz_mysql_driver.c b/contrib/dlz/drivers/dlz_mysql_driver.c index e7ac52b241..227504877b 100644 --- a/contrib/dlz/drivers/dlz_mysql_driver.c +++ b/contrib/dlz/drivers/dlz_mysql_driver.c @@ -101,7 +101,7 @@ mysqldrv_escape_string(MYSQL *mysql, const char *instr) { len = strlen(instr); - outstr = isc_mem_allocate(ns_g_mctx ,(2 * len * sizeof(char)) + 1); + outstr = isc_mem_allocate(named_g_mctx ,(2 * len * sizeof(char)) + 1); if (outstr == NULL) return NULL; @@ -267,22 +267,22 @@ mysql_get_resultset(const char *zone, const char *record, */ switch(query) { case ALLNODES: - querystring = build_querystring(ns_g_mctx, dbi->allnodes_q); + querystring = build_querystring(named_g_mctx, dbi->allnodes_q); break; case ALLOWXFR: - querystring = build_querystring(ns_g_mctx, dbi->allowxfr_q); + querystring = build_querystring(named_g_mctx, dbi->allowxfr_q); break; case AUTHORITY: - querystring = build_querystring(ns_g_mctx, dbi->authority_q); + querystring = build_querystring(named_g_mctx, dbi->authority_q); break; case FINDZONE: - querystring = build_querystring(ns_g_mctx, dbi->findzone_q); + querystring = build_querystring(named_g_mctx, dbi->findzone_q); break; case COUNTZONE: - querystring = build_querystring(ns_g_mctx, dbi->countzone_q); + querystring = build_querystring(named_g_mctx, dbi->countzone_q); break; case LOOKUP: - querystring = build_querystring(ns_g_mctx, dbi->lookup_q); + querystring = build_querystring(named_g_mctx, dbi->lookup_q); break; default: /* @@ -340,19 +340,19 @@ mysql_get_resultset(const char *zone, const char *record, /* free dbi->zone string */ if (dbi->zone != NULL) - isc_mem_free(ns_g_mctx, dbi->zone); + isc_mem_free(named_g_mctx, dbi->zone); /* free dbi->record string */ if (dbi->record != NULL) - isc_mem_free(ns_g_mctx, dbi->record); + isc_mem_free(named_g_mctx, dbi->record); /* free dbi->client string */ if (dbi->client != NULL) - isc_mem_free(ns_g_mctx, dbi->client); + isc_mem_free(named_g_mctx, dbi->client); /* release query string */ if (querystring != NULL) - isc_mem_free(ns_g_mctx, querystring); + isc_mem_free(named_g_mctx, querystring); /* return result */ return result; @@ -427,7 +427,7 @@ mysql_process_rs(dns_sdlzlookup_t *lookup, MYSQL_RES *rs) * allocate string memory, allow for NULL to * term string */ - tmpString = isc_mem_allocate(ns_g_mctx, len + 1); + tmpString = isc_mem_allocate(named_g_mctx, len + 1); if (tmpString == NULL) { /* major bummer, need more ram */ isc_log_write(dns_lctx, @@ -464,7 +464,7 @@ mysql_process_rs(dns_sdlzlookup_t *lookup, MYSQL_RES *rs) result = dns_sdlz_putrr(lookup, safeGet(row[1]), ttl, tmpString); /* done, get rid of this thing. */ - isc_mem_free(ns_g_mctx, tmpString); + isc_mem_free(named_g_mctx, tmpString); } /* I sure hope we were successful */ if (result != ISC_R_SUCCESS) { @@ -655,7 +655,7 @@ mysql_allnodes(const char *zone, void *driverarg, void *dbdata, len += strlen(safeGet(row[j])) + 1; } /* allocate memory, allow for NULL to term string */ - tmpString = isc_mem_allocate(ns_g_mctx, len + 1); + tmpString = isc_mem_allocate(named_g_mctx, len + 1); if (tmpString == NULL) { /* we need more ram. */ isc_log_write(dns_lctx, DNS_LOGCATEGORY_DATABASE, @@ -677,7 +677,7 @@ mysql_allnodes(const char *zone, void *driverarg, void *dbdata, result = dns_sdlz_putnamedrr(allnodes, safeGet(row[2]), safeGet(row[1]), ttl, tmpString); - isc_mem_free(ns_g_mctx, tmpString); + isc_mem_free(named_g_mctx, tmpString); } /* if we weren't successful, log err msg */ if (result != ISC_R_SUCCESS) { @@ -837,34 +837,34 @@ mysql_create(const char *dlzname, unsigned int argc, char *argv[], DNS_LOGMODULE_DLZ, ISC_LOG_ERROR, "Mysql driver port " "must be a positive number."); - isc_mem_free(ns_g_mctx, tmp); + isc_mem_free(named_g_mctx, tmp); result = ISC_R_FAILURE; goto full_cleanup; } - isc_mem_free(ns_g_mctx, tmp); + isc_mem_free(named_g_mctx, tmp); } /* how many queries were passed in from config file? */ switch(argc) { case 4: - result = build_sqldbinstance(ns_g_mctx, NULL, NULL, NULL, + result = build_sqldbinstance(named_g_mctx, NULL, NULL, NULL, argv[2], argv[3], NULL, &dbi); break; case 5: - result = build_sqldbinstance(ns_g_mctx, NULL, NULL, argv[4], + result = build_sqldbinstance(named_g_mctx, NULL, NULL, argv[4], argv[2], argv[3], NULL, &dbi); break; case 6: - result = build_sqldbinstance(ns_g_mctx, argv[5], NULL, argv[4], + result = build_sqldbinstance(named_g_mctx, argv[5], NULL, argv[4], argv[2], argv[3], NULL, &dbi); break; case 7: - result = build_sqldbinstance(ns_g_mctx, argv[5], + result = build_sqldbinstance(named_g_mctx, argv[5], argv[6], argv[4], argv[2], argv[3], NULL, &dbi); break; case 8: - result = build_sqldbinstance(ns_g_mctx, argv[5], + result = build_sqldbinstance(named_g_mctx, argv[5], argv[6], argv[4], argv[2], argv[3], argv[7], &dbi); break; @@ -900,21 +900,21 @@ mysql_create(const char *dlzname, unsigned int argc, char *argv[], if (tmp != NULL) { if (strcasecmp(tmp, "true") == 0) flags = CLIENT_COMPRESS; - isc_mem_free(ns_g_mctx, tmp); + isc_mem_free(named_g_mctx, tmp); } tmp = getParameterValue(argv[1], "ssl="); if (tmp != NULL) { if (strcasecmp(tmp, "true") == 0) flags = flags | CLIENT_SSL; - isc_mem_free(ns_g_mctx, tmp); + isc_mem_free(named_g_mctx, tmp); } tmp = getParameterValue(argv[1], "space="); if (tmp != NULL) { if (strcasecmp(tmp, "ignore") == 0) flags = flags | CLIENT_IGNORE_SPACE; - isc_mem_free(ns_g_mctx, tmp); + isc_mem_free(named_g_mctx, tmp); } dbc = NULL; @@ -963,15 +963,15 @@ mysql_create(const char *dlzname, unsigned int argc, char *argv[], cleanup: if (dbname != NULL) - isc_mem_free(ns_g_mctx, dbname); + isc_mem_free(named_g_mctx, dbname); if (host != NULL) - isc_mem_free(ns_g_mctx, host); + isc_mem_free(named_g_mctx, host); if (user != NULL) - isc_mem_free(ns_g_mctx, user); + isc_mem_free(named_g_mctx, user); if (pass != NULL) - isc_mem_free(ns_g_mctx, pass); + isc_mem_free(named_g_mctx, pass); if (socket != NULL) - isc_mem_free(ns_g_mctx, socket); + isc_mem_free(named_g_mctx, socket); return result; @@ -1045,7 +1045,7 @@ dlz_mysql_init(void) { DNS_SDLZFLAG_RELATIVEOWNER | DNS_SDLZFLAG_RELATIVERDATA | DNS_SDLZFLAG_THREADSAFE, - ns_g_mctx, &dlz_mysql); + named_g_mctx, &dlz_mysql); /* if we can't register the driver, there are big problems. */ if (result != ISC_R_SUCCESS) { UNEXPECTED_ERROR(__FILE__, __LINE__, diff --git a/contrib/dlz/drivers/dlz_odbc_driver.c b/contrib/dlz/drivers/dlz_odbc_driver.c index 27a8526101..2f1dba9aa1 100644 --- a/contrib/dlz/drivers/dlz_odbc_driver.c +++ b/contrib/dlz/drivers/dlz_odbc_driver.c @@ -172,13 +172,13 @@ destroy_odbc_instance(odbc_instance_t *odbc_inst) { } /* free memory that held connection & statement. */ - isc_mem_free(ns_g_mctx, dbi->dbconn); + isc_mem_free(named_g_mctx, dbi->dbconn); } /* release all memory that comprised a DBI */ destroy_sqldbinstance(dbi); } /* release memory for the list structure */ - isc_mem_put(ns_g_mctx, odbc_inst->db, sizeof(db_list_t)); + isc_mem_put(named_g_mctx, odbc_inst->db, sizeof(db_list_t)); #else /* ISC_PLATFORM_USETHREADS */ @@ -198,7 +198,7 @@ destroy_odbc_instance(odbc_instance_t *odbc_inst) { } /* free mem for the odbc_db_t structure held in db */ if (((odbc_db_t *) odbc_inst->db->dbconn) != NULL) { - isc_mem_free(ns_g_mctx, odbc_inst->db->dbconn); + isc_mem_free(named_g_mctx, odbc_inst->db->dbconn); odbc_inst->db->dbconn = NULL; } @@ -214,15 +214,15 @@ destroy_odbc_instance(odbc_instance_t *odbc_inst) { /* free ODBC instance strings */ if (odbc_inst->dsn != NULL) - isc_mem_free(ns_g_mctx, odbc_inst->dsn); + isc_mem_free(named_g_mctx, odbc_inst->dsn); if (odbc_inst->pass != NULL) - isc_mem_free(ns_g_mctx, odbc_inst->pass); + isc_mem_free(named_g_mctx, odbc_inst->pass); if (odbc_inst->user != NULL) - isc_mem_free(ns_g_mctx, odbc_inst->user); + isc_mem_free(named_g_mctx, odbc_inst->user); /* free memory for odbc_inst */ if (odbc_inst != NULL) - isc_mem_put(ns_g_mctx, odbc_inst, sizeof(odbc_instance_t)); + isc_mem_put(named_g_mctx, odbc_inst, sizeof(odbc_instance_t)); } @@ -251,7 +251,7 @@ odbc_connect(odbc_instance_t *dbi, odbc_db_t **dbc) { ndb->dbc = NULL; } } else { - ndb = isc_mem_allocate(ns_g_mctx, sizeof(odbc_db_t)); + ndb = isc_mem_allocate(named_g_mctx, sizeof(odbc_db_t)); if (ndb == NULL) { isc_log_write(dns_lctx, DNS_LOGCATEGORY_DATABASE, DNS_LOGMODULE_DLZ, ISC_LOG_ERROR, @@ -310,7 +310,7 @@ odbc_connect(odbc_instance_t *dbi, odbc_db_t **dbc) { ndb->dbc = NULL; } /* free memory holding ndb */ - isc_mem_free(ns_g_mctx, ndb); + isc_mem_free(named_g_mctx, ndb); } return result; @@ -382,7 +382,7 @@ odbc_escape_string(const char *instr) { len = strlen(instr); - outstr = isc_mem_allocate(ns_g_mctx ,(2 * len * sizeof(char)) + 1); + outstr = isc_mem_allocate(named_g_mctx ,(2 * len * sizeof(char)) + 1); if (outstr == NULL) return NULL; @@ -614,19 +614,19 @@ odbc_get_resultset(const char *zone, const char *record, */ switch(query) { case ALLNODES: - querystring = build_querystring(ns_g_mctx, dbi->allnodes_q); + querystring = build_querystring(named_g_mctx, dbi->allnodes_q); break; case ALLOWXFR: - querystring = build_querystring(ns_g_mctx, dbi->allowxfr_q); + querystring = build_querystring(named_g_mctx, dbi->allowxfr_q); break; case AUTHORITY: - querystring = build_querystring(ns_g_mctx, dbi->authority_q); + querystring = build_querystring(named_g_mctx, dbi->authority_q); break; case FINDZONE: - querystring = build_querystring(ns_g_mctx, dbi->findzone_q); + querystring = build_querystring(named_g_mctx, dbi->findzone_q); break; case LOOKUP: - querystring = build_querystring(ns_g_mctx, dbi->lookup_q); + querystring = build_querystring(named_g_mctx, dbi->lookup_q); break; default: /* @@ -688,15 +688,15 @@ odbc_get_resultset(const char *zone, const char *record, /* free dbi->zone string */ if (dbi->zone != NULL) - isc_mem_free(ns_g_mctx, dbi->zone); + isc_mem_free(named_g_mctx, dbi->zone); /* free dbi->record string */ if (dbi->record != NULL) - isc_mem_free(ns_g_mctx, dbi->record); + isc_mem_free(named_g_mctx, dbi->record); /* free dbi->client string */ if (dbi->client != NULL) - isc_mem_free(ns_g_mctx, dbi->client); + isc_mem_free(named_g_mctx, dbi->client); #ifdef ISC_PLATFORM_USETHREADS @@ -708,7 +708,7 @@ odbc_get_resultset(const char *zone, const char *record, /* release query string */ if (querystring != NULL) - isc_mem_free(ns_g_mctx, querystring ); + isc_mem_free(named_g_mctx, querystring ); /* return result */ return result; @@ -719,7 +719,7 @@ odbc_get_resultset(const char *zone, const char *record, * Gets a single field from the ODBC statement. The memory for the * returned data is dynamically allocated. If this method is successful * it is the reponsibility of the caller to free the memory using - * isc_mem_free(ns_g_mctx, *ptr); + * isc_mem_free(named_g_mctx, *ptr); */ static isc_result_t @@ -731,12 +731,12 @@ odbc_getField(SQLHSTMT *stmnt, SQLSMALLINT field, char **data) { if (sqlOK(SQLColAttribute(stmnt, field, SQL_DESC_DISPLAY_SIZE, NULL, 0, NULL, &size)) && size > 0) { - *data = isc_mem_allocate(ns_g_mctx, size + 1); + *data = isc_mem_allocate(named_g_mctx, size + 1); if (data != NULL) { if (sqlOK(SQLGetData(stmnt, field, SQL_C_CHAR, *data, size + 1,&size))) return ISC_R_SUCCESS; - isc_mem_free(ns_g_mctx, *data); + isc_mem_free(named_g_mctx, *data); } } return ISC_R_FAILURE; @@ -746,7 +746,7 @@ odbc_getField(SQLHSTMT *stmnt, SQLSMALLINT field, char **data) { * Gets multiple fields from the ODBC statement. The memory for the * returned data is dynamically allocated. If this method is successful * it is the reponsibility of the caller to free the memory using - * isc_mem_free(ns_g_mctx, *ptr); + * isc_mem_free(named_g_mctx, *ptr); */ static isc_result_t @@ -776,7 +776,7 @@ odbc_getManyFields(SQLHSTMT *stmnt, SQLSMALLINT startField, return ISC_R_FAILURE; /* allow for a "\n" at the end of the string/ */ - data = isc_mem_allocate(ns_g_mctx, ++totSize); + data = isc_mem_allocate(named_g_mctx, ++totSize); if (data == NULL) return ISC_R_NOMEMORY; @@ -793,13 +793,13 @@ odbc_getManyFields(SQLHSTMT *stmnt, SQLSMALLINT startField, result = ISC_R_SUCCESS; } } else { - isc_mem_free(ns_g_mctx, data); + isc_mem_free(named_g_mctx, data); return ISC_R_FAILURE; } } if (result != ISC_R_SUCCESS) { - isc_mem_free(ns_g_mctx, data); + isc_mem_free(named_g_mctx, data); return result; } @@ -914,11 +914,11 @@ odbc_process_rs(dns_sdlzlookup_t *lookup, dbinstance_t *dbi) /* clean up mem */ if (ttl_s != NULL) - isc_mem_free(ns_g_mctx, ttl_s); + isc_mem_free(named_g_mctx, ttl_s); if (type != NULL) - isc_mem_free(ns_g_mctx, type); + isc_mem_free(named_g_mctx, type); if (data != NULL) - isc_mem_free(ns_g_mctx, data); + isc_mem_free(named_g_mctx, data); /* I sure hope we were successful */ if (result != ISC_R_SUCCESS) { @@ -1142,13 +1142,13 @@ odbc_allnodes(const char *zone, void *driverarg, void *dbdata, /* clean up mem */ if (ttl_s != NULL) - isc_mem_free(ns_g_mctx, ttl_s); + isc_mem_free(named_g_mctx, ttl_s); if (type != NULL) - isc_mem_free(ns_g_mctx, type); + isc_mem_free(named_g_mctx, type); if (host != NULL) - isc_mem_free(ns_g_mctx, host); + isc_mem_free(named_g_mctx, host); if (data != NULL) - isc_mem_free(ns_g_mctx, data); + isc_mem_free(named_g_mctx, data); /* if we weren't successful, log err msg */ if (result != ISC_R_SUCCESS) { @@ -1310,7 +1310,7 @@ odbc_create(const char *dlzname, unsigned int argc, char *argv[], #endif /* ISC_PLATFORM_USETHREADS */ /* allocate memory for odbc instance */ - odbc_inst = isc_mem_get(ns_g_mctx, sizeof(odbc_instance_t)); + odbc_inst = isc_mem_get(named_g_mctx, sizeof(odbc_instance_t)); if (odbc_inst == NULL) return (ISC_R_NOMEMORY); memset(odbc_inst, 0, sizeof(odbc_instance_t)); @@ -1364,7 +1364,7 @@ odbc_create(const char *dlzname, unsigned int argc, char *argv[], #ifdef ISC_PLATFORM_USETHREADS /* allocate memory for database connection list */ - odbc_inst->db = isc_mem_get(ns_g_mctx, sizeof(db_list_t)); + odbc_inst->db = isc_mem_get(named_g_mctx, sizeof(db_list_t)); if (odbc_inst->db == NULL) { result = ISC_R_NOMEMORY; goto cleanup; @@ -1383,22 +1383,22 @@ odbc_create(const char *dlzname, unsigned int argc, char *argv[], /* how many queries were passed in from config file? */ switch(argc) { case 5: - result = build_sqldbinstance(ns_g_mctx, NULL, NULL, + result = build_sqldbinstance(named_g_mctx, NULL, NULL, NULL, argv[3], argv[4], NULL, &db); break; case 6: - result = build_sqldbinstance(ns_g_mctx, NULL, NULL, + result = build_sqldbinstance(named_g_mctx, NULL, NULL, argv[5], argv[3], argv[4], NULL, &db); break; case 7: - result = build_sqldbinstance(ns_g_mctx, argv[6], NULL, + result = build_sqldbinstance(named_g_mctx, argv[6], NULL, argv[5], argv[3], argv[4], NULL, &db); break; case 8: - result = build_sqldbinstance(ns_g_mctx, argv[6], + result = build_sqldbinstance(named_g_mctx, argv[6], argv[7], argv[5], argv[3], argv[4], NULL, &db); break; @@ -1538,7 +1538,7 @@ dlz_odbc_init(void) { DNS_SDLZFLAG_RELATIVEOWNER | DNS_SDLZFLAG_RELATIVERDATA | DNS_SDLZFLAG_THREADSAFE, - ns_g_mctx, &dlz_odbc); + named_g_mctx, &dlz_odbc); /* if we can't register the driver, there are big problems. */ if (result != ISC_R_SUCCESS) { UNEXPECTED_ERROR(__FILE__, __LINE__, diff --git a/contrib/dlz/drivers/dlz_postgres_driver.c b/contrib/dlz/drivers/dlz_postgres_driver.c index 7fc9ee370f..349e96c1c1 100644 --- a/contrib/dlz/drivers/dlz_postgres_driver.c +++ b/contrib/dlz/drivers/dlz_postgres_driver.c @@ -178,7 +178,7 @@ postgres_destroy_dblist(db_list_t *dblist) destroy_sqldbinstance(dbi); } /* release memory for the list structure */ - isc_mem_put(ns_g_mctx, dblist, sizeof(db_list_t)); + isc_mem_put(named_g_mctx, dblist, sizeof(db_list_t)); } /*% @@ -246,7 +246,7 @@ postgres_escape_string(const char *instr) { len = strlen(instr); - outstr = isc_mem_allocate(ns_g_mctx ,(2 * len * sizeof(char)) + 1); + outstr = isc_mem_allocate(named_g_mctx ,(2 * len * sizeof(char)) + 1); if (outstr == NULL) return NULL; @@ -465,19 +465,19 @@ postgres_get_resultset(const char *zone, const char *record, */ switch(query) { case ALLNODES: - querystring = build_querystring(ns_g_mctx, dbi->allnodes_q); + querystring = build_querystring(named_g_mctx, dbi->allnodes_q); break; case ALLOWXFR: - querystring = build_querystring(ns_g_mctx, dbi->allowxfr_q); + querystring = build_querystring(named_g_mctx, dbi->allowxfr_q); break; case AUTHORITY: - querystring = build_querystring(ns_g_mctx, dbi->authority_q); + querystring = build_querystring(named_g_mctx, dbi->authority_q); break; case FINDZONE: - querystring = build_querystring(ns_g_mctx, dbi->findzone_q); + querystring = build_querystring(named_g_mctx, dbi->findzone_q); break; case LOOKUP: - querystring = build_querystring(ns_g_mctx, dbi->lookup_q); + querystring = build_querystring(named_g_mctx, dbi->lookup_q); break; default: /* @@ -589,15 +589,15 @@ postgres_get_resultset(const char *zone, const char *record, /* free dbi->zone string */ if (dbi->zone != NULL) - isc_mem_free(ns_g_mctx, dbi->zone); + isc_mem_free(named_g_mctx, dbi->zone); /* free dbi->record string */ if (dbi->record != NULL) - isc_mem_free(ns_g_mctx, dbi->record); + isc_mem_free(named_g_mctx, dbi->record); /* free dbi->client string */ if (dbi->client != NULL) - isc_mem_free(ns_g_mctx, dbi->client); + isc_mem_free(named_g_mctx, dbi->client); #ifdef ISC_PLATFORM_USETHREADS @@ -615,7 +615,7 @@ postgres_get_resultset(const char *zone, const char *record, /* release query string */ if (querystring != NULL) - isc_mem_free(ns_g_mctx, querystring ); + isc_mem_free(named_g_mctx, querystring ); #if 0 /* temporary logging message */ @@ -696,7 +696,7 @@ postgres_process_rs(dns_sdlzlookup_t *lookup, PGresult *rs) * allocate string memory, allow for NULL to * term string */ - tmpString = isc_mem_allocate(ns_g_mctx, len + 1); + tmpString = isc_mem_allocate(named_g_mctx, len + 1); if (tmpString == NULL) { /* major bummer, need more ram */ isc_log_write(dns_lctx, @@ -731,7 +731,7 @@ postgres_process_rs(dns_sdlzlookup_t *lookup, PGresult *rs) result = dns_sdlz_putrr(lookup, PQgetvalue(rs, i, 1), ttl, tmpString); /* done, get rid of this thing. */ - isc_mem_free(ns_g_mctx, tmpString); + isc_mem_free(named_g_mctx, tmpString); } /* I sure hope we were successful */ if (result != ISC_R_SUCCESS) { @@ -926,7 +926,7 @@ postgres_allnodes(const char *zone, void *driverarg, void *dbdata, len += strlen(PQgetvalue(rs, i, j)) + 1; } /* allocate memory, allow for NULL to term string */ - tmpString = isc_mem_allocate(ns_g_mctx, len + 1); + tmpString = isc_mem_allocate(named_g_mctx, len + 1); if (tmpString == NULL) { /* we need more ram. */ isc_log_write(dns_lctx, DNS_LOGCATEGORY_DATABASE, @@ -949,7 +949,7 @@ postgres_allnodes(const char *zone, void *driverarg, void *dbdata, PQgetvalue(rs, i, 2), PQgetvalue(rs, i, 1), ttl, tmpString); - isc_mem_free(ns_g_mctx, tmpString); + isc_mem_free(named_g_mctx, tmpString); } /* if we weren't successful, log err msg */ if (result != ISC_R_SUCCESS) { @@ -1118,7 +1118,7 @@ postgres_create(const char *dlzname, unsigned int argc, char *argv[], } /* allocate memory for database connection list */ - dblist = isc_mem_get(ns_g_mctx, sizeof(db_list_t)); + dblist = isc_mem_get(named_g_mctx, sizeof(db_list_t)); if (dblist == NULL) return (ISC_R_NOMEMORY); @@ -1136,22 +1136,22 @@ postgres_create(const char *dlzname, unsigned int argc, char *argv[], /* how many queries were passed in from config file? */ switch(argc) { case 5: - result = build_sqldbinstance(ns_g_mctx, NULL, NULL, + result = build_sqldbinstance(named_g_mctx, NULL, NULL, NULL, argv[3], argv[4], NULL, &dbi); break; case 6: - result = build_sqldbinstance(ns_g_mctx, NULL, NULL, + result = build_sqldbinstance(named_g_mctx, NULL, NULL, argv[5], argv[3], argv[4], NULL, &dbi); break; case 7: - result = build_sqldbinstance(ns_g_mctx, argv[6], NULL, + result = build_sqldbinstance(named_g_mctx, argv[6], NULL, argv[5], argv[3], argv[4], NULL, &dbi); break; case 8: - result = build_sqldbinstance(ns_g_mctx, argv[6], + result = build_sqldbinstance(named_g_mctx, argv[6], argv[7], argv[5], argv[3], argv[4], NULL, &dbi); break; @@ -1347,7 +1347,7 @@ dlz_postgres_init(void) { DNS_SDLZFLAG_RELATIVEOWNER | DNS_SDLZFLAG_RELATIVERDATA | DNS_SDLZFLAG_THREADSAFE, - ns_g_mctx, &dlz_postgres); + named_g_mctx, &dlz_postgres); /* if we can't register the driver, there are big problems. */ if (result != ISC_R_SUCCESS) { UNEXPECTED_ERROR(__FILE__, __LINE__, diff --git a/contrib/dlz/drivers/dlz_stub_driver.c b/contrib/dlz/drivers/dlz_stub_driver.c index f873c1ea36..013431191a 100644 --- a/contrib/dlz/drivers/dlz_stub_driver.c +++ b/contrib/dlz/drivers/dlz_stub_driver.c @@ -210,35 +210,35 @@ stub_dlz_create(const char *dlzname, unsigned int argc, char *argv[], "Zone: %s, Name: %s IP: %s", dlzname, argv[1], argv[2], argv[3]); - cd = isc_mem_get(ns_g_mctx, sizeof(config_data_t)); + cd = isc_mem_get(named_g_mctx, sizeof(config_data_t)); if ((cd) == NULL) { return (ISC_R_NOMEMORY); } memset(cd, 0, sizeof(config_data_t)); - cd->myzone = isc_mem_strdup(ns_g_mctx, argv[1]); + cd->myzone = isc_mem_strdup(named_g_mctx, argv[1]); if (cd->myzone == NULL) { - isc_mem_put(ns_g_mctx, cd, sizeof(config_data_t)); + isc_mem_put(named_g_mctx, cd, sizeof(config_data_t)); return (ISC_R_NOMEMORY); } - cd->myname = isc_mem_strdup(ns_g_mctx, argv[2]); + cd->myname = isc_mem_strdup(named_g_mctx, argv[2]); if (cd->myname == NULL) { - isc_mem_put(ns_g_mctx, cd, sizeof(config_data_t)); - isc_mem_free(ns_g_mctx, cd->myzone); + isc_mem_put(named_g_mctx, cd, sizeof(config_data_t)); + isc_mem_free(named_g_mctx, cd->myzone); return (ISC_R_NOMEMORY); } - cd->myip = isc_mem_strdup(ns_g_mctx, argv[3]); + cd->myip = isc_mem_strdup(named_g_mctx, argv[3]); if (cd->myip == NULL) { - isc_mem_put(ns_g_mctx, cd, sizeof(config_data_t)); - isc_mem_free(ns_g_mctx, cd->myname); - isc_mem_free(ns_g_mctx, cd->myzone); + isc_mem_put(named_g_mctx, cd, sizeof(config_data_t)); + isc_mem_free(named_g_mctx, cd->myname); + isc_mem_free(named_g_mctx, cd->myzone); return (ISC_R_NOMEMORY); } - isc_mem_attach(ns_g_mctx, &cd->mctx); + isc_mem_attach(named_g_mctx, &cd->mctx); *dbdata = cd; @@ -262,9 +262,9 @@ stub_dlz_destroy(void *driverarg, void *dbdata) DNS_LOGMODULE_DLZ, ISC_LOG_DEBUG(2), "Unloading DLZ_stub driver."); - isc_mem_free(ns_g_mctx, cd->myzone); - isc_mem_free(ns_g_mctx, cd->myname); - isc_mem_free(ns_g_mctx, cd->myip); + isc_mem_free(named_g_mctx, cd->myzone); + isc_mem_free(named_g_mctx, cd->myname); + isc_mem_free(named_g_mctx, cd->myip); mctx = cd->mctx; isc_mem_put(mctx, cd, sizeof(config_data_t)); isc_mem_detach(&mctx); @@ -304,7 +304,7 @@ dlz_stub_init(void) { result = dns_sdlzregister("dlz_stub", &dlz_stub_methods, NULL, DNS_SDLZFLAG_RELATIVEOWNER | DNS_SDLZFLAG_RELATIVERDATA, - ns_g_mctx, &dlz_stub); + named_g_mctx, &dlz_stub); if (result != ISC_R_SUCCESS) { UNEXPECTED_ERROR(__FILE__, __LINE__, "dns_sdlzregister() failed: %s", diff --git a/contrib/dlz/drivers/include/dlz/sdlz_helper.h b/contrib/dlz/drivers/include/dlz/sdlz_helper.h index 764a05af7c..c623fcadc8 100644 --- a/contrib/dlz/drivers/include/dlz/sdlz_helper.h +++ b/contrib/dlz/drivers/include/dlz/sdlz_helper.h @@ -112,6 +112,6 @@ sdlzh_get_parameter_value(isc_mem_t *mctx, const char *input, const char* key); #define build_sqldbinstance sdlzh_build_sqldbinstance #define destroy_sqldbinstance sdlzh_destroy_sqldbinstance -#define getParameterValue(x,y) sdlzh_get_parameter_value(ns_g_mctx, (x), (y)) +#define getParameterValue(x,y) sdlzh_get_parameter_value(named_g_mctx, (x), (y)) #endif /* SDLZHELPER_H */ diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml index 2dd26d9671..71eef5405c 100644 --- a/doc/arm/Bv9ARM-book.xml +++ b/doc/arm/Bv9ARM-book.xml @@ -242,8 +242,8 @@ resolver library, which sends queries to one or more name servers and interprets the responses. The BIND 9 software distribution - contains a name server, named, and a - resolver library, liblwres. + contains a name server, named, and a set + of associated tools. @@ -2466,62 +2466,6 @@ $ORIGIN 0.0.0.0.0.0.0.0.8.b.d.0.1.0.0.2.ip6.arpa. that is distinct from and simpler than the full DNS protocol. -
Running a Resolver Daemon - - - To use the lightweight resolver interface, the system must - run the resolver daemon lwresd or a - local - name server configured with a lwres - statement. - - - - By default, applications using the lightweight resolver library will - make - UDP requests to the IPv4 loopback address (127.0.0.1) on port 921. - The - address can be overridden by lwserver - lines in - /etc/resolv.conf. - - - - The daemon currently only looks in the DNS, but in the future - it may use other sources such as /etc/hosts, - NIS, etc. - - - - The lwresd daemon is essentially a - caching-only name server that responds to requests using the - lightweight - resolver protocol rather than the DNS protocol. Because it needs - to run on each host, it is designed to require no or minimal - configuration. - Unless configured otherwise, it uses the name servers listed on - nameserver lines in /etc/resolv.conf - as forwarders, but is also capable of doing the resolution - autonomously if - none are specified. - - - The lwresd daemon may also be - configured with a - named.conf style configuration file, - in - /etc/lwresd.conf by default. A name - server may also - be configured to act as a lightweight resolver daemon using the - lwres statement in named.conf. - - - The number of client queries that the lwresd - daemon is able to serve can be set using the - and - statements in the configuration. - -
<acronym>BIND</acronym> 9 Configuration Reference @@ -3213,17 +3157,6 @@ $ORIGIN 0.0.0.0.0.0.0.0.8.b.d.0.1.0.0.2.ip6.arpa. - - - lwres - - - - configures named to - also act as a light-weight resolver daemon (lwresd). - - - masters @@ -4280,106 +4213,6 @@ badresp:1,adberr:0,findfail:0,valfail:0] -
<command>lwres</command> Statement Grammar - - - This is the grammar of the lwres - statement in the named.conf file: - - -lwres { - [ listen-on { - ( ip_addr [ port ip_port ] [ dscp ip_dscp ] ; ) - ... - }; ] - [ view view_name; ] - [ search { domain_name ; ... }; ] - [ ndots number; ] - [ lwres-tasks number; ] - [ lwres-clients number; ] -}; - - -
-
<command>lwres</command> Statement Definition and Usage - - - The lwres statement configures the - name - server to also act as a lightweight resolver server. (See - .) There may be multiple - lwres statements configuring - lightweight resolver servers with different properties. - - - - The listen-on statement specifies a - list of - IPv4 addresses (and ports) that this instance of a lightweight - resolver daemon - should accept requests on. If no port is specified, port 921 is - used. - If this statement is omitted, requests will be accepted on - 127.0.0.1, - port 921. - - - - The view statement binds this - instance of a - lightweight resolver daemon to a view in the DNS namespace, so that - the - response will be constructed in the same manner as a normal DNS - query - matching this view. If this statement is omitted, the default view - is - used, and if there is no default view, an error is triggered. - - - - The search statement is equivalent to - the - search statement in - /etc/resolv.conf. It provides a - list of domains - which are appended to relative names in queries. - - - - The ndots statement is equivalent to - the - ndots statement in - /etc/resolv.conf. It indicates the - minimum - number of dots in a relative domain name that should result in an - exact match lookup before search path elements are appended. - - - The statement specifies the number - of worker threads the lightweight resolver will dedicate to serving - clients. By default the number is the same as the number of CPUs on - the system; this can be overridden using the - command line option when starting the server. - - - The specifies - the number of client objects per thread the lightweight - resolver should create to serve client queries. - By default, if the lightweight resolver runs as a part - of named, 256 client objects are - created for each task; if it runs as lwresd, - 1024 client objects are created for each thread. The maximum - value is 32768; higher values will be silently ignored and - the maximum will be used instead. - Note that setting too high a value may overconsume - system resources. - - - The maximum number of client queries that the lightweight - resolver can handle at any one time equals - times . - -
<command>masters</command> Statement Grammar @@ -18668,7 +18501,6 @@ allow-query { !{ !10/8; any; }; key example; }; - diff --git a/doc/arm/man.lwresd.html b/doc/arm/man.lwresd.html deleted file mode 100644 index 024d7b2040..0000000000 --- a/doc/arm/man.lwresd.html +++ /dev/null @@ -1,334 +0,0 @@ - - - - - -lwresd - - - - - - - -
- - - - - - - -
lwresd
-Prev Manual pages Next -
-
-
-
-
- - - - - -
-

Name

-

- lwresd - — lightweight resolver daemon -

-
- - - -
-

Synopsis

-

- lwresd - [-c config-file] - [-C config-file] - [-d debug-level] - [-f] - [-g] - [-i pid-file] - [-m flag] - [-n #cpus] - [-P port] - [-p port] - [-s] - [-t directory] - [-u user] - [-v] - [ - [-4] - | [-6] - ] -

-
- -
-

DESCRIPTION

- - -

lwresd - is the daemon providing name lookup - services to clients that use the BIND 9 lightweight resolver - library. It is essentially a stripped-down, caching-only name - server that answers queries using the BIND 9 lightweight - resolver protocol rather than the DNS protocol. -

- -

lwresd - listens for resolver queries on a - UDP port on the IPv4 loopback interface, 127.0.0.1. This - means that lwresd can only be used by - processes running on the local machine. By default, UDP port - number 921 is used for lightweight resolver requests and - responses. -

-

- Incoming lightweight resolver requests are decoded by the - server which then resolves them using the DNS protocol. When - the DNS lookup completes, lwresd encodes - the answers in the lightweight resolver format and returns - them to the client that made the request. -

-

- If /etc/resolv.conf contains any - nameserver entries, lwresd - sends recursive DNS queries to those servers. This is similar - to the use of forwarders in a caching name server. If no - nameserver entries are present, or if - forwarding fails, lwresd resolves the - queries autonomously starting at the root name servers, using - a built-in list of root server hints. -

-
- -
-

OPTIONS

- - -
-
-4
-
-

- Use IPv4 only even if the host machine is capable of IPv6. - -4 and -6 are mutually - exclusive. -

-
-
-6
-
-

- Use IPv6 only even if the host machine is capable of IPv4. - -4 and -6 are mutually - exclusive. -

-
-
-c config-file
-
-

- Use config-file as the - configuration file instead of the default, - /etc/lwresd.conf. - - -c can not be used with -C. -

-
-
-C config-file
-
-

- Use config-file as the - configuration file instead of the default, - /etc/resolv.conf. - -C can not be used with -c. -

-
-
-d debug-level
-
-

- Set the daemon's debug level to debug-level. - Debugging traces from lwresd become - more verbose as the debug level increases. -

-
-
-f
-
-

- Run the server in the foreground (i.e. do not daemonize). -

-
-
-g
-
-

- Run the server in the foreground and force all logging - to stderr. -

-
-
-i pid-file
-
-

- Use pid-file as the - PID file instead of the default, - /var/run/lwresd/lwresd.pid. -

-
-
-m flag
-
-

- Turn on memory usage debugging flags. Possible flags are - usage, - trace, - record, - size, and - mctx. - These correspond to the ISC_MEM_DEBUGXXXX flags described in - <isc/mem.h>. -

-
-
-n #cpus
-
-

- Create #cpus worker threads - to take advantage of multiple CPUs. If not specified, - lwresd will try to determine the - number of CPUs present and create one thread per CPU. - If it is unable to determine the number of CPUs, a - single worker thread will be created. -

-
-
-P port
-
-

- Listen for lightweight resolver queries on port - port. If - not specified, the default is port 921. -

-
-
-p port
-
-

- Send DNS lookups to port port. If not - specified, the default is port 53. This provides a - way of testing the lightweight resolver daemon with a - name server that listens for queries on a non-standard - port number. -

-
-
-s
-
-

- Write memory usage statistics to stdout - on exit. -

-
-

Note

-

- This option is mainly of interest to BIND 9 developers - and may be removed or changed in a future release. -

-
-
-
-t directory
-
-

Chroot - to directory after - processing the command line arguments, but before - reading the configuration file. -

-
-

Warning

-

- This option should be used in conjunction with the - -u option, as chrooting a process - running as root doesn't enhance security on most - systems; the way chroot(2) is - defined allows a process with root privileges to - escape a chroot jail. -

-
-
-
-u user
-
-

Setuid - to user after completing - privileged operations, such as creating sockets that - listen on privileged ports. -

-
-
-v
-
-

- Report the version number and exit. -

-
-
- -
- -
-

FILES

- - -
-
/etc/resolv.conf
-
-

- The default configuration file. -

-
-
/var/run/lwresd.pid
-
-

- The default process-id file. -

-
-
- -
- -
-

SEE ALSO

- -

- named(8) - , - - lwres(3) - , - - resolver(5) - . -

-
- -
-
-
- - - - - - - - - - - -
-Prev Up Next -
-dnssec-verify Home named -
-
-

BIND 9.12.0-pre-alpha

- - diff --git a/doc/arm/notes.xml b/doc/arm/notes.xml index cc25d1f08b..97491873a4 100644 --- a/doc/arm/notes.xml +++ b/doc/arm/notes.xml @@ -181,6 +181,15 @@
New Features + + + Code implementing name server query processing has been moved + from named to an external library, + libns. This will make it easier to + write unit tests for the code, or to link it into new tools. + [RT #45186] + + nsupdate and rndc now accept @@ -433,6 +442,12 @@
Feature Changes + + + The lightweight resolver daemon and library (lwresd + and liblwres) have been removed. [RT #45186] + + dnssec-keygen no longer has default diff --git a/doc/design/lwres b/doc/design/lwres deleted file mode 100644 index e2460f8f5b..0000000000 --- a/doc/design/lwres +++ /dev/null @@ -1,168 +0,0 @@ -Copyright (C) 2000, 2001, 2004, 2016 Internet Systems Consortium, Inc. ("ISC") - -This Source Code Form is subject to the terms of the Mozilla Public -License, v. 2.0. If a copy of the MPL was not distributed with this -file, You can obtain one at http://mozilla.org/MPL/2.0/. - -$Id: lwres,v 1.6 2004/03/05 05:04:46 marka Exp $ - -This document describes the bind v9 lightweight resolver. - -WHY LWRES? - -Currently, applications make queries directly to a DNS server. With -v4 records (A records) the client can typically do the proper DNS work -to get a hostname into an address or vice versa. - -With ipv6 and A6 recods, however, this becomes harder. Add to that -DNAME and CNAME and DNSSEC, and a client is quickly overwhelmed. - -To keep clients from having to make direct DNS queries for address -information, an API was developed to allow clients to ask high-level -information, such as "what addresses does foo.nominum.com have?" and -"what name does 1.2.3.4 have?" - - - -GENERAL DESIGN - -The lwres library converts structures into wire-format packets for -transmission, and unmarshalls them on receive. - - - -Marshalling and unmarshalling: - -Each structure will have two functions defined, one to take a -wire-format packet and convert it into a structure, and another to -take a structure and convert it into a wire-format packet. There -is a structure cleanup function that will take the unmarshalled -structure and free any dynamically allocated elements. - - -Wire formats: - -All integer values are in network byte order. - -All addresses are in network byte order. That is, they are directly -usable and do not need to be byte swapped, at least for ipv4 and ipv6. - -All character strings are prefixed with a length, and are NUL -terminated C strings. This is a concession for structure handling on -the receive side, and allows a mapping structure to point to data -contained in the actual receive buffer, eliminating copying. - - -NOOP (aka ping) packet format (request, response): - - lwres_lwpacket_t header; - isc_uint16_t datalength; - < datalength bytes > - -The server simply returns the entire data region in the reply. This -allows the client to determine if the server is operational. - - -GETADDRSBYNAME (response): - - lwres_lwpacket_t header; - - isc_uint16_t naliases; - - isc_uint16_t naddrs; - - isc_uint16_t real_name_len; - < real_name_len bytes of name > - isc_uint8_t \0 - - < naliases of - isc_uint16_t len; - < len bytes of name > - isc_uint8_t \0 - > - - < naddrs of - isc_uint32_t family; - isc_uint16_t len; - < len bytes of address > - > - - -GETNAMEBYADDR (response): - - lwres_lwpacket_t header; - - isc_uint16_t naliases; - - isc_uint16_t real_name_len; - < real_name_len bytes of name > - isc_uint8_t \0 - - < naliases of - isc_uint16_t len; - < len bytes of name > - isc_uint8_t \0 - > - - - -FUNCTIONS PROVIDED - -The lwres library provides three functions per data item. One takes a -structure and marshalls it into a buffer. Another unmarshalls that -data into a structure. A third frees memory used to unmarshall the -data. - -There are two structures used in a typical request/response. The -basic sequence is for the client to marshall the request into a -buffer and to transmit the request to the server. The server will -unmarshall the request, process it, and fill in a structure with the -response. The response is marshalled by the server, transmitted to -the client, where it is unmarshalled and used by the client. - - - -CLIENT CONTEXT - -Each client instance has its own state that is created and maintained -through library calls. Each thread needs its own client context, or -locking must be provided by the client to ensure private access to the -structure while lwres_*() calls are in progress. - -When a client context is created, /etc/resolv.conf is read to find -various options, including search lists, sort lists, etc. - - - -API - -The simpliest interface is to call lwres_getaddrsbyname() or -lwres_getnamebyaddr(), both of which are blocking calls. That is, a -packet is transmitted to the local lightweight resolver, and the call -will not return until a response is received or the timeout period -expires. - -If a caller requires non-blocking operation, the caller must call the -lower-level marshalling and unmarshalling functions directly. See the -source code implementing the blocking calls for more information, in -lib/lwres/lwresutil.c. - - - -LIBC INTEGRATION - -Several sample implementations for gethostbyname() etc. are provided -in the lib/lwres/ directory. These are considered to be examples -only. They have been merged into a local copy of NetBSD's libc, but -they are not drop-in replacements for most operating systems. They do -not provide NIS support or /etc/hosts support. - - - -LWRES DAEMON - -The daemon (in bin/lwresd/) implements name->address and address->name -resolution using the bind9 dns library functions. Currently, it will -read /etc/resolv.conf and use any "nameserver" lines as forwarders. -If none are listed it will become a full resolver itself, and not use -any forwarders. diff --git a/doc/dev/dev.md b/doc/dev/dev.md index c749512381..293ea18f1f 100644 --- a/doc/dev/dev.md +++ b/doc/dev/dev.md @@ -298,7 +298,7 @@ creating a memory context. Similar functions `dns_test_begin()` and #### Source tree layout * `bind9/bin`: binaries - * `bind9/bin/named`: source code for `named` and `lwresd` binaries; includes server configuration, interface manager, client manger, and high-level processing logic for query, update, and xfer. + * `bind9/bin/named`: source code for the `named` binary; includes server configuration, interface manager, client manger, and high-level processing logic for query, update, and xfer. * `bind9/bin/dnssec`: DNSSEC-related tools written in C: `dnssec-keygen`, `dnssec-signzone`, `dnssec-settime`, `dnssec-revoke`, `dnssec-keyfromlabel`, `dnssec-dsfromkey`, @@ -327,10 +327,8 @@ creating a memory context. Similar functions `dns_test_begin()` and configuration parser. * `bind9/lib/isccc`: library implementing the control channel used by `rndc` - * `bind9/lib/lwres`: lightweight resolver library. Used very little - in BIND * `bind9/lib/irs`: provides mechanisms for reading `/etc/resolv.conf` - and other configuration files. Used very little in BIND + and other configuration files. #### Namespace diff --git a/doc/doxygen/Doxyfile.in b/doc/doxygen/Doxyfile.in index 620e3b0e48..28046f533e 100644 --- a/doc/doxygen/Doxyfile.in +++ b/doc/doxygen/Doxyfile.in @@ -465,6 +465,7 @@ INPUT = @BIND9_TOP_BUILDDIR@/lib/isc \ @BIND9_TOP_BUILDDIR@/lib/dns \ @BIND9_TOP_BUILDDIR@/lib/isccfg \ @BIND9_TOP_BUILDDIR@/lib/isccc \ + @BIND9_TOP_BUILDDIR@/lib/ns \ @BIND9_TOP_BUILDDIR@/lib/bind9 \ @BIND9_TOP_BUILDDIR@/bin/check \ @BIND9_TOP_BUILDDIR@/bin/dig \ diff --git a/doc/misc/options b/doc/misc/options index 087b54c01f..cfa1961d56 100644 --- a/doc/misc/options +++ b/doc/misc/options @@ -45,15 +45,7 @@ logging { }; // may occur multiple times }; -lwres { - listen-on [ port ] [ dscp ] { ( - | ) [ port ] [ dscp ]; ... }; - lwres-clients ; - lwres-tasks ; - ndots ; - search { ; ... }; - view [ ]; -}; // may occur multiple times +lwres { }; // obsolete, may occur multiple times managed-keys { ; ... }; // may occur multiple times @@ -174,9 +166,9 @@ options { fetches-per-server [ ( drop | fail ) ]; fetches-per-zone [ ( drop | fail ) ]; files ( default | unlimited | ); - filter-aaaa { ; ... }; // not configured - filter-aaaa-on-v4 ( break-dnssec | ); // not configured - filter-aaaa-on-v6 ( break-dnssec | ); // not configured + filter-aaaa { ; ... }; + filter-aaaa-on-v4 ( break-dnssec | ); + filter-aaaa-on-v6 ( break-dnssec | ); flush-zones-on-shutdown ; forward ( first | only ); forwarders [ port ] [ dscp ] { ( @@ -208,7 +200,7 @@ options { listen-on-v6 [ port ] [ dscp ] { ; ... }; // may occur multiple times - lmdb-mapsize ; // non-operational + lmdb-mapsize ; lock-file ( | none ); maintain-ixfr-base ; // obsolete managed-keys-directory ; @@ -521,9 +513,9 @@ view [ ] { fetch-quota-params ; fetches-per-server [ ( drop | fail ) ]; fetches-per-zone [ ( drop | fail ) ]; - filter-aaaa { ; ... }; // not configured - filter-aaaa-on-v4 ( break-dnssec | ); // not configured - filter-aaaa-on-v6 ( break-dnssec | ); // not configured + filter-aaaa { ; ... }; + filter-aaaa-on-v4 ( break-dnssec | ); + filter-aaaa-on-v6 ( break-dnssec | ); forward ( first | only ); forwarders [ port ] [ dscp ] { ( | ) [ port ] [ dscp ]; ... }; @@ -536,7 +528,7 @@ view [ ] { }; // may occur multiple times key-directory ; lame-ttl ; - lmdb-mapsize ; // non-operational + lmdb-mapsize ; maintain-ixfr-base ; // obsolete managed-keys { diff --git a/doc/misc/roadmap b/doc/misc/roadmap index 4b529664b9..90aa87935e 100644 --- a/doc/misc/roadmap +++ b/doc/misc/roadmap @@ -1,11 +1,9 @@ -Copyright (C) 2000, 2001, 2004, 2016 Internet Systems Consortium, Inc. ("ISC") +Copyright (C) 2000, 2001, 2004, 2016, 2017 Internet Systems Consortium, Inc. ("ISC") This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/. -$Id: roadmap,v 1.2 2004/03/05 05:04:54 marka Exp $ - Road Map to the BIND 9 Source Tree bin/named The name server. This relies heavily on the @@ -33,7 +31,6 @@ lib/isccfg Routines for reading and writing ISC-style configuration files like named.conf and rndc.conf lib/isccc The command channel library, used by rndc. lib/tests Support code for the test suites. -lib/lwres The lightweight resolver library. doc/draft Current internet-drafts pertaining to the DNS doc/rfc RFCs pertaining to the DNS doc/misc Miscellaneous documentation diff --git a/doc/misc/sdb b/doc/misc/sdb index c4a4aa2f60..e03a735bdc 100644 --- a/doc/misc/sdb +++ b/doc/misc/sdb @@ -1,4 +1,4 @@ -Copyright (C) 2000, 2001, 2004, 2016 Internet Systems Consortium, Inc. ("ISC") +Copyright (C) 2000, 2001, 2004, 2016, 2017 Internet Systems Consortium, Inc. ("ISC") This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with this @@ -115,7 +115,7 @@ Calls to dns_sdb_register() and dns_sdb_unregister() (or wrappers, e.g. timedb_init() and timedb_clear() for the timedb sample sdb driver) must be inserted into the server, in bind9/bin/named/main.c. Registration should be in setup(), before the call to -ns_server_create(). Unregistration should be in cleanup(), +named_server_create(). Unregistration should be in cleanup(), after the call to ns_server_destroy(). A #include should be added corresponding to the driver header file. diff --git a/isc-config.sh.docbook b/isc-config.sh.docbook index 6d1f478a26..d30e4e3e9d 100644 --- a/isc-config.sh.docbook +++ b/isc-config.sh.docbook @@ -1,5 +1,5 @@ - - - - - 2007-06-18 - - - ISC - Internet Systems Consortium, Inc. - - - - lwres - 3 - BIND9 - - - lwres - introduction to the lightweight resolver library - - - - - 2000 - 2001 - 2004 - 2005 - 2007 - 2014 - 2015 - 2016 - Internet Systems Consortium, Inc. ("ISC") - - - - - -#include <lwres/lwres.h> - - - - DESCRIPTION - - - The BIND 9 lightweight resolver library is a simple, name service - independent stub resolver library. It provides hostname-to-address - and address-to-hostname lookup services to applications by - transmitting lookup requests to a resolver daemon - lwresd - running on the local host. The resolver daemon performs the - lookup using the DNS or possibly other name service protocols, - and returns the results to the application through the library. - The library and resolver daemon communicate using a simple - UDP-based protocol. - - - - OVERVIEW - - - The lwresd library implements multiple name service APIs. - The standard - gethostbyname(), - gethostbyaddr(), - gethostbyname_r(), - gethostbyaddr_r(), - getaddrinfo(), - getipnodebyname(), - and - getipnodebyaddr() - functions are all supported. To allow the lwres library to coexist - with system libraries that define functions of the same name, - the library defines these functions with names prefixed by - lwres_. - To define the standard names, applications must include the - header file - <lwres/netdb.h> - which contains macro definitions mapping the standard function names - into - lwres_ - prefixed ones. Operating system vendors who integrate the lwres - library into their base distributions should rename the functions - in the library proper so that the renaming macros are not needed. - - - The library also provides a native API consisting of the functions - lwres_getaddrsbyname() - and - lwres_getnamebyaddr(). - These may be called by applications that require more detailed - control over the lookup process than the standard functions - provide. - - - In addition to these name service independent address lookup - functions, the library implements a new, experimental API - for looking up arbitrary DNS resource records, using the - lwres_getaddrsbyname() - function. - - - Finally, there is a low-level API for converting lookup - requests and responses to and from raw lwres protocol packets. - This API can be used by clients requiring nonblocking operation, - and is also used when implementing the server side of the lwres - protocol, for example in the - lwresd - resolver daemon. The use of this low-level API in clients - and servers is outlined in the following sections. - - - CLIENT-SIDE LOW-LEVEL API CALL FLOW - - - When a client program wishes to make an lwres request using the - native low-level API, it typically performs the following - sequence of actions. - - - (1) Allocate or use an existing lwres_packet_t, - called pkt below. - - - (2) Set pkt.recvlength to the maximum length - we will accept. - This is done so the receiver of our packets knows how large our receive - buffer is. The "default" is a constant in - lwres.h: LWRES_RECVLENGTH = 4096. - - - (3) Set pkt.serial - to a unique serial number. This value is echoed - back to the application by the remote server. - - - (4) Set pkt.pktflags. Usually this is set to - 0. - - - (5) Set pkt.result to 0. - - - (6) Call lwres_*request_render(), - or marshall in the data using the primitives - such as lwres_packet_render() - and storing the packet data. - - - (7) Transmit the resulting buffer. - - - (8) Call lwres_*response_parse() - to parse any packets received. - - - (9) Verify that the opcode and serial match a request, and process the - packet specific information contained in the body. - - - SERVER-SIDE LOW-LEVEL API CALL FLOW - - - When implementing the server side of the lightweight resolver - protocol using the lwres library, a sequence of actions like the - following is typically involved in processing each request packet. - - - Note that the same lwres_packet_t is used - in both the _parse() and _render() calls, - with only a few modifications made - to the packet header's contents between uses. This method is - recommended - as it keeps the serial, opcode, and other fields correct. - - - (1) When a packet is received, call lwres_*request_parse() to - unmarshall it. This returns a lwres_packet_t (also called pkt, below) - as well as a data specific type, such as lwres_gabnrequest_t. - - - (2) Process the request in the data specific type. - - - (3) Set the pkt.result, - pkt.recvlength as above. All other fields - can - be left untouched since they were filled in by the *_parse() call - above. If using lwres_*response_render(), - pkt.pktflags will be set up - properly. Otherwise, the LWRES_LWPACKETFLAG_RESPONSE bit should be - set. - - - (4) Call the data specific rendering function, such as - lwres_gabnresponse_render(). - - - (5) Send the resulting packet to the client. - - - - SEE ALSO - - - lwres_gethostent3 - , - - - lwres_getipnode3 - , - - - lwres_getnameinfo3 - , - - - lwres_noop3 - , - - - lwres_gabn3 - , - - - lwres_gnba3 - , - - - lwres_context3 - , - - - lwres_config3 - , - - - resolver5 - , - - - lwresd8 - . - - - - diff --git a/lib/lwres/man/lwres.html b/lib/lwres/man/lwres.html deleted file mode 100644 index 821da10468..0000000000 --- a/lib/lwres/man/lwres.html +++ /dev/null @@ -1,248 +0,0 @@ - - - - - -lwres - - -
-
- - - - -
-

Name

-

- lwres - — introduction to the lightweight resolver library -

-
- - - -
-

Synopsis

-
-
#include <lwres/lwres.h>
-
-
- -
-

DESCRIPTION

- -

- The BIND 9 lightweight resolver library is a simple, name service - independent stub resolver library. It provides hostname-to-address - and address-to-hostname lookup services to applications by - transmitting lookup requests to a resolver daemon - lwresd - running on the local host. The resolver daemon performs the - lookup using the DNS or possibly other name service protocols, - and returns the results to the application through the library. - The library and resolver daemon communicate using a simple - UDP-based protocol. -

-
- -
-

OVERVIEW

- -

- The lwresd library implements multiple name service APIs. - The standard - gethostbyname(), - gethostbyaddr(), - gethostbyname_r(), - gethostbyaddr_r(), - getaddrinfo(), - getipnodebyname(), - and - getipnodebyaddr() - functions are all supported. To allow the lwres library to coexist - with system libraries that define functions of the same name, - the library defines these functions with names prefixed by - lwres_. - To define the standard names, applications must include the - header file - <lwres/netdb.h> - which contains macro definitions mapping the standard function names - into - lwres_ - prefixed ones. Operating system vendors who integrate the lwres - library into their base distributions should rename the functions - in the library proper so that the renaming macros are not needed. -

-

- The library also provides a native API consisting of the functions - lwres_getaddrsbyname() - and - lwres_getnamebyaddr(). - These may be called by applications that require more detailed - control over the lookup process than the standard functions - provide. -

-

- In addition to these name service independent address lookup - functions, the library implements a new, experimental API - for looking up arbitrary DNS resource records, using the - lwres_getaddrsbyname() - function. -

-

- Finally, there is a low-level API for converting lookup - requests and responses to and from raw lwres protocol packets. - This API can be used by clients requiring nonblocking operation, - and is also used when implementing the server side of the lwres - protocol, for example in the - lwresd - resolver daemon. The use of this low-level API in clients - and servers is outlined in the following sections. -

-
-
-

CLIENT-SIDE LOW-LEVEL API CALL FLOW

- -

- When a client program wishes to make an lwres request using the - native low-level API, it typically performs the following - sequence of actions. -

-

- (1) Allocate or use an existing lwres_packet_t, - called pkt below. -

-

- (2) Set pkt.recvlength to the maximum length - we will accept. - This is done so the receiver of our packets knows how large our receive - buffer is. The "default" is a constant in - lwres.h: LWRES_RECVLENGTH = 4096. -

-

- (3) Set pkt.serial - to a unique serial number. This value is echoed - back to the application by the remote server. -

-

- (4) Set pkt.pktflags. Usually this is set to - 0. -

-

- (5) Set pkt.result to 0. -

-

- (6) Call lwres_*request_render(), - or marshall in the data using the primitives - such as lwres_packet_render() - and storing the packet data. -

-

- (7) Transmit the resulting buffer. -

-

- (8) Call lwres_*response_parse() - to parse any packets received. -

-

- (9) Verify that the opcode and serial match a request, and process the - packet specific information contained in the body. -

-
-
-

SERVER-SIDE LOW-LEVEL API CALL FLOW

- -

- When implementing the server side of the lightweight resolver - protocol using the lwres library, a sequence of actions like the - following is typically involved in processing each request packet. -

-

- Note that the same lwres_packet_t is used - in both the _parse() and _render() calls, - with only a few modifications made - to the packet header's contents between uses. This method is - recommended - as it keeps the serial, opcode, and other fields correct. -

-

- (1) When a packet is received, call lwres_*request_parse() to - unmarshall it. This returns a lwres_packet_t (also called pkt, below) - as well as a data specific type, such as lwres_gabnrequest_t. -

-

- (2) Process the request in the data specific type. -

-

- (3) Set the pkt.result, - pkt.recvlength as above. All other fields - can - be left untouched since they were filled in by the *_parse() call - above. If using lwres_*response_render(), - pkt.pktflags will be set up - properly. Otherwise, the LWRES_LWPACKETFLAG_RESPONSE bit should be - set. -

-

- (4) Call the data specific rendering function, such as - lwres_gabnresponse_render(). -

-

- (5) Send the resulting packet to the client. -

-

-
-
-

SEE ALSO

- -

- lwres_gethostent(3) - , - - - lwres_getipnode(3) - , - - - lwres_getnameinfo(3) - , - - - lwres_noop(3) - , - - - lwres_gabn(3) - , - - - lwres_gnba(3) - , - - - lwres_context(3) - , - - - lwres_config(3) - , - - - resolver(5) - , - - - lwresd(8) - . - -

-
-
- diff --git a/lib/lwres/man/lwres_buffer.3 b/lib/lwres/man/lwres_buffer.3 deleted file mode 100644 index 8b960f1c7f..0000000000 --- a/lib/lwres/man/lwres_buffer.3 +++ /dev/null @@ -1,252 +0,0 @@ -.\" Copyright (C) 2000, 2001, 2004, 2005, 2007, 2014-2016 Internet Systems Consortium, Inc. ("ISC") -.\" -.\" This Source Code Form is subject to the terms of the Mozilla Public -.\" License, v. 2.0. If a copy of the MPL was not distributed with this -.\" file, You can obtain one at http://mozilla.org/MPL/2.0/. -.\" -.hy 0 -.ad l -'\" t -.\" Title: lwres_buffer -.\" Author: -.\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 2007-06-18 -.\" Manual: BIND9 -.\" Source: ISC -.\" Language: English -.\" -.TH "LWRES_BUFFER" "3" "2007\-06\-18" "ISC" "BIND9" -.\" ----------------------------------------------------------------- -.\" * Define some portability stuff -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" http://bugs.debian.org/507673 -.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.ie \n(.g .ds Aq \(aq -.el .ds Aq ' -.\" ----------------------------------------------------------------- -.\" * set default formatting -.\" ----------------------------------------------------------------- -.\" disable hyphenation -.nh -.\" disable justification (adjust text to left margin only) -.ad l -.\" ----------------------------------------------------------------- -.\" * MAIN CONTENT STARTS HERE * -.\" ----------------------------------------------------------------- -.SH "NAME" -lwres_buffer_init, lwres_buffer_invalidate, lwres_buffer_add, lwres_buffer_subtract, lwres_buffer_clear, lwres_buffer_first, lwres_buffer_forward, lwres_buffer_back, lwres_buffer_getuint8, lwres_buffer_putuint8, lwres_buffer_getuint16, lwres_buffer_putuint16, lwres_buffer_getuint32, lwres_buffer_putuint32, lwres_buffer_putmem, lwres_buffer_getmem \- lightweight resolver buffer management -.SH "SYNOPSIS" -.sp -.ft B -.nf -#include -.fi -.ft -.HP \w'void\ lwres_buffer_init('u -.BI "void lwres_buffer_init(lwres_buffer_t\ *" "b" ", void\ *" "base" ", unsigned\ int\ " "length" ");" -.HP \w'void\ lwres_buffer_invalidate('u -.BI "void lwres_buffer_invalidate(lwres_buffer_t\ *" "b" ");" -.HP \w'void\ lwres_buffer_add('u -.BI "void lwres_buffer_add(lwres_buffer_t\ *" "b" ", unsigned\ int\ " "n" ");" -.HP \w'void\ lwres_buffer_subtract('u -.BI "void lwres_buffer_subtract(lwres_buffer_t\ *" "b" ", unsigned\ int\ " "n" ");" -.HP \w'void\ lwres_buffer_clear('u -.BI "void lwres_buffer_clear(lwres_buffer_t\ *" "b" ");" -.HP \w'void\ lwres_buffer_first('u -.BI "void lwres_buffer_first(lwres_buffer_t\ *" "b" ");" -.HP \w'void\ lwres_buffer_forward('u -.BI "void lwres_buffer_forward(lwres_buffer_t\ *" "b" ", unsigned\ int\ " "n" ");" -.HP \w'void\ lwres_buffer_back('u -.BI "void lwres_buffer_back(lwres_buffer_t\ *" "b" ", unsigned\ int\ " "n" ");" -.HP \w'lwres_uint8_t\ lwres_buffer_getuint8('u -.BI "lwres_uint8_t lwres_buffer_getuint8(lwres_buffer_t\ *" "b" ");" -.HP \w'void\ lwres_buffer_putuint8('u -.BI "void lwres_buffer_putuint8(lwres_buffer_t\ *" "b" ", lwres_uint8_t\ " "val" ");" -.HP \w'lwres_uint16_t\ lwres_buffer_getuint16('u -.BI "lwres_uint16_t lwres_buffer_getuint16(lwres_buffer_t\ *" "b" ");" -.HP \w'void\ lwres_buffer_putuint16('u -.BI "void lwres_buffer_putuint16(lwres_buffer_t\ *" "b" ", lwres_uint16_t\ " "val" ");" -.HP \w'lwres_uint32_t\ lwres_buffer_getuint32('u -.BI "lwres_uint32_t lwres_buffer_getuint32(lwres_buffer_t\ *" "b" ");" -.HP \w'void\ lwres_buffer_putuint32('u -.BI "void lwres_buffer_putuint32(lwres_buffer_t\ *" "b" ", lwres_uint32_t\ " "val" ");" -.HP \w'void\ lwres_buffer_putmem('u -.BI "void lwres_buffer_putmem(lwres_buffer_t\ *" "b" ", const\ unsigned\ char\ *" "base" ", unsigned\ int\ " "length" ");" -.HP \w'void\ lwres_buffer_getmem('u -.BI "void lwres_buffer_getmem(lwres_buffer_t\ *" "b" ", unsigned\ char\ *" "base" ", unsigned\ int\ " "length" ");" -.SH "DESCRIPTION" -.PP -These functions provide bounds checked access to a region of memory where data is being read or written\&. They are based on, and similar to, the -isc_buffer_ -functions in the ISC library\&. -.PP -A buffer is a region of memory, together with a set of related subregions\&. The -\fIused region\fR -and the -\fIavailable\fR -region are disjoint, and their union is the buffer\*(Aqs region\&. The used region extends from the beginning of the buffer region to the last used byte\&. The available region extends from one byte greater than the last used byte to the end of the buffer\*(Aqs region\&. The size of the used region can be changed using various buffer commands\&. Initially, the used region is empty\&. -.PP -The used region is further subdivided into two disjoint regions: the -\fIconsumed region\fR -and the -\fIremaining region\fR\&. The union of these two regions is the used region\&. The consumed region extends from the beginning of the used region to the byte before the -\fIcurrent\fR -offset (if any)\&. The -\fIremaining\fR -region the current pointer to the end of the used region\&. The size of the consumed region can be changed using various buffer commands\&. Initially, the consumed region is empty\&. -.PP -The -\fIactive region\fR -is an (optional) subregion of the remaining region\&. It extends from the current offset to an offset in the remaining region\&. Initially, the active region is empty\&. If the current offset advances beyond the chosen offset, the active region will also be empty\&. -.PP -.if n \{\ -.RS 4 -.\} -.nf - /\-\-\-\-\-\-\-\-\-\-\-\-entire length\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\e\e - /\-\-\-\-\- used region \-\-\-\-\-\e\e/\-\- available \-\-\e\e - +\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+ - | consumed | remaining | | - +\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+ - a b c d e -.fi -.if n \{\ -.RE -.\} -.PP -.if n \{\ -.RS 4 -.\} -.nf - a == base of buffer\&. - b == current pointer\&. Can be anywhere between a and d\&. - c == active pointer\&. Meaningful between b and d\&. - d == used pointer\&. - e == length of buffer\&. -.fi -.if n \{\ -.RE -.\} -.PP -.if n \{\ -.RS 4 -.\} -.nf - a\-e == entire length of buffer\&. - a\-d == used region\&. - a\-b == consumed region\&. - b\-d == remaining region\&. - b\-c == optional active region\&. -.fi -.if n \{\ -.RE -.\} -.PP -\fBlwres_buffer_init()\fR -initializes the -\fBlwres_buffer_t\fR\fI*b\fR -and assocates it with the memory region of size -\fIlength\fR -bytes starting at location -\fIbase\&.\fR -.PP -\fBlwres_buffer_invalidate()\fR -marks the buffer -\fI*b\fR -as invalid\&. Invalidating a buffer after use is not required, but makes it possible to catch its possible accidental use\&. -.PP -The functions -\fBlwres_buffer_add()\fR -and -\fBlwres_buffer_subtract()\fR -respectively increase and decrease the used space in buffer -\fI*b\fR -by -\fIn\fR -bytes\&. -\fBlwres_buffer_add()\fR -checks for buffer overflow and -\fBlwres_buffer_subtract()\fR -checks for underflow\&. These functions do not allocate or deallocate memory\&. They just change the value of -\fIused\fR\&. -.PP -A buffer is re\-initialised by -\fBlwres_buffer_clear()\fR\&. The function sets -\fIused\fR, -\fIcurrent\fR -and -\fIactive\fR -to zero\&. -.PP -\fBlwres_buffer_first\fR -makes the consumed region of buffer -\fI*p\fR -empty by setting -\fIcurrent\fR -to zero (the start of the buffer)\&. -.PP -\fBlwres_buffer_forward()\fR -increases the consumed region of buffer -\fI*b\fR -by -\fIn\fR -bytes, checking for overflow\&. Similarly, -\fBlwres_buffer_back()\fR -decreases buffer -\fIb\fR\*(Aqs consumed region by -\fIn\fR -bytes and checks for underflow\&. -.PP -\fBlwres_buffer_getuint8()\fR -reads an unsigned 8\-bit integer from -\fI*b\fR -and returns it\&. -\fBlwres_buffer_putuint8()\fR -writes the unsigned 8\-bit integer -\fIval\fR -to buffer -\fI*b\fR\&. -.PP -\fBlwres_buffer_getuint16()\fR -and -\fBlwres_buffer_getuint32()\fR -are identical to -\fBlwres_buffer_putuint8()\fR -except that they respectively read an unsigned 16\-bit or 32\-bit integer in network byte order from -\fIb\fR\&. Similarly, -\fBlwres_buffer_putuint16()\fR -and -\fBlwres_buffer_putuint32()\fR -writes the unsigned 16\-bit or 32\-bit integer -\fIval\fR -to buffer -\fIb\fR, in network byte order\&. -.PP -Arbitrary amounts of data are read or written from a lightweight resolver buffer with -\fBlwres_buffer_getmem()\fR -and -\fBlwres_buffer_putmem()\fR -respectively\&. -\fBlwres_buffer_putmem()\fR -copies -\fIlength\fR -bytes of memory at -\fIbase\fR -to -\fIb\fR\&. Conversely, -\fBlwres_buffer_getmem()\fR -copies -\fIlength\fR -bytes of memory from -\fIb\fR -to -\fIbase\fR\&. -.SH "AUTHOR" -.PP -\fBInternet Systems Consortium, Inc\&.\fR -.SH "COPYRIGHT" -.br -Copyright \(co 2000, 2001, 2004, 2005, 2007, 2014-2016 Internet Systems Consortium, Inc. ("ISC") -.br diff --git a/lib/lwres/man/lwres_buffer.docbook b/lib/lwres/man/lwres_buffer.docbook deleted file mode 100644 index ef8ff1f9d8..0000000000 --- a/lib/lwres/man/lwres_buffer.docbook +++ /dev/null @@ -1,382 +0,0 @@ - - - - - - 2007-06-18 - - - ISC - Internet Systems Consortium, Inc. - - - - lwres_buffer - 3 - BIND9 - - - - - 2000 - 2001 - 2004 - 2005 - 2007 - 2014 - 2015 - 2016 - Internet Systems Consortium, Inc. ("ISC") - - - - - lwres_buffer_init - lwres_buffer_invalidate - lwres_buffer_add - lwres_buffer_subtract - lwres_buffer_clear - lwres_buffer_first - lwres_buffer_forward - lwres_buffer_back - lwres_buffer_getuint8 - lwres_buffer_putuint8 - lwres_buffer_getuint16 - lwres_buffer_putuint16 - lwres_buffer_getuint32 - lwres_buffer_putuint32 - lwres_buffer_putmem - lwres_buffer_getmem - lightweight resolver buffer management - - - - - - -#include <lwres/lwbuffer.h> - - - - - -void -lwres_buffer_init - lwres_buffer_t *b - void *base - unsigned int length - - - - -void -lwres_buffer_invalidate - lwres_buffer_t *b - - - -void -lwres_buffer_add - lwres_buffer_t *b - unsigned int n - - - - -void -lwres_buffer_subtract - lwres_buffer_t *b - unsigned int n - - - - -void -lwres_buffer_clear - lwres_buffer_t *b - - - - -void -lwres_buffer_first - lwres_buffer_t *b - - - - -void -lwres_buffer_forward - lwres_buffer_t *b - unsigned int n - - - - -void -lwres_buffer_back - lwres_buffer_t *b - unsigned int n - - - - -lwres_uint8_t -lwres_buffer_getuint8 - lwres_buffer_t *b - - - - -void -lwres_buffer_putuint8 - lwres_buffer_t *b - lwres_uint8_t val - - - - -lwres_uint16_t -lwres_buffer_getuint16 - lwres_buffer_t *b - - - - -void -lwres_buffer_putuint16 - lwres_buffer_t *b - lwres_uint16_t val - - - - -lwres_uint32_t -lwres_buffer_getuint32 - lwres_buffer_t *b - - - - -void -lwres_buffer_putuint32 - lwres_buffer_t *b - lwres_uint32_t val - - - - -void -lwres_buffer_putmem - lwres_buffer_t *b - const unsigned char *base - unsigned int length - - - - -void -lwres_buffer_getmem - lwres_buffer_t *b - unsigned char *base - unsigned int length - - - - - - DESCRIPTION - - - - These functions provide bounds checked access to a region of memory - where data is being read or written. - They are based on, and similar to, the - isc_buffer_ - functions in the ISC library. - - - A buffer is a region of memory, together with a set of related - subregions. - The used region and the - available region are disjoint, and - their union is the buffer's region. - The used region extends from the beginning of the buffer region to the - last used byte. - The available region extends from one byte greater than the last used - byte to the end of the buffer's region. - The size of the used region can be changed using various - buffer commands. - Initially, the used region is empty. - - - The used region is further subdivided into two disjoint regions: the - consumed region and the remaining region. - The union of these two regions is the used region. - The consumed region extends from the beginning of the used region to - the byte before the current offset (if any). - The remaining region the current pointer to the end - of the used - region. - The size of the consumed region can be changed using various - buffer commands. - Initially, the consumed region is empty. - - - The active region is an (optional) subregion of the - remaining - region. - It extends from the current offset to an offset in the - remaining region. - Initially, the active region is empty. - If the current offset advances beyond the chosen offset, - the active region will also be empty. - - - /------------entire length---------------\\ - /----- used region -----\\/-- available --\\ - +----------------------------------------+ - | consumed | remaining | | - +----------------------------------------+ - a b c d e - - - - a == base of buffer. - b == current pointer. Can be anywhere between a and d. - c == active pointer. Meaningful between b and d. - d == used pointer. - e == length of buffer. - - - - a-e == entire length of buffer. - a-d == used region. - a-b == consumed region. - b-d == remaining region. - b-c == optional active region. - - - lwres_buffer_init() - initializes the - lwres_buffer_t - *b - and assocates it with the memory region of size - length - bytes starting at location - base. - - lwres_buffer_invalidate() - marks the buffer *b - as invalid. Invalidating a buffer after use is not required, - but makes it possible to catch its possible accidental use. - - - The functions - lwres_buffer_add() - and - lwres_buffer_subtract() - respectively increase and decrease the used space in - buffer - *b - by - n - bytes. - lwres_buffer_add() - checks for buffer overflow and - lwres_buffer_subtract() - checks for underflow. - These functions do not allocate or deallocate memory. - They just change the value of - used. - - - A buffer is re-initialised by - lwres_buffer_clear(). - The function sets - used, - current - and - active - to zero. - - lwres_buffer_first - makes the consumed region of buffer - *p - empty by setting - current - to zero (the start of the buffer). - - lwres_buffer_forward() - increases the consumed region of buffer - *b - by - n - bytes, checking for overflow. - Similarly, - lwres_buffer_back() - decreases buffer - b's - consumed region by - n - bytes and checks for underflow. - - lwres_buffer_getuint8() - reads an unsigned 8-bit integer from - *b - and returns it. - lwres_buffer_putuint8() - writes the unsigned 8-bit integer - val - to buffer - *b. - - lwres_buffer_getuint16() - and - lwres_buffer_getuint32() - are identical to - lwres_buffer_putuint8() - except that they respectively read an unsigned 16-bit or 32-bit integer - in network byte order from - b. - Similarly, - lwres_buffer_putuint16() - and - lwres_buffer_putuint32() - writes the unsigned 16-bit or 32-bit integer - val - to buffer - b, - in network byte order. - - - Arbitrary amounts of data are read or written from a lightweight - resolver buffer with - lwres_buffer_getmem() - and - lwres_buffer_putmem() - respectively. - lwres_buffer_putmem() - copies - length - bytes of memory at - base - to - b. - Conversely, - lwres_buffer_getmem() - copies - length - bytes of memory from - b - to - base. - - - diff --git a/lib/lwres/man/lwres_buffer.html b/lib/lwres/man/lwres_buffer.html deleted file mode 100644 index a082a759e0..0000000000 --- a/lib/lwres/man/lwres_buffer.html +++ /dev/null @@ -1,449 +0,0 @@ - - - - - -lwres_buffer - - -
-
- - - - - - - -
-

Name

-

- lwres_buffer_init, - lwres_buffer_invalidate, - lwres_buffer_add, - lwres_buffer_subtract, - lwres_buffer_clear, - lwres_buffer_first, - lwres_buffer_forward, - lwres_buffer_back, - lwres_buffer_getuint8, - lwres_buffer_putuint8, - lwres_buffer_getuint16, - lwres_buffer_putuint16, - lwres_buffer_getuint32, - lwres_buffer_putuint32, - lwres_buffer_putmem, - lwres_buffer_getmem - — lightweight resolver buffer management -

-
- -
-

Synopsis

- -
-
-#include <lwres/lwbuffer.h>
-
- - - - - - - - - - - - - - -
-void -lwres_buffer_init(lwres_buffer_t *b,
 void *base,
 unsigned int length);
-
 
- - - - -
-void -lwres_buffer_invalidate(lwres_buffer_t *b);
-
 
- - - - - - - - - -
-void -lwres_buffer_add(lwres_buffer_t *b,
 unsigned int n);
-
 
- - - - - - - - - - -
-void -lwres_buffer_subtract(lwres_buffer_t *b,
 unsigned int n);
-
 
- - - - -
-void -lwres_buffer_clear(lwres_buffer_t *b);
-
 
- - - - -
-void -lwres_buffer_first(lwres_buffer_t *b);
-
 
- - - - - - - - - - -
-void -lwres_buffer_forward(lwres_buffer_t *b,
 unsigned int n);
-
 
- - - - - - - - - -
-void -lwres_buffer_back(lwres_buffer_t *b,
 unsigned int n);
-
 
- - - - -
-lwres_uint8_t -lwres_buffer_getuint8(lwres_buffer_t *b);
-
 
- - - - - - - - - - -
-void -lwres_buffer_putuint8(lwres_buffer_t *b,
 lwres_uint8_t val);
-
 
- - - - -
-lwres_uint16_t -lwres_buffer_getuint16(lwres_buffer_t *b);
-
 
- - - - - - - - - - -
-void -lwres_buffer_putuint16(lwres_buffer_t *b,
 lwres_uint16_t val);
-
 
- - - - -
-lwres_uint32_t -lwres_buffer_getuint32(lwres_buffer_t *b);
-
 
- - - - - - - - - - -
-void -lwres_buffer_putuint32(lwres_buffer_t *b,
 lwres_uint32_t val);
-
 
- - - - - - - - - - - - - - -
-void -lwres_buffer_putmem(lwres_buffer_t *b,
 const unsigned char *base,
 unsigned int length);
-
 
- - - - - - - - - - - - - - -
-void -lwres_buffer_getmem(lwres_buffer_t *b,
 unsigned char *base,
 unsigned int length);
-
 
- -
-
- -
-

DESCRIPTION

- - -

- These functions provide bounds checked access to a region of memory - where data is being read or written. - They are based on, and similar to, the - isc_buffer_ - functions in the ISC library. -

-

- A buffer is a region of memory, together with a set of related - subregions. - The used region and the - available region are disjoint, and - their union is the buffer's region. - The used region extends from the beginning of the buffer region to the - last used byte. - The available region extends from one byte greater than the last used - byte to the end of the buffer's region. - The size of the used region can be changed using various - buffer commands. - Initially, the used region is empty. -

-

- The used region is further subdivided into two disjoint regions: the - consumed region and the remaining region. - The union of these two regions is the used region. - The consumed region extends from the beginning of the used region to - the byte before the current offset (if any). - The remaining region the current pointer to the end - of the used - region. - The size of the consumed region can be changed using various - buffer commands. - Initially, the consumed region is empty. -

-

- The active region is an (optional) subregion of the - remaining - region. - It extends from the current offset to an offset in the - remaining region. - Initially, the active region is empty. - If the current offset advances beyond the chosen offset, - the active region will also be empty. -

- 
-   /------------entire length---------------\\
-   /----- used region -----\\/-- available --\\
-   +----------------------------------------+
-   | consumed  | remaining |                |
-   +----------------------------------------+
-   a           b     c     d                e
-
-

-

- 
-  a == base of buffer.
-  b == current pointer.  Can be anywhere between a and d.
-  c == active pointer.  Meaningful between b and d.
-  d == used pointer.
-  e == length of buffer.
-
-

-

- 
-  a-e == entire length of buffer.
-  a-d == used region.
-  a-b == consumed region.
-  b-d == remaining region.
-  b-c == optional active region.
-
-

-

-

lwres_buffer_init() - initializes the - lwres_buffer_t - *b - and assocates it with the memory region of size - length - bytes starting at location - base. -

-

lwres_buffer_invalidate() - marks the buffer *b - as invalid. Invalidating a buffer after use is not required, - but makes it possible to catch its possible accidental use. -

-

- The functions - lwres_buffer_add() - and - lwres_buffer_subtract() - respectively increase and decrease the used space in - buffer - *b - by - n - bytes. - lwres_buffer_add() - checks for buffer overflow and - lwres_buffer_subtract() - checks for underflow. - These functions do not allocate or deallocate memory. - They just change the value of - used. -

-

- A buffer is re-initialised by - lwres_buffer_clear(). - The function sets - used, - current - and - active - to zero. -

-

lwres_buffer_first - makes the consumed region of buffer - *p - empty by setting - current - to zero (the start of the buffer). -

-

lwres_buffer_forward() - increases the consumed region of buffer - *b - by - n - bytes, checking for overflow. - Similarly, - lwres_buffer_back() - decreases buffer - b's - consumed region by - n - bytes and checks for underflow. -

-

lwres_buffer_getuint8() - reads an unsigned 8-bit integer from - *b - and returns it. - lwres_buffer_putuint8() - writes the unsigned 8-bit integer - val - to buffer - *b. -

-

lwres_buffer_getuint16() - and - lwres_buffer_getuint32() - are identical to - lwres_buffer_putuint8() - except that they respectively read an unsigned 16-bit or 32-bit integer - in network byte order from - b. - Similarly, - lwres_buffer_putuint16() - and - lwres_buffer_putuint32() - writes the unsigned 16-bit or 32-bit integer - val - to buffer - b, - in network byte order. -

-

- Arbitrary amounts of data are read or written from a lightweight - resolver buffer with - lwres_buffer_getmem() - and - lwres_buffer_putmem() - respectively. - lwres_buffer_putmem() - copies - length - bytes of memory at - base - to - b. - Conversely, - lwres_buffer_getmem() - copies - length - bytes of memory from - b - to - base. -

-
-
- diff --git a/lib/lwres/man/lwres_config.3 b/lib/lwres/man/lwres_config.3 deleted file mode 100644 index 31a0d593a5..0000000000 --- a/lib/lwres/man/lwres_config.3 +++ /dev/null @@ -1,116 +0,0 @@ -.\" Copyright (C) 2000, 2001, 2004, 2005, 2007, 2014-2016 Internet Systems Consortium, Inc. ("ISC") -.\" -.\" This Source Code Form is subject to the terms of the Mozilla Public -.\" License, v. 2.0. If a copy of the MPL was not distributed with this -.\" file, You can obtain one at http://mozilla.org/MPL/2.0/. -.\" -.hy 0 -.ad l -'\" t -.\" Title: lwres_config -.\" Author: -.\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 2007-06-18 -.\" Manual: BIND9 -.\" Source: ISC -.\" Language: English -.\" -.TH "LWRES_CONFIG" "3" "2007\-06\-18" "ISC" "BIND9" -.\" ----------------------------------------------------------------- -.\" * Define some portability stuff -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" http://bugs.debian.org/507673 -.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.ie \n(.g .ds Aq \(aq -.el .ds Aq ' -.\" ----------------------------------------------------------------- -.\" * set default formatting -.\" ----------------------------------------------------------------- -.\" disable hyphenation -.nh -.\" disable justification (adjust text to left margin only) -.ad l -.\" ----------------------------------------------------------------- -.\" * MAIN CONTENT STARTS HERE * -.\" ----------------------------------------------------------------- -.SH "NAME" -lwres_conf_init, lwres_conf_clear, lwres_conf_parse, lwres_conf_print, lwres_conf_get \- lightweight resolver configuration -.SH "SYNOPSIS" -.sp -.ft B -.nf -#include -.fi -.ft -.HP \w'void\ lwres_conf_init('u -.BI "void lwres_conf_init(lwres_context_t\ *" "ctx" ");" -.HP \w'void\ lwres_conf_clear('u -.BI "void lwres_conf_clear(lwres_context_t\ *" "ctx" ");" -.HP \w'lwres_result_t\ lwres_conf_parse('u -.BI "lwres_result_t lwres_conf_parse(lwres_context_t\ *" "ctx" ", const\ char\ *" "filename" ");" -.HP \w'lwres_result_t\ lwres_conf_print('u -.BI "lwres_result_t lwres_conf_print(lwres_context_t\ *" "ctx" ", FILE\ *" "fp" ");" -.HP \w'lwres_conf_t\ *\ lwres_conf_get('u -.BI "lwres_conf_t * lwres_conf_get(lwres_context_t\ *" "ctx" ");" -.SH "DESCRIPTION" -.PP -\fBlwres_conf_init()\fR -creates an empty -\fBlwres_conf_t\fR -structure for lightweight resolver context -\fIctx\fR\&. -.PP -\fBlwres_conf_clear()\fR -frees up all the internal memory used by that -\fBlwres_conf_t\fR -structure in resolver context -\fIctx\fR\&. -.PP -\fBlwres_conf_parse()\fR -opens the file -\fIfilename\fR -and parses it to initialise the resolver context -\fIctx\fR\*(Aqs -\fBlwres_conf_t\fR -structure\&. -.PP -\fBlwres_conf_print()\fR -prints the -\fBlwres_conf_t\fR -structure for resolver context -\fIctx\fR -to the -\fBFILE\fR\fIfp\fR\&. -.SH "RETURN VALUES" -.PP -\fBlwres_conf_parse()\fR -returns -\fBLWRES_R_SUCCESS\fR -if it successfully read and parsed -\fIfilename\fR\&. It returns -\fBLWRES_R_FAILURE\fR -if -\fIfilename\fR -could not be opened or contained incorrect resolver statements\&. -.PP -\fBlwres_conf_print()\fR -returns -\fBLWRES_R_SUCCESS\fR -unless an error occurred when converting the network addresses to a numeric host address string\&. If this happens, the function returns -\fBLWRES_R_FAILURE\fR\&. -.SH "SEE ALSO" -.PP -\fBstdio\fR(3), -\fBresolver\fR(5)\&. -.SH "FILES" -.PP -/etc/resolv\&.conf -.SH "AUTHOR" -.PP -\fBInternet Systems Consortium, Inc\&.\fR -.SH "COPYRIGHT" -.br -Copyright \(co 2000, 2001, 2004, 2005, 2007, 2014-2016 Internet Systems Consortium, Inc. ("ISC") -.br diff --git a/lib/lwres/man/lwres_config.docbook b/lib/lwres/man/lwres_config.docbook deleted file mode 100644 index ffdb7dc478..0000000000 --- a/lib/lwres/man/lwres_config.docbook +++ /dev/null @@ -1,160 +0,0 @@ - - - - - - 2007-06-18 - - - ISC - Internet Systems Consortium, Inc. - - - - lwres_config - 3 - BIND9 - - - - - 2000 - 2001 - 2004 - 2005 - 2007 - 2014 - 2015 - 2016 - Internet Systems Consortium, Inc. ("ISC") - - - - - lwres_conf_init - lwres_conf_clear - lwres_conf_parse - lwres_conf_print - lwres_conf_get - lightweight resolver configuration - - - - -#include <lwres/lwres.h> - - -void -lwres_conf_init - lwres_context_t *ctx - - - -void -lwres_conf_clear - lwres_context_t *ctx - - - -lwres_result_t -lwres_conf_parse - lwres_context_t *ctx - const char *filename - - - -lwres_result_t -lwres_conf_print - lwres_context_t *ctx - FILE *fp - - - -lwres_conf_t * -lwres_conf_get - lwres_context_t *ctx - - - - - DESCRIPTION - - - lwres_conf_init() - creates an empty - lwres_conf_t - structure for lightweight resolver context - ctx. - - - lwres_conf_clear() - frees up all the internal memory used by - that - lwres_conf_t - structure in resolver context - ctx. - - - lwres_conf_parse() - opens the file - filename - and parses it to initialise the resolver context - ctx's - lwres_conf_t - structure. - - - lwres_conf_print() - prints the - lwres_conf_t - structure for resolver context - ctx - to the - FILE - fp. - - - RETURN VALUES - - - - lwres_conf_parse() - returns LWRES_R_SUCCESS - if it successfully read and parsed - filename. - It returns LWRES_R_FAILURE - if filename - could not be opened or contained incorrect - resolver statements. - - - lwres_conf_print() - returns LWRES_R_SUCCESS - unless an error occurred when converting the network addresses to a - numeric host address string. - If this happens, the function returns - LWRES_R_FAILURE. - - - SEE ALSO - - - stdio3 - , - - resolver5 - . - - - FILES - - /etc/resolv.conf - - - diff --git a/lib/lwres/man/lwres_config.html b/lib/lwres/man/lwres_config.html deleted file mode 100644 index 8c906183be..0000000000 --- a/lib/lwres/man/lwres_config.html +++ /dev/null @@ -1,169 +0,0 @@ - - - - - -lwres_config - - -
-
- - - - - - - -
-

Name

-

- lwres_conf_init, - lwres_conf_clear, - lwres_conf_parse, - lwres_conf_print, - lwres_conf_get - — lightweight resolver configuration -

-
- -
-

Synopsis

-
-
#include <lwres/lwres.h>
- - - -
-void -lwres_conf_init(lwres_context_t *ctx);
-
 
- - - -
-void -lwres_conf_clear(lwres_context_t *ctx);
-
 
- - - - - - - - - -
-lwres_result_t -lwres_conf_parse(lwres_context_t *ctx,
 const char *filename);
-
 
- - - - - - - - - -
-lwres_result_t -lwres_conf_print(lwres_context_t *ctx,
 FILE *fp);
-
 
- - - -
-lwres_conf_t * -lwres_conf_get(lwres_context_t *ctx);
-
 
-
-
- -
-

DESCRIPTION

- - -

lwres_conf_init() - creates an empty - lwres_conf_t - structure for lightweight resolver context - ctx. -

- -

lwres_conf_clear() - frees up all the internal memory used by - that - lwres_conf_t - structure in resolver context - ctx. -

- -

lwres_conf_parse() - opens the file - filename - and parses it to initialise the resolver context - ctx's - lwres_conf_t - structure. -

- -

lwres_conf_print() - prints the - lwres_conf_t - structure for resolver context - ctx - to the - FILE - fp. -

-
-
-

RETURN VALUES

- - - -

lwres_conf_parse() - returns LWRES_R_SUCCESS - if it successfully read and parsed - filename. - It returns LWRES_R_FAILURE - if filename - could not be opened or contained incorrect - resolver statements. -

- -

lwres_conf_print() - returns LWRES_R_SUCCESS - unless an error occurred when converting the network addresses to a - numeric host address string. - If this happens, the function returns - LWRES_R_FAILURE. -

-
-
-

SEE ALSO

- -

- stdio(3) - , - - resolver(5) - . -

-
-
-

FILES

- -

/etc/resolv.conf -

-
-
- diff --git a/lib/lwres/man/lwres_context.3 b/lib/lwres/man/lwres_context.3 deleted file mode 100644 index 3a5af0f9ae..0000000000 --- a/lib/lwres/man/lwres_context.3 +++ /dev/null @@ -1,181 +0,0 @@ -.\" Copyright (C) 2000, 2001, 2003-2005, 2007, 2014-2016 Internet Systems Consortium, Inc. ("ISC") -.\" -.\" This Source Code Form is subject to the terms of the Mozilla Public -.\" License, v. 2.0. If a copy of the MPL was not distributed with this -.\" file, You can obtain one at http://mozilla.org/MPL/2.0/. -.\" -.hy 0 -.ad l -'\" t -.\" Title: lwres_context -.\" Author: -.\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 2007-06-18 -.\" Manual: BIND9 -.\" Source: ISC -.\" Language: English -.\" -.TH "LWRES_CONTEXT" "3" "2007\-06\-18" "ISC" "BIND9" -.\" ----------------------------------------------------------------- -.\" * Define some portability stuff -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" http://bugs.debian.org/507673 -.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.ie \n(.g .ds Aq \(aq -.el .ds Aq ' -.\" ----------------------------------------------------------------- -.\" * set default formatting -.\" ----------------------------------------------------------------- -.\" disable hyphenation -.nh -.\" disable justification (adjust text to left margin only) -.ad l -.\" ----------------------------------------------------------------- -.\" * MAIN CONTENT STARTS HERE * -.\" ----------------------------------------------------------------- -.SH "NAME" -lwres_context_create, lwres_context_destroy, lwres_context_nextserial, lwres_context_initserial, lwres_context_freemem, lwres_context_allocmem, lwres_context_sendrecv \- lightweight resolver context management -.SH "SYNOPSIS" -.sp -.ft B -.nf -#include -.fi -.ft -.HP \w'lwres_result_t\ lwres_context_create('u -.BI "lwres_result_t lwres_context_create(lwres_context_t\ **" "contextp" ", void\ *" "arg" ", lwres_malloc_t\ " "malloc_function" ", lwres_free_t\ " "free_function" ");" -.HP \w'lwres_result_t\ lwres_context_destroy('u -.BI "lwres_result_t lwres_context_destroy(lwres_context_t\ **" "contextp" ");" -.HP \w'void\ lwres_context_initserial('u -.BI "void lwres_context_initserial(lwres_context_t\ *" "ctx" ", lwres_uint32_t\ " "serial" ");" -.HP \w'lwres_uint32_t\ lwres_context_nextserial('u -.BI "lwres_uint32_t lwres_context_nextserial(lwres_context_t\ *" "ctx" ");" -.HP \w'void\ lwres_context_freemem('u -.BI "void lwres_context_freemem(lwres_context_t\ *" "ctx" ", void\ *" "mem" ", size_t\ " "len" ");" -.HP \w'void\ lwres_context_allocmem('u -.BI "void lwres_context_allocmem(lwres_context_t\ *" "ctx" ", size_t\ " "len" ");" -.HP \w'void\ *\ lwres_context_sendrecv('u -.BI "void * lwres_context_sendrecv(lwres_context_t\ *" "ctx" ", void\ *" "sendbase" ", int\ " "sendlen" ", void\ *" "recvbase" ", int\ " "recvlen" ", int\ *" "recvd_len" ");" -.SH "DESCRIPTION" -.PP -\fBlwres_context_create()\fR -creates a -\fBlwres_context_t\fR -structure for use in lightweight resolver operations\&. It holds a socket and other data needed for communicating with a resolver daemon\&. The new -\fBlwres_context_t\fR -is returned through -\fIcontextp\fR, a pointer to a -\fBlwres_context_t\fR -pointer\&. This -\fBlwres_context_t\fR -pointer must initially be NULL, and is modified to point to the newly created -\fBlwres_context_t\fR\&. -.PP -When the lightweight resolver needs to perform dynamic memory allocation, it will call -\fImalloc_function\fR -to allocate memory and -\fIfree_function\fR -to free it\&. If -\fImalloc_function\fR -and -\fIfree_function\fR -are NULL, memory is allocated using -\fBmalloc\fR(3)\&. and -\fBfree\fR(3)\&. It is not permitted to have a NULL -\fImalloc_function\fR -and a non\-NULL -\fIfree_function\fR -or vice versa\&. -\fIarg\fR -is passed as the first parameter to the memory allocation functions\&. If -\fImalloc_function\fR -and -\fIfree_function\fR -are NULL, -\fIarg\fR -is unused and should be passed as NULL\&. -.PP -Once memory for the structure has been allocated, it is initialized using -\fBlwres_conf_init\fR(3) -and returned via -\fI*contextp\fR\&. -.PP -\fBlwres_context_destroy()\fR -destroys a -\fBlwres_context_t\fR, closing its socket\&. -\fIcontextp\fR -is a pointer to a pointer to the context that is to be destroyed\&. The pointer will be set to NULL when the context has been destroyed\&. -.PP -The context holds a serial number that is used to identify resolver request packets and associate responses with the corresponding requests\&. This serial number is controlled using -\fBlwres_context_initserial()\fR -and -\fBlwres_context_nextserial()\fR\&. -\fBlwres_context_initserial()\fR -sets the serial number for context -\fI*ctx\fR -to -\fIserial\fR\&. -\fBlwres_context_nextserial()\fR -increments the serial number and returns the previous value\&. -.PP -Memory for a lightweight resolver context is allocated and freed using -\fBlwres_context_allocmem()\fR -and -\fBlwres_context_freemem()\fR\&. These use whatever allocations were defined when the context was created with -\fBlwres_context_create()\fR\&. -\fBlwres_context_allocmem()\fR -allocates -\fIlen\fR -bytes of memory and if successful returns a pointer to the allocated storage\&. -\fBlwres_context_freemem()\fR -frees -\fIlen\fR -bytes of space starting at location -\fImem\fR\&. -.PP -\fBlwres_context_sendrecv()\fR -performs I/O for the context -\fIctx\fR\&. Data are read and written from the context\*(Aqs socket\&. It writes data from -\fIsendbase\fR -\(em typically a lightweight resolver query packet \(em and waits for a reply which is copied to the receive buffer at -\fIrecvbase\fR\&. The number of bytes that were written to this receive buffer is returned in -\fI*recvd_len\fR\&. -.SH "RETURN VALUES" -.PP -\fBlwres_context_create()\fR -returns -\fBLWRES_R_NOMEMORY\fR -if memory for the -\fBstruct lwres_context\fR -could not be allocated, -\fBLWRES_R_SUCCESS\fR -otherwise\&. -.PP -Successful calls to the memory allocator -\fBlwres_context_allocmem()\fR -return a pointer to the start of the allocated space\&. It returns NULL if memory could not be allocated\&. -.PP -\fBLWRES_R_SUCCESS\fR -is returned when -\fBlwres_context_sendrecv()\fR -completes successfully\&. -\fBLWRES_R_IOERROR\fR -is returned if an I/O error occurs and -\fBLWRES_R_TIMEOUT\fR -is returned if -\fBlwres_context_sendrecv()\fR -times out waiting for a response\&. -.SH "SEE ALSO" -.PP -\fBlwres_conf_init\fR(3), -\fBmalloc\fR(3), -\fBfree\fR(3)\&. -.SH "AUTHOR" -.PP -\fBInternet Systems Consortium, Inc\&.\fR -.SH "COPYRIGHT" -.br -Copyright \(co 2000, 2001, 2003-2005, 2007, 2014-2016 Internet Systems Consortium, Inc. ("ISC") -.br diff --git a/lib/lwres/man/lwres_context.docbook b/lib/lwres/man/lwres_context.docbook deleted file mode 100644 index efb3a30fb2..0000000000 --- a/lib/lwres/man/lwres_context.docbook +++ /dev/null @@ -1,251 +0,0 @@ -]> - - - - - - 2007-06-18 - - - ISC - Internet Systems Consortium, Inc. - - - - lwres_context - 3 - BIND9 - - - - - 2000 - 2001 - 2003 - 2004 - 2005 - 2007 - 2014 - 2015 - 2016 - Internet Systems Consortium, Inc. ("ISC") - - - - - lwres_context_create - lwres_context_destroy - lwres_context_nextserial - lwres_context_initserial - lwres_context_freemem - lwres_context_allocmem - lwres_context_sendrecv - lightweight resolver context management - - - -#include <lwres/lwres.h> - - -lwres_result_t -lwres_context_create - lwres_context_t **contextp - void *arg - lwres_malloc_t malloc_function - lwres_free_t free_function - - - -lwres_result_t -lwres_context_destroy - lwres_context_t **contextp - - - -void -lwres_context_initserial - lwres_context_t *ctx - lwres_uint32_t serial - - - -lwres_uint32_t -lwres_context_nextserial - lwres_context_t *ctx - - - -void -lwres_context_freemem - lwres_context_t *ctx - void *mem - size_t len - - - -void -lwres_context_allocmem - lwres_context_t *ctx - size_t len - - - -void * -lwres_context_sendrecv - lwres_context_t *ctx - void *sendbase - int sendlen - void *recvbase - int recvlen - int *recvd_len - - - - DESCRIPTION - - - lwres_context_create() - creates a lwres_context_t structure for use in - lightweight resolver operations. It holds a socket and other - data needed for communicating with a resolver daemon. The new - lwres_context_t is returned through - contextp, a pointer to a - lwres_context_t pointer. This - lwres_context_t pointer must initially be NULL, and - is modified to point to the newly created - lwres_context_t. - - - When the lightweight resolver needs to perform dynamic memory - allocation, it will call - malloc_function - to allocate memory and - free_function - to free it. If - malloc_function - and - free_function - are NULL, memory is allocated using - - malloc3 - . - and - - free3 - . - - It is not permitted to have a NULL - malloc_function and a non-NULL - free_function or vice versa. - arg is passed as the first parameter to - the memory allocation functions. If - malloc_function and - free_function are NULL, - arg is unused and should be passed as - NULL. - - - - Once memory for the structure has been allocated, - it is initialized using - - lwres_conf_init3 - - and returned via *contextp. - - - lwres_context_destroy() - destroys a lwres_context_t, closing its socket. - contextp is a pointer to a pointer to the - context that is to be destroyed. The pointer will be set to - NULL when the context has been destroyed. - - - - The context holds a serial number that is used to identify - resolver request packets and associate responses with the - corresponding requests. This serial number is controlled using - lwres_context_initserial() and - lwres_context_nextserial(). - lwres_context_initserial() sets the serial - number for context *ctx to - serial. - lwres_context_nextserial() increments the - serial number and returns the previous value. - - - - Memory for a lightweight resolver context is allocated and freed - using lwres_context_allocmem() and - lwres_context_freemem(). These use - whatever allocations were defined when the context was created - with lwres_context_create(). - lwres_context_allocmem() allocates - len bytes of memory and if successful - returns a pointer to the allocated storage. - lwres_context_freemem() frees - len bytes of space starting at location - mem. - - - lwres_context_sendrecv() - performs I/O for the context ctx. Data - are read and written from the context's socket. It writes data - from sendbase — typically a - lightweight resolver query packet — and waits for a reply - which is copied to the receive buffer at - recvbase. The number of bytes that were - written to this receive buffer is returned in - *recvd_len. - - - - RETURN VALUES - - - lwres_context_create() - returns LWRES_R_NOMEMORY if memory for - the struct lwres_context could not be allocated, - LWRES_R_SUCCESS otherwise. - - - Successful calls to the memory allocator - lwres_context_allocmem() - return a pointer to the start of the allocated space. - It returns NULL if memory could not be allocated. - - LWRES_R_SUCCESS - is returned when - lwres_context_sendrecv() - completes successfully. - LWRES_R_IOERROR - is returned if an I/O error occurs and - LWRES_R_TIMEOUT - is returned if - lwres_context_sendrecv() - times out waiting for a response. - - - SEE ALSO - - - lwres_conf_init3 - , - - - malloc3 - , - - - free3 - . - - - diff --git a/lib/lwres/man/lwres_context.html b/lib/lwres/man/lwres_context.html deleted file mode 100644 index c8274e727b..0000000000 --- a/lib/lwres/man/lwres_context.html +++ /dev/null @@ -1,294 +0,0 @@ - - - - - -lwres_context - - -
-
- - - - - - - -
-

Name

-

- lwres_context_create, - lwres_context_destroy, - lwres_context_nextserial, - lwres_context_initserial, - lwres_context_freemem, - lwres_context_allocmem, - lwres_context_sendrecv - — lightweight resolver context management -

-
-
-

Synopsis

-
-
#include <lwres/lwres.h>
- - - - - - - - - - - - - - - - - -
-lwres_result_t -lwres_context_create(lwres_context_t **contextp,
 void *arg,
 lwres_malloc_t malloc_function,
 lwres_free_t free_function);
-
 
- - - -
-lwres_result_t -lwres_context_destroy(lwres_context_t **contextp);
-
 
- - - - - - - - - -
-void -lwres_context_initserial(lwres_context_t *ctx,
 lwres_uint32_t serial);
-
 
- - - -
-lwres_uint32_t -lwres_context_nextserial(lwres_context_t *ctx);
-
 
- - - - - - - - - - - - - -
-void -lwres_context_freemem(lwres_context_t *ctx,
 void *mem,
 size_t len);
-
 
- - - - - - - - - -
-void -lwres_context_allocmem(lwres_context_t *ctx,
 size_t len);
-
 
- - - - - - - - - - - - - - - - - - - - - - - - - -
-void * -lwres_context_sendrecv(lwres_context_t *ctx,
 void *sendbase,
 int sendlen,
 void *recvbase,
 int recvlen,
 int *recvd_len);
-
 
-
-
-
-

DESCRIPTION

- - -

lwres_context_create() - creates a lwres_context_t structure for use in - lightweight resolver operations. It holds a socket and other - data needed for communicating with a resolver daemon. The new - lwres_context_t is returned through - contextp, a pointer to a - lwres_context_t pointer. This - lwres_context_t pointer must initially be NULL, and - is modified to point to the newly created - lwres_context_t. -

-

- When the lightweight resolver needs to perform dynamic memory - allocation, it will call - malloc_function - to allocate memory and - free_function - to free it. If - malloc_function - and - free_function - are NULL, memory is allocated using - - malloc(3) - . - and - - free(3) - . - - It is not permitted to have a NULL - malloc_function and a non-NULL - free_function or vice versa. - arg is passed as the first parameter to - the memory allocation functions. If - malloc_function and - free_function are NULL, - arg is unused and should be passed as - NULL. -

- -

- Once memory for the structure has been allocated, - it is initialized using - - lwres_conf_init(3) - - and returned via *contextp. -

- -

lwres_context_destroy() - destroys a lwres_context_t, closing its socket. - contextp is a pointer to a pointer to the - context that is to be destroyed. The pointer will be set to - NULL when the context has been destroyed. -

- -

- The context holds a serial number that is used to identify - resolver request packets and associate responses with the - corresponding requests. This serial number is controlled using - lwres_context_initserial() and - lwres_context_nextserial(). - lwres_context_initserial() sets the serial - number for context *ctx to - serial. - lwres_context_nextserial() increments the - serial number and returns the previous value. -

- -

- Memory for a lightweight resolver context is allocated and freed - using lwres_context_allocmem() and - lwres_context_freemem(). These use - whatever allocations were defined when the context was created - with lwres_context_create(). - lwres_context_allocmem() allocates - len bytes of memory and if successful - returns a pointer to the allocated storage. - lwres_context_freemem() frees - len bytes of space starting at location - mem. -

- -

lwres_context_sendrecv() - performs I/O for the context ctx. Data - are read and written from the context's socket. It writes data - from sendbase — typically a - lightweight resolver query packet — and waits for a reply - which is copied to the receive buffer at - recvbase. The number of bytes that were - written to this receive buffer is returned in - *recvd_len. -

-
- -
-

RETURN VALUES

- - -

lwres_context_create() - returns LWRES_R_NOMEMORY if memory for - the struct lwres_context could not be allocated, - LWRES_R_SUCCESS otherwise. -

-

- Successful calls to the memory allocator - lwres_context_allocmem() - return a pointer to the start of the allocated space. - It returns NULL if memory could not be allocated. -

-

LWRES_R_SUCCESS - is returned when - lwres_context_sendrecv() - completes successfully. - LWRES_R_IOERROR - is returned if an I/O error occurs and - LWRES_R_TIMEOUT - is returned if - lwres_context_sendrecv() - times out waiting for a response. -

-
-
-

SEE ALSO

- -

- lwres_conf_init(3) - , - - - malloc(3) - , - - - free(3) - . -

-
-
- diff --git a/lib/lwres/man/lwres_gabn.3 b/lib/lwres/man/lwres_gabn.3 deleted file mode 100644 index 655687a063..0000000000 --- a/lib/lwres/man/lwres_gabn.3 +++ /dev/null @@ -1,217 +0,0 @@ -.\" Copyright (C) 2000, 2001, 2004, 2005, 2007, 2014-2016 Internet Systems Consortium, Inc. ("ISC") -.\" -.\" This Source Code Form is subject to the terms of the Mozilla Public -.\" License, v. 2.0. If a copy of the MPL was not distributed with this -.\" file, You can obtain one at http://mozilla.org/MPL/2.0/. -.\" -.hy 0 -.ad l -'\" t -.\" Title: lwres_gabn -.\" Author: -.\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 2007-06-18 -.\" Manual: BIND9 -.\" Source: ISC -.\" Language: English -.\" -.TH "LWRES_GABN" "3" "2007\-06\-18" "ISC" "BIND9" -.\" ----------------------------------------------------------------- -.\" * Define some portability stuff -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" http://bugs.debian.org/507673 -.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.ie \n(.g .ds Aq \(aq -.el .ds Aq ' -.\" ----------------------------------------------------------------- -.\" * set default formatting -.\" ----------------------------------------------------------------- -.\" disable hyphenation -.nh -.\" disable justification (adjust text to left margin only) -.ad l -.\" ----------------------------------------------------------------- -.\" * MAIN CONTENT STARTS HERE * -.\" ----------------------------------------------------------------- -.SH "NAME" -lwres_gabnrequest_render, lwres_gabnresponse_render, lwres_gabnrequest_parse, lwres_gabnresponse_parse, lwres_gabnresponse_free, lwres_gabnrequest_free \- lightweight resolver getaddrbyname message handling -.SH "SYNOPSIS" -.sp -.ft B -.nf -#include -.fi -.ft -.HP \w'lwres_result_t\ lwres_gabnrequest_render('u -.BI "lwres_result_t lwres_gabnrequest_render(lwres_context_t\ *" "ctx" ", lwres_gabnrequest_t\ *" "req" ", lwres_lwpacket_t\ *" "pkt" ", lwres_buffer_t\ *" "b" ");" -.HP \w'lwres_result_t\ lwres_gabnresponse_render('u -.BI "lwres_result_t lwres_gabnresponse_render(lwres_context_t\ *" "ctx" ", lwres_gabnresponse_t\ *" "req" ", lwres_lwpacket_t\ *" "pkt" ", lwres_buffer_t\ *" "b" ");" -.HP \w'lwres_result_t\ lwres_gabnrequest_parse('u -.BI "lwres_result_t lwres_gabnrequest_parse(lwres_context_t\ *" "ctx" ", lwres_buffer_t\ *" "b" ", lwres_lwpacket_t\ *" "pkt" ", lwres_gabnrequest_t\ **" "structp" ");" -.HP \w'lwres_result_t\ lwres_gabnresponse_parse('u -.BI "lwres_result_t lwres_gabnresponse_parse(lwres_context_t\ *" "ctx" ", lwres_buffer_t\ *" "b" ", lwres_lwpacket_t\ *" "pkt" ", lwres_gabnresponse_t\ **" "structp" ");" -.HP \w'void\ lwres_gabnresponse_free('u -.BI "void lwres_gabnresponse_free(lwres_context_t\ *" "ctx" ", lwres_gabnresponse_t\ **" "structp" ");" -.HP \w'void\ lwres_gabnrequest_free('u -.BI "void lwres_gabnrequest_free(lwres_context_t\ *" "ctx" ", lwres_gabnrequest_t\ **" "structp" ");" -.SH "DESCRIPTION" -.PP -These are low\-level routines for creating and parsing lightweight resolver name\-to\-address lookup request and response messages\&. -.PP -There are four main functions for the getaddrbyname opcode\&. One render function converts a getaddrbyname request structure \(em -\fBlwres_gabnrequest_t\fR -\(em to the lightweight resolver\*(Aqs canonical format\&. It is complemented by a parse function that converts a packet in this canonical format to a getaddrbyname request structure\&. Another render function converts the getaddrbyname response structure \(em -\fBlwres_gabnresponse_t\fR -\(em to the canonical format\&. This is complemented by a parse function which converts a packet in canonical format to a getaddrbyname response structure\&. -.PP -These structures are defined in -\&. They are shown below\&. -.PP -.if n \{\ -.RS 4 -.\} -.nf -#define LWRES_OPCODE_GETADDRSBYNAME 0x00010001U -.fi -.if n \{\ -.RE -.\} -.PP -.if n \{\ -.RS 4 -.\} -.nf -typedef struct lwres_addr lwres_addr_t; -typedef LWRES_LIST(lwres_addr_t) lwres_addrlist_t; -.fi -.if n \{\ -.RE -.\} -.PP -.if n \{\ -.RS 4 -.\} -.nf -typedef struct { - lwres_uint32_t flags; - lwres_uint32_t addrtypes; - lwres_uint16_t namelen; - char *name; -} lwres_gabnrequest_t; -.fi -.if n \{\ -.RE -.\} -.PP -.if n \{\ -.RS 4 -.\} -.nf -typedef struct { - lwres_uint32_t flags; - lwres_uint16_t naliases; - lwres_uint16_t naddrs; - char *realname; - char **aliases; - lwres_uint16_t realnamelen; - lwres_uint16_t *aliaslen; - lwres_addrlist_t addrs; - void *base; - size_t baselen; -} lwres_gabnresponse_t; -.fi -.if n \{\ -.RE -.\} -.PP -\fBlwres_gabnrequest_render()\fR -uses resolver context -\fIctx\fR -to convert getaddrbyname request structure -\fIreq\fR -to canonical format\&. The packet header structure -\fIpkt\fR -is initialised and transferred to buffer -\fIb\fR\&. The contents of -\fI*req\fR -are then appended to the buffer in canonical format\&. -\fBlwres_gabnresponse_render()\fR -performs the same task, except it converts a getaddrbyname response structure -\fBlwres_gabnresponse_t\fR -to the lightweight resolver\*(Aqs canonical format\&. -.PP -\fBlwres_gabnrequest_parse()\fR -uses context -\fIctx\fR -to convert the contents of packet -\fIpkt\fR -to a -\fBlwres_gabnrequest_t\fR -structure\&. Buffer -\fIb\fR -provides space to be used for storing this structure\&. When the function succeeds, the resulting -\fBlwres_gabnrequest_t\fR -is made available through -\fI*structp\fR\&. -\fBlwres_gabnresponse_parse()\fR -offers the same semantics as -\fBlwres_gabnrequest_parse()\fR -except it yields a -\fBlwres_gabnresponse_t\fR -structure\&. -.PP -\fBlwres_gabnresponse_free()\fR -and -\fBlwres_gabnrequest_free()\fR -release the memory in resolver context -\fIctx\fR -that was allocated to the -\fBlwres_gabnresponse_t\fR -or -\fBlwres_gabnrequest_t\fR -structures referenced via -\fIstructp\fR\&. Any memory associated with ancillary buffers and strings for those structures is also discarded\&. -.SH "RETURN VALUES" -.PP -The getaddrbyname opcode functions -\fBlwres_gabnrequest_render()\fR, -\fBlwres_gabnresponse_render()\fR\fBlwres_gabnrequest_parse()\fR -and -\fBlwres_gabnresponse_parse()\fR -all return -\fBLWRES_R_SUCCESS\fR -on success\&. They return -\fBLWRES_R_NOMEMORY\fR -if memory allocation fails\&. -\fBLWRES_R_UNEXPECTEDEND\fR -is returned if the available space in the buffer -\fIb\fR -is too small to accommodate the packet header or the -\fBlwres_gabnrequest_t\fR -and -\fBlwres_gabnresponse_t\fR -structures\&. -\fBlwres_gabnrequest_parse()\fR -and -\fBlwres_gabnresponse_parse()\fR -will return -\fBLWRES_R_UNEXPECTEDEND\fR -if the buffer is not empty after decoding the received packet\&. These functions will return -\fBLWRES_R_FAILURE\fR -if -\fIpktflags\fR -in the packet header structure -\fBlwres_lwpacket_t\fR -indicate that the packet is not a response to an earlier query\&. -.SH "SEE ALSO" -.PP -\fBlwres_packet\fR(3) -.SH "AUTHOR" -.PP -\fBInternet Systems Consortium, Inc\&.\fR -.SH "COPYRIGHT" -.br -Copyright \(co 2000, 2001, 2004, 2005, 2007, 2014-2016 Internet Systems Consortium, Inc. ("ISC") -.br diff --git a/lib/lwres/man/lwres_gabn.docbook b/lib/lwres/man/lwres_gabn.docbook deleted file mode 100644 index 1727ae76b7..0000000000 --- a/lib/lwres/man/lwres_gabn.docbook +++ /dev/null @@ -1,249 +0,0 @@ -]> - - - - - - 2007-06-18 - - - ISC - Internet Systems Consortium, Inc. - - - - lwres_gabn - 3 - BIND9 - - - - - 2000 - 2001 - 2004 - 2005 - 2007 - 2014 - 2015 - 2016 - Internet Systems Consortium, Inc. ("ISC") - - - - - lwres_gabnrequest_render - lwres_gabnresponse_render - lwres_gabnrequest_parse - lwres_gabnresponse_parse - lwres_gabnresponse_free - lwres_gabnrequest_free - lightweight resolver getaddrbyname message handling - - - -#include <lwres/lwres.h> - - -lwres_result_t -lwres_gabnrequest_render - lwres_context_t *ctx - lwres_gabnrequest_t *req - lwres_lwpacket_t *pkt - lwres_buffer_t *b - - - -lwres_result_t -lwres_gabnresponse_render - lwres_context_t *ctx - lwres_gabnresponse_t *req - lwres_lwpacket_t *pkt - lwres_buffer_t *b - - - -lwres_result_t -lwres_gabnrequest_parse - lwres_context_t *ctx - lwres_buffer_t *b - lwres_lwpacket_t *pkt - lwres_gabnrequest_t **structp - - - -lwres_result_t -lwres_gabnresponse_parse - lwres_context_t *ctx - lwres_buffer_t *b - lwres_lwpacket_t *pkt - lwres_gabnresponse_t **structp - - - -void -lwres_gabnresponse_free - lwres_context_t *ctx - lwres_gabnresponse_t **structp - - - -void -lwres_gabnrequest_free - lwres_context_t *ctx - lwres_gabnrequest_t **structp - - - - DESCRIPTION - - - These are low-level routines for creating and parsing - lightweight resolver name-to-address lookup request and - response messages. - - - There are four main functions for the getaddrbyname opcode. - One render function converts a getaddrbyname request structure — - lwres_gabnrequest_t — - to the lightweight resolver's canonical format. - It is complemented by a parse function that converts a packet in this - canonical format to a getaddrbyname request structure. - Another render function converts the getaddrbyname response structure - — lwres_gabnresponse_t — - to the canonical format. - This is complemented by a parse function which converts a packet in - canonical format to a getaddrbyname response structure. - - - These structures are defined in - <lwres/lwres.h>. - They are shown below. - - -#define LWRES_OPCODE_GETADDRSBYNAME 0x00010001U - - - -typedef struct lwres_addr lwres_addr_t; -typedef LWRES_LIST(lwres_addr_t) lwres_addrlist_t; - - - -typedef struct { - lwres_uint32_t flags; - lwres_uint32_t addrtypes; - lwres_uint16_t namelen; - char *name; -} lwres_gabnrequest_t; - - - -typedef struct { - lwres_uint32_t flags; - lwres_uint16_t naliases; - lwres_uint16_t naddrs; - char *realname; - char **aliases; - lwres_uint16_t realnamelen; - lwres_uint16_t *aliaslen; - lwres_addrlist_t addrs; - void *base; - size_t baselen; -} lwres_gabnresponse_t; - - - - lwres_gabnrequest_render() - uses resolver context ctx to convert - getaddrbyname request structure req to - canonical format. The packet header structure - pkt is initialised and transferred to - buffer b. - - The contents of *req are then appended to - the buffer in canonical format. - lwres_gabnresponse_render() performs the - same task, except it converts a getaddrbyname response structure - lwres_gabnresponse_t to the lightweight resolver's - canonical format. - - - lwres_gabnrequest_parse() - uses context ctx to convert the contents - of packet pkt to a - lwres_gabnrequest_t structure. Buffer - b provides space to be used for storing - this structure. When the function succeeds, the resulting - lwres_gabnrequest_t is made available through - *structp. - - lwres_gabnresponse_parse() offers the same - semantics as lwres_gabnrequest_parse() - except it yields a lwres_gabnresponse_t structure. - - - lwres_gabnresponse_free() - and lwres_gabnrequest_free() release the - memory in resolver context ctx that was - allocated to the lwres_gabnresponse_t or - lwres_gabnrequest_t structures referenced via - structp. - - Any memory associated with ancillary buffers and strings for - those structures is also discarded. - - - RETURN VALUES - - - The getaddrbyname opcode functions - lwres_gabnrequest_render(), - lwres_gabnresponse_render() - lwres_gabnrequest_parse() - and - lwres_gabnresponse_parse() - all return - LWRES_R_SUCCESS - on success. - They return - LWRES_R_NOMEMORY - if memory allocation fails. - LWRES_R_UNEXPECTEDEND - is returned if the available space in the buffer - b - is too small to accommodate the packet header or the - lwres_gabnrequest_t - and - lwres_gabnresponse_t - structures. - lwres_gabnrequest_parse() - and - lwres_gabnresponse_parse() - will return - LWRES_R_UNEXPECTEDEND - if the buffer is not empty after decoding the received packet. - These functions will return - LWRES_R_FAILURE - if - pktflags - in the packet header structure - lwres_lwpacket_t - indicate that the packet is not a response to an earlier query. - - - SEE ALSO - - - lwres_packet3 - - - - diff --git a/lib/lwres/man/lwres_gabn.html b/lib/lwres/man/lwres_gabn.html deleted file mode 100644 index 645b8aaf2d..0000000000 --- a/lib/lwres/man/lwres_gabn.html +++ /dev/null @@ -1,304 +0,0 @@ - - - - - -lwres_gabn - - -
-
- - - - - - - -
-

Name

-

- lwres_gabnrequest_render, - lwres_gabnresponse_render, - lwres_gabnrequest_parse, - lwres_gabnresponse_parse, - lwres_gabnresponse_free, - lwres_gabnrequest_free - — lightweight resolver getaddrbyname message handling -

-
-
-

Synopsis

-
-
#include <lwres/lwres.h>
- - - - - - - - - - - - - - - - - -
-lwres_result_t -lwres_gabnrequest_render(lwres_context_t *ctx,
 lwres_gabnrequest_t *req,
 lwres_lwpacket_t *pkt,
 lwres_buffer_t *b);
-
 
- - - - - - - - - - - - - - - - - -
-lwres_result_t -lwres_gabnresponse_render(lwres_context_t *ctx,
 lwres_gabnresponse_t *req,
 lwres_lwpacket_t *pkt,
 lwres_buffer_t *b);
-
 
- - - - - - - - - - - - - - - - - -
-lwres_result_t -lwres_gabnrequest_parse(lwres_context_t *ctx,
 lwres_buffer_t *b,
 lwres_lwpacket_t *pkt,
 lwres_gabnrequest_t **structp);
-
 
- - - - - - - - - - - - - - - - - -
-lwres_result_t -lwres_gabnresponse_parse(lwres_context_t *ctx,
 lwres_buffer_t *b,
 lwres_lwpacket_t *pkt,
 lwres_gabnresponse_t **structp);
-
 
- - - - - - - - - -
-void -lwres_gabnresponse_free(lwres_context_t *ctx,
 lwres_gabnresponse_t **structp);
-
 
- - - - - - - - - -
-void -lwres_gabnrequest_free(lwres_context_t *ctx,
 lwres_gabnrequest_t **structp);
-
 
-
-
-
-

DESCRIPTION

- -

- These are low-level routines for creating and parsing - lightweight resolver name-to-address lookup request and - response messages. -

-

- There are four main functions for the getaddrbyname opcode. - One render function converts a getaddrbyname request structure — - lwres_gabnrequest_t — - to the lightweight resolver's canonical format. - It is complemented by a parse function that converts a packet in this - canonical format to a getaddrbyname request structure. - Another render function converts the getaddrbyname response structure - — lwres_gabnresponse_t — - to the canonical format. - This is complemented by a parse function which converts a packet in - canonical format to a getaddrbyname response structure. -

-

- These structures are defined in - <lwres/lwres.h>. - They are shown below. -

- 
-#define LWRES_OPCODE_GETADDRSBYNAME     0x00010001U
-
-

-

- 
-typedef struct lwres_addr lwres_addr_t;
-typedef LWRES_LIST(lwres_addr_t) lwres_addrlist_t;
-
-

-

- 
-typedef struct {
-        lwres_uint32_t  flags;
-        lwres_uint32_t  addrtypes;
-        lwres_uint16_t  namelen;
-        char           *name;
-} lwres_gabnrequest_t;
-
-

-

- 
-typedef struct {
-        lwres_uint32_t          flags;
-        lwres_uint16_t          naliases;
-        lwres_uint16_t          naddrs;
-        char                   *realname;
-        char                  **aliases;
-        lwres_uint16_t          realnamelen;
-        lwres_uint16_t         *aliaslen;
-        lwres_addrlist_t        addrs;
-        void                   *base;
-        size_t                  baselen;
-} lwres_gabnresponse_t;
-
-

-

- -

lwres_gabnrequest_render() - uses resolver context ctx to convert - getaddrbyname request structure req to - canonical format. The packet header structure - pkt is initialised and transferred to - buffer b. - - The contents of *req are then appended to - the buffer in canonical format. - lwres_gabnresponse_render() performs the - same task, except it converts a getaddrbyname response structure - lwres_gabnresponse_t to the lightweight resolver's - canonical format. -

- -

lwres_gabnrequest_parse() - uses context ctx to convert the contents - of packet pkt to a - lwres_gabnrequest_t structure. Buffer - b provides space to be used for storing - this structure. When the function succeeds, the resulting - lwres_gabnrequest_t is made available through - *structp. - - lwres_gabnresponse_parse() offers the same - semantics as lwres_gabnrequest_parse() - except it yields a lwres_gabnresponse_t structure. -

- -

lwres_gabnresponse_free() - and lwres_gabnrequest_free() release the - memory in resolver context ctx that was - allocated to the lwres_gabnresponse_t or - lwres_gabnrequest_t structures referenced via - structp. - - Any memory associated with ancillary buffers and strings for - those structures is also discarded. -

-
-
-

RETURN VALUES

- -

- The getaddrbyname opcode functions - lwres_gabnrequest_render(), - lwres_gabnresponse_render() - lwres_gabnrequest_parse() - and - lwres_gabnresponse_parse() - all return - LWRES_R_SUCCESS - on success. - They return - LWRES_R_NOMEMORY - if memory allocation fails. - LWRES_R_UNEXPECTEDEND - is returned if the available space in the buffer - b - is too small to accommodate the packet header or the - lwres_gabnrequest_t - and - lwres_gabnresponse_t - structures. - lwres_gabnrequest_parse() - and - lwres_gabnresponse_parse() - will return - LWRES_R_UNEXPECTEDEND - if the buffer is not empty after decoding the received packet. - These functions will return - LWRES_R_FAILURE - if - pktflags - in the packet header structure - lwres_lwpacket_t - indicate that the packet is not a response to an earlier query. -

-
-
-

SEE ALSO

- -

- lwres_packet(3) - -

-
-
- diff --git a/lib/lwres/man/lwres_gai_strerror.3 b/lib/lwres/man/lwres_gai_strerror.3 deleted file mode 100644 index d8161be267..0000000000 --- a/lib/lwres/man/lwres_gai_strerror.3 +++ /dev/null @@ -1,140 +0,0 @@ -.\" Copyright (C) 2000, 2001, 2004, 2005, 2007, 2014-2016 Internet Systems Consortium, Inc. ("ISC") -.\" -.\" This Source Code Form is subject to the terms of the Mozilla Public -.\" License, v. 2.0. If a copy of the MPL was not distributed with this -.\" file, You can obtain one at http://mozilla.org/MPL/2.0/. -.\" -.hy 0 -.ad l -'\" t -.\" Title: lwres_gai_strerror -.\" Author: -.\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 2007-06-18 -.\" Manual: BIND9 -.\" Source: ISC -.\" Language: English -.\" -.TH "LWRES_GAI_STRERROR" "3" "2007\-06\-18" "ISC" "BIND9" -.\" ----------------------------------------------------------------- -.\" * Define some portability stuff -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" http://bugs.debian.org/507673 -.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.ie \n(.g .ds Aq \(aq -.el .ds Aq ' -.\" ----------------------------------------------------------------- -.\" * set default formatting -.\" ----------------------------------------------------------------- -.\" disable hyphenation -.nh -.\" disable justification (adjust text to left margin only) -.ad l -.\" ----------------------------------------------------------------- -.\" * MAIN CONTENT STARTS HERE * -.\" ----------------------------------------------------------------- -.SH "NAME" -lwres_gai_strerror \- print suitable error string -.SH "SYNOPSIS" -.sp -.ft B -.nf -#include -.fi -.ft -.HP \w'char\ *\ gai_strerror('u -.BI "char * gai_strerror(int\ " "ecode" ");" -.SH "DESCRIPTION" -.PP -\fBlwres_gai_strerror()\fR -returns an error message corresponding to an error code returned by -\fBgetaddrinfo()\fR\&. The following error codes and their meaning are defined in -include/lwres/netdb\&.h\&. -.PP -\fBEAI_ADDRFAMILY\fR -.RS 4 -address family for hostname not supported -.RE -.PP -\fBEAI_AGAIN\fR -.RS 4 -temporary failure in name resolution -.RE -.PP -\fBEAI_BADFLAGS\fR -.RS 4 -invalid value for -\fBai_flags\fR -.RE -.PP -\fBEAI_FAIL\fR -.RS 4 -non\-recoverable failure in name resolution -.RE -.PP -\fBEAI_FAMILY\fR -.RS 4 -\fBai_family\fR -not supported -.RE -.PP -\fBEAI_MEMORY\fR -.RS 4 -memory allocation failure -.RE -.PP -\fBEAI_NODATA\fR -.RS 4 -no address associated with hostname -.RE -.PP -\fBEAI_NONAME\fR -.RS 4 -hostname or servname not provided, or not known -.RE -.PP -\fBEAI_SERVICE\fR -.RS 4 -servname not supported for -\fBai_socktype\fR -.RE -.PP -\fBEAI_SOCKTYPE\fR -.RS 4 -\fBai_socktype\fR -not supported -.RE -.PP -\fBEAI_SYSTEM\fR -.RS 4 -system error returned in errno -.RE -The message -invalid error code -is returned if -\fIecode\fR -is out of range\&. -.PP -\fBai_flags\fR, -\fBai_family\fR -and -\fBai_socktype\fR -are elements of the -\fBstruct addrinfo\fR -used by -\fBlwres_getaddrinfo()\fR\&. -.SH "SEE ALSO" -.PP -\fBstrerror\fR(3), -\fBlwres_getaddrinfo\fR(3), -\fBgetaddrinfo\fR(3), -\fBRFC2133\fR()\&. -.SH "AUTHOR" -.PP -\fBInternet Systems Consortium, Inc\&.\fR -.SH "COPYRIGHT" -.br -Copyright \(co 2000, 2001, 2004, 2005, 2007, 2014-2016 Internet Systems Consortium, Inc. ("ISC") -.br diff --git a/lib/lwres/man/lwres_gai_strerror.docbook b/lib/lwres/man/lwres_gai_strerror.docbook deleted file mode 100644 index 52d3e7de65..0000000000 --- a/lib/lwres/man/lwres_gai_strerror.docbook +++ /dev/null @@ -1,187 +0,0 @@ - - - - - - 2007-06-18 - - - ISC - Internet Systems Consortium, Inc. - - - - lwres_gai_strerror - 3 - BIND9 - - - - - 2000 - 2001 - 2004 - 2005 - 2007 - 2014 - 2015 - 2016 - Internet Systems Consortium, Inc. ("ISC") - - - - - lwres_gai_strerror - print suitable error string - - - - -#include <lwres/netdb.h> - - -char * -gai_strerror - int ecode - - - - - DESCRIPTION - - - lwres_gai_strerror() - returns an error message corresponding to an error code returned by - getaddrinfo(). - The following error codes and their meaning are defined in - include/lwres/netdb.h. - - - EAI_ADDRFAMILY - - - address family for hostname not supported - - - - - EAI_AGAIN - - - temporary failure in name resolution - - - - - EAI_BADFLAGS - - - invalid value for - ai_flags - - - - - EAI_FAIL - - - non-recoverable failure in name resolution - - - - - EAI_FAMILY - - ai_family not supported - - - - - EAI_MEMORY - - - memory allocation failure - - - - - EAI_NODATA - - - no address associated with hostname - - - - - EAI_NONAME - - - hostname or servname not provided, or not known - - - - - EAI_SERVICE - - - servname not supported for ai_socktype - - - - - EAI_SOCKTYPE - - ai_socktype not supported - - - - - EAI_SYSTEM - - - system error returned in errno - - - - - The message invalid error code is returned if - ecode - is out of range. - - ai_flags, - ai_family - and - ai_socktype - are elements of the - struct addrinfo - used by - lwres_getaddrinfo(). - - - - SEE ALSO - - - strerror3 - , - - - lwres_getaddrinfo3 - , - - - getaddrinfo3 - , - - - RFC2133 - . - - - diff --git a/lib/lwres/man/lwres_gai_strerror.html b/lib/lwres/man/lwres_gai_strerror.html deleted file mode 100644 index 1f27a18799..0000000000 --- a/lib/lwres/man/lwres_gai_strerror.html +++ /dev/null @@ -1,160 +0,0 @@ - - - - - -lwres_gai_strerror - - -
-
- - - - - - - -
-

Name

-

- lwres_gai_strerror - — print suitable error string -

-
- -
-

Synopsis

-
-
#include <lwres/netdb.h>
- - - -
-char * -gai_strerror(int ecode);
-
 
-
-
- -
-

DESCRIPTION

- - -

lwres_gai_strerror() - returns an error message corresponding to an error code returned by - getaddrinfo(). - The following error codes and their meaning are defined in - include/lwres/netdb.h. -

-
-
EAI_ADDRFAMILY
-
-

- address family for hostname not supported -

-
-
EAI_AGAIN
-
-

- temporary failure in name resolution -

-
-
EAI_BADFLAGS
-
-

- invalid value for - ai_flags -

-
-
EAI_FAIL
-
-

- non-recoverable failure in name resolution -

-
-
EAI_FAMILY
-
-

ai_family not supported -

-
-
EAI_MEMORY
-
-

- memory allocation failure -

-
-
EAI_NODATA
-
-

- no address associated with hostname -

-
-
EAI_NONAME
-
-

- hostname or servname not provided, or not known -

-
-
EAI_SERVICE
-
-

- servname not supported for ai_socktype -

-
-
EAI_SOCKTYPE
-
-

ai_socktype not supported -

-
-
EAI_SYSTEM
-
-

- system error returned in errno -

-
-
-

- The message invalid error code is returned if - ecode - is out of range. -

-

ai_flags, - ai_family - and - ai_socktype - are elements of the - struct addrinfo - used by - lwres_getaddrinfo(). -

-
- -
-

SEE ALSO

- -

- strerror(3) - , - - - lwres_getaddrinfo(3) - , - - - getaddrinfo(3) - , - - - RFC2133 - . -

-
-
- diff --git a/lib/lwres/man/lwres_getaddrinfo.3 b/lib/lwres/man/lwres_getaddrinfo.3 deleted file mode 100644 index 5c80b81b95..0000000000 --- a/lib/lwres/man/lwres_getaddrinfo.3 +++ /dev/null @@ -1,254 +0,0 @@ -.\" Copyright (C) 2000, 2001, 2003-2005, 2007, 2014-2016 Internet Systems Consortium, Inc. ("ISC") -.\" -.\" This Source Code Form is subject to the terms of the Mozilla Public -.\" License, v. 2.0. If a copy of the MPL was not distributed with this -.\" file, You can obtain one at http://mozilla.org/MPL/2.0/. -.\" -.hy 0 -.ad l -'\" t -.\" Title: lwres_getaddrinfo -.\" Author: -.\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 2007-06-18 -.\" Manual: BIND9 -.\" Source: ISC -.\" Language: English -.\" -.TH "LWRES_GETADDRINFO" "3" "2007\-06\-18" "ISC" "BIND9" -.\" ----------------------------------------------------------------- -.\" * Define some portability stuff -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" http://bugs.debian.org/507673 -.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.ie \n(.g .ds Aq \(aq -.el .ds Aq ' -.\" ----------------------------------------------------------------- -.\" * set default formatting -.\" ----------------------------------------------------------------- -.\" disable hyphenation -.nh -.\" disable justification (adjust text to left margin only) -.ad l -.\" ----------------------------------------------------------------- -.\" * MAIN CONTENT STARTS HERE * -.\" ----------------------------------------------------------------- -.SH "NAME" -lwres_getaddrinfo, lwres_freeaddrinfo \- socket address structure to host and service name -.SH "SYNOPSIS" -.sp -.ft B -.nf -#include -.fi -.ft -.HP \w'int\ lwres_getaddrinfo('u -.BI "int lwres_getaddrinfo(const\ char\ *" "hostname" ", const\ char\ *" "servname" ", const\ struct\ addrinfo\ *" "hints" ", struct\ addrinfo\ **" "res" ");" -.HP \w'void\ lwres_freeaddrinfo('u -.BI "void lwres_freeaddrinfo(struct\ addrinfo\ *" "ai" ");" -.PP -If the operating system does not provide a -\fBstruct addrinfo\fR, the following structure is used: -.PP -.nf -struct addrinfo { - int ai_flags; /* AI_PASSIVE, AI_CANONNAME */ - int ai_family; /* PF_xxx */ - int ai_socktype; /* SOCK_xxx */ - int ai_protocol; /* 0 or IPPROTO_xxx for IPv4 and IPv6 */ - size_t ai_addrlen; /* length of ai_addr */ - char *ai_canonname; /* canonical name for hostname */ - struct sockaddr *ai_addr; /* binary address */ - struct addrinfo *ai_next; /* next structure in linked list */ -}; -.fi -.sp -.SH "DESCRIPTION" -.PP -\fBlwres_getaddrinfo()\fR -is used to get a list of IP addresses and port numbers for host -\fIhostname\fR -and service -\fIservname\fR\&. The function is the lightweight resolver\*(Aqs implementation of -\fBgetaddrinfo()\fR -as defined in RFC2133\&. -\fIhostname\fR -and -\fIservname\fR -are pointers to null\-terminated strings or -\fBNULL\fR\&. -\fIhostname\fR -is either a host name or a numeric host address string: a dotted decimal IPv4 address or an IPv6 address\&. -\fIservname\fR -is either a decimal port number or a service name as listed in -/etc/services\&. -.PP -\fIhints\fR -is an optional pointer to a -\fBstruct addrinfo\fR\&. This structure can be used to provide hints concerning the type of socket that the caller supports or wishes to use\&. The caller can supply the following structure elements in -\fI*hints\fR: -.PP -\fBai_family\fR -.RS 4 -The protocol family that should be used\&. When -\fBai_family\fR -is set to -\fBPF_UNSPEC\fR, it means the caller will accept any protocol family supported by the operating system\&. -.RE -.PP -\fBai_socktype\fR -.RS 4 -denotes the type of socket \(em -\fBSOCK_STREAM\fR, -\fBSOCK_DGRAM\fR -or -\fBSOCK_RAW\fR -\(em that is wanted\&. When -\fBai_socktype\fR -is zero the caller will accept any socket type\&. -.RE -.PP -\fBai_protocol\fR -.RS 4 -indicates which transport protocol is wanted: IPPROTO_UDP or IPPROTO_TCP\&. If -\fBai_protocol\fR -is zero the caller will accept any protocol\&. -.RE -.PP -\fBai_flags\fR -.RS 4 -Flag bits\&. If the -\fBAI_CANONNAME\fR -bit is set, a successful call to -\fBlwres_getaddrinfo()\fR -will return a null\-terminated string containing the canonical name of the specified hostname in -\fBai_canonname\fR -of the first -\fBaddrinfo\fR -structure returned\&. Setting the -\fBAI_PASSIVE\fR -bit indicates that the returned socket address structure is intended for used in a call to -\fBbind\fR(2)\&. In this case, if the hostname argument is a -\fBNULL\fR -pointer, then the IP address portion of the socket address structure will be set to -\fBINADDR_ANY\fR -for an IPv4 address or -\fBIN6ADDR_ANY_INIT\fR -for an IPv6 address\&. -.sp -When -\fBai_flags\fR -does not set the -\fBAI_PASSIVE\fR -bit, the returned socket address structure will be ready for use in a call to -\fBconnect\fR(2) -for a connection\-oriented protocol or -\fBconnect\fR(2), -\fBsendto\fR(2), or -\fBsendmsg\fR(2) -if a connectionless protocol was chosen\&. The IP address portion of the socket address structure will be set to the loopback address if -\fIhostname\fR -is a -\fBNULL\fR -pointer and -\fBAI_PASSIVE\fR -is not set in -\fBai_flags\fR\&. -.sp -If -\fBai_flags\fR -is set to -\fBAI_NUMERICHOST\fR -it indicates that -\fIhostname\fR -should be treated as a numeric string defining an IPv4 or IPv6 address and no name resolution should be attempted\&. -.RE -.PP -All other elements of the -\fBstruct addrinfo\fR -passed via -\fIhints\fR -must be zero\&. -.PP -A -\fIhints\fR -of -\fBNULL\fR -is treated as if the caller provided a -\fBstruct addrinfo\fR -initialized to zero with -\fBai_family\fRset to -\fBPF_UNSPEC\fR\&. -.PP -After a successful call to -\fBlwres_getaddrinfo()\fR, -\fI*res\fR -is a pointer to a linked list of one or more -\fBaddrinfo\fR -structures\&. Each -\fBstruct addrinfo\fR -in this list cn be processed by following the -\fBai_next\fR -pointer, until a -\fBNULL\fR -pointer is encountered\&. The three members -\fBai_family\fR, -\fBai_socktype\fR, and -\fBai_protocol\fR -in each returned -\fBaddrinfo\fR -structure contain the corresponding arguments for a call to -\fBsocket\fR(2)\&. For each -\fBaddrinfo\fR -structure in the list, the -\fBai_addr\fR -member points to a filled\-in socket address structure of length -\fBai_addrlen\fR\&. -.PP -All of the information returned by -\fBlwres_getaddrinfo()\fR -is dynamically allocated: the addrinfo structures, and the socket address structures and canonical host name strings pointed to by the -\fBaddrinfo\fRstructures\&. Memory allocated for the dynamically allocated structures created by a successful call to -\fBlwres_getaddrinfo()\fR -is released by -\fBlwres_freeaddrinfo()\fR\&. -\fIai\fR -is a pointer to a -\fBstruct addrinfo\fR -created by a call to -\fBlwres_getaddrinfo()\fR\&. -.SH "RETURN VALUES" -.PP -\fBlwres_getaddrinfo()\fR -returns zero on success or one of the error codes listed in -\fBgai_strerror\fR(3) -if an error occurs\&. If both -\fIhostname\fR -and -\fIservname\fR -are -\fBNULL\fR\fBlwres_getaddrinfo()\fR -returns -\fBEAI_NONAME\fR\&. -.SH "SEE ALSO" -.PP -\fBlwres\fR(3), -\fBlwres_getaddrinfo\fR(3), -\fBlwres_freeaddrinfo\fR(3), -\fBlwres_gai_strerror\fR(3), -\fBRFC2133\fR(), -\fBgetservbyname\fR(3), -\fBbind\fR(2), -\fBconnect\fR(2), -\fBsendto\fR(2), -\fBsendmsg\fR(2), -\fBsocket\fR(2)\&. -.SH "AUTHOR" -.PP -\fBInternet Systems Consortium, Inc\&.\fR -.SH "COPYRIGHT" -.br -Copyright \(co 2000, 2001, 2003-2005, 2007, 2014-2016 Internet Systems Consortium, Inc. ("ISC") -.br diff --git a/lib/lwres/man/lwres_getaddrinfo.docbook b/lib/lwres/man/lwres_getaddrinfo.docbook deleted file mode 100644 index 9a86c84ea5..0000000000 --- a/lib/lwres/man/lwres_getaddrinfo.docbook +++ /dev/null @@ -1,376 +0,0 @@ -]> - - - - - - 2007-06-18 - - - ISC - Internet Systems Consortium, Inc. - - - - lwres_getaddrinfo - 3 - BIND9 - - - - - 2000 - 2001 - 2003 - 2004 - 2005 - 2007 - 2014 - 2015 - 2016 - Internet Systems Consortium, Inc. ("ISC") - - - - - lwres_getaddrinfo - lwres_freeaddrinfo - socket address structure to host and service name - - - -#include <lwres/netdb.h> - - -int -lwres_getaddrinfo - const char *hostname - const char *servname - const struct addrinfo *hints - struct addrinfo **res - - - -void -lwres_freeaddrinfo - struct addrinfo *ai - - - - - If the operating system does not provide a - struct addrinfo, - the following structure is used: - - -struct addrinfo { - int ai_flags; /* AI_PASSIVE, AI_CANONNAME */ - int ai_family; /* PF_xxx */ - int ai_socktype; /* SOCK_xxx */ - int ai_protocol; /* 0 or IPPROTO_xxx for IPv4 and IPv6 */ - size_t ai_addrlen; /* length of ai_addr */ - char *ai_canonname; /* canonical name for hostname */ - struct sockaddr *ai_addr; /* binary address */ - struct addrinfo *ai_next; /* next structure in linked list */ -}; - - - - - - DESCRIPTION - - - lwres_getaddrinfo() - is used to get a list of IP addresses and port numbers for host - hostname and service - servname. - - The function is the lightweight resolver's implementation of - getaddrinfo() as defined in RFC2133. - hostname and - servname are pointers to null-terminated - strings or NULL. - - hostname is either a host name or a - numeric host address string: a dotted decimal IPv4 address or an - IPv6 address. servname is either a - decimal port number or a service name as listed in - /etc/services. - - - hints - is an optional pointer to a - struct addrinfo. - This structure can be used to provide hints concerning the type of - socket - that the caller supports or wishes to use. - The caller can supply the following structure elements in - *hints: - - - - ai_family - - - The protocol family that should be used. - When - ai_family - is set to - PF_UNSPEC, - it means the caller will accept any protocol family supported by - the - operating system. - - - - - ai_socktype - - - denotes the type of socket — - SOCK_STREAM, - SOCK_DGRAM - or - SOCK_RAW - — that is wanted. - When - ai_socktype - is zero the caller will accept any socket type. - - - - - ai_protocol - - - indicates which transport protocol is wanted: IPPROTO_UDP or - IPPROTO_TCP. - If - ai_protocol - is zero the caller will accept any protocol. - - - - - ai_flags - - - Flag bits. - If the - AI_CANONNAME - bit is set, a successful call to - lwres_getaddrinfo() - will return a null-terminated string containing the canonical - name - of the specified hostname in - ai_canonname - of the first - addrinfo - structure returned. - Setting the - AI_PASSIVE - bit indicates that the returned socket address structure is - intended - for used in a call to - - bind2 - . - - In this case, if the hostname argument is a - NULL - pointer, then the IP address portion of the socket - address structure will be set to - INADDR_ANY - for an IPv4 address or - IN6ADDR_ANY_INIT - for an IPv6 address. - - - When - ai_flags - does not set the - AI_PASSIVE - bit, the returned socket address structure will be ready - for use in a call to - - connect2 - - for a connection-oriented protocol or - - connect2 - , - - - sendto2 - , - - or - - sendmsg2 - - if a connectionless protocol was chosen. - The IP address portion of the socket address structure will be - set to the loopback address if - hostname - is a - NULL - pointer and - AI_PASSIVE - is not set in - ai_flags. - - - If - ai_flags - is set to - AI_NUMERICHOST - it indicates that - hostname - should be treated as a numeric string defining an IPv4 or IPv6 - address - and no name resolution should be attempted. - - - - - - - - All other elements of the struct addrinfo passed - via hints must be zero. - - - - A hints of NULL is - treated as if - the caller provided a struct addrinfo initialized to zero - with ai_familyset to - PF_UNSPEC. - - - - After a successful call to - lwres_getaddrinfo(), - *res - is a pointer to a linked list of one or more - addrinfo - structures. - Each - struct addrinfo - in this list cn be processed by following - the - ai_next - pointer, until a - NULL - pointer is encountered. - The three members - ai_family, - ai_socktype, - and - ai_protocol - in each - returned - addrinfo - structure contain the corresponding arguments for a call to - - socket2 - . - For each - addrinfo - structure in the list, the - ai_addr - member points to a filled-in socket address structure of length - ai_addrlen. - - - - All of the information returned by - lwres_getaddrinfo() - is dynamically allocated: the addrinfo structures, and the socket - address structures and canonical host name strings pointed to by the - addrinfostructures. - Memory allocated for the dynamically allocated structures created by - a successful call to - lwres_getaddrinfo() - is released by - lwres_freeaddrinfo(). - ai - is a pointer to a - struct addrinfo - created by a call to - lwres_getaddrinfo(). - - - - - RETURN VALUES - - - lwres_getaddrinfo() - returns zero on success or one of the error codes listed in - - gai_strerror3 - - if an error occurs. If both hostname and - servname are NULL - lwres_getaddrinfo() returns - EAI_NONAME. - - - SEE ALSO - - - lwres3 - , - - - lwres_getaddrinfo3 - , - - - lwres_freeaddrinfo3 - , - - - lwres_gai_strerror3 - , - - - RFC2133 - , - - - getservbyname3 - , - - - bind2 - , - - - connect2 - , - - - sendto2 - , - - - sendmsg2 - , - - - socket2 - . - - - - diff --git a/lib/lwres/man/lwres_getaddrinfo.html b/lib/lwres/man/lwres_getaddrinfo.html deleted file mode 100644 index 5b1c2d5aa4..0000000000 --- a/lib/lwres/man/lwres_getaddrinfo.html +++ /dev/null @@ -1,374 +0,0 @@ - - - - - -lwres_getaddrinfo - - -
-
- - - - - - - -
-

Name

-

- lwres_getaddrinfo, - lwres_freeaddrinfo - — socket address structure to host and service name -

-
-
-

Synopsis

-
-
#include <lwres/netdb.h>
- - - - - - - - - - - - - - - - - -
-int -lwres_getaddrinfo(const char *hostname,
 const char *servname,
 const struct addrinfo *hints,
 struct addrinfo **res);
-
 
- - - -
-void -lwres_freeaddrinfo(struct addrinfo *ai);
-
 
-
- -

- If the operating system does not provide a - struct addrinfo, - the following structure is used: -

- 
-struct  addrinfo {
-        int             ai_flags;       /* AI_PASSIVE, AI_CANONNAME */
-        int             ai_family;      /* PF_xxx */
-        int             ai_socktype;    /* SOCK_xxx */
-        int             ai_protocol;    /* 0 or IPPROTO_xxx for IPv4 and IPv6 */
-        size_t          ai_addrlen;     /* length of ai_addr */
-        char            *ai_canonname;  /* canonical name for hostname */
-        struct sockaddr *ai_addr;       /* binary address */
-        struct addrinfo *ai_next;       /* next structure in linked list */
-};
-
-

-

- -
- -
-

DESCRIPTION

- - -

lwres_getaddrinfo() - is used to get a list of IP addresses and port numbers for host - hostname and service - servname. - - The function is the lightweight resolver's implementation of - getaddrinfo() as defined in RFC2133. - hostname and - servname are pointers to null-terminated - strings or NULL. - - hostname is either a host name or a - numeric host address string: a dotted decimal IPv4 address or an - IPv6 address. servname is either a - decimal port number or a service name as listed in - /etc/services. -

- -

hints - is an optional pointer to a - struct addrinfo. - This structure can be used to provide hints concerning the type of - socket - that the caller supports or wishes to use. - The caller can supply the following structure elements in - *hints: - -

-
-
ai_family
-
-

- The protocol family that should be used. - When - ai_family - is set to - PF_UNSPEC, - it means the caller will accept any protocol family supported by - the - operating system. -

-
-
ai_socktype
-
-

- denotes the type of socket — - SOCK_STREAM, - SOCK_DGRAM - or - SOCK_RAW - — that is wanted. - When - ai_socktype - is zero the caller will accept any socket type. -

-
-
ai_protocol
-
-

- indicates which transport protocol is wanted: IPPROTO_UDP or - IPPROTO_TCP. - If - ai_protocol - is zero the caller will accept any protocol. -

-
-
ai_flags
-
-

- Flag bits. - If the - AI_CANONNAME - bit is set, a successful call to - lwres_getaddrinfo() - will return a null-terminated string containing the canonical - name - of the specified hostname in - ai_canonname - of the first - addrinfo - structure returned. - Setting the - AI_PASSIVE - bit indicates that the returned socket address structure is - intended - for used in a call to - - bind(2) - . - - In this case, if the hostname argument is a - NULL - pointer, then the IP address portion of the socket - address structure will be set to - INADDR_ANY - for an IPv4 address or - IN6ADDR_ANY_INIT - for an IPv6 address. -

-

- When - ai_flags - does not set the - AI_PASSIVE - bit, the returned socket address structure will be ready - for use in a call to - - connect(2) - - for a connection-oriented protocol or - - connect(2) - , - - - sendto(2) - , - - or - - sendmsg(2) - - if a connectionless protocol was chosen. - The IP address portion of the socket address structure will be - set to the loopback address if - hostname - is a - NULL - pointer and - AI_PASSIVE - is not set in - ai_flags. -

-

- If - ai_flags - is set to - AI_NUMERICHOST - it indicates that - hostname - should be treated as a numeric string defining an IPv4 or IPv6 - address - and no name resolution should be attempted. -

-
-
-

-

- -

- All other elements of the struct addrinfo passed - via hints must be zero. -

- -

- A hints of NULL is - treated as if - the caller provided a struct addrinfo initialized to zero - with ai_familyset to - PF_UNSPEC. -

- -

- After a successful call to - lwres_getaddrinfo(), - *res - is a pointer to a linked list of one or more - addrinfo - structures. - Each - struct addrinfo - in this list cn be processed by following - the - ai_next - pointer, until a - NULL - pointer is encountered. - The three members - ai_family, - ai_socktype, - and - ai_protocol - in each - returned - addrinfo - structure contain the corresponding arguments for a call to - - socket(2) - . - For each - addrinfo - structure in the list, the - ai_addr - member points to a filled-in socket address structure of length - ai_addrlen. -

- -

- All of the information returned by - lwres_getaddrinfo() - is dynamically allocated: the addrinfo structures, and the socket - address structures and canonical host name strings pointed to by the - addrinfostructures. - Memory allocated for the dynamically allocated structures created by - a successful call to - lwres_getaddrinfo() - is released by - lwres_freeaddrinfo(). - ai - is a pointer to a - struct addrinfo - created by a call to - lwres_getaddrinfo(). -

- -
- -
-

RETURN VALUES

- - -

lwres_getaddrinfo() - returns zero on success or one of the error codes listed in - - gai_strerror(3) - - if an error occurs. If both hostname and - servname are NULL - lwres_getaddrinfo() returns - EAI_NONAME. -

-
-
-

SEE ALSO

- -

- lwres(3) - , - - - lwres_getaddrinfo(3) - , - - - lwres_freeaddrinfo(3) - , - - - lwres_gai_strerror(3) - , - - - RFC2133 - , - - - getservbyname(3) - , - - - bind(2) - , - - - connect(2) - , - - - sendto(2) - , - - - sendmsg(2) - , - - - socket(2) - . -

- -
-
- diff --git a/lib/lwres/man/lwres_gethostent.3 b/lib/lwres/man/lwres_gethostent.3 deleted file mode 100644 index de87313a2e..0000000000 --- a/lib/lwres/man/lwres_gethostent.3 +++ /dev/null @@ -1,329 +0,0 @@ -.\" Copyright (C) 2001, 2004, 2005, 2007, 2014-2016 Internet Systems Consortium, Inc. ("ISC") -.\" -.\" This Source Code Form is subject to the terms of the Mozilla Public -.\" License, v. 2.0. If a copy of the MPL was not distributed with this -.\" file, You can obtain one at http://mozilla.org/MPL/2.0/. -.\" -.hy 0 -.ad l -'\" t -.\" Title: lwres_gethostent -.\" Author: -.\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 2007-06-18 -.\" Manual: BIND9 -.\" Source: ISC -.\" Language: English -.\" -.TH "LWRES_GETHOSTENT" "3" "2007\-06\-18" "ISC" "BIND9" -.\" ----------------------------------------------------------------- -.\" * Define some portability stuff -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" http://bugs.debian.org/507673 -.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.ie \n(.g .ds Aq \(aq -.el .ds Aq ' -.\" ----------------------------------------------------------------- -.\" * set default formatting -.\" ----------------------------------------------------------------- -.\" disable hyphenation -.nh -.\" disable justification (adjust text to left margin only) -.ad l -.\" ----------------------------------------------------------------- -.\" * MAIN CONTENT STARTS HERE * -.\" ----------------------------------------------------------------- -.SH "NAME" -lwres_gethostbyname, lwres_gethostbyname2, lwres_gethostbyaddr, lwres_gethostent, lwres_sethostent, lwres_endhostent, lwres_gethostbyname_r, lwres_gethostbyaddr_r, lwres_gethostent_r, lwres_sethostent_r, lwres_endhostent_r \- lightweight resolver get network host entry -.SH "SYNOPSIS" -.sp -.ft B -.nf -#include -.fi -.ft -.HP \w'struct\ hostent\ *\ lwres_gethostbyname('u -.BI "struct hostent * lwres_gethostbyname(const\ char\ *" "name" ");" -.HP \w'struct\ hostent\ *\ lwres_gethostbyname2('u -.BI "struct hostent * lwres_gethostbyname2(const\ char\ *" "name" ", int\ " "af" ");" -.HP \w'struct\ hostent\ *\ lwres_gethostbyaddr('u -.BI "struct hostent * lwres_gethostbyaddr(const\ char\ *" "addr" ", int\ " "len" ", int\ " "type" ");" -.HP \w'struct\ hostent\ *\ lwres_gethostent('u -.BI "struct hostent * lwres_gethostent(void);" -.HP \w'void\ lwres_sethostent('u -.BI "void lwres_sethostent(int\ " "stayopen" ");" -.HP \w'void\ lwres_endhostent('u -.BI "void lwres_endhostent(void);" -.HP \w'struct\ hostent\ *\ lwres_gethostbyname_r('u -.BI "struct hostent * lwres_gethostbyname_r(const\ char\ *" "name" ", struct\ hostent\ *" "resbuf" ", char\ *" "buf" ", int\ " "buflen" ", int\ *" "error" ");" -.HP \w'struct\ hostent\ *\ lwres_gethostbyaddr_r('u -.BI "struct hostent * lwres_gethostbyaddr_r(const\ char\ *" "addr" ", int\ " "len" ", int\ " "type" ", struct\ hostent\ *" "resbuf" ", char\ *" "buf" ", int\ " "buflen" ", int\ *" "error" ");" -.HP \w'struct\ hostent\ *\ lwres_gethostent_r('u -.BI "struct hostent * lwres_gethostent_r(struct\ hostent\ *" "resbuf" ", char\ *" "buf" ", int\ " "buflen" ", int\ *" "error" ");" -.HP \w'void\ lwres_sethostent_r('u -.BI "void lwres_sethostent_r(int\ " "stayopen" ");" -.HP \w'void\ lwres_endhostent_r('u -.BI "void lwres_endhostent_r(void);" -.SH "DESCRIPTION" -.PP -These functions provide hostname\-to\-address and address\-to\-hostname lookups by means of the lightweight resolver\&. They are similar to the standard -\fBgethostent\fR(3) -functions provided by most operating systems\&. They use a -\fBstruct hostent\fR -which is usually defined in -\&. -.PP -.if n \{\ -.RS 4 -.\} -.nf -struct hostent { - char *h_name; /* official name of host */ - char **h_aliases; /* alias list */ - int h_addrtype; /* host address type */ - int h_length; /* length of address */ - char **h_addr_list; /* list of addresses from name server */ -}; -#define h_addr h_addr_list[0] /* address, for backward compatibility */ -.fi -.if n \{\ -.RE -.\} -.PP -The members of this structure are: -.PP -\fBh_name\fR -.RS 4 -The official (canonical) name of the host\&. -.RE -.PP -\fBh_aliases\fR -.RS 4 -A NULL\-terminated array of alternate names (nicknames) for the host\&. -.RE -.PP -\fBh_addrtype\fR -.RS 4 -The type of address being returned \(em -\fBPF_INET\fR -or -\fBPF_INET6\fR\&. -.RE -.PP -\fBh_length\fR -.RS 4 -The length of the address in bytes\&. -.RE -.PP -\fBh_addr_list\fR -.RS 4 -A -\fBNULL\fR -terminated array of network addresses for the host\&. Host addresses are returned in network byte order\&. -.RE -.PP -For backward compatibility with very old software, -\fBh_addr\fR -is the first address in -\fBh_addr_list\&.\fR -.PP -\fBlwres_gethostent()\fR, -\fBlwres_sethostent()\fR, -\fBlwres_endhostent()\fR, -\fBlwres_gethostent_r()\fR, -\fBlwres_sethostent_r()\fR -and -\fBlwres_endhostent_r()\fR -provide iteration over the known host entries on systems that provide such functionality through facilities like -/etc/hosts -or NIS\&. The lightweight resolver does not currently implement these functions; it only provides them as stub functions that always return failure\&. -.PP -\fBlwres_gethostbyname()\fR -and -\fBlwres_gethostbyname2()\fR -look up the hostname -\fIname\fR\&. -\fBlwres_gethostbyname()\fR -always looks for an IPv4 address while -\fBlwres_gethostbyname2()\fR -looks for an address of protocol family -\fIaf\fR: either -\fBPF_INET\fR -or -\fBPF_INET6\fR -\(em IPv4 or IPV6 addresses respectively\&. Successful calls of the functions return a -\fBstruct hostent\fRfor the name that was looked up\&. -\fBNULL\fR -is returned if the lookups by -\fBlwres_gethostbyname()\fR -or -\fBlwres_gethostbyname2()\fR -fail\&. -.PP -Reverse lookups of addresses are performed by -\fBlwres_gethostbyaddr()\fR\&. -\fIaddr\fR -is an address of length -\fIlen\fR -bytes and protocol family -\fItype\fR -\(em -\fBPF_INET\fR -or -\fBPF_INET6\fR\&. -\fBlwres_gethostbyname_r()\fR -is a thread\-safe function for forward lookups\&. If an error occurs, an error code is returned in -\fI*error\fR\&. -\fIresbuf\fR -is a pointer to a -\fBstruct hostent\fR -which is initialised by a successful call to -\fBlwres_gethostbyname_r()\fR\&. -\fIbuf\fR -is a buffer of length -\fIlen\fR -bytes which is used to store the -\fBh_name\fR, -\fBh_aliases\fR, and -\fBh_addr_list\fR -elements of the -\fBstruct hostent\fR -returned in -\fIresbuf\fR\&. Successful calls to -\fBlwres_gethostbyname_r()\fR -return -\fIresbuf\fR, which is a pointer to the -\fBstruct hostent\fR -it created\&. -.PP -\fBlwres_gethostbyaddr_r()\fR -is a thread\-safe function that performs a reverse lookup of address -\fIaddr\fR -which is -\fIlen\fR -bytes long and is of protocol family -\fItype\fR -\(em -\fBPF_INET\fR -or -\fBPF_INET6\fR\&. If an error occurs, the error code is returned in -\fI*error\fR\&. The other function parameters are identical to those in -\fBlwres_gethostbyname_r()\fR\&. -\fIresbuf\fR -is a pointer to a -\fBstruct hostent\fR -which is initialised by a successful call to -\fBlwres_gethostbyaddr_r()\fR\&. -\fIbuf\fR -is a buffer of length -\fIlen\fR -bytes which is used to store the -\fBh_name\fR, -\fBh_aliases\fR, and -\fBh_addr_list\fR -elements of the -\fBstruct hostent\fR -returned in -\fIresbuf\fR\&. Successful calls to -\fBlwres_gethostbyaddr_r()\fR -return -\fIresbuf\fR, which is a pointer to the -\fBstruct hostent()\fR -it created\&. -.SH "RETURN VALUES" -.PP -The functions -\fBlwres_gethostbyname()\fR, -\fBlwres_gethostbyname2()\fR, -\fBlwres_gethostbyaddr()\fR, and -\fBlwres_gethostent()\fR -return NULL to indicate an error\&. In this case the global variable -\fBlwres_h_errno\fR -will contain one of the following error codes defined in -: -.PP -\fBHOST_NOT_FOUND\fR -.RS 4 -The host or address was not found\&. -.RE -.PP -\fBTRY_AGAIN\fR -.RS 4 -A recoverable error occurred, e\&.g\&., a timeout\&. Retrying the lookup may succeed\&. -.RE -.PP -\fBNO_RECOVERY\fR -.RS 4 -A non\-recoverable error occurred\&. -.RE -.PP -\fBNO_DATA\fR -.RS 4 -The name exists, but has no address information associated with it (or vice versa in the case of a reverse lookup)\&. The code NO_ADDRESS is accepted as a synonym for NO_DATA for backwards compatibility\&. -.RE -.PP -\fBlwres_hstrerror\fR(3) -translates these error codes to suitable error messages\&. -.PP -\fBlwres_gethostent()\fR -and -\fBlwres_gethostent_r()\fR -always return -\fBNULL\fR\&. -.PP -Successful calls to -\fBlwres_gethostbyname_r()\fR -and -\fBlwres_gethostbyaddr_r()\fR -return -\fIresbuf\fR, a pointer to the -\fBstruct hostent\fR -that was initialised by these functions\&. They return -\fBNULL\fR -if the lookups fail or if -\fIbuf\fR -was too small to hold the list of addresses and names referenced by the -\fBh_name\fR, -\fBh_aliases\fR, and -\fBh_addr_list\fR -elements of the -\fBstruct hostent\fR\&. If -\fIbuf\fR -was too small, both -\fBlwres_gethostbyname_r()\fR -and -\fBlwres_gethostbyaddr_r()\fR -set the global variable -\fBerrno\fR -to -\fBERANGE\fR\&. -.SH "SEE ALSO" -.PP -\fBgethostent\fR(3), -\fBlwres_getipnode\fR(3), -\fBlwres_hstrerror\fR(3) -.SH "BUGS" -.PP -\fBlwres_gethostbyname()\fR, -\fBlwres_gethostbyname2()\fR, -\fBlwres_gethostbyaddr()\fR -and -\fBlwres_endhostent()\fR -are not thread safe; they return pointers to static data and provide error codes through a global variable\&. Thread\-safe versions for name and address lookup are provided by -\fBlwres_gethostbyname_r()\fR, and -\fBlwres_gethostbyaddr_r()\fR -respectively\&. -.PP -The resolver daemon does not currently support any non\-DNS name services such as -/etc/hosts -or -\fBNIS\fR, consequently the above functions don\*(Aqt, either\&. -.SH "AUTHOR" -.PP -\fBInternet Systems Consortium, Inc\&.\fR -.SH "COPYRIGHT" -.br -Copyright \(co 2001, 2004, 2005, 2007, 2014-2016 Internet Systems Consortium, Inc. ("ISC") -.br diff --git a/lib/lwres/man/lwres_gethostent.docbook b/lib/lwres/man/lwres_gethostent.docbook deleted file mode 100644 index 9cc306552e..0000000000 --- a/lib/lwres/man/lwres_gethostent.docbook +++ /dev/null @@ -1,428 +0,0 @@ -]> - - - - - - 2007-06-18 - - - ISC - Internet Systems Consortium, Inc. - - - - lwres_gethostent - 3 - BIND9 - - - - - 2001 - 2004 - 2005 - 2007 - 2014 - 2015 - 2016 - Internet Systems Consortium, Inc. ("ISC") - - - - - lwres_gethostbyname - lwres_gethostbyname2 - lwres_gethostbyaddr - lwres_gethostent - lwres_sethostent - lwres_endhostent - lwres_gethostbyname_r - lwres_gethostbyaddr_r - lwres_gethostent_r - lwres_sethostent_r - lwres_endhostent_r - lightweight resolver get network host entry - - - -#include <lwres/netdb.h> - - -struct hostent * -lwres_gethostbyname - const char *name - - - -struct hostent * -lwres_gethostbyname2 - const char *name - int af - - - -struct hostent * -lwres_gethostbyaddr - const char *addr - int len - int type - - - -struct hostent * -lwres_gethostent - void - - - -void -lwres_sethostent - int stayopen - - - -void -lwres_endhostent - void - - - -struct hostent * -lwres_gethostbyname_r - const char *name - struct hostent *resbuf - char *buf - int buflen - int *error - - - -struct hostent * -lwres_gethostbyaddr_r - const char *addr - int len - int type - struct hostent *resbuf - char *buf - int buflen - int *error - - - -struct hostent * -lwres_gethostent_r - struct hostent *resbuf - char *buf - int buflen - int *error - - - -void -lwres_sethostent_r - int stayopen - - - -void -lwres_endhostent_r - void - - - - - DESCRIPTION - - - These functions provide hostname-to-address and - address-to-hostname lookups by means of the lightweight resolver. - They are similar to the standard - - gethostent3 - - functions provided by most operating systems. - They use a - struct hostent - which is usually defined in - <namedb.h>. - - -struct hostent { - char *h_name; /* official name of host */ - char **h_aliases; /* alias list */ - int h_addrtype; /* host address type */ - int h_length; /* length of address */ - char **h_addr_list; /* list of addresses from name server */ -}; -#define h_addr h_addr_list[0] /* address, for backward compatibility */ - - - - The members of this structure are: - - - h_name - - - The official (canonical) name of the host. - - - - - h_aliases - - - A NULL-terminated array of alternate names (nicknames) for the - host. - - - - - h_addrtype - - - The type of address being returned — - PF_INET - or - PF_INET6. - - - - - h_length - - - The length of the address in bytes. - - - - - h_addr_list - - - A NULL - terminated array of network addresses for the host. - Host addresses are returned in network byte order. - - - - - - - For backward compatibility with very old software, - h_addr - is the first address in - h_addr_list. - - lwres_gethostent(), - lwres_sethostent(), - lwres_endhostent(), - lwres_gethostent_r(), - lwres_sethostent_r() - and - lwres_endhostent_r() - provide iteration over the known host entries on systems that - provide such functionality through facilities like - /etc/hosts - or NIS. The lightweight resolver does not currently implement - these functions; it only provides them as stub functions that always - return failure. - - - lwres_gethostbyname() - and lwres_gethostbyname2() look up the - hostname name. - lwres_gethostbyname() always looks for an - IPv4 address while lwres_gethostbyname2() - looks for an address of protocol family - af: either PF_INET or - PF_INET6 — IPv4 or IPV6 addresses - respectively. Successful calls of the functions return a - struct hostentfor the name that was looked up. - NULL is returned if the lookups by - lwres_gethostbyname() or - lwres_gethostbyname2() fail. - - - - Reverse lookups of addresses are performed by - lwres_gethostbyaddr(). - addr is an address of length - len bytes and protocol family - type — PF_INET or - PF_INET6. - lwres_gethostbyname_r() is a - thread-safe function - for forward lookups. If an error occurs, an error code is returned in - *error. - resbuf is a pointer to a - struct hostent which is initialised by a successful call to - lwres_gethostbyname_r(). - buf is a buffer of length - len bytes which is used to store the - h_name, h_aliases, and - h_addr_list elements of the - struct hostent returned in resbuf. - Successful calls to lwres_gethostbyname_r() - return resbuf, - which is a pointer to the struct hostent it created. - - - lwres_gethostbyaddr_r() - is a thread-safe function - that performs a reverse lookup of address addr - which is len bytes long and is of - protocol - family type — PF_INET or - PF_INET6. If an error occurs, the error code is returned - in *error. The other function - parameters are - identical to those in lwres_gethostbyname_r(). - resbuf is a pointer to a - struct hostent which is initialised by a successful call to - lwres_gethostbyaddr_r(). - buf is a buffer of length - len bytes which is used to store the - h_name, h_aliases, and - h_addr_list elements of the - struct hostent returned in resbuf. - Successful calls to lwres_gethostbyaddr_r() return - resbuf, which is a pointer to the - struct hostent() it created. - - - - - RETURN VALUES - - - The functions - lwres_gethostbyname(), - lwres_gethostbyname2(), - lwres_gethostbyaddr(), - and - lwres_gethostent() - return NULL to indicate an error. In this case the global variable - lwres_h_errno - will contain one of the following error codes defined in - <lwres/netdb.h>: - - - - HOST_NOT_FOUND - - - The host or address was not found. - - - - - TRY_AGAIN - - - A recoverable error occurred, e.g., a timeout. - Retrying the lookup may succeed. - - - - - NO_RECOVERY - - - A non-recoverable error occurred. - - - - - NO_DATA - - - The name exists, but has no address information - associated with it (or vice versa in the case - of a reverse lookup). The code NO_ADDRESS - is accepted as a synonym for NO_DATA for backwards - compatibility. - - - - - - - - lwres_hstrerror3 - - translates these error codes to suitable error messages. - - - lwres_gethostent() - and lwres_gethostent_r() - always return NULL. - - - - Successful calls to lwres_gethostbyname_r() and - lwres_gethostbyaddr_r() return - resbuf, a pointer to the - struct hostent that was initialised by these functions. They return - NULL if the lookups fail or if buf - was too small to hold the list of addresses and names referenced by - the h_name, h_aliases, and - h_addr_list elements of the - struct hostent. - If buf was too small, both - lwres_gethostbyname_r() and - lwres_gethostbyaddr_r() set the global - variable - errno to ERANGE. - - - - SEE ALSO - - - gethostent3 - , - - - lwres_getipnode3 - , - - - lwres_hstrerror3 - - - - - BUGS - - lwres_gethostbyname(), - lwres_gethostbyname2(), - lwres_gethostbyaddr() - and - lwres_endhostent() - are not thread safe; they return pointers to static data and - provide error codes through a global variable. - Thread-safe versions for name and address lookup are provided by - lwres_gethostbyname_r(), - and - lwres_gethostbyaddr_r() - respectively. - - - The resolver daemon does not currently support any non-DNS - name services such as - /etc/hosts - or - NIS, - consequently the above functions don't, either. - - - diff --git a/lib/lwres/man/lwres_gethostent.html b/lib/lwres/man/lwres_gethostent.html deleted file mode 100644 index 1d1c58bbc6..0000000000 --- a/lib/lwres/man/lwres_gethostent.html +++ /dev/null @@ -1,477 +0,0 @@ - - - - - -lwres_gethostent - - -
-
- - - - - - - -
-

Name

-

- lwres_gethostbyname, - lwres_gethostbyname2, - lwres_gethostbyaddr, - lwres_gethostent, - lwres_sethostent, - lwres_endhostent, - lwres_gethostbyname_r, - lwres_gethostbyaddr_r, - lwres_gethostent_r, - lwres_sethostent_r, - lwres_endhostent_r - — lightweight resolver get network host entry -

-
-
-

Synopsis

-
-
#include <lwres/netdb.h>
- - - -
-struct hostent * -lwres_gethostbyname(const char *name);
-
 
- - - - - - - - - -
-struct hostent * -lwres_gethostbyname2(const char *name,
 int af);
-
 
- - - - - - - - - - - - - -
-struct hostent * -lwres_gethostbyaddr(const char *addr,
 int len,
 int type);
-
 
- - - -
-struct hostent * -lwres_gethostent(void);
-
 
- - - -
-void -lwres_sethostent(int stayopen);
-
 
- - - -
-void -lwres_endhostent(void);
-
 
- - - - - - - - - - - - - - - - - - - - - -
-struct hostent * -lwres_gethostbyname_r(const char *name,
 struct hostent *resbuf,
 char *buf,
 int buflen,
 int *error);
-
 
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-struct hostent * -lwres_gethostbyaddr_r(const char *addr,
 int len,
 int type,
 struct hostent *resbuf,
 char *buf,
 int buflen,
 int *error);
-
 
- - - - - - - - - - - - - - - - - -
-struct hostent * -lwres_gethostent_r(struct hostent *resbuf,
 char *buf,
 int buflen,
 int *error);
-
 
- - - -
-void -lwres_sethostent_r(int stayopen);
-
 
- - - -
-void -lwres_endhostent_r(void);
-
 
-
-
- -
-

DESCRIPTION

- -

- These functions provide hostname-to-address and - address-to-hostname lookups by means of the lightweight resolver. - They are similar to the standard - - gethostent(3) - - functions provided by most operating systems. - They use a - struct hostent - which is usually defined in - <namedb.h>. -

- 
-struct  hostent {
-        char    *h_name;        /* official name of host */
-        char    **h_aliases;    /* alias list */
-        int     h_addrtype;     /* host address type */
-        int     h_length;       /* length of address */
-        char    **h_addr_list;  /* list of addresses from name server */
-};
-#define h_addr  h_addr_list[0]  /* address, for backward compatibility */
-
-

-

-

- The members of this structure are: -

-
-
h_name
-
-

- The official (canonical) name of the host. -

-
-
h_aliases
-
-

- A NULL-terminated array of alternate names (nicknames) for the - host. -

-
-
h_addrtype
-
-

- The type of address being returned — - PF_INET - or - PF_INET6. -

-
-
h_length
-
-

- The length of the address in bytes. -

-
-
h_addr_list
-
-

- A NULL - terminated array of network addresses for the host. - Host addresses are returned in network byte order. -

-
-
-

-

-

- For backward compatibility with very old software, - h_addr - is the first address in - h_addr_list. -

-

lwres_gethostent(), - lwres_sethostent(), - lwres_endhostent(), - lwres_gethostent_r(), - lwres_sethostent_r() - and - lwres_endhostent_r() - provide iteration over the known host entries on systems that - provide such functionality through facilities like - /etc/hosts - or NIS. The lightweight resolver does not currently implement - these functions; it only provides them as stub functions that always - return failure. -

- -

lwres_gethostbyname() - and lwres_gethostbyname2() look up the - hostname name. - lwres_gethostbyname() always looks for an - IPv4 address while lwres_gethostbyname2() - looks for an address of protocol family - af: either PF_INET or - PF_INET6 — IPv4 or IPV6 addresses - respectively. Successful calls of the functions return a - struct hostentfor the name that was looked up. - NULL is returned if the lookups by - lwres_gethostbyname() or - lwres_gethostbyname2() fail. -

- -

- Reverse lookups of addresses are performed by - lwres_gethostbyaddr(). - addr is an address of length - len bytes and protocol family - type — PF_INET or - PF_INET6. - lwres_gethostbyname_r() is a - thread-safe function - for forward lookups. If an error occurs, an error code is returned in - *error. - resbuf is a pointer to a - struct hostent which is initialised by a successful call to - lwres_gethostbyname_r(). - buf is a buffer of length - len bytes which is used to store the - h_name, h_aliases, and - h_addr_list elements of the - struct hostent returned in resbuf. - Successful calls to lwres_gethostbyname_r() - return resbuf, - which is a pointer to the struct hostent it created. -

- -

lwres_gethostbyaddr_r() - is a thread-safe function - that performs a reverse lookup of address addr - which is len bytes long and is of - protocol - family type — PF_INET or - PF_INET6. If an error occurs, the error code is returned - in *error. The other function - parameters are - identical to those in lwres_gethostbyname_r(). - resbuf is a pointer to a - struct hostent which is initialised by a successful call to - lwres_gethostbyaddr_r(). - buf is a buffer of length - len bytes which is used to store the - h_name, h_aliases, and - h_addr_list elements of the - struct hostent returned in resbuf. - Successful calls to lwres_gethostbyaddr_r() return - resbuf, which is a pointer to the - struct hostent() it created. -

- -
- -
-

RETURN VALUES

- -

- The functions - lwres_gethostbyname(), - lwres_gethostbyname2(), - lwres_gethostbyaddr(), - and - lwres_gethostent() - return NULL to indicate an error. In this case the global variable - lwres_h_errno - will contain one of the following error codes defined in - <lwres/netdb.h>: - -

-
-
HOST_NOT_FOUND
-
-

- The host or address was not found. -

-
-
TRY_AGAIN
-
-

- A recoverable error occurred, e.g., a timeout. - Retrying the lookup may succeed. -

-
-
NO_RECOVERY
-
-

- A non-recoverable error occurred. -

-
-
NO_DATA
-
-

- The name exists, but has no address information - associated with it (or vice versa in the case - of a reverse lookup). The code NO_ADDRESS - is accepted as a synonym for NO_DATA for backwards - compatibility. -

-
-
-

-

- -

- lwres_hstrerror(3) - - translates these error codes to suitable error messages. -

- -

lwres_gethostent() - and lwres_gethostent_r() - always return NULL. -

- -

- Successful calls to lwres_gethostbyname_r() and - lwres_gethostbyaddr_r() return - resbuf, a pointer to the - struct hostent that was initialised by these functions. They return - NULL if the lookups fail or if buf - was too small to hold the list of addresses and names referenced by - the h_name, h_aliases, and - h_addr_list elements of the - struct hostent. - If buf was too small, both - lwres_gethostbyname_r() and - lwres_gethostbyaddr_r() set the global - variable - errno to ERANGE. -

- -
-
-

SEE ALSO

- -

- gethostent(3) - , - - - lwres_getipnode(3) - , - - - lwres_hstrerror(3) - -

-
- -
-

BUGS

- -

lwres_gethostbyname(), - lwres_gethostbyname2(), - lwres_gethostbyaddr() - and - lwres_endhostent() - are not thread safe; they return pointers to static data and - provide error codes through a global variable. - Thread-safe versions for name and address lookup are provided by - lwres_gethostbyname_r(), - and - lwres_gethostbyaddr_r() - respectively. -

-

- The resolver daemon does not currently support any non-DNS - name services such as - /etc/hosts - or - NIS, - consequently the above functions don't, either. -

-
-
- diff --git a/lib/lwres/man/lwres_getipnode.3 b/lib/lwres/man/lwres_getipnode.3 deleted file mode 100644 index 91b5a15350..0000000000 --- a/lib/lwres/man/lwres_getipnode.3 +++ /dev/null @@ -1,220 +0,0 @@ -.\" Copyright (C) 2000, 2001, 2003-2005, 2007, 2014-2016 Internet Systems Consortium, Inc. ("ISC") -.\" -.\" This Source Code Form is subject to the terms of the Mozilla Public -.\" License, v. 2.0. If a copy of the MPL was not distributed with this -.\" file, You can obtain one at http://mozilla.org/MPL/2.0/. -.\" -.hy 0 -.ad l -'\" t -.\" Title: lwres_getipnode -.\" Author: -.\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 2007-06-18 -.\" Manual: BIND9 -.\" Source: ISC -.\" Language: English -.\" -.TH "LWRES_GETIPNODE" "3" "2007\-06\-18" "ISC" "BIND9" -.\" ----------------------------------------------------------------- -.\" * Define some portability stuff -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" http://bugs.debian.org/507673 -.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.ie \n(.g .ds Aq \(aq -.el .ds Aq ' -.\" ----------------------------------------------------------------- -.\" * set default formatting -.\" ----------------------------------------------------------------- -.\" disable hyphenation -.nh -.\" disable justification (adjust text to left margin only) -.ad l -.\" ----------------------------------------------------------------- -.\" * MAIN CONTENT STARTS HERE * -.\" ----------------------------------------------------------------- -.SH "NAME" -lwres_getipnodebyname, lwres_getipnodebyaddr, lwres_freehostent \- lightweight resolver nodename / address translation API -.SH "SYNOPSIS" -.sp -.ft B -.nf -#include -.fi -.ft -.HP \w'struct\ hostent\ *\ lwres_getipnodebyname('u -.BI "struct hostent * lwres_getipnodebyname(const\ char\ *" "name" ", int\ " "af" ", int\ " "flags" ", int\ *" "error_num" ");" -.HP \w'struct\ hostent\ *\ lwres_getipnodebyaddr('u -.BI "struct hostent * lwres_getipnodebyaddr(const\ void\ *" "src" ", size_t\ " "len" ", int\ " "af" ", int\ *" "error_num" ");" -.HP \w'void\ lwres_freehostent('u -.BI "void lwres_freehostent(struct\ hostent\ *" "he" ");" -.SH "DESCRIPTION" -.PP -These functions perform thread safe, protocol independent nodename\-to\-address and address\-to\-nodename translation as defined in RFC2553\&. -.PP -They use a -\fBstruct hostent\fR -which is defined in -namedb\&.h: -.PP -.if n \{\ -.RS 4 -.\} -.nf -struct hostent { - char *h_name; /* official name of host */ - char **h_aliases; /* alias list */ - int h_addrtype; /* host address type */ - int h_length; /* length of address */ - char **h_addr_list; /* list of addresses from name server */ -}; -#define h_addr h_addr_list[0] /* address, for backward compatibility */ -.fi -.if n \{\ -.RE -.\} -.PP -The members of this structure are: -.PP -\fBh_name\fR -.RS 4 -The official (canonical) name of the host\&. -.RE -.PP -\fBh_aliases\fR -.RS 4 -A NULL\-terminated array of alternate names (nicknames) for the host\&. -.RE -.PP -\fBh_addrtype\fR -.RS 4 -The type of address being returned \- usually -\fBPF_INET\fR -or -\fBPF_INET6\fR\&. -.RE -.PP -\fBh_length\fR -.RS 4 -The length of the address in bytes\&. -.RE -.PP -\fBh_addr_list\fR -.RS 4 -A -\fBNULL\fR -terminated array of network addresses for the host\&. Host addresses are returned in network byte order\&. -.RE -.PP -\fBlwres_getipnodebyname()\fR -looks up addresses of protocol family -\fIaf\fR -for the hostname -\fIname\fR\&. The -\fIflags\fR -parameter contains ORed flag bits to specify the types of addresses that are searched for, and the types of addresses that are returned\&. The flag bits are: -.PP -\fBAI_V4MAPPED\fR -.RS 4 -This is used with an -\fIaf\fR -of AF_INET6, and causes IPv4 addresses to be returned as IPv4\-mapped IPv6 addresses\&. -.RE -.PP -\fBAI_ALL\fR -.RS 4 -This is used with an -\fIaf\fR -of AF_INET6, and causes all known addresses (IPv6 and IPv4) to be returned\&. If AI_V4MAPPED is also set, the IPv4 addresses are return as mapped IPv6 addresses\&. -.RE -.PP -\fBAI_ADDRCONFIG\fR -.RS 4 -Only return an IPv6 or IPv4 address if here is an active network interface of that type\&. This is not currently implemented in the BIND 9 lightweight resolver, and the flag is ignored\&. -.RE -.PP -\fBAI_DEFAULT\fR -.RS 4 -This default sets the -\fBAI_V4MAPPED\fR -and -\fBAI_ADDRCONFIG\fR -flag bits\&. -.RE -.PP -\fBlwres_getipnodebyaddr()\fR -performs a reverse lookup of address -\fIsrc\fR -which is -\fIlen\fR -bytes long\&. -\fIaf\fR -denotes the protocol family, typically -\fBPF_INET\fR -or -\fBPF_INET6\fR\&. -.PP -\fBlwres_freehostent()\fR -releases all the memory associated with the -\fBstruct hostent\fR -pointer -\fIhe\fR\&. Any memory allocated for the -\fBh_name\fR, -\fBh_addr_list\fR -and -\fBh_aliases\fR -is freed, as is the memory for the -\fBhostent\fR -structure itself\&. -.SH "RETURN VALUES" -.PP -If an error occurs, -\fBlwres_getipnodebyname()\fR -and -\fBlwres_getipnodebyaddr()\fR -set -\fI*error_num\fR -to an appropriate error code and the function returns a -\fBNULL\fR -pointer\&. The error codes and their meanings are defined in -: -.PP -\fBHOST_NOT_FOUND\fR -.RS 4 -No such host is known\&. -.RE -.PP -\fBNO_ADDRESS\fR -.RS 4 -The server recognised the request and the name but no address is available\&. Another type of request to the name server for the domain might return an answer\&. -.RE -.PP -\fBTRY_AGAIN\fR -.RS 4 -A temporary and possibly transient error occurred, such as a failure of a server to respond\&. The request may succeed if retried\&. -.RE -.PP -\fBNO_RECOVERY\fR -.RS 4 -An unexpected failure occurred, and retrying the request is pointless\&. -.RE -.PP -\fBlwres_hstrerror\fR(3) -translates these error codes to suitable error messages\&. -.SH "SEE ALSO" -.PP -\fBRFC2553\fR(), -\fBlwres\fR(3), -\fBlwres_gethostent\fR(3), -\fBlwres_getaddrinfo\fR(3), -\fBlwres_getnameinfo\fR(3), -\fBlwres_hstrerror\fR(3)\&. -.SH "AUTHOR" -.PP -\fBInternet Systems Consortium, Inc\&.\fR -.SH "COPYRIGHT" -.br -Copyright \(co 2000, 2001, 2003-2005, 2007, 2014-2016 Internet Systems Consortium, Inc. ("ISC") -.br diff --git a/lib/lwres/man/lwres_getipnode.docbook b/lib/lwres/man/lwres_getipnode.docbook deleted file mode 100644 index b290d9f65b..0000000000 --- a/lib/lwres/man/lwres_getipnode.docbook +++ /dev/null @@ -1,318 +0,0 @@ - - - - - - 2007-06-18 - - - ISC - Internet Systems Consortium, Inc. - - - - lwres_getipnode - 3 - BIND9 - - - - - 2000 - 2001 - 2003 - 2004 - 2005 - 2007 - 2014 - 2015 - 2016 - Internet Systems Consortium, Inc. ("ISC") - - - - - lwres_getipnodebyname - lwres_getipnodebyaddr - lwres_freehostent - lightweight resolver nodename / address translation API - - - -#include <lwres/netdb.h> - - -struct hostent * -lwres_getipnodebyname - const char *name - int af - int flags - int *error_num - - - -struct hostent * -lwres_getipnodebyaddr - const void *src - size_t len - int af - int *error_num - - - -void -lwres_freehostent - struct hostent *he - - - - - DESCRIPTION - - - - These functions perform thread safe, protocol independent - nodename-to-address and address-to-nodename - translation as defined in RFC2553. - - - - They use a - struct hostent - which is defined in - namedb.h: - - -struct hostent { - char *h_name; /* official name of host */ - char **h_aliases; /* alias list */ - int h_addrtype; /* host address type */ - int h_length; /* length of address */ - char **h_addr_list; /* list of addresses from name server */ -}; -#define h_addr h_addr_list[0] /* address, for backward compatibility */ - - - - - The members of this structure are: - - - h_name - - - The official (canonical) name of the host. - - - - - h_aliases - - - A NULL-terminated array of alternate names (nicknames) for the - host. - - - - - h_addrtype - - - The type of address being returned - usually - PF_INET - or - PF_INET6. - - - - - - h_length - - - The length of the address in bytes. - - - - - h_addr_list - - - A - NULL - terminated array of network addresses for the host. - Host addresses are returned in network byte order. - - - - - - - lwres_getipnodebyname() - looks up addresses of protocol family af - for the hostname name. The - flags parameter contains ORed flag bits - to specify the types of addresses that are searched for, and the - types of addresses that are returned. The flag bits are: - - - - AI_V4MAPPED - - - This is used with an - af - of AF_INET6, and causes IPv4 addresses to be returned as - IPv4-mapped - IPv6 addresses. - - - - - AI_ALL - - - This is used with an - af - of AF_INET6, and causes all known addresses (IPv6 and IPv4) to - be returned. - If AI_V4MAPPED is also set, the IPv4 addresses are return as - mapped - IPv6 addresses. - - - - - AI_ADDRCONFIG - - - Only return an IPv6 or IPv4 address if here is an active network - interface of that type. This is not currently implemented - in the BIND 9 lightweight resolver, and the flag is ignored. - - - - - AI_DEFAULT - - - This default sets the - AI_V4MAPPED - and - AI_ADDRCONFIG - flag bits. - - - - - - - lwres_getipnodebyaddr() - performs a reverse lookup of address src - which is len bytes long. - af denotes the protocol family, typically - PF_INET or PF_INET6. - - lwres_freehostent() - releases all the memory associated with the struct - hostent pointer he. Any memory - allocated for the h_name, - h_addr_list and - h_aliases is freed, as is the memory for - the hostent structure itself. - - - RETURN VALUES - - - If an error occurs, - lwres_getipnodebyname() - and - lwres_getipnodebyaddr() - set - *error_num - to an appropriate error code and the function returns a - NULL - pointer. - The error codes and their meanings are defined in - <lwres/netdb.h>: - - - HOST_NOT_FOUND - - - No such host is known. - - - - - NO_ADDRESS - - - The server recognised the request and the name but no address is - available. Another type of request to the name server for the - domain might return an answer. - - - - - TRY_AGAIN - - - A temporary and possibly transient error occurred, such as a - failure of a server to respond. The request may succeed if - retried. - - - - - NO_RECOVERY - - - An unexpected failure occurred, and retrying the request - is pointless. - - - - - - - lwres_hstrerror3 - - translates these error codes to suitable error messages. - - - SEE ALSO - - - RFC2553 - , - - - lwres3 - , - - - lwres_gethostent3 - , - - - lwres_getaddrinfo3 - , - - - lwres_getnameinfo3 - , - - - lwres_hstrerror3 - . - - - diff --git a/lib/lwres/man/lwres_getipnode.html b/lib/lwres/man/lwres_getipnode.html deleted file mode 100644 index 3fe7a31c30..0000000000 --- a/lib/lwres/man/lwres_getipnode.html +++ /dev/null @@ -1,316 +0,0 @@ - - - - - -lwres_getipnode - - -
-
- - - - - - - -
-

Name

-

- lwres_getipnodebyname, - lwres_getipnodebyaddr, - lwres_freehostent - — lightweight resolver nodename / address translation API -

-
-
-

Synopsis

-
-
#include <lwres/netdb.h>
- - - - - - - - - - - - - - - - - -
-struct hostent * -lwres_getipnodebyname(const char *name,
 int af,
 int flags,
 int *error_num);
-
 
- - - - - - - - - - - - - - - - - -
-struct hostent * -lwres_getipnodebyaddr(const void *src,
 size_t len,
 int af,
 int *error_num);
-
 
- - - -
-void -lwres_freehostent(struct hostent *he);
-
 
-
-
- -
-

DESCRIPTION

- - -

- These functions perform thread safe, protocol independent - nodename-to-address and address-to-nodename - translation as defined in RFC2553. -

- -

- They use a - struct hostent - which is defined in - namedb.h: -

- 
-struct  hostent {
-        char    *h_name;        /* official name of host */
-        char    **h_aliases;    /* alias list */
-        int     h_addrtype;     /* host address type */
-        int     h_length;       /* length of address */
-        char    **h_addr_list;  /* list of addresses from name server */
-};
-#define h_addr  h_addr_list[0]  /* address, for backward compatibility */
-
-

-

- -

- The members of this structure are: -

-
-
h_name
-
-

- The official (canonical) name of the host. -

-
-
h_aliases
-
-

- A NULL-terminated array of alternate names (nicknames) for the - host. -

-
-
h_addrtype
-
-

- The type of address being returned - usually - PF_INET - or - PF_INET6. - -

-
-
h_length
-
-

- The length of the address in bytes. -

-
-
h_addr_list
-
-

- A - NULL - terminated array of network addresses for the host. - Host addresses are returned in network byte order. -

-
-
-

-

- -

lwres_getipnodebyname() - looks up addresses of protocol family af - for the hostname name. The - flags parameter contains ORed flag bits - to specify the types of addresses that are searched for, and the - types of addresses that are returned. The flag bits are: - -

-
-
AI_V4MAPPED
-
-

- This is used with an - af - of AF_INET6, and causes IPv4 addresses to be returned as - IPv4-mapped - IPv6 addresses. -

-
-
AI_ALL
-
-

- This is used with an - af - of AF_INET6, and causes all known addresses (IPv6 and IPv4) to - be returned. - If AI_V4MAPPED is also set, the IPv4 addresses are return as - mapped - IPv6 addresses. -

-
-
AI_ADDRCONFIG
-
-

- Only return an IPv6 or IPv4 address if here is an active network - interface of that type. This is not currently implemented - in the BIND 9 lightweight resolver, and the flag is ignored. -

-
-
AI_DEFAULT
-
-

- This default sets the - AI_V4MAPPED - and - AI_ADDRCONFIG - flag bits. -

-
-
-

-

- -

lwres_getipnodebyaddr() - performs a reverse lookup of address src - which is len bytes long. - af denotes the protocol family, typically - PF_INET or PF_INET6. -

-

lwres_freehostent() - releases all the memory associated with the struct - hostent pointer he. Any memory - allocated for the h_name, - h_addr_list and - h_aliases is freed, as is the memory for - the hostent structure itself. -

-
-
-

RETURN VALUES

- -

- If an error occurs, - lwres_getipnodebyname() - and - lwres_getipnodebyaddr() - set - *error_num - to an appropriate error code and the function returns a - NULL - pointer. - The error codes and their meanings are defined in - <lwres/netdb.h>: -

-
-
HOST_NOT_FOUND
-
-

- No such host is known. -

-
-
NO_ADDRESS
-
-

- The server recognised the request and the name but no address is - available. Another type of request to the name server for the - domain might return an answer. -

-
-
TRY_AGAIN
-
-

- A temporary and possibly transient error occurred, such as a - failure of a server to respond. The request may succeed if - retried. -

-
-
NO_RECOVERY
-
-

- An unexpected failure occurred, and retrying the request - is pointless. -

-
-
-

-

-

- lwres_hstrerror(3) - - translates these error codes to suitable error messages. -

-
-
-

SEE ALSO

- -

- RFC2553 - , - - - lwres(3) - , - - - lwres_gethostent(3) - , - - - lwres_getaddrinfo(3) - , - - - lwres_getnameinfo(3) - , - - - lwres_hstrerror(3) - . -

-
-
- diff --git a/lib/lwres/man/lwres_getnameinfo.3 b/lib/lwres/man/lwres_getnameinfo.3 deleted file mode 100644 index 2bcbdbfa70..0000000000 --- a/lib/lwres/man/lwres_getnameinfo.3 +++ /dev/null @@ -1,127 +0,0 @@ -.\" Copyright (C) 2000, 2001, 2004, 2005, 2007, 2014-2016 Internet Systems Consortium, Inc. ("ISC") -.\" -.\" This Source Code Form is subject to the terms of the Mozilla Public -.\" License, v. 2.0. If a copy of the MPL was not distributed with this -.\" file, You can obtain one at http://mozilla.org/MPL/2.0/. -.\" -.hy 0 -.ad l -'\" t -.\" Title: lwres_getnameinfo -.\" Author: -.\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 2007-06-18 -.\" Manual: BIND9 -.\" Source: ISC -.\" Language: English -.\" -.TH "LWRES_GETNAMEINFO" "3" "2007\-06\-18" "ISC" "BIND9" -.\" ----------------------------------------------------------------- -.\" * Define some portability stuff -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" http://bugs.debian.org/507673 -.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.ie \n(.g .ds Aq \(aq -.el .ds Aq ' -.\" ----------------------------------------------------------------- -.\" * set default formatting -.\" ----------------------------------------------------------------- -.\" disable hyphenation -.nh -.\" disable justification (adjust text to left margin only) -.ad l -.\" ----------------------------------------------------------------- -.\" * MAIN CONTENT STARTS HERE * -.\" ----------------------------------------------------------------- -.SH "NAME" -lwres_getnameinfo \- lightweight resolver socket address structure to hostname and service name -.SH "SYNOPSIS" -.sp -.ft B -.nf -#include -.fi -.ft -.HP \w'int\ lwres_getnameinfo('u -.BI "int lwres_getnameinfo(const\ struct\ sockaddr\ *" "sa" ", size_t\ " "salen" ", char\ *" "host" ", size_t\ " "hostlen" ", char\ *" "serv" ", size_t\ " "servlen" ", int\ " "flags" ");" -.SH "DESCRIPTION" -.PP -This function is equivalent to the -\fBgetnameinfo\fR(3) -function defined in RFC2133\&. -\fBlwres_getnameinfo()\fR -returns the hostname for the -\fBstruct sockaddr\fR\fIsa\fR -which is -\fIsalen\fR -bytes long\&. The hostname is of length -\fIhostlen\fR -and is returned via -\fI*host\&.\fR -The maximum length of the hostname is 1025 bytes: -\fBNI_MAXHOST\fR\&. -.PP -The name of the service associated with the port number in -\fIsa\fR -is returned in -\fI*serv\&.\fR -It is -\fIservlen\fR -bytes long\&. The maximum length of the service name is -\fBNI_MAXSERV\fR -\- 32 bytes\&. -.PP -The -\fIflags\fR -argument sets the following bits: -.PP -\fBNI_NOFQDN\fR -.RS 4 -A fully qualified domain name is not required for local hosts\&. The local part of the fully qualified domain name is returned instead\&. -.RE -.PP -\fBNI_NUMERICHOST\fR -.RS 4 -Return the address in numeric form, as if calling inet_ntop(), instead of a host name\&. -.RE -.PP -\fBNI_NAMEREQD\fR -.RS 4 -A name is required\&. If the hostname cannot be found in the DNS and this flag is set, a non\-zero error code is returned\&. If the hostname is not found and the flag is not set, the address is returned in numeric form\&. -.RE -.PP -\fBNI_NUMERICSERV\fR -.RS 4 -The service name is returned as a digit string representing the port number\&. -.RE -.PP -\fBNI_DGRAM\fR -.RS 4 -Specifies that the service being looked up is a datagram service, and causes getservbyport() to be called with a second argument of "udp" instead of its default of "tcp"\&. This is required for the few ports (512\-514) that have different services for UDP and TCP\&. -.RE -.SH "RETURN VALUES" -.PP -\fBlwres_getnameinfo()\fR -returns 0 on success or a non\-zero error code if an error occurs\&. -.SH "SEE ALSO" -.PP -\fBRFC2133\fR(), -\fBgetservbyport\fR(3), -\fBlwres\fR(3), -\fBlwres_getnameinfo\fR(3), -\fBlwres_getnamebyaddr\fR(3)\&. -\fBlwres_net_ntop\fR(3)\&. -.SH "BUGS" -.PP -RFC2133 fails to define what the nonzero return values of -\fBgetnameinfo\fR(3) -are\&. -.SH "AUTHOR" -.PP -\fBInternet Systems Consortium, Inc\&.\fR -.SH "COPYRIGHT" -.br -Copyright \(co 2000, 2001, 2004, 2005, 2007, 2014-2016 Internet Systems Consortium, Inc. ("ISC") -.br diff --git a/lib/lwres/man/lwres_getnameinfo.docbook b/lib/lwres/man/lwres_getnameinfo.docbook deleted file mode 100644 index acc2608e2c..0000000000 --- a/lib/lwres/man/lwres_getnameinfo.docbook +++ /dev/null @@ -1,192 +0,0 @@ - - - - - - 2007-06-18 - - - ISC - Internet Systems Consortium, Inc. - - - - lwres_getnameinfo - 3 - BIND9 - - - - - 2000 - 2001 - 2004 - 2005 - 2007 - 2014 - 2015 - 2016 - Internet Systems Consortium, Inc. ("ISC") - - - - - lwres_getnameinfo - lightweight resolver socket address structure to hostname and - service name - - - - -#include <lwres/netdb.h> - - -int -lwres_getnameinfo - const struct sockaddr *sa - size_t salen - char *host - size_t hostlen - char *serv - size_t servlen - int flags - - - - - DESCRIPTION - - - - This function is equivalent to the - - getnameinfo3 - function defined in RFC2133. - lwres_getnameinfo() returns the - hostname for the - struct sockaddr sa which - is - salen bytes long. The hostname is of - length - hostlen and is returned via - *host. The maximum length of the - hostname is - 1025 bytes: NI_MAXHOST. - - - The name of the service associated with the port number in - sa is returned in *serv. - It is servlen bytes long. The - maximum length - of the service name is NI_MAXSERV - 32 - bytes. - - - - The flags argument sets the - following - bits: - - - NI_NOFQDN - - - A fully qualified domain name is not required for local hosts. - The local part of the fully qualified domain name is returned - instead. - - - - - NI_NUMERICHOST - - - Return the address in numeric form, as if calling inet_ntop(), - instead of a host name. - - - - - NI_NAMEREQD - - - A name is required. If the hostname cannot be found in the DNS - and - this flag is set, a non-zero error code is returned. - If the hostname is not found and the flag is not set, the - address is returned in numeric form. - - - - - NI_NUMERICSERV - - - The service name is returned as a digit string representing the - port number. - - - - - NI_DGRAM - - - Specifies that the service being looked up is a datagram - service, and causes getservbyport() to be called with a second - argument of "udp" instead of its default of "tcp". This is - required - for the few ports (512-514) that have different services for UDP - and - TCP. - - - - - - - - RETURN VALUES - - lwres_getnameinfo() - returns 0 on success or a non-zero error code if an error occurs. - - - SEE ALSO - - - RFC2133 - , - - getservbyport3 - , - - lwres3 - , - - lwres_getnameinfo3 - , - - lwres_getnamebyaddr3 - . - - lwres_net_ntop3 - . - - - BUGS - - - RFC2133 fails to define what the nonzero return values of - - getnameinfo3 - - are. - - - diff --git a/lib/lwres/man/lwres_getnameinfo.html b/lib/lwres/man/lwres_getnameinfo.html deleted file mode 100644 index ee4d76d68a..0000000000 --- a/lib/lwres/man/lwres_getnameinfo.html +++ /dev/null @@ -1,199 +0,0 @@ - - - - - -lwres_getnameinfo - - -
-
- - - - - - - -
-

Name

-

- lwres_getnameinfo - — lightweight resolver socket address structure to hostname and - service name - -

-
-
-

Synopsis

-
-
#include <lwres/netdb.h>
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-int -lwres_getnameinfo(const struct sockaddr *sa,
 size_t salen,
 char *host,
 size_t hostlen,
 char *serv,
 size_t servlen,
 int flags);
-
 
-
-
- -
-

DESCRIPTION

- - -

- This function is equivalent to the - - getnameinfo(3) - function defined in RFC2133. - lwres_getnameinfo() returns the - hostname for the - struct sockaddr sa which - is - salen bytes long. The hostname is of - length - hostlen and is returned via - *host. The maximum length of the - hostname is - 1025 bytes: NI_MAXHOST. -

- -

The name of the service associated with the port number in - sa is returned in *serv. - It is servlen bytes long. The - maximum length - of the service name is NI_MAXSERV - 32 - bytes. -

- -

- The flags argument sets the - following - bits: -

-
-
NI_NOFQDN
-
-

- A fully qualified domain name is not required for local hosts. - The local part of the fully qualified domain name is returned - instead. -

-
-
NI_NUMERICHOST
-
-

- Return the address in numeric form, as if calling inet_ntop(), - instead of a host name. -

-
-
NI_NAMEREQD
-
-

- A name is required. If the hostname cannot be found in the DNS - and - this flag is set, a non-zero error code is returned. - If the hostname is not found and the flag is not set, the - address is returned in numeric form. -

-
-
NI_NUMERICSERV
-
-

- The service name is returned as a digit string representing the - port number. -

-
-
NI_DGRAM
-
-

- Specifies that the service being looked up is a datagram - service, and causes getservbyport() to be called with a second - argument of "udp" instead of its default of "tcp". This is - required - for the few ports (512-514) that have different services for UDP - and - TCP. -

-
-
-

-

-
- -
-

RETURN VALUES

- -

lwres_getnameinfo() - returns 0 on success or a non-zero error code if an error occurs. -

-
-
-

SEE ALSO

- -

- RFC2133 - , - - getservbyport(3) - , - - lwres(3) - , - - lwres_getnameinfo(3) - , - - lwres_getnamebyaddr(3) - . - - lwres_net_ntop(3) - . -

-
-
-

BUGS

- -

- RFC2133 fails to define what the nonzero return values of - - getnameinfo(3) - - are. -

-
-
- diff --git a/lib/lwres/man/lwres_getrrsetbyname.3 b/lib/lwres/man/lwres_getrrsetbyname.3 deleted file mode 100644 index 4fc42e4757..0000000000 --- a/lib/lwres/man/lwres_getrrsetbyname.3 +++ /dev/null @@ -1,170 +0,0 @@ -.\" Copyright (C) 2000, 2001, 2004, 2005, 2007, 2014-2016 Internet Systems Consortium, Inc. ("ISC") -.\" -.\" This Source Code Form is subject to the terms of the Mozilla Public -.\" License, v. 2.0. If a copy of the MPL was not distributed with this -.\" file, You can obtain one at http://mozilla.org/MPL/2.0/. -.\" -.hy 0 -.ad l -'\" t -.\" Title: lwres_getrrsetbyname -.\" Author: -.\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 2007-06-18 -.\" Manual: BIND9 -.\" Source: ISC -.\" Language: English -.\" -.TH "LWRES_GETRRSETBYNAME" "3" "2007\-06\-18" "ISC" "BIND9" -.\" ----------------------------------------------------------------- -.\" * Define some portability stuff -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" http://bugs.debian.org/507673 -.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.ie \n(.g .ds Aq \(aq -.el .ds Aq ' -.\" ----------------------------------------------------------------- -.\" * set default formatting -.\" ----------------------------------------------------------------- -.\" disable hyphenation -.nh -.\" disable justification (adjust text to left margin only) -.ad l -.\" ----------------------------------------------------------------- -.\" * MAIN CONTENT STARTS HERE * -.\" ----------------------------------------------------------------- -.SH "NAME" -lwres_getrrsetbyname, lwres_freerrset \- retrieve DNS records -.SH "SYNOPSIS" -.sp -.ft B -.nf -#include -.fi -.ft -.HP \w'int\ lwres_getrrsetbyname('u -.BI "int lwres_getrrsetbyname(const\ char\ *" "hostname" ", unsigned\ int\ " "rdclass" ", unsigned\ int\ " "rdtype" ", unsigned\ int\ " "flags" ", struct\ rrsetinfo\ **" "res" ");" -.HP \w'void\ lwres_freerrset('u -.BI "void lwres_freerrset(struct\ rrsetinfo\ *" "rrset" ");" -.PP -The following structures are used: -.PP -.nf -struct rdatainfo { - unsigned int rdi_length; /* length of data */ - unsigned char *rdi_data; /* record data */ -}; -.fi -.PP -.nf -struct rrsetinfo { - unsigned int rri_flags; /* RRSET_VALIDATED\&.\&.\&. */ - unsigned int rri_rdclass; /* class number */ - unsigned int rri_rdtype; /* RR type number */ - unsigned int rri_ttl; /* time to live */ - unsigned int rri_nrdatas; /* size of rdatas array */ - unsigned int rri_nsigs; /* size of sigs array */ - char *rri_name; /* canonical name */ - struct rdatainfo *rri_rdatas; /* individual records */ - struct rdatainfo *rri_sigs; /* individual signatures */ -}; -.fi -.sp -.SH "DESCRIPTION" -.PP -\fBlwres_getrrsetbyname()\fR -gets a set of resource records associated with a -\fIhostname\fR, -\fIclass\fR, and -\fItype\fR\&. -\fIhostname\fR -is a pointer a to null\-terminated string\&. The -\fIflags\fR -field is currently unused and must be zero\&. -.PP -After a successful call to -\fBlwres_getrrsetbyname()\fR, -\fI*res\fR -is a pointer to an -\fBrrsetinfo\fR -structure, containing a list of one or more -\fBrdatainfo\fR -structures containing resource records and potentially another list of -\fBrdatainfo\fR -structures containing SIG resource records associated with those records\&. The members -\fBrri_rdclass\fR -and -\fBrri_rdtype\fR -are copied from the parameters\&. -\fBrri_ttl\fR -and -\fBrri_name\fR -are properties of the obtained rrset\&. The resource records contained in -\fBrri_rdatas\fR -and -\fBrri_sigs\fR -are in uncompressed DNS wire format\&. Properties of the rdataset are represented in the -\fBrri_flags\fR -bitfield\&. If the RRSET_VALIDATED bit is set, the data has been DNSSEC validated and the signatures verified\&. -.PP -All of the information returned by -\fBlwres_getrrsetbyname()\fR -is dynamically allocated: the -\fBrrsetinfo\fR -and -\fBrdatainfo\fR -structures, and the canonical host name strings pointed to by the -\fBrrsetinfo\fRstructure\&. Memory allocated for the dynamically allocated structures created by a successful call to -\fBlwres_getrrsetbyname()\fR -is released by -\fBlwres_freerrset()\fR\&. -\fIrrset\fR -is a pointer to a -\fBstruct rrset\fR -created by a call to -\fBlwres_getrrsetbyname()\fR\&. -.PP -.SH "RETURN VALUES" -.PP -\fBlwres_getrrsetbyname()\fR -returns zero on success, and one of the following error codes if an error occurred: -.PP -\fBERRSET_NONAME\fR -.RS 4 -the name does not exist -.RE -.PP -\fBERRSET_NODATA\fR -.RS 4 -the name exists, but does not have data of the desired type -.RE -.PP -\fBERRSET_NOMEMORY\fR -.RS 4 -memory could not be allocated -.RE -.PP -\fBERRSET_INVAL\fR -.RS 4 -a parameter is invalid -.RE -.PP -\fBERRSET_FAIL\fR -.RS 4 -other failure -.RE -.PP -.RS 4 -.RE -.SH "SEE ALSO" -.PP -\fBlwres\fR(3)\&. -.SH "AUTHOR" -.PP -\fBInternet Systems Consortium, Inc\&.\fR -.SH "COPYRIGHT" -.br -Copyright \(co 2000, 2001, 2004, 2005, 2007, 2014-2016 Internet Systems Consortium, Inc. ("ISC") -.br diff --git a/lib/lwres/man/lwres_getrrsetbyname.docbook b/lib/lwres/man/lwres_getrrsetbyname.docbook deleted file mode 100644 index aab909afdc..0000000000 --- a/lib/lwres/man/lwres_getrrsetbyname.docbook +++ /dev/null @@ -1,210 +0,0 @@ - - - - - - 2007-06-18 - - - ISC - Internet Systems Consortium, Inc. - - - - lwres_getrrsetbyname - 3 - BIND9 - - - - - 2000 - 2001 - 2004 - 2005 - 2007 - 2014 - 2015 - 2016 - Internet Systems Consortium, Inc. ("ISC") - - - - - lwres_getrrsetbyname - lwres_freerrset - retrieve DNS records - - - -#include <lwres/netdb.h> - - -int -lwres_getrrsetbyname - const char *hostname - unsigned int rdclass - unsigned int rdtype - unsigned int flags - struct rrsetinfo **res - - - -void -lwres_freerrset - struct rrsetinfo *rrset - - - - - The following structures are used: - - -struct rdatainfo { - unsigned int rdi_length; /* length of data */ - unsigned char *rdi_data; /* record data */ -}; - - - -struct rrsetinfo { - unsigned int rri_flags; /* RRSET_VALIDATED... */ - unsigned int rri_rdclass; /* class number */ - unsigned int rri_rdtype; /* RR type number */ - unsigned int rri_ttl; /* time to live */ - unsigned int rri_nrdatas; /* size of rdatas array */ - unsigned int rri_nsigs; /* size of sigs array */ - char *rri_name; /* canonical name */ - struct rdatainfo *rri_rdatas; /* individual records */ - struct rdatainfo *rri_sigs; /* individual signatures */ -}; - - - - - DESCRIPTION - - lwres_getrrsetbyname() - gets a set of resource records associated with a - hostname, class, - and type. - hostname is a pointer a to - null-terminated string. The flags field - is currently unused and must be zero. - - - After a successful call to - lwres_getrrsetbyname(), - *res is a pointer to an - rrsetinfo structure, containing a list of one or - more rdatainfo structures containing resource - records and potentially another list of rdatainfo - structures containing SIG resource records associated with those - records. The members rri_rdclass and - rri_rdtype are copied from the parameters. - rri_ttl and rri_name - are properties of the obtained rrset. The resource records - contained in rri_rdatas and - rri_sigs are in uncompressed DNS wire - format. Properties of the rdataset are represented in the - rri_flags bitfield. If the RRSET_VALIDATED - bit is set, the data has been DNSSEC validated and the - signatures verified. - - - All of the information returned by - lwres_getrrsetbyname() is dynamically - allocated: the rrsetinfo and - rdatainfo structures, and the canonical - host name strings pointed to by the - rrsetinfostructure. - - Memory allocated for the dynamically allocated structures - created by a successful call to - lwres_getrrsetbyname() is released by - lwres_freerrset(). - - rrset is a pointer to a struct - rrset created by a call to - lwres_getrrsetbyname(). - - - - RETURN VALUES - - lwres_getrrsetbyname() - returns zero on success, and one of the following error codes if - an error occurred: - - - - ERRSET_NONAME - - - the name does not exist - - - - - - ERRSET_NODATA - - - the name exists, but does not have data of the desired type - - - - - - ERRSET_NOMEMORY - - - memory could not be allocated - - - - - - ERRSET_INVAL - - - a parameter is invalid - - - - - - ERRSET_FAIL - - - other failure - - - - - - - - - - - - - - - - SEE ALSO - - - lwres3 - . - - - - diff --git a/lib/lwres/man/lwres_getrrsetbyname.html b/lib/lwres/man/lwres_getrrsetbyname.html deleted file mode 100644 index 0b6802d9b6..0000000000 --- a/lib/lwres/man/lwres_getrrsetbyname.html +++ /dev/null @@ -1,204 +0,0 @@ - - - - - -lwres_getrrsetbyname - - -
-
- - - - - - - -
-

Name

-

- lwres_getrrsetbyname, - lwres_freerrset - — retrieve DNS records -

-
-
-

Synopsis

-
-
#include <lwres/netdb.h>
- - - - - - - - - - - - - - - - - - - - - -
-int -lwres_getrrsetbyname(const char *hostname,
 unsigned int rdclass,
 unsigned int rdtype,
 unsigned int flags,
 struct rrsetinfo **res);
-
 
- - - -
-void -lwres_freerrset(struct rrsetinfo *rrset);
-
 
-
- -

- The following structures are used: -

- 
-struct  rdatainfo {
-        unsigned int            rdi_length;     /* length of data */
-        unsigned char           *rdi_data;      /* record data */
-};
-
-

-

- 
-struct  rrsetinfo {
-        unsigned int            rri_flags;      /* RRSET_VALIDATED... */
-        unsigned int            rri_rdclass;    /* class number */
-        unsigned int            rri_rdtype;     /* RR type number */
-        unsigned int            rri_ttl;        /* time to live */
-        unsigned int            rri_nrdatas;    /* size of rdatas array */
-        unsigned int            rri_nsigs;      /* size of sigs array */
-        char                    *rri_name;      /* canonical name */
-        struct rdatainfo        *rri_rdatas;    /* individual records */
-        struct rdatainfo        *rri_sigs;      /* individual signatures */
-};
-
-

-

-
- -
-

DESCRIPTION

- -

lwres_getrrsetbyname() - gets a set of resource records associated with a - hostname, class, - and type. - hostname is a pointer a to - null-terminated string. The flags field - is currently unused and must be zero. -

-

- After a successful call to - lwres_getrrsetbyname(), - *res is a pointer to an - rrsetinfo structure, containing a list of one or - more rdatainfo structures containing resource - records and potentially another list of rdatainfo - structures containing SIG resource records associated with those - records. The members rri_rdclass and - rri_rdtype are copied from the parameters. - rri_ttl and rri_name - are properties of the obtained rrset. The resource records - contained in rri_rdatas and - rri_sigs are in uncompressed DNS wire - format. Properties of the rdataset are represented in the - rri_flags bitfield. If the RRSET_VALIDATED - bit is set, the data has been DNSSEC validated and the - signatures verified. -

-

- All of the information returned by - lwres_getrrsetbyname() is dynamically - allocated: the rrsetinfo and - rdatainfo structures, and the canonical - host name strings pointed to by the - rrsetinfostructure. - - Memory allocated for the dynamically allocated structures - created by a successful call to - lwres_getrrsetbyname() is released by - lwres_freerrset(). - - rrset is a pointer to a struct - rrset created by a call to - lwres_getrrsetbyname(). -

-

-
-
-

RETURN VALUES

- -

lwres_getrrsetbyname() - returns zero on success, and one of the following error codes if - an error occurred: -

-
-
ERRSET_NONAME
-
-

- the name does not exist -

-
-
ERRSET_NODATA
-
-

- the name exists, but does not have data of the desired type -

-
-
ERRSET_NOMEMORY
-
-

- memory could not be allocated -

-
-
ERRSET_INVAL
-
-

- a parameter is invalid -

-
-
ERRSET_FAIL
-
-

- other failure -

-
-
-
-

-
-
-

- -

-
-
-

SEE ALSO

- -

- lwres(3) - . -

- -
-
- diff --git a/lib/lwres/man/lwres_gnba.3 b/lib/lwres/man/lwres_gnba.3 deleted file mode 100644 index 3e73b79883..0000000000 --- a/lib/lwres/man/lwres_gnba.3 +++ /dev/null @@ -1,202 +0,0 @@ -.\" Copyright (C) 2000, 2001, 2004, 2005, 2007, 2014-2016 Internet Systems Consortium, Inc. ("ISC") -.\" -.\" This Source Code Form is subject to the terms of the Mozilla Public -.\" License, v. 2.0. If a copy of the MPL was not distributed with this -.\" file, You can obtain one at http://mozilla.org/MPL/2.0/. -.\" -.hy 0 -.ad l -'\" t -.\" Title: lwres_gnba -.\" Author: -.\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 2007-06-18 -.\" Manual: BIND9 -.\" Source: ISC -.\" Language: English -.\" -.TH "LWRES_GNBA" "3" "2007\-06\-18" "ISC" "BIND9" -.\" ----------------------------------------------------------------- -.\" * Define some portability stuff -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" http://bugs.debian.org/507673 -.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.ie \n(.g .ds Aq \(aq -.el .ds Aq ' -.\" ----------------------------------------------------------------- -.\" * set default formatting -.\" ----------------------------------------------------------------- -.\" disable hyphenation -.nh -.\" disable justification (adjust text to left margin only) -.ad l -.\" ----------------------------------------------------------------- -.\" * MAIN CONTENT STARTS HERE * -.\" ----------------------------------------------------------------- -.SH "NAME" -lwres_gnbarequest_render, lwres_gnbaresponse_render, lwres_gnbarequest_parse, lwres_gnbaresponse_parse, lwres_gnbaresponse_free, lwres_gnbarequest_free \- lightweight resolver getnamebyaddress message handling -.SH "SYNOPSIS" -.sp -.ft B -.nf -#include -.fi -.ft -.HP \w'lwres_result_t\ lwres_gnbarequest_render('u -.BI "lwres_result_t lwres_gnbarequest_render(lwres_context_t\ *" "ctx" ", lwres_gnbarequest_t\ *" "req" ", lwres_lwpacket_t\ *" "pkt" ", lwres_buffer_t\ *" "b" ");" -.HP \w'lwres_result_t\ lwres_gnbaresponse_render('u -.BI "lwres_result_t lwres_gnbaresponse_render(lwres_context_t\ *" "ctx" ", lwres_gnbaresponse_t\ *" "req" ", lwres_lwpacket_t\ *" "pkt" ", lwres_buffer_t\ *" "b" ");" -.HP \w'lwres_result_t\ lwres_gnbarequest_parse('u -.BI "lwres_result_t lwres_gnbarequest_parse(lwres_context_t\ *" "ctx" ", lwres_buffer_t\ *" "b" ", lwres_lwpacket_t\ *" "pkt" ", lwres_gnbarequest_t\ **" "structp" ");" -.HP \w'lwres_result_t\ lwres_gnbaresponse_parse('u -.BI "lwres_result_t lwres_gnbaresponse_parse(lwres_context_t\ *" "ctx" ", lwres_buffer_t\ *" "b" ", lwres_lwpacket_t\ *" "pkt" ", lwres_gnbaresponse_t\ **" "structp" ");" -.HP \w'void\ lwres_gnbaresponse_free('u -.BI "void lwres_gnbaresponse_free(lwres_context_t\ *" "ctx" ", lwres_gnbaresponse_t\ **" "structp" ");" -.HP \w'void\ lwres_gnbarequest_free('u -.BI "void lwres_gnbarequest_free(lwres_context_t\ *" "ctx" ", lwres_gnbarequest_t\ **" "structp" ");" -.SH "DESCRIPTION" -.PP -These are low\-level routines for creating and parsing lightweight resolver address\-to\-name lookup request and response messages\&. -.PP -There are four main functions for the getnamebyaddr opcode\&. One render function converts a getnamebyaddr request structure \(em -\fBlwres_gnbarequest_t\fR -\(em to the lightweight resolver\*(Aqs canonical format\&. It is complemented by a parse function that converts a packet in this canonical format to a getnamebyaddr request structure\&. Another render function converts the getnamebyaddr response structure \(em -\fBlwres_gnbaresponse_t\fR -to the canonical format\&. This is complemented by a parse function which converts a packet in canonical format to a getnamebyaddr response structure\&. -.PP -These structures are defined in -lwres/lwres\&.h\&. They are shown below\&. -.PP -.if n \{\ -.RS 4 -.\} -.nf -#define LWRES_OPCODE_GETNAMEBYADDR 0x00010002U -.fi -.if n \{\ -.RE -.\} -.PP -.if n \{\ -.RS 4 -.\} -.nf -typedef struct { - lwres_uint32_t flags; - lwres_addr_t addr; -} lwres_gnbarequest_t; -.fi -.if n \{\ -.RE -.\} -.PP -.if n \{\ -.RS 4 -.\} -.nf -typedef struct { - lwres_uint32_t flags; - lwres_uint16_t naliases; - char *realname; - char **aliases; - lwres_uint16_t realnamelen; - lwres_uint16_t *aliaslen; - void *base; - size_t baselen; -} lwres_gnbaresponse_t; -.fi -.if n \{\ -.RE -.\} -.PP -\fBlwres_gnbarequest_render()\fR -uses resolver context -\fIctx\fR -to convert getnamebyaddr request structure -\fIreq\fR -to canonical format\&. The packet header structure -\fIpkt\fR -is initialised and transferred to buffer -\fIb\fR\&. The contents of -\fI*req\fR -are then appended to the buffer in canonical format\&. -\fBlwres_gnbaresponse_render()\fR -performs the same task, except it converts a getnamebyaddr response structure -\fBlwres_gnbaresponse_t\fR -to the lightweight resolver\*(Aqs canonical format\&. -.PP -\fBlwres_gnbarequest_parse()\fR -uses context -\fIctx\fR -to convert the contents of packet -\fIpkt\fR -to a -\fBlwres_gnbarequest_t\fR -structure\&. Buffer -\fIb\fR -provides space to be used for storing this structure\&. When the function succeeds, the resulting -\fBlwres_gnbarequest_t\fR -is made available through -\fI*structp\fR\&. -\fBlwres_gnbaresponse_parse()\fR -offers the same semantics as -\fBlwres_gnbarequest_parse()\fR -except it yields a -\fBlwres_gnbaresponse_t\fR -structure\&. -.PP -\fBlwres_gnbaresponse_free()\fR -and -\fBlwres_gnbarequest_free()\fR -release the memory in resolver context -\fIctx\fR -that was allocated to the -\fBlwres_gnbaresponse_t\fR -or -\fBlwres_gnbarequest_t\fR -structures referenced via -\fIstructp\fR\&. Any memory associated with ancillary buffers and strings for those structures is also discarded\&. -.SH "RETURN VALUES" -.PP -The getnamebyaddr opcode functions -\fBlwres_gnbarequest_render()\fR, -\fBlwres_gnbaresponse_render()\fR\fBlwres_gnbarequest_parse()\fR -and -\fBlwres_gnbaresponse_parse()\fR -all return -\fBLWRES_R_SUCCESS\fR -on success\&. They return -\fBLWRES_R_NOMEMORY\fR -if memory allocation fails\&. -\fBLWRES_R_UNEXPECTEDEND\fR -is returned if the available space in the buffer -\fIb\fR -is too small to accommodate the packet header or the -\fBlwres_gnbarequest_t\fR -and -\fBlwres_gnbaresponse_t\fR -structures\&. -\fBlwres_gnbarequest_parse()\fR -and -\fBlwres_gnbaresponse_parse()\fR -will return -\fBLWRES_R_UNEXPECTEDEND\fR -if the buffer is not empty after decoding the received packet\&. These functions will return -\fBLWRES_R_FAILURE\fR -if -\fIpktflags\fR -in the packet header structure -\fBlwres_lwpacket_t\fR -indicate that the packet is not a response to an earlier query\&. -.SH "SEE ALSO" -.PP -\fBlwres_packet\fR(3)\&. -.SH "AUTHOR" -.PP -\fBInternet Systems Consortium, Inc\&.\fR -.SH "COPYRIGHT" -.br -Copyright \(co 2000, 2001, 2004, 2005, 2007, 2014-2016 Internet Systems Consortium, Inc. ("ISC") -.br diff --git a/lib/lwres/man/lwres_gnba.docbook b/lib/lwres/man/lwres_gnba.docbook deleted file mode 100644 index e7011ce561..0000000000 --- a/lib/lwres/man/lwres_gnba.docbook +++ /dev/null @@ -1,250 +0,0 @@ -]> - - - - - - 2007-06-18 - - - ISC - Internet Systems Consortium, Inc. - - - - lwres_gnba - 3 - BIND9 - - - - - 2000 - 2001 - 2004 - 2005 - 2007 - 2014 - 2015 - 2016 - Internet Systems Consortium, Inc. ("ISC") - - - - - lwres_gnbarequest_render - lwres_gnbaresponse_render - lwres_gnbarequest_parse - lwres_gnbaresponse_parse - lwres_gnbaresponse_free - lwres_gnbarequest_free - lightweight resolver getnamebyaddress message handling - - - - - - -#include <lwres/lwres.h> - - - - -lwres_result_t -lwres_gnbarequest_render - - lwres_context_t *ctx - lwres_gnbarequest_t *req - lwres_lwpacket_t *pkt - lwres_buffer_t *b - - - - -lwres_result_t -lwres_gnbaresponse_render - - lwres_context_t *ctx - lwres_gnbaresponse_t *req - lwres_lwpacket_t *pkt - lwres_buffer_t *b - - - -lwres_result_t -lwres_gnbarequest_parse - lwres_context_t *ctx - lwres_buffer_t *b - lwres_lwpacket_t *pkt - lwres_gnbarequest_t **structp - - - -lwres_result_t -lwres_gnbaresponse_parse - lwres_context_t *ctx - lwres_buffer_t *b - lwres_lwpacket_t *pkt - lwres_gnbaresponse_t **structp - - - - -void -lwres_gnbaresponse_free - - lwres_context_t *ctx - lwres_gnbaresponse_t **structp - - - -void -lwres_gnbarequest_free - lwres_context_t *ctx - lwres_gnbarequest_t **structp - - - - - - DESCRIPTION - - - These are low-level routines for creating and parsing - lightweight resolver address-to-name lookup request and - response messages. - - - There are four main functions for the getnamebyaddr opcode. - One render function converts a getnamebyaddr request structure — - lwres_gnbarequest_t — - to the lightweight resolver's canonical format. - It is complemented by a parse function that converts a packet in this - canonical format to a getnamebyaddr request structure. - Another render function converts the getnamebyaddr response structure - — - lwres_gnbaresponse_t - to the canonical format. - This is complemented by a parse function which converts a packet in - canonical format to a getnamebyaddr response structure. - - - These structures are defined in - lwres/lwres.h. - They are shown below. - - -#define LWRES_OPCODE_GETNAMEBYADDR 0x00010002U - - - -typedef struct { - lwres_uint32_t flags; - lwres_addr_t addr; -} lwres_gnbarequest_t; - - - -typedef struct { - lwres_uint32_t flags; - lwres_uint16_t naliases; - char *realname; - char **aliases; - lwres_uint16_t realnamelen; - lwres_uint16_t *aliaslen; - void *base; - size_t baselen; -} lwres_gnbaresponse_t; - - - - lwres_gnbarequest_render() - uses resolver context ctx to convert - getnamebyaddr request structure req to - canonical format. The packet header structure - pkt is initialised and transferred to buffer - b. The contents of *req - are then appended to the buffer in canonical format. - lwres_gnbaresponse_render() performs the - same task, except it converts a getnamebyaddr response structure - lwres_gnbaresponse_t to the lightweight resolver's - canonical format. - - - lwres_gnbarequest_parse() - uses context ctx to convert the contents of - packet pkt to a - lwres_gnbarequest_t structure. Buffer - b provides space to be used for storing this - structure. When the function succeeds, the resulting - lwres_gnbarequest_t is made available through - *structp. - lwres_gnbaresponse_parse() offers the same - semantics as lwres_gnbarequest_parse() - except it yields a lwres_gnbaresponse_t structure. - - - lwres_gnbaresponse_free() - and lwres_gnbarequest_free() release the - memory in resolver context ctx that was - allocated to the lwres_gnbaresponse_t or - lwres_gnbarequest_t structures referenced via - structp. Any memory associated with - ancillary buffers and strings for those structures is also - discarded. - - - - RETURN VALUES - - - The getnamebyaddr opcode functions - lwres_gnbarequest_render(), - lwres_gnbaresponse_render() - lwres_gnbarequest_parse() - and - lwres_gnbaresponse_parse() - all return - LWRES_R_SUCCESS - on success. - They return - LWRES_R_NOMEMORY - if memory allocation fails. - LWRES_R_UNEXPECTEDEND - is returned if the available space in the buffer - b - is too small to accommodate the packet header or the - lwres_gnbarequest_t - and - lwres_gnbaresponse_t - structures. - lwres_gnbarequest_parse() - and - lwres_gnbaresponse_parse() - will return - LWRES_R_UNEXPECTEDEND - if the buffer is not empty after decoding the received packet. - These functions will return - LWRES_R_FAILURE - if - pktflags - in the packet header structure - lwres_lwpacket_t - indicate that the packet is not a response to an earlier query. - - - SEE ALSO - - - lwres_packet3 - . - - - diff --git a/lib/lwres/man/lwres_gnba.html b/lib/lwres/man/lwres_gnba.html deleted file mode 100644 index d0a76805a8..0000000000 --- a/lib/lwres/man/lwres_gnba.html +++ /dev/null @@ -1,304 +0,0 @@ - - - - - -lwres_gnba - - -
-
- - - - - - - -
-

Name

-

- lwres_gnbarequest_render, - lwres_gnbaresponse_render, - lwres_gnbarequest_parse, - lwres_gnbaresponse_parse, - lwres_gnbaresponse_free, - lwres_gnbarequest_free - — lightweight resolver getnamebyaddress message handling -

-
- -
-

Synopsis

- -
-
-#include <lwres/lwres.h>
-
- - - - - - - - - - - - - - - - - - -
-lwres_result_t -lwres_gnbarequest_render -(lwres_context_t *ctx,
 lwres_gnbarequest_t *req,
 lwres_lwpacket_t *pkt,
 lwres_buffer_t *b);
-
 
- - - - - - - - - - - - - - - - - - -
-lwres_result_t -lwres_gnbaresponse_render -(lwres_context_t *ctx,
 lwres_gnbaresponse_t *req,
 lwres_lwpacket_t *pkt,
 lwres_buffer_t *b);
-
 
- - - - - - - - - - - - - - - - - -
-lwres_result_t -lwres_gnbarequest_parse(lwres_context_t *ctx,
 lwres_buffer_t *b,
 lwres_lwpacket_t *pkt,
 lwres_gnbarequest_t **structp);
-
 
- - - - - - - - - - - - - - - - - -
-lwres_result_t -lwres_gnbaresponse_parse(lwres_context_t *ctx,
 lwres_buffer_t *b,
 lwres_lwpacket_t *pkt,
 lwres_gnbaresponse_t **structp);
-
 
- - - - - - - - - - -
-void -lwres_gnbaresponse_free -(lwres_context_t *ctx,
 lwres_gnbaresponse_t **structp);
-
 
- - - - - - - - - -
-void -lwres_gnbarequest_free(lwres_context_t *ctx,
 lwres_gnbarequest_t **structp);
-
 
-
- -
- -
-

DESCRIPTION

- -

- These are low-level routines for creating and parsing - lightweight resolver address-to-name lookup request and - response messages. -

-

- There are four main functions for the getnamebyaddr opcode. - One render function converts a getnamebyaddr request structure — - lwres_gnbarequest_t — - to the lightweight resolver's canonical format. - It is complemented by a parse function that converts a packet in this - canonical format to a getnamebyaddr request structure. - Another render function converts the getnamebyaddr response structure - — - lwres_gnbaresponse_t - to the canonical format. - This is complemented by a parse function which converts a packet in - canonical format to a getnamebyaddr response structure. -

-

- These structures are defined in - lwres/lwres.h. - They are shown below. -

- 
-#define LWRES_OPCODE_GETNAMEBYADDR      0x00010002U
-
-

-

- 
-typedef struct {
-        lwres_uint32_t  flags;
-        lwres_addr_t    addr;
-} lwres_gnbarequest_t;
-
-

-

- 
-typedef struct {
-        lwres_uint32_t  flags;
-        lwres_uint16_t  naliases;
-        char           *realname;
-        char          **aliases;
-        lwres_uint16_t  realnamelen;
-        lwres_uint16_t *aliaslen;
-        void           *base;
-        size_t          baselen;
-} lwres_gnbaresponse_t;
-
-

-

- -

lwres_gnbarequest_render() - uses resolver context ctx to convert - getnamebyaddr request structure req to - canonical format. The packet header structure - pkt is initialised and transferred to buffer - b. The contents of *req - are then appended to the buffer in canonical format. - lwres_gnbaresponse_render() performs the - same task, except it converts a getnamebyaddr response structure - lwres_gnbaresponse_t to the lightweight resolver's - canonical format. -

- -

lwres_gnbarequest_parse() - uses context ctx to convert the contents of - packet pkt to a - lwres_gnbarequest_t structure. Buffer - b provides space to be used for storing this - structure. When the function succeeds, the resulting - lwres_gnbarequest_t is made available through - *structp. - lwres_gnbaresponse_parse() offers the same - semantics as lwres_gnbarequest_parse() - except it yields a lwres_gnbaresponse_t structure. -

- -

lwres_gnbaresponse_free() - and lwres_gnbarequest_free() release the - memory in resolver context ctx that was - allocated to the lwres_gnbaresponse_t or - lwres_gnbarequest_t structures referenced via - structp. Any memory associated with - ancillary buffers and strings for those structures is also - discarded. -

-
- -
-

RETURN VALUES

- -

- The getnamebyaddr opcode functions - lwres_gnbarequest_render(), - lwres_gnbaresponse_render() - lwres_gnbarequest_parse() - and - lwres_gnbaresponse_parse() - all return - LWRES_R_SUCCESS - on success. - They return - LWRES_R_NOMEMORY - if memory allocation fails. - LWRES_R_UNEXPECTEDEND - is returned if the available space in the buffer - b - is too small to accommodate the packet header or the - lwres_gnbarequest_t - and - lwres_gnbaresponse_t - structures. - lwres_gnbarequest_parse() - and - lwres_gnbaresponse_parse() - will return - LWRES_R_UNEXPECTEDEND - if the buffer is not empty after decoding the received packet. - These functions will return - LWRES_R_FAILURE - if - pktflags - in the packet header structure - lwres_lwpacket_t - indicate that the packet is not a response to an earlier query. -

-
-
-

SEE ALSO

- -

- lwres_packet(3) - . -

-
-
- diff --git a/lib/lwres/man/lwres_hstrerror.3 b/lib/lwres/man/lwres_hstrerror.3 deleted file mode 100644 index f0237e10cb..0000000000 --- a/lib/lwres/man/lwres_hstrerror.3 +++ /dev/null @@ -1,110 +0,0 @@ -.\" Copyright (C) 2000, 2001, 2004, 2005, 2007, 2014-2016 Internet Systems Consortium, Inc. ("ISC") -.\" -.\" This Source Code Form is subject to the terms of the Mozilla Public -.\" License, v. 2.0. If a copy of the MPL was not distributed with this -.\" file, You can obtain one at http://mozilla.org/MPL/2.0/. -.\" -.hy 0 -.ad l -'\" t -.\" Title: lwres_hstrerror -.\" Author: -.\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 2007-06-18 -.\" Manual: BIND9 -.\" Source: ISC -.\" Language: English -.\" -.TH "LWRES_HSTRERROR" "3" "2007\-06\-18" "ISC" "BIND9" -.\" ----------------------------------------------------------------- -.\" * Define some portability stuff -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" http://bugs.debian.org/507673 -.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.ie \n(.g .ds Aq \(aq -.el .ds Aq ' -.\" ----------------------------------------------------------------- -.\" * set default formatting -.\" ----------------------------------------------------------------- -.\" disable hyphenation -.nh -.\" disable justification (adjust text to left margin only) -.ad l -.\" ----------------------------------------------------------------- -.\" * MAIN CONTENT STARTS HERE * -.\" ----------------------------------------------------------------- -.SH "NAME" -lwres_herror, lwres_hstrerror \- lightweight resolver error message generation -.SH "SYNOPSIS" -.sp -.ft B -.nf -#include -.fi -.ft -.HP \w'void\ lwres_herror('u -.BI "void lwres_herror(const\ char\ *" "s" ");" -.HP \w'const\ char\ *\ lwres_hstrerror('u -.BI "const char * lwres_hstrerror(int\ " "err" ");" -.SH "DESCRIPTION" -.PP -\fBlwres_herror()\fR -prints the string -\fIs\fR -on -\fBstderr\fR -followed by the string generated by -\fBlwres_hstrerror()\fR -for the error code stored in the global variable -\fBlwres_h_errno\fR\&. -.PP -\fBlwres_hstrerror()\fR -returns an appropriate string for the error code gievn by -\fIerr\fR\&. The values of the error codes and messages are as follows: -.PP -\fBNETDB_SUCCESS\fR -.RS 4 -Resolver Error 0 (no error) -.RE -.PP -\fBHOST_NOT_FOUND\fR -.RS 4 -Unknown host -.RE -.PP -\fBTRY_AGAIN\fR -.RS 4 -Host name lookup failure -.RE -.PP -\fBNO_RECOVERY\fR -.RS 4 -Unknown server error -.RE -.PP -\fBNO_DATA\fR -.RS 4 -No address associated with name -.RE -.SH "RETURN VALUES" -.PP -The string -Unknown resolver error -is returned by -\fBlwres_hstrerror()\fR -when the value of -\fBlwres_h_errno\fR -is not a valid error code\&. -.SH "SEE ALSO" -.PP -\fBherror\fR(3), -\fBlwres_hstrerror\fR(3)\&. -.SH "AUTHOR" -.PP -\fBInternet Systems Consortium, Inc\&.\fR -.SH "COPYRIGHT" -.br -Copyright \(co 2000, 2001, 2004, 2005, 2007, 2014-2016 Internet Systems Consortium, Inc. ("ISC") -.br diff --git a/lib/lwres/man/lwres_hstrerror.docbook b/lib/lwres/man/lwres_hstrerror.docbook deleted file mode 100644 index 49e3c2156e..0000000000 --- a/lib/lwres/man/lwres_hstrerror.docbook +++ /dev/null @@ -1,139 +0,0 @@ - - - - - - 2007-06-18 - - - ISC - Internet Systems Consortium, Inc. - - - - lwres_hstrerror - 3 - BIND9 - - - - - 2000 - 2001 - 2004 - 2005 - 2007 - 2014 - 2015 - 2016 - Internet Systems Consortium, Inc. ("ISC") - - - - - lwres_herror - lwres_hstrerror - lightweight resolver error message generation - - - -#include <lwres/netdb.h> - - -void -lwres_herror - const char *s - - - -const char * -lwres_hstrerror - int err - - - - - DESCRIPTION - - - lwres_herror() - prints the string s on - stderr followed by the string generated by - lwres_hstrerror() for the error code stored - in the global variable lwres_h_errno. - - - lwres_hstrerror() - returns an appropriate string for the error code gievn by - err. The values of the error codes and - messages are as follows: - - - - NETDB_SUCCESS - - Resolver Error 0 (no error) - - - - - HOST_NOT_FOUND - - Unknown host - - - - - TRY_AGAIN - - Host name lookup failure - - - - - NO_RECOVERY - - Unknown server error - - - - - NO_DATA - - No address associated with name - - - - - - - - RETURN VALUES - - - The string Unknown resolver error is returned by - lwres_hstrerror() - when the value of - lwres_h_errno - is not a valid error code. - - - SEE ALSO - - - herror3 - , - - - lwres_hstrerror3 - . - - - - diff --git a/lib/lwres/man/lwres_hstrerror.html b/lib/lwres/man/lwres_hstrerror.html deleted file mode 100644 index c5c6729e3a..0000000000 --- a/lib/lwres/man/lwres_hstrerror.html +++ /dev/null @@ -1,126 +0,0 @@ - - - - - -lwres_hstrerror - - -
-
- - - - - - - -
-

Name

-

- lwres_herror, - lwres_hstrerror - — lightweight resolver error message generation -

-
-
-

Synopsis

-
-
#include <lwres/netdb.h>
- - - -
-void -lwres_herror(const char *s);
-
 
- - - -
-const char * -lwres_hstrerror(int err);
-
 
-
-
- -
-

DESCRIPTION

- - -

lwres_herror() - prints the string s on - stderr followed by the string generated by - lwres_hstrerror() for the error code stored - in the global variable lwres_h_errno. -

- -

lwres_hstrerror() - returns an appropriate string for the error code gievn by - err. The values of the error codes and - messages are as follows: - -

-
-
NETDB_SUCCESS
-
-

Resolver Error 0 (no error) -

-
-
HOST_NOT_FOUND
-
-

Unknown host -

-
-
TRY_AGAIN
-
-

Host name lookup failure -

-
-
NO_RECOVERY
-
-

Unknown server error -

-
-
NO_DATA
-
-

No address associated with name -

-
-
-

-

-
- -
-

RETURN VALUES

- -

- The string Unknown resolver error is returned by - lwres_hstrerror() - when the value of - lwres_h_errno - is not a valid error code. -

-
-
-

SEE ALSO

- -

- herror(3) - , - - - lwres_hstrerror(3) - . -

- -
-
- diff --git a/lib/lwres/man/lwres_inetntop.3 b/lib/lwres/man/lwres_inetntop.3 deleted file mode 100644 index 126226ea70..0000000000 --- a/lib/lwres/man/lwres_inetntop.3 +++ /dev/null @@ -1,88 +0,0 @@ -.\" Copyright (C) 2000, 2001, 2004, 2005, 2007, 2014-2016 Internet Systems Consortium, Inc. ("ISC") -.\" -.\" This Source Code Form is subject to the terms of the Mozilla Public -.\" License, v. 2.0. If a copy of the MPL was not distributed with this -.\" file, You can obtain one at http://mozilla.org/MPL/2.0/. -.\" -.hy 0 -.ad l -'\" t -.\" Title: lwres_inetntop -.\" Author: -.\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 2007-06-18 -.\" Manual: BIND9 -.\" Source: ISC -.\" Language: English -.\" -.TH "LWRES_INETNTOP" "3" "2007\-06\-18" "ISC" "BIND9" -.\" ----------------------------------------------------------------- -.\" * Define some portability stuff -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" http://bugs.debian.org/507673 -.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.ie \n(.g .ds Aq \(aq -.el .ds Aq ' -.\" ----------------------------------------------------------------- -.\" * set default formatting -.\" ----------------------------------------------------------------- -.\" disable hyphenation -.nh -.\" disable justification (adjust text to left margin only) -.ad l -.\" ----------------------------------------------------------------- -.\" * MAIN CONTENT STARTS HERE * -.\" ----------------------------------------------------------------- -.SH "NAME" -lwres_net_ntop \- lightweight resolver IP address presentation -.SH "SYNOPSIS" -.sp -.ft B -.nf -#include -.fi -.ft -.HP \w'const\ char\ *\ lwres_net_ntop('u -.BI "const char * lwres_net_ntop(int\ " "af" ", const\ void\ *" "src" ", char\ *" "dst" ", size_t\ " "size" ");" -.SH "DESCRIPTION" -.PP -\fBlwres_net_ntop()\fR -converts an IP address of protocol family -\fIaf\fR -\(em IPv4 or IPv6 \(em at location -\fIsrc\fR -from network format to its conventional representation as a string\&. For IPv4 addresses, that string would be a dotted\-decimal\&. An IPv6 address would be represented in colon notation as described in RFC1884\&. -.PP -The generated string is copied to -\fIdst\fR -provided -\fIsize\fR -indicates it is long enough to store the ASCII representation of the address\&. -.SH "RETURN VALUES" -.PP -If successful, the function returns -\fIdst\fR: a pointer to a string containing the presentation format of the address\&. -\fBlwres_net_ntop()\fR -returns -\fBNULL\fR -and sets the global variable -\fBerrno\fR -to -\fBEAFNOSUPPORT\fR -if the protocol family given in -\fIaf\fR -is not supported\&. -.SH "SEE ALSO" -.PP -\fBRFC1884\fR(), -\fBinet_ntop\fR(3), -\fBerrno\fR(3)\&. -.SH "AUTHOR" -.PP -\fBInternet Systems Consortium, Inc\&.\fR -.SH "COPYRIGHT" -.br -Copyright \(co 2000, 2001, 2004, 2005, 2007, 2014-2016 Internet Systems Consortium, Inc. ("ISC") -.br diff --git a/lib/lwres/man/lwres_inetntop.docbook b/lib/lwres/man/lwres_inetntop.docbook deleted file mode 100644 index 7faa4673a6..0000000000 --- a/lib/lwres/man/lwres_inetntop.docbook +++ /dev/null @@ -1,109 +0,0 @@ -]> - - - - - - 2007-06-18 - - - ISC - Internet Systems Consortium, Inc. - - - - lwres_inetntop - 3 - BIND9 - - - - - 2000 - 2001 - 2004 - 2005 - 2007 - 2014 - 2015 - 2016 - Internet Systems Consortium, Inc. ("ISC") - - - - - lwres_net_ntop - lightweight resolver IP address presentation - - - -#include <lwres/net.h> - - -const char * -lwres_net_ntop - int af - const void *src - char *dst - size_t size - - - - - DESCRIPTION - - - lwres_net_ntop() - converts an IP address of protocol family - af — IPv4 or IPv6 — at - location src from network format to its - conventional representation as a string. For IPv4 addresses, - that string would be a dotted-decimal. An IPv6 address would be - represented in colon notation as described in RFC1884. - - - - The generated string is copied to dst - provided - size indicates it is long enough to - store the - ASCII representation of the address. - - - - RETURN VALUES - - - - If successful, the function returns dst: - a pointer to a string containing the presentation format of the - address. lwres_net_ntop() returns - NULL and sets the global variable - errno to EAFNOSUPPORT if - the protocol family given in af is - not - supported. - - - - SEE ALSO - - - RFC1884 - , - - inet_ntop3 - , - - errno3 - . - - - diff --git a/lib/lwres/man/lwres_inetntop.html b/lib/lwres/man/lwres_inetntop.html deleted file mode 100644 index b0a27a0ed9..0000000000 --- a/lib/lwres/man/lwres_inetntop.html +++ /dev/null @@ -1,112 +0,0 @@ - - - - - -lwres_inetntop - - -
-
- - - - - - - -
-

Name

-

- lwres_net_ntop - — lightweight resolver IP address presentation -

-
-
-

Synopsis

-
-
#include <lwres/net.h>
- - - - - - - - - - - - - - - - - -
-const char * -lwres_net_ntop(int af,
 const void *src,
 char *dst,
 size_t size);
-
 
-
-
- -
-

DESCRIPTION

- - -

lwres_net_ntop() - converts an IP address of protocol family - af — IPv4 or IPv6 — at - location src from network format to its - conventional representation as a string. For IPv4 addresses, - that string would be a dotted-decimal. An IPv6 address would be - represented in colon notation as described in RFC1884. -

- -

- The generated string is copied to dst - provided - size indicates it is long enough to - store the - ASCII representation of the address. -

- -
-
-

RETURN VALUES

- - -

- If successful, the function returns dst: - a pointer to a string containing the presentation format of the - address. lwres_net_ntop() returns - NULL and sets the global variable - errno to EAFNOSUPPORT if - the protocol family given in af is - not - supported. -

- -
-
-

SEE ALSO

- -

- RFC1884 - , - - inet_ntop(3) - , - - errno(3) - . -

-
-
- diff --git a/lib/lwres/man/lwres_noop.3 b/lib/lwres/man/lwres_noop.3 deleted file mode 100644 index 910b811c93..0000000000 --- a/lib/lwres/man/lwres_noop.3 +++ /dev/null @@ -1,202 +0,0 @@ -.\" Copyright (C) 2000, 2001, 2004, 2005, 2007, 2014-2016 Internet Systems Consortium, Inc. ("ISC") -.\" -.\" This Source Code Form is subject to the terms of the Mozilla Public -.\" License, v. 2.0. If a copy of the MPL was not distributed with this -.\" file, You can obtain one at http://mozilla.org/MPL/2.0/. -.\" -.hy 0 -.ad l -'\" t -.\" Title: lwres_noop -.\" Author: -.\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 2007-06-18 -.\" Manual: BIND9 -.\" Source: ISC -.\" Language: English -.\" -.TH "LWRES_NOOP" "3" "2007\-06\-18" "ISC" "BIND9" -.\" ----------------------------------------------------------------- -.\" * Define some portability stuff -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" http://bugs.debian.org/507673 -.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.ie \n(.g .ds Aq \(aq -.el .ds Aq ' -.\" ----------------------------------------------------------------- -.\" * set default formatting -.\" ----------------------------------------------------------------- -.\" disable hyphenation -.nh -.\" disable justification (adjust text to left margin only) -.ad l -.\" ----------------------------------------------------------------- -.\" * MAIN CONTENT STARTS HERE * -.\" ----------------------------------------------------------------- -.SH "NAME" -lwres_nooprequest_render, lwres_noopresponse_render, lwres_nooprequest_parse, lwres_noopresponse_parse, lwres_noopresponse_free, lwres_nooprequest_free \- lightweight resolver no\-op message handling -.SH "SYNOPSIS" -.sp -.ft B -.nf -#include -.fi -.ft -.HP \w'lwres_result_t\ lwres_nooprequest_render('u -.BI "lwres_result_t lwres_nooprequest_render(lwres_context_t\ *" "ctx" ", lwres_nooprequest_t\ *" "req" ", lwres_lwpacket_t\ *" "pkt" ", lwres_buffer_t\ *" "b" ");" -.HP \w'lwres_result_t\ lwres_noopresponse_render('u -.BI "lwres_result_t lwres_noopresponse_render(lwres_context_t\ *" "ctx" ", lwres_noopresponse_t\ *" "req" ", lwres_lwpacket_t\ *" "pkt" ", lwres_buffer_t\ *" "b" ");" -.HP \w'lwres_result_t\ lwres_nooprequest_parse('u -.BI "lwres_result_t lwres_nooprequest_parse(lwres_context_t\ *" "ctx" ", lwres_buffer_t\ *" "b" ", lwres_lwpacket_t\ *" "pkt" ", lwres_nooprequest_t\ **" "structp" ");" -.HP \w'lwres_result_t\ lwres_noopresponse_parse('u -.BI "lwres_result_t lwres_noopresponse_parse(lwres_context_t\ *" "ctx" ", lwres_buffer_t\ *" "b" ", lwres_lwpacket_t\ *" "pkt" ", lwres_noopresponse_t\ **" "structp" ");" -.HP \w'void\ lwres_noopresponse_free('u -.BI "void lwres_noopresponse_free(lwres_context_t\ *" "ctx" ", lwres_noopresponse_t\ **" "structp" ");" -.HP \w'void\ lwres_nooprequest_free('u -.BI "void lwres_nooprequest_free(lwres_context_t\ *" "ctx" ", lwres_nooprequest_t\ **" "structp" ");" -.SH "DESCRIPTION" -.PP -These are low\-level routines for creating and parsing lightweight resolver no\-op request and response messages\&. -.PP -The no\-op message is analogous to a -\fBping\fR -packet: a packet is sent to the resolver daemon and is simply echoed back\&. The opcode is intended to allow a client to determine if the server is operational or not\&. -.PP -There are four main functions for the no\-op opcode\&. One render function converts a no\-op request structure \(em -\fBlwres_nooprequest_t\fR -\(em to the lightweight resolver\*(Aqs canonical format\&. It is complemented by a parse function that converts a packet in this canonical format to a no\-op request structure\&. Another render function converts the no\-op response structure \(em -\fBlwres_noopresponse_t\fR -to the canonical format\&. This is complemented by a parse function which converts a packet in canonical format to a no\-op response structure\&. -.PP -These structures are defined in -lwres/lwres\&.h\&. They are shown below\&. -.PP -.if n \{\ -.RS 4 -.\} -.nf -#define LWRES_OPCODE_NOOP 0x00000000U -.fi -.if n \{\ -.RE -.\} -.PP -.if n \{\ -.RS 4 -.\} -.nf -typedef struct { - lwres_uint16_t datalength; - unsigned char *data; -} lwres_nooprequest_t; -.fi -.if n \{\ -.RE -.\} -.PP -.if n \{\ -.RS 4 -.\} -.nf -typedef struct { - lwres_uint16_t datalength; - unsigned char *data; -} lwres_noopresponse_t; -.fi -.if n \{\ -.RE -.\} -.PP -Although the structures have different types, they are identical\&. This is because the no\-op opcode simply echos whatever data was sent: the response is therefore identical to the request\&. -.PP -\fBlwres_nooprequest_render()\fR -uses resolver context -\fIctx\fR -to convert no\-op request structure -\fIreq\fR -to canonical format\&. The packet header structure -\fIpkt\fR -is initialised and transferred to buffer -\fIb\fR\&. The contents of -\fI*req\fR -are then appended to the buffer in canonical format\&. -\fBlwres_noopresponse_render()\fR -performs the same task, except it converts a no\-op response structure -\fBlwres_noopresponse_t\fR -to the lightweight resolver\*(Aqs canonical format\&. -.PP -\fBlwres_nooprequest_parse()\fR -uses context -\fIctx\fR -to convert the contents of packet -\fIpkt\fR -to a -\fBlwres_nooprequest_t\fR -structure\&. Buffer -\fIb\fR -provides space to be used for storing this structure\&. When the function succeeds, the resulting -\fBlwres_nooprequest_t\fR -is made available through -\fI*structp\fR\&. -\fBlwres_noopresponse_parse()\fR -offers the same semantics as -\fBlwres_nooprequest_parse()\fR -except it yields a -\fBlwres_noopresponse_t\fR -structure\&. -.PP -\fBlwres_noopresponse_free()\fR -and -\fBlwres_nooprequest_free()\fR -release the memory in resolver context -\fIctx\fR -that was allocated to the -\fBlwres_noopresponse_t\fR -or -\fBlwres_nooprequest_t\fR -structures referenced via -\fIstructp\fR\&. -.SH "RETURN VALUES" -.PP -The no\-op opcode functions -\fBlwres_nooprequest_render()\fR, -\fBlwres_noopresponse_render()\fR\fBlwres_nooprequest_parse()\fR -and -\fBlwres_noopresponse_parse()\fR -all return -\fBLWRES_R_SUCCESS\fR -on success\&. They return -\fBLWRES_R_NOMEMORY\fR -if memory allocation fails\&. -\fBLWRES_R_UNEXPECTEDEND\fR -is returned if the available space in the buffer -\fIb\fR -is too small to accommodate the packet header or the -\fBlwres_nooprequest_t\fR -and -\fBlwres_noopresponse_t\fR -structures\&. -\fBlwres_nooprequest_parse()\fR -and -\fBlwres_noopresponse_parse()\fR -will return -\fBLWRES_R_UNEXPECTEDEND\fR -if the buffer is not empty after decoding the received packet\&. These functions will return -\fBLWRES_R_FAILURE\fR -if -\fBpktflags\fR -in the packet header structure -\fBlwres_lwpacket_t\fR -indicate that the packet is not a response to an earlier query\&. -.SH "SEE ALSO" -.PP -\fBlwres_packet\fR(3) -.SH "AUTHOR" -.PP -\fBInternet Systems Consortium, Inc\&.\fR -.SH "COPYRIGHT" -.br -Copyright \(co 2000, 2001, 2004, 2005, 2007, 2014-2016 Internet Systems Consortium, Inc. ("ISC") -.br diff --git a/lib/lwres/man/lwres_noop.docbook b/lib/lwres/man/lwres_noop.docbook deleted file mode 100644 index a6b6f6f2dc..0000000000 --- a/lib/lwres/man/lwres_noop.docbook +++ /dev/null @@ -1,244 +0,0 @@ -]> - - - - - - 2007-06-18 - - - ISC - Internet Systems Consortium, Inc. - - - - lwres_noop - 3 - BIND9 - - - - - 2000 - 2001 - 2004 - 2005 - 2007 - 2014 - 2015 - 2016 - Internet Systems Consortium, Inc. ("ISC") - - - - - lwres_nooprequest_render - lwres_noopresponse_render - lwres_nooprequest_parse - lwres_noopresponse_parse - lwres_noopresponse_free - lwres_nooprequest_free - lightweight resolver no-op message handling - - - - -#include <lwres/lwres.h> - - -lwres_result_t -lwres_nooprequest_render - lwres_context_t *ctx - lwres_nooprequest_t *req - lwres_lwpacket_t *pkt - lwres_buffer_t *b - - - -lwres_result_t -lwres_noopresponse_render - lwres_context_t *ctx - lwres_noopresponse_t *req - lwres_lwpacket_t *pkt - lwres_buffer_t *b - - - -lwres_result_t -lwres_nooprequest_parse - lwres_context_t *ctx - lwres_buffer_t *b - lwres_lwpacket_t *pkt - lwres_nooprequest_t **structp - - - -lwres_result_t -lwres_noopresponse_parse - lwres_context_t *ctx - lwres_buffer_t *b - lwres_lwpacket_t *pkt - lwres_noopresponse_t **structp - - - -void -lwres_noopresponse_free - lwres_context_t *ctx - lwres_noopresponse_t **structp - - - -void -lwres_nooprequest_free - lwres_context_t *ctx - lwres_nooprequest_t **structp - - - - DESCRIPTION - - - These are low-level routines for creating and parsing - lightweight resolver no-op request and response messages. - - - The no-op message is analogous to a ping - packet: - a packet is sent to the resolver daemon and is simply echoed back. - The opcode is intended to allow a client to determine if the server is - operational or not. - - - There are four main functions for the no-op opcode. - One render function converts a no-op request structure — - lwres_nooprequest_t — - to the lightweight resolver's canonical format. - It is complemented by a parse function that converts a packet in this - canonical format to a no-op request structure. - Another render function converts the no-op response structure — - lwres_noopresponse_t - to the canonical format. - This is complemented by a parse function which converts a packet in - canonical format to a no-op response structure. - - - These structures are defined in - lwres/lwres.h. - - They are shown below. - - -#define LWRES_OPCODE_NOOP 0x00000000U - - - -typedef struct { - lwres_uint16_t datalength; - unsigned char *data; -} lwres_nooprequest_t; - - - -typedef struct { - lwres_uint16_t datalength; - unsigned char *data; -} lwres_noopresponse_t; - - - - Although the structures have different types, they are identical. - This is because the no-op opcode simply echos whatever data was sent: - the response is therefore identical to the request. - - - lwres_nooprequest_render() - uses resolver context ctx to convert - no-op request structure req to canonical - format. The packet header structure pkt - is initialised and transferred to buffer - b. The contents of - *req are then appended to the buffer in - canonical format. - lwres_noopresponse_render() performs the - same task, except it converts a no-op response structure - lwres_noopresponse_t to the lightweight resolver's - canonical format. - - - lwres_nooprequest_parse() - uses context ctx to convert the contents - of packet pkt to a - lwres_nooprequest_t structure. Buffer - b provides space to be used for storing - this structure. When the function succeeds, the resulting - lwres_nooprequest_t is made available through - *structp. - lwres_noopresponse_parse() offers the same - semantics as lwres_nooprequest_parse() - except it yields a lwres_noopresponse_t structure. - - - lwres_noopresponse_free() - and lwres_nooprequest_free() release the - memory in resolver context ctx that was - allocated to the lwres_noopresponse_t or - lwres_nooprequest_t structures referenced via - structp. - - - - RETURN VALUES - - - The no-op opcode functions - lwres_nooprequest_render(), - - lwres_noopresponse_render() - lwres_nooprequest_parse() - and - lwres_noopresponse_parse() - all return - LWRES_R_SUCCESS - on success. - They return - LWRES_R_NOMEMORY - if memory allocation fails. - LWRES_R_UNEXPECTEDEND - is returned if the available space in the buffer - b - is too small to accommodate the packet header or the - lwres_nooprequest_t - and - lwres_noopresponse_t - structures. - lwres_nooprequest_parse() - and - lwres_noopresponse_parse() - will return - LWRES_R_UNEXPECTEDEND - if the buffer is not empty after decoding the received packet. - These functions will return - LWRES_R_FAILURE - if - pktflags - in the packet header structure - lwres_lwpacket_t - indicate that the packet is not a response to an earlier query. - - - SEE ALSO - - - lwres_packet3 - - - - diff --git a/lib/lwres/man/lwres_noop.html b/lib/lwres/man/lwres_noop.html deleted file mode 100644 index 908b4125a7..0000000000 --- a/lib/lwres/man/lwres_noop.html +++ /dev/null @@ -1,298 +0,0 @@ - - - - - -lwres_noop - - -
-
- - - - - - - -
-

Name

-

- lwres_nooprequest_render, - lwres_noopresponse_render, - lwres_nooprequest_parse, - lwres_noopresponse_parse, - lwres_noopresponse_free, - lwres_nooprequest_free - — lightweight resolver no-op message handling -

-
-
-

Synopsis

-
-
-#include <lwres/lwres.h>
- - - - - - - - - - - - - - - - - -
-lwres_result_t -lwres_nooprequest_render(lwres_context_t *ctx,
 lwres_nooprequest_t *req,
 lwres_lwpacket_t *pkt,
 lwres_buffer_t *b);
-
 
- - - - - - - - - - - - - - - - - -
-lwres_result_t -lwres_noopresponse_render(lwres_context_t *ctx,
 lwres_noopresponse_t *req,
 lwres_lwpacket_t *pkt,
 lwres_buffer_t *b);
-
 
- - - - - - - - - - - - - - - - - -
-lwres_result_t -lwres_nooprequest_parse(lwres_context_t *ctx,
 lwres_buffer_t *b,
 lwres_lwpacket_t *pkt,
 lwres_nooprequest_t **structp);
-
 
- - - - - - - - - - - - - - - - - -
-lwres_result_t -lwres_noopresponse_parse(lwres_context_t *ctx,
 lwres_buffer_t *b,
 lwres_lwpacket_t *pkt,
 lwres_noopresponse_t **structp);
-
 
- - - - - - - - - -
-void -lwres_noopresponse_free(lwres_context_t *ctx,
 lwres_noopresponse_t **structp);
-
 
- - - - - - - - - -
-void -lwres_nooprequest_free(lwres_context_t *ctx,
 lwres_nooprequest_t **structp);
-
 
-
-
-
-

DESCRIPTION

- -

- These are low-level routines for creating and parsing - lightweight resolver no-op request and response messages. -

-

- The no-op message is analogous to a ping - packet: - a packet is sent to the resolver daemon and is simply echoed back. - The opcode is intended to allow a client to determine if the server is - operational or not. -

-

- There are four main functions for the no-op opcode. - One render function converts a no-op request structure — - lwres_nooprequest_t — - to the lightweight resolver's canonical format. - It is complemented by a parse function that converts a packet in this - canonical format to a no-op request structure. - Another render function converts the no-op response structure — - lwres_noopresponse_t - to the canonical format. - This is complemented by a parse function which converts a packet in - canonical format to a no-op response structure. -

-

- These structures are defined in - lwres/lwres.h. - - They are shown below. -

- 
-#define LWRES_OPCODE_NOOP       0x00000000U
-
-

-

- 
-typedef struct {
-        lwres_uint16_t  datalength;
-        unsigned char   *data;
-} lwres_nooprequest_t;
-
-

-

- 
-typedef struct {
-        lwres_uint16_t  datalength;
-        unsigned char   *data;
-} lwres_noopresponse_t;
-
-

-

-

- Although the structures have different types, they are identical. - This is because the no-op opcode simply echos whatever data was sent: - the response is therefore identical to the request. -

- -

lwres_nooprequest_render() - uses resolver context ctx to convert - no-op request structure req to canonical - format. The packet header structure pkt - is initialised and transferred to buffer - b. The contents of - *req are then appended to the buffer in - canonical format. - lwres_noopresponse_render() performs the - same task, except it converts a no-op response structure - lwres_noopresponse_t to the lightweight resolver's - canonical format. -

- -

lwres_nooprequest_parse() - uses context ctx to convert the contents - of packet pkt to a - lwres_nooprequest_t structure. Buffer - b provides space to be used for storing - this structure. When the function succeeds, the resulting - lwres_nooprequest_t is made available through - *structp. - lwres_noopresponse_parse() offers the same - semantics as lwres_nooprequest_parse() - except it yields a lwres_noopresponse_t structure. -

- -

lwres_noopresponse_free() - and lwres_nooprequest_free() release the - memory in resolver context ctx that was - allocated to the lwres_noopresponse_t or - lwres_nooprequest_t structures referenced via - structp. -

- -
-
-

RETURN VALUES

- -

- The no-op opcode functions - lwres_nooprequest_render(), - - lwres_noopresponse_render() - lwres_nooprequest_parse() - and - lwres_noopresponse_parse() - all return - LWRES_R_SUCCESS - on success. - They return - LWRES_R_NOMEMORY - if memory allocation fails. - LWRES_R_UNEXPECTEDEND - is returned if the available space in the buffer - b - is too small to accommodate the packet header or the - lwres_nooprequest_t - and - lwres_noopresponse_t - structures. - lwres_nooprequest_parse() - and - lwres_noopresponse_parse() - will return - LWRES_R_UNEXPECTEDEND - if the buffer is not empty after decoding the received packet. - These functions will return - LWRES_R_FAILURE - if - pktflags - in the packet header structure - lwres_lwpacket_t - indicate that the packet is not a response to an earlier query. -

-
-
-

SEE ALSO

- -

- lwres_packet(3) - -

-
-
- diff --git a/lib/lwres/man/lwres_packet.3 b/lib/lwres/man/lwres_packet.3 deleted file mode 100644 index 762838a111..0000000000 --- a/lib/lwres/man/lwres_packet.3 +++ /dev/null @@ -1,186 +0,0 @@ -.\" Copyright (C) 2000, 2001, 2004, 2005, 2007, 2014-2016 Internet Systems Consortium, Inc. ("ISC") -.\" -.\" This Source Code Form is subject to the terms of the Mozilla Public -.\" License, v. 2.0. If a copy of the MPL was not distributed with this -.\" file, You can obtain one at http://mozilla.org/MPL/2.0/. -.\" -.hy 0 -.ad l -'\" t -.\" Title: lwres_packet -.\" Author: -.\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 2007-06-18 -.\" Manual: BIND9 -.\" Source: ISC -.\" Language: English -.\" -.TH "LWRES_PACKET" "3" "2007\-06\-18" "ISC" "BIND9" -.\" ----------------------------------------------------------------- -.\" * Define some portability stuff -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" http://bugs.debian.org/507673 -.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.ie \n(.g .ds Aq \(aq -.el .ds Aq ' -.\" ----------------------------------------------------------------- -.\" * set default formatting -.\" ----------------------------------------------------------------- -.\" disable hyphenation -.nh -.\" disable justification (adjust text to left margin only) -.ad l -.\" ----------------------------------------------------------------- -.\" * MAIN CONTENT STARTS HERE * -.\" ----------------------------------------------------------------- -.SH "NAME" -lwres_lwpacket_renderheader, lwres_lwpacket_parseheader \- lightweight resolver packet handling functions -.SH "SYNOPSIS" -.sp -.ft B -.nf -#include -.fi -.ft -.HP \w'lwres_result_t\ lwres_lwpacket_renderheader('u -.BI "lwres_result_t lwres_lwpacket_renderheader(lwres_buffer_t\ *" "b" ", lwres_lwpacket_t\ *" "pkt" ");" -.HP \w'lwres_result_t\ lwres_lwpacket_parseheader('u -.BI "lwres_result_t lwres_lwpacket_parseheader(lwres_buffer_t\ *" "b" ", lwres_lwpacket_t\ *" "pkt" ");" -.SH "DESCRIPTION" -.PP -These functions rely on a -\fBstruct lwres_lwpacket\fR -which is defined in -lwres/lwpacket\&.h\&. -.PP -.if n \{\ -.RS 4 -.\} -.nf -typedef struct lwres_lwpacket lwres_lwpacket_t; -.fi -.if n \{\ -.RE -.\} -.PP -.if n \{\ -.RS 4 -.\} -.nf -struct lwres_lwpacket { - lwres_uint32_t length; - lwres_uint16_t version; - lwres_uint16_t pktflags; - lwres_uint32_t serial; - lwres_uint32_t opcode; - lwres_uint32_t result; - lwres_uint32_t recvlength; - lwres_uint16_t authtype; - lwres_uint16_t authlength; -}; -.fi -.if n \{\ -.RE -.\} -.PP -The elements of this structure are: -.PP -\fBlength\fR -.RS 4 -the overall packet length, including the entire packet header\&. This field is filled in by the lwres_gabn_*() and lwres_gnba_*() calls\&. -.RE -.PP -\fBversion\fR -.RS 4 -the header format\&. There is currently only one format, -\fBLWRES_LWPACKETVERSION_0\fR\&. This field is filled in by the lwres_gabn_*() and lwres_gnba_*() calls\&. -.RE -.PP -\fBpktflags\fR -.RS 4 -library\-defined flags for this packet: for instance whether the packet is a request or a reply\&. Flag values can be set, but not defined by the caller\&. This field is filled in by the application wit the exception of the LWRES_LWPACKETFLAG_RESPONSE bit, which is set by the library in the lwres_gabn_*() and lwres_gnba_*() calls\&. -.RE -.PP -\fBserial\fR -.RS 4 -is set by the requestor and is returned in all replies\&. If two or more packets from the same source have the same serial number and are from the same source, they are assumed to be duplicates and the latter ones may be dropped\&. This field must be set by the application\&. -.RE -.PP -\fBopcode\fR -.RS 4 -indicates the operation\&. Opcodes between 0x00000000 and 0x03ffffff are reserved for use by the lightweight resolver library\&. Opcodes between 0x04000000 and 0xffffffff are application defined\&. This field is filled in by the lwres_gabn_*() and lwres_gnba_*() calls\&. -.RE -.PP -\fBresult\fR -.RS 4 -is only valid for replies\&. Results between 0x04000000 and 0xffffffff are application defined\&. Results between 0x00000000 and 0x03ffffff are reserved for library use\&. This field is filled in by the lwres_gabn_*() and lwres_gnba_*() calls\&. -.RE -.PP -\fBrecvlength\fR -.RS 4 -is the maximum buffer size that the receiver can handle on requests and the size of the buffer needed to satisfy a request when the buffer is too large for replies\&. This field is supplied by the application\&. -.RE -.PP -\fBauthtype\fR -.RS 4 -defines the packet level authentication that is used\&. Authorisation types between 0x1000 and 0xffff are application defined and types between 0x0000 and 0x0fff are reserved for library use\&. Currently these are not used and must be zero\&. -.RE -.PP -\fBauthlen\fR -.RS 4 -gives the length of the authentication data\&. Since packet authentication is currently not used, this must be zero\&. -.RE -.PP -The following opcodes are currently defined: -.PP -\fBNOOP\fR -.RS 4 -Success is always returned and the packet contents are echoed\&. The lwres_noop_*() functions should be used for this type\&. -.RE -.PP -\fBGETADDRSBYNAME\fR -.RS 4 -returns all known addresses for a given name\&. The lwres_gabn_*() functions should be used for this type\&. -.RE -.PP -\fBGETNAMEBYADDR\fR -.RS 4 -return the hostname for the given address\&. The lwres_gnba_*() functions should be used for this type\&. -.RE -.PP -\fBlwres_lwpacket_renderheader()\fR -transfers the contents of lightweight resolver packet structure -\fBlwres_lwpacket_t\fR\fI*pkt\fR -in network byte order to the lightweight resolver buffer, -\fI*b\fR\&. -.PP -\fBlwres_lwpacket_parseheader()\fR -performs the converse operation\&. It transfers data in network byte order from buffer -\fI*b\fR -to resolver packet -\fI*pkt\fR\&. The contents of the buffer -\fIb\fR -should correspond to a -\fBlwres_lwpacket_t\fR\&. -.SH "RETURN VALUES" -.PP -Successful calls to -\fBlwres_lwpacket_renderheader()\fR -and -\fBlwres_lwpacket_parseheader()\fR -return -\fBLWRES_R_SUCCESS\fR\&. If there is insufficient space to copy data between the buffer -\fI*b\fR -and lightweight resolver packet -\fI*pkt\fR -both functions return -\fBLWRES_R_UNEXPECTEDEND\fR\&. -.SH "AUTHOR" -.PP -\fBInternet Systems Consortium, Inc\&.\fR -.SH "COPYRIGHT" -.br -Copyright \(co 2000, 2001, 2004, 2005, 2007, 2014-2016 Internet Systems Consortium, Inc. ("ISC") -.br diff --git a/lib/lwres/man/lwres_packet.docbook b/lib/lwres/man/lwres_packet.docbook deleted file mode 100644 index a7ec451ee1..0000000000 --- a/lib/lwres/man/lwres_packet.docbook +++ /dev/null @@ -1,278 +0,0 @@ - - - - - - 2007-06-18 - - - ISC - Internet Systems Consortium, Inc. - - - - lwres_packet - 3 - BIND9 - - - - - 2000 - 2001 - 2004 - 2005 - 2007 - 2014 - 2015 - 2016 - Internet Systems Consortium, Inc. ("ISC") - - - - - lwres_lwpacket_renderheader - lwres_lwpacket_parseheader - lightweight resolver packet handling functions - - - -#include <lwres/lwpacket.h> - - -lwres_result_t -lwres_lwpacket_renderheader - lwres_buffer_t *b - lwres_lwpacket_t *pkt - - - -lwres_result_t -lwres_lwpacket_parseheader - lwres_buffer_t *b - lwres_lwpacket_t *pkt - - - - DESCRIPTION - - - These functions rely on a - struct lwres_lwpacket - which is defined in - lwres/lwpacket.h. - - - -typedef struct lwres_lwpacket lwres_lwpacket_t; - - - -struct lwres_lwpacket { - lwres_uint32_t length; - lwres_uint16_t version; - lwres_uint16_t pktflags; - lwres_uint32_t serial; - lwres_uint32_t opcode; - lwres_uint32_t result; - lwres_uint32_t recvlength; - lwres_uint16_t authtype; - lwres_uint16_t authlength; -}; - - - - - The elements of this structure are: - - - length - - - the overall packet length, including the entire packet header. - This field is filled in by the lwres_gabn_*() and lwres_gnba_*() - calls. - - - - - version - - - the header format. There is currently only one format, - LWRES_LWPACKETVERSION_0. - - This field is filled in by the lwres_gabn_*() and lwres_gnba_*() - calls. - - - - - pktflags - - - library-defined flags for this packet: for instance whether the - packet - is a request or a reply. Flag values can be set, but not defined - by - the caller. - This field is filled in by the application wit the exception of - the - LWRES_LWPACKETFLAG_RESPONSE bit, which is set by the library in - the - lwres_gabn_*() and lwres_gnba_*() calls. - - - - - serial - - - is set by the requestor and is returned in all replies. If two - or more - packets from the same source have the same serial number and are - from - the same source, they are assumed to be duplicates and the - latter ones - may be dropped. - This field must be set by the application. - - - - - opcode - - - indicates the operation. - Opcodes between 0x00000000 and 0x03ffffff are - reserved for use by the lightweight resolver library. Opcodes - between - 0x04000000 and 0xffffffff are application defined. - This field is filled in by the lwres_gabn_*() and lwres_gnba_*() - calls. - - - - - result - - - is only valid for replies. - Results between 0x04000000 and 0xffffffff are application - defined. - Results between 0x00000000 and 0x03ffffff are reserved for - library use. - This field is filled in by the lwres_gabn_*() and lwres_gnba_*() - calls. - - - - - recvlength - - - is the maximum buffer size that the receiver can handle on - requests - and the size of the buffer needed to satisfy a request when the - buffer - is too large for replies. - This field is supplied by the application. - - - - - authtype - - - defines the packet level authentication that is used. - Authorisation types between 0x1000 and 0xffff are application - defined - and types between 0x0000 and 0x0fff are reserved for library - use. - Currently these are not used and must be zero. - - - - - authlen - - - gives the length of the authentication data. - Since packet authentication is currently not used, this must be - zero. - - - - - - - The following opcodes are currently defined: - - - NOOP - - - Success is always returned and the packet contents are echoed. - The lwres_noop_*() functions should be used for this type. - - - - - GETADDRSBYNAME - - - returns all known addresses for a given name. - The lwres_gabn_*() functions should be used for this type. - - - - - GETNAMEBYADDR - - - return the hostname for the given address. - The lwres_gnba_*() functions should be used for this type. - - - - - - - lwres_lwpacket_renderheader() - transfers the contents of lightweight resolver packet structure - lwres_lwpacket_t *pkt in - network byte order to the lightweight resolver buffer, - *b. - - - lwres_lwpacket_parseheader() - performs the converse operation. It transfers data in network - byte order from buffer *b to resolver - packet *pkt. The contents of the buffer - b should correspond to a - lwres_lwpacket_t. - - - - - RETURN VALUES - - - Successful calls to - lwres_lwpacket_renderheader() and - lwres_lwpacket_parseheader() return - LWRES_R_SUCCESS. If there is insufficient - space to copy data between the buffer *b and - lightweight resolver packet *pkt both - functions - return LWRES_R_UNEXPECTEDEND. - - - - diff --git a/lib/lwres/man/lwres_packet.html b/lib/lwres/man/lwres_packet.html deleted file mode 100644 index 7029e268df..0000000000 --- a/lib/lwres/man/lwres_packet.html +++ /dev/null @@ -1,264 +0,0 @@ - - - - - -lwres_packet - - -
-
- - - - - - - -
-

Name

-

- lwres_lwpacket_renderheader, - lwres_lwpacket_parseheader - — lightweight resolver packet handling functions -

-
-
-

Synopsis

-
-
#include <lwres/lwpacket.h>
- - - - - - - - - -
-lwres_result_t -lwres_lwpacket_renderheader(lwres_buffer_t *b,
 lwres_lwpacket_t *pkt);
-
 
- - - - - - - - - -
-lwres_result_t -lwres_lwpacket_parseheader(lwres_buffer_t *b,
 lwres_lwpacket_t *pkt);
-
 
-
-
-
-

DESCRIPTION

- -

- These functions rely on a - struct lwres_lwpacket - which is defined in - lwres/lwpacket.h. -

- - 
-typedef struct lwres_lwpacket lwres_lwpacket_t;
-
-

-

- 
-struct lwres_lwpacket {
-        lwres_uint32_t          length;
-        lwres_uint16_t          version;
-        lwres_uint16_t          pktflags;
-        lwres_uint32_t          serial;
-        lwres_uint32_t          opcode;
-        lwres_uint32_t          result;
-        lwres_uint32_t          recvlength;
-        lwres_uint16_t          authtype;
-        lwres_uint16_t          authlength;
-};
-
-

-

- -

- The elements of this structure are: -

-
-
length
-
-

- the overall packet length, including the entire packet header. - This field is filled in by the lwres_gabn_*() and lwres_gnba_*() - calls. -

-
-
version
-
-

- the header format. There is currently only one format, - LWRES_LWPACKETVERSION_0. - - This field is filled in by the lwres_gabn_*() and lwres_gnba_*() - calls. -

-
-
pktflags
-
-

- library-defined flags for this packet: for instance whether the - packet - is a request or a reply. Flag values can be set, but not defined - by - the caller. - This field is filled in by the application wit the exception of - the - LWRES_LWPACKETFLAG_RESPONSE bit, which is set by the library in - the - lwres_gabn_*() and lwres_gnba_*() calls. -

-
-
serial
-
-

- is set by the requestor and is returned in all replies. If two - or more - packets from the same source have the same serial number and are - from - the same source, they are assumed to be duplicates and the - latter ones - may be dropped. - This field must be set by the application. -

-
-
opcode
-
-

- indicates the operation. - Opcodes between 0x00000000 and 0x03ffffff are - reserved for use by the lightweight resolver library. Opcodes - between - 0x04000000 and 0xffffffff are application defined. - This field is filled in by the lwres_gabn_*() and lwres_gnba_*() - calls. -

-
-
result
-
-

- is only valid for replies. - Results between 0x04000000 and 0xffffffff are application - defined. - Results between 0x00000000 and 0x03ffffff are reserved for - library use. - This field is filled in by the lwres_gabn_*() and lwres_gnba_*() - calls. -

-
-
recvlength
-
-

- is the maximum buffer size that the receiver can handle on - requests - and the size of the buffer needed to satisfy a request when the - buffer - is too large for replies. - This field is supplied by the application. -

-
-
authtype
-
-

- defines the packet level authentication that is used. - Authorisation types between 0x1000 and 0xffff are application - defined - and types between 0x0000 and 0x0fff are reserved for library - use. - Currently these are not used and must be zero. -

-
-
authlen
-
-

- gives the length of the authentication data. - Since packet authentication is currently not used, this must be - zero. -

-
-
-

-

-

- The following opcodes are currently defined: -

-
-
NOOP
-
-

- Success is always returned and the packet contents are echoed. - The lwres_noop_*() functions should be used for this type. -

-
-
GETADDRSBYNAME
-
-

- returns all known addresses for a given name. - The lwres_gabn_*() functions should be used for this type. -

-
-
GETNAMEBYADDR
-
-

- return the hostname for the given address. - The lwres_gnba_*() functions should be used for this type. -

-
-
-

-

- -

lwres_lwpacket_renderheader() - transfers the contents of lightweight resolver packet structure - lwres_lwpacket_t *pkt in - network byte order to the lightweight resolver buffer, - *b. -

- -

lwres_lwpacket_parseheader() - performs the converse operation. It transfers data in network - byte order from buffer *b to resolver - packet *pkt. The contents of the buffer - b should correspond to a - lwres_lwpacket_t. -

- -
- -
-

RETURN VALUES

- -

- Successful calls to - lwres_lwpacket_renderheader() and - lwres_lwpacket_parseheader() return - LWRES_R_SUCCESS. If there is insufficient - space to copy data between the buffer *b and - lightweight resolver packet *pkt both - functions - return LWRES_R_UNEXPECTEDEND. -

- -
-
- diff --git a/lib/lwres/man/lwres_resutil.3 b/lib/lwres/man/lwres_resutil.3 deleted file mode 100644 index 38e2aec934..0000000000 --- a/lib/lwres/man/lwres_resutil.3 +++ /dev/null @@ -1,185 +0,0 @@ -.\" Copyright (C) 2000, 2001, 2004, 2005, 2007, 2014-2016 Internet Systems Consortium, Inc. ("ISC") -.\" -.\" This Source Code Form is subject to the terms of the Mozilla Public -.\" License, v. 2.0. If a copy of the MPL was not distributed with this -.\" file, You can obtain one at http://mozilla.org/MPL/2.0/. -.\" -.hy 0 -.ad l -'\" t -.\" Title: lwres_resutil -.\" Author: -.\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 2007-06-18 -.\" Manual: BIND9 -.\" Source: ISC -.\" Language: English -.\" -.TH "LWRES_RESUTIL" "3" "2007\-06\-18" "ISC" "BIND9" -.\" ----------------------------------------------------------------- -.\" * Define some portability stuff -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" http://bugs.debian.org/507673 -.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.ie \n(.g .ds Aq \(aq -.el .ds Aq ' -.\" ----------------------------------------------------------------- -.\" * set default formatting -.\" ----------------------------------------------------------------- -.\" disable hyphenation -.nh -.\" disable justification (adjust text to left margin only) -.ad l -.\" ----------------------------------------------------------------- -.\" * MAIN CONTENT STARTS HERE * -.\" ----------------------------------------------------------------- -.SH "NAME" -lwres_string_parse, lwres_addr_parse, lwres_getaddrsbyname, lwres_getnamebyaddr \- lightweight resolver utility functions -.SH "SYNOPSIS" -.sp -.ft B -.nf -#include -.fi -.ft -.HP \w'lwres_result_t\ lwres_string_parse('u -.BI "lwres_result_t lwres_string_parse(lwres_buffer_t\ *" "b" ", char\ **" "c" ", lwres_uint16_t\ *" "len" ");" -.HP \w'lwres_result_t\ lwres_addr_parse('u -.BI "lwres_result_t lwres_addr_parse(lwres_buffer_t\ *" "b" ", lwres_addr_t\ *" "addr" ");" -.HP \w'lwres_result_t\ lwres_getaddrsbyname('u -.BI "lwres_result_t lwres_getaddrsbyname(lwres_context_t\ *" "ctx" ", const\ char\ *" "name" ", lwres_uint32_t\ " "addrtypes" ", lwres_gabnresponse_t\ **" "structp" ");" -.HP \w'lwres_result_t\ lwres_getnamebyaddr('u -.BI "lwres_result_t lwres_getnamebyaddr(lwres_context_t\ *" "ctx" ", lwres_uint32_t\ " "addrtype" ", lwres_uint16_t\ " "addrlen" ", const\ unsigned\ char\ *" "addr" ", lwres_gnbaresponse_t\ **" "structp" ");" -.SH "DESCRIPTION" -.PP -\fBlwres_string_parse()\fR -retrieves a DNS\-encoded string starting the current pointer of lightweight resolver buffer -\fIb\fR: i\&.e\&. -\fBb\->current\fR\&. When the function returns, the address of the first byte of the encoded string is returned via -\fI*c\fR -and the length of that string is given by -\fI*len\fR\&. The buffer\*(Aqs current pointer is advanced to point at the character following the string length, the encoded string, and the trailing -\fBNULL\fR -character\&. -.PP -\fBlwres_addr_parse()\fR -extracts an address from the buffer -\fIb\fR\&. The buffer\*(Aqs current pointer -\fBb\->current\fR -is presumed to point at an encoded address: the address preceded by a 32\-bit protocol family identifier and a 16\-bit length field\&. The encoded address is copied to -\fBaddr\->address\fR -and -\fBaddr\->length\fR -indicates the size in bytes of the address that was copied\&. -\fBb\->current\fR -is advanced to point at the next byte of available data in the buffer following the encoded address\&. -.PP -\fBlwres_getaddrsbyname()\fR -and -\fBlwres_getnamebyaddr()\fR -use the -\fBlwres_gnbaresponse_t\fR -structure defined below: -.PP -.if n \{\ -.RS 4 -.\} -.nf -typedef struct { - lwres_uint32_t flags; - lwres_uint16_t naliases; - lwres_uint16_t naddrs; - char *realname; - char **aliases; - lwres_uint16_t realnamelen; - lwres_uint16_t *aliaslen; - lwres_addrlist_t addrs; - void *base; - size_t baselen; -} lwres_gabnresponse_t; -.fi -.if n \{\ -.RE -.\} -.PP -The contents of this structure are not manipulated directly but they are controlled through the -\fBlwres_gabn\fR(3) -functions\&. -.PP -The lightweight resolver uses -\fBlwres_getaddrsbyname()\fR -to perform forward lookups\&. Hostname -\fIname\fR -is looked up using the resolver context -\fIctx\fR -for memory allocation\&. -\fIaddrtypes\fR -is a bitmask indicating which type of addresses are to be looked up\&. Current values for this bitmask are -\fBLWRES_ADDRTYPE_V4\fR -for IPv4 addresses and -\fBLWRES_ADDRTYPE_V6\fR -for IPv6 addresses\&. Results of the lookup are returned in -\fI*structp\fR\&. -.PP -\fBlwres_getnamebyaddr()\fR -performs reverse lookups\&. Resolver context -\fIctx\fR -is used for memory allocation\&. The address type is indicated by -\fIaddrtype\fR: -\fBLWRES_ADDRTYPE_V4\fR -or -\fBLWRES_ADDRTYPE_V6\fR\&. The address to be looked up is given by -\fIaddr\fR -and its length is -\fIaddrlen\fR -bytes\&. The result of the function call is made available through -\fI*structp\fR\&. -.SH "RETURN VALUES" -.PP -Successful calls to -\fBlwres_string_parse()\fR -and -\fBlwres_addr_parse()\fR -return -\fBLWRES_R_SUCCESS\&.\fR -Both functions return -\fBLWRES_R_FAILURE\fR -if the buffer is corrupt or -\fBLWRES_R_UNEXPECTEDEND\fR -if the buffer has less space than expected for the components of the encoded string or address\&. -.PP -\fBlwres_getaddrsbyname()\fR -returns -\fBLWRES_R_SUCCESS\fR -on success and it returns -\fBLWRES_R_NOTFOUND\fR -if the hostname -\fIname\fR -could not be found\&. -.PP -\fBLWRES_R_SUCCESS\fR -is returned by a successful call to -\fBlwres_getnamebyaddr()\fR\&. -.PP -Both -\fBlwres_getaddrsbyname()\fR -and -\fBlwres_getnamebyaddr()\fR -return -\fBLWRES_R_NOMEMORY\fR -when memory allocation requests fail and -\fBLWRES_R_UNEXPECTEDEND\fR -if the buffers used for sending queries and receiving replies are too small\&. -.SH "SEE ALSO" -.PP -\fBlwres_buffer\fR(3), -\fBlwres_gabn\fR(3)\&. -.SH "AUTHOR" -.PP -\fBInternet Systems Consortium, Inc\&.\fR -.SH "COPYRIGHT" -.br -Copyright \(co 2000, 2001, 2004, 2005, 2007, 2014-2016 Internet Systems Consortium, Inc. ("ISC") -.br diff --git a/lib/lwres/man/lwres_resutil.docbook b/lib/lwres/man/lwres_resutil.docbook deleted file mode 100644 index a34cf91e56..0000000000 --- a/lib/lwres/man/lwres_resutil.docbook +++ /dev/null @@ -1,225 +0,0 @@ - - - - - - 2007-06-18 - - - ISC - Internet Systems Consortium, Inc. - - - - lwres_resutil - 3 - BIND9 - - - - - 2000 - 2001 - 2004 - 2005 - 2007 - 2014 - 2015 - 2016 - Internet Systems Consortium, Inc. ("ISC") - - - - - lwres_string_parse - lwres_addr_parse - lwres_getaddrsbyname - lwres_getnamebyaddr - lightweight resolver utility functions - - - -#include <lwres/lwres.h> - - -lwres_result_t -lwres_string_parse - lwres_buffer_t *b - char **c - lwres_uint16_t *len - - - -lwres_result_t -lwres_addr_parse - lwres_buffer_t *b - lwres_addr_t *addr - - - -lwres_result_t -lwres_getaddrsbyname - lwres_context_t *ctx - const char *name - lwres_uint32_t addrtypes - lwres_gabnresponse_t **structp - - - -lwres_result_t -lwres_getnamebyaddr - lwres_context_t *ctx - lwres_uint32_t addrtype - lwres_uint16_t addrlen - const unsigned char *addr - lwres_gnbaresponse_t **structp - - - - - DESCRIPTION - - - lwres_string_parse() - retrieves a DNS-encoded string starting the current pointer of - lightweight resolver buffer b: i.e. - b->current. When the function returns, - the address of the first byte of the encoded string is returned - via *c and the length of that string is - given by *len. The buffer's current - pointer is advanced to point at the character following the - string length, the encoded string, and the trailing - NULL character. - - - lwres_addr_parse() - extracts an address from the buffer b. - The buffer's current pointer b->current - is presumed to point at an encoded address: the address preceded - by a 32-bit protocol family identifier and a 16-bit length - field. The encoded address is copied to - addr->address and - addr->length indicates the size in bytes - of the address that was copied. - b->current is advanced to point at the - next byte of available data in the buffer following the encoded - address. - - - lwres_getaddrsbyname() - and lwres_getnamebyaddr() use the - lwres_gnbaresponse_t structure defined below: - - - -typedef struct { - lwres_uint32_t flags; - lwres_uint16_t naliases; - lwres_uint16_t naddrs; - char *realname; - char **aliases; - lwres_uint16_t realnamelen; - lwres_uint16_t *aliaslen; - lwres_addrlist_t addrs; - void *base; - size_t baselen; -} lwres_gabnresponse_t; - - - - The contents of this structure are not manipulated directly but - they are controlled through the - - lwres_gabn3 - - functions. - - - - The lightweight resolver uses - lwres_getaddrsbyname() to perform - forward lookups. - Hostname name is looked up using the - resolver - context ctx for memory allocation. - addrtypes is a bitmask indicating - which type of - addresses are to be looked up. Current values for this bitmask are - LWRES_ADDRTYPE_V4 for IPv4 addresses and - LWRES_ADDRTYPE_V6 for IPv6 addresses. Results of the - lookup are returned in *structp. - - - lwres_getnamebyaddr() - performs reverse lookups. Resolver context - ctx is used for memory allocation. The - address type is indicated by addrtype: - LWRES_ADDRTYPE_V4 or - LWRES_ADDRTYPE_V6. The address to be looked up is - given by addr and its length is - addrlen bytes. The result of the - function call is made available through - *structp. - - - - RETURN VALUES - - - Successful calls to - lwres_string_parse() - and - lwres_addr_parse() - return - LWRES_R_SUCCESS. - Both functions return - LWRES_R_FAILURE - if the buffer is corrupt or - LWRES_R_UNEXPECTEDEND - if the buffer has less space than expected for the components of the - encoded string or address. - - - lwres_getaddrsbyname() - returns LWRES_R_SUCCESS on success and it - returns LWRES_R_NOTFOUND if the hostname - name could not be found. - - LWRES_R_SUCCESS - is returned by a successful call to - lwres_getnamebyaddr(). - - - - Both - lwres_getaddrsbyname() - and - lwres_getnamebyaddr() - return - LWRES_R_NOMEMORY - when memory allocation requests fail and - LWRES_R_UNEXPECTEDEND - if the buffers used for sending queries and receiving replies are too - small. - - - - SEE ALSO - - - lwres_buffer3 - , - - - lwres_gabn3 - . - - - - diff --git a/lib/lwres/man/lwres_resutil.html b/lib/lwres/man/lwres_resutil.html deleted file mode 100644 index a6dcb73145..0000000000 --- a/lib/lwres/man/lwres_resutil.html +++ /dev/null @@ -1,260 +0,0 @@ - - - - - -lwres_resutil - - -
-
- - - - - - - -
-

Name

-

- lwres_string_parse, - lwres_addr_parse, - lwres_getaddrsbyname, - lwres_getnamebyaddr - — lightweight resolver utility functions -

-
-
-

Synopsis

-
-
#include <lwres/lwres.h>
- - - - - - - - - - - - - -
-lwres_result_t -lwres_string_parse(lwres_buffer_t *b,
 char **c,
 lwres_uint16_t *len);
-
 
- - - - - - - - - -
-lwres_result_t -lwres_addr_parse(lwres_buffer_t *b,
 lwres_addr_t *addr);
-
 
- - - - - - - - - - - - - - - - - -
-lwres_result_t -lwres_getaddrsbyname(lwres_context_t *ctx,
 const char *name,
 lwres_uint32_t addrtypes,
 lwres_gabnresponse_t **structp);
-
 
- - - - - - - - - - - - - - - - - - - - - -
-lwres_result_t -lwres_getnamebyaddr(lwres_context_t *ctx,
 lwres_uint32_t addrtype,
 lwres_uint16_t addrlen,
 const unsigned char *addr,
 lwres_gnbaresponse_t **structp);
-
 
-
-
- -
-

DESCRIPTION

- - -

lwres_string_parse() - retrieves a DNS-encoded string starting the current pointer of - lightweight resolver buffer b: i.e. - b->current. When the function returns, - the address of the first byte of the encoded string is returned - via *c and the length of that string is - given by *len. The buffer's current - pointer is advanced to point at the character following the - string length, the encoded string, and the trailing - NULL character. -

- -

lwres_addr_parse() - extracts an address from the buffer b. - The buffer's current pointer b->current - is presumed to point at an encoded address: the address preceded - by a 32-bit protocol family identifier and a 16-bit length - field. The encoded address is copied to - addr->address and - addr->length indicates the size in bytes - of the address that was copied. - b->current is advanced to point at the - next byte of available data in the buffer following the encoded - address. -

- -

lwres_getaddrsbyname() - and lwres_getnamebyaddr() use the - lwres_gnbaresponse_t structure defined below: -

- -
-typedef struct {
-        lwres_uint32_t          flags;
-        lwres_uint16_t          naliases;
-        lwres_uint16_t          naddrs;
-        char                   *realname;
-        char                  **aliases;
-        lwres_uint16_t          realnamelen;
-        lwres_uint16_t         *aliaslen;
-        lwres_addrlist_t        addrs;
-        void                   *base;
-        size_t                  baselen;
-} lwres_gabnresponse_t;
-
- -

- The contents of this structure are not manipulated directly but - they are controlled through the - - lwres_gabn(3) - - functions. -

- -

- The lightweight resolver uses - lwres_getaddrsbyname() to perform - forward lookups. - Hostname name is looked up using the - resolver - context ctx for memory allocation. - addrtypes is a bitmask indicating - which type of - addresses are to be looked up. Current values for this bitmask are - LWRES_ADDRTYPE_V4 for IPv4 addresses and - LWRES_ADDRTYPE_V6 for IPv6 addresses. Results of the - lookup are returned in *structp. -

- -

lwres_getnamebyaddr() - performs reverse lookups. Resolver context - ctx is used for memory allocation. The - address type is indicated by addrtype: - LWRES_ADDRTYPE_V4 or - LWRES_ADDRTYPE_V6. The address to be looked up is - given by addr and its length is - addrlen bytes. The result of the - function call is made available through - *structp. -

-
- -
-

RETURN VALUES

- -

- Successful calls to - lwres_string_parse() - and - lwres_addr_parse() - return - LWRES_R_SUCCESS. - Both functions return - LWRES_R_FAILURE - if the buffer is corrupt or - LWRES_R_UNEXPECTEDEND - if the buffer has less space than expected for the components of the - encoded string or address. -

- -

lwres_getaddrsbyname() - returns LWRES_R_SUCCESS on success and it - returns LWRES_R_NOTFOUND if the hostname - name could not be found. -

-

LWRES_R_SUCCESS - is returned by a successful call to - lwres_getnamebyaddr(). -

- -

- Both - lwres_getaddrsbyname() - and - lwres_getnamebyaddr() - return - LWRES_R_NOMEMORY - when memory allocation requests fail and - LWRES_R_UNEXPECTEDEND - if the buffers used for sending queries and receiving replies are too - small. -

- -
-
-

SEE ALSO

- -

- lwres_buffer(3) - , - - - lwres_gabn(3) - . -

- -
-
- diff --git a/lib/lwres/man/resolver.5 b/lib/lwres/man/resolver.5 deleted file mode 100644 index 0c6526c494..0000000000 --- a/lib/lwres/man/resolver.5 +++ /dev/null @@ -1,206 +0,0 @@ -.\" Copyright (C) 2000, 2001, 2004, 2007, 2016 Internet Systems Consortium, Inc. ("ISC") -.\" -.\" This Source Code Form is subject to the terms of the Mozilla Public -.\" License, v. 2.0. If a copy of the MPL was not distributed with this -.\" file, You can obtain one at http://mozilla.org/MPL/2.0/. -.\" -.\" $Id: resolver.5,v 1.8 2007/06/19 23:47:23 tbox Exp $ -.\" -.Dd Jun 30, 2000 -.Dt RESOLVER 5 -.Os BIND9 9 -.ds vT BIND9 Programmer's Manual -.Sh NAME -.Nm resolver -.Nd resolver configuration file -.Sh SYNOPSIS -.Pa /etc/resolv.conf -.Sh DESCRIPTION -The -.Nm resolver -and -.Nm "BIND9 lightwreight resolver" -are sets of routines in the C library and BIND9 library respectively -that provide access to the Internet Domain Name System. -The resolver configuration file, -.Pa /etc/resolv.conf , -is normally gets read -by the resolver and lightweight resolver -routines to initialise low-level resolver data structures the first time -that a process invokes those routines. -The file contains a list of -keywords with values that provide various types of -information, such as the IP addresses of the servers that should be -used when making lookup requests. -.Pp -Each keyword and value must appear on a single line. -The value follows the keyword, separated by white space. -The hash character '#' or semi-colon ';' introduce comments. -Anything from either of these characters to the end of the line -is treated as a comment and ignored. -.\" XXXJR - Don't think the next para is relevant. Not every host will run -.\" a name server or lightweight resolver. Those that don't will need -.\" a resolv.conf so they can send their lookups somewhere sensible. -.\".Pp -.\"On a normally configured system, this file should not be necessary. -.\"The only name server to be queried will be on the local machine, -.\"the domain name is determined from the host name, -.\"and the domain search path is constructed from the domain name. -.Pp -The available configuration directives are: -.Bl -tag -width "nameserver" -.It Li nameserver -Internet address of a name server that the resolver should query. -The IP address of the server can be supplied in the usual notation: -either in dotted-decimal form for an IPv4 addess or in double colon -form described in RFC1884 for an IPv6 address. -Up to three nameserver directives can be listed. -See -.Dv LWRES_CONFMAXNAMESERVERS -in -.Pa . -If more than -.Dv LWRES_CONFMAXNAMESERVERS -nameserver directives are present in the file, -only the first three are used. -Any others are ignored. -.Pp -When there are multiple servers, the resolver -library queries them in the order listed. -If no -.Li nameserver -entries are present, the default is to attempt to use the name server or -lightweight resolver daemon on the local machine. -The algorithm used is to try a server, and if the query times out, -try the next, until out of name servers, -then repeat trying all the name servers -until a maximum number of retries are made. -.It Li domain -Local domain name. -Most queries for names within this domain can use short names -relative to the local domain. -When no -.Li domain -entry is present, the domain is determined from the local host name returned by -.Xr gethostname 2 ; -the domain part is taken to be everything after the first -.Sq \&. . -Finally, if the host name does not contain a domain part, the root -domain is assumed. -.It Li search -Search list for host-name lookup. -The search list is normally determined from the local domain name; -by default, it contains only the local domain name. -This may be changed by listing the desired domain search path -following the -.Li search -keyword with spaces or tabs separating the names. -Most resolver -queries will be attempted using each component -of the search path in turn until a match is found. -Note that this process may be slow and will generate a lot of network -traffic if the servers for the listed domains are not local, -and that queries will time out if no server is available -for one of the domains. -.Pp -The search list is currently limited to eight domains -with a total of 256 characters. -See -.Dv LWRES_CONFMAXSEARCH -and -.Dv LWRES_CONFMAXLINELEN -in -.Pa lwres/lwres.h . -.It Li sortlist -Allows addresses returned by gethostbyname to be sorted. -A -.Li sortlist -is specified by IP address netmask pairs. -The netmask is optional and defaults to the natural netmask of the net. -The IP address and optional network pairs are separated by slashes. -Up to 10 pairs may be specified. -For example: -.Bd -literal -offset indent -sortlist 130.155.160.0/255.255.240.0 130.155.0.0 -.Ed -.It Li options -Allows certain internal -.Nm resolver -variables to be modified. -The syntax is -.D1 Li options Ar option ... -where -.Ar option -is one of the following: -.Bl -tag -width "no_tld_query" -.It Li ndots: Ns Ar n -sets a threshold for the number of dots which -must appear in a name given to -.Fn res_query -(see -.Xr resolver 3 ) -before an -.Em initial absolute query -will be made. -The default for -.Ar n -is -.Dq 1 , -meaning that if there are -.Em any -dots in a name, the name will be tried first as an absolute name before any -.Em search list -elements are appended to it. -Acceptable values of -.Ar n -are between 0 and 255 inclusive. -.It debug -enables debugging traces for the resolver -XXXJR if anything actually looked at -.Dv confdata->resdebug . -At present the option is just recognised but not used by -the BIND9 implementation. -.It no_tld_query -tells the resolver not to attempt to resolve a -top level domain name, i.e. a name containing no dots. -Use of this option does not prevent the resolver from obeying the -standard -.Ar domain -and -.Ar search -rules with the given name. -XXXJR At present this option is recognised but is otherwise unused -in BIND9. -.It missing -XXXJR what about the other BIND8 resolver options like rotate and -timeout? Shouldn't these be provided for backwards compatibility? -.El -.El -.Pp -The -.Li domain -and -.Li search -keywords are mutually exclusive. -If more than one instance of these keywords is present, -the last instance wins. -.Sh FILES -.Pa /etc/resolv.conf -.Pa -.Sh SEE ALSO -.Xr gethostbyname 3 , -.Xr lwres_config 3 , -.Xr lwres 3 , -.Xr resolver 3 , -.Xr hostname 7 , -.Xr lwresd 8 , -.Xr named 8 , -"BIND9 Administrators Manual". -.Sh BUGS -Unrecognised directives and syntax errors in -.Pa /etc/resolv.conf -are usually silently ignored, though -.Er LWRES_R_FAILURE -can be returned by the lightweight resolver functions described in -.Xr lwres_config 3 -which parse this file. diff --git a/lib/lwres/print.c b/lib/lwres/print.c deleted file mode 100644 index be46648e42..0000000000 --- a/lib/lwres/print.c +++ /dev/null @@ -1,575 +0,0 @@ -/* - * Copyright (C) 1999-2001, 2003-2005, 2007, 2011, 2012, 2014-2017 Internet Systems Consortium, Inc. ("ISC") - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#include - -#include -#include /* for sprintf */ -#include - -#define LWRES__PRINT_SOURCE /* Used to get the lwres_print_* prototypes. */ - -#include -#include - -#include "assert_p.h" -#include "print_p.h" - -#define LWRES_PRINT_QUADFORMAT LWRES_PLATFORM_QUADFORMAT - -int -lwres__print_sprintf(char *str, const char *format, ...) { - va_list ap; - - va_start(ap, format); - vsprintf(str, format, ap); - va_end(ap); - return (strlen(str)); -} - -/* - * Return length of string that would have been written if not truncated. - */ - -int -lwres__print_snprintf(char *str, size_t size, const char *format, ...) { - va_list ap; - int ret; - - va_start(ap, format); - ret = vsnprintf(str, size, format, ap); - va_end(ap); - return (ret); - -} - -/* - * Return length of string that would have been written if not truncated. - */ - -int -lwres__print_vsnprintf(char *str, size_t size, const char *format, va_list ap) { - int h; - int l; - int q; - int z; - int alt; - int zero; - int left; - int plus; - int space; - long long tmpi; - unsigned long long tmpui; - unsigned long width; - unsigned long precision; - unsigned int length; - char buf[1024]; - char c; - void *v; - char *save = str; - const char *cp; - const char *head; - int count = 0; - int pad; - int zeropad; - int dot; - double dbl; -#ifdef HAVE_LONG_DOUBLE - long double ldbl; -#endif - char fmt[32]; - - INSIST(str != NULL); - INSIST(format != NULL); - - while (*format != '\0') { - if (*format != '%') { - if (size > 1U) { - *str++ = *format; - size--; - } - count++; - format++; - continue; - } - format++; - - /* - * Reset flags. - */ - dot = space = plus = left = zero = alt = h = l = q = z = 0; - width = precision = 0; - head = ""; - length = pad = zeropad = 0; - POST(length); - - do { - if (*format == '#') { - alt = 1; - format++; - } else if (*format == '-') { - left = 1; - zero = 0; - format++; - } else if (*format == ' ') { - if (!plus) - space = 1; - format++; - } else if (*format == '+') { - plus = 1; - space = 0; - format++; - } else if (*format == '0') { - if (!left) - zero = 1; - format++; - } else - break; - } while (1); - - /* - * Width. - */ - if (*format == '*') { - width = va_arg(ap, int); - format++; - } else if (isdigit((unsigned char)*format)) { - char *e; - width = strtoul(format, &e, 10); - format = e; - } - - /* - * Precision. - */ - if (*format == '.') { - format++; - dot = 1; - if (*format == '*') { - precision = va_arg(ap, int); - format++; - } else if (isdigit((unsigned char)*format)) { - char *e; - precision = strtoul(format, &e, 10); - format = e; - } - } - - switch (*format) { - case '\0': - continue; - case '%': - if (size > 1U) { - *str++ = *format; - size--; - } - count++; - break; - case 'q': - q = 1; - format++; - goto doint; - case 'h': - h = 1; - format++; - goto doint; - case 'l': - l = 1; - format++; - if (*format == 'l') { - q = 1; - format++; - } - goto doint; - case 'z': - z = 1; - format++; - goto doint; - case 'n': - case 'i': - case 'd': - case 'o': - case 'u': - case 'x': - case 'X': - doint: - if (precision != 0U) - zero = 0; - switch (*format) { - case 'n': - if (h) { - short int *p; - p = va_arg(ap, short *); - REQUIRE(p != NULL); - *p = str - save; - } else if (l) { - long int *p; - p = va_arg(ap, long *); - REQUIRE(p != NULL); - *p = str - save; - } else if (z) { - size_t *p; - p = va_arg(ap, size_t *); - REQUIRE(p != NULL); - *p = str - save; - } else { - int *p; - p = va_arg(ap, int *); - REQUIRE(p != NULL); - *p = str - save; - } - break; - case 'i': - case 'd': - if (q) - tmpi = va_arg(ap, long long int); - else if (l) - tmpi = va_arg(ap, long int); - else if (z) - tmpi = va_arg(ap, size_t); - else - tmpi = va_arg(ap, int); - if (tmpi < 0) { - head = "-"; - tmpui = -tmpi; - } else { - if (plus) - head = "+"; - else if (space) - head = " "; - else - head = ""; - tmpui = tmpi; - } - sprintf(buf, "%" LWRES_PRINT_QUADFORMAT "u", - tmpui); - goto printint; - case 'o': - if (q) - tmpui = va_arg(ap, - unsigned long long int); - else if (l) - tmpui = va_arg(ap, long int); - else if (z) - tmpui = va_arg(ap, size_t); - else - tmpui = va_arg(ap, int); - sprintf(buf, - alt ? "%#" LWRES_PRINT_QUADFORMAT "o" - : "%" LWRES_PRINT_QUADFORMAT "o", - tmpui); - goto printint; - case 'u': - if (q) - tmpui = va_arg(ap, - unsigned long long int); - else if (l) - tmpui = va_arg(ap, unsigned long int); - else if (z) - tmpui = va_arg(ap, size_t); - else - tmpui = va_arg(ap, unsigned int); - sprintf(buf, "%" LWRES_PRINT_QUADFORMAT "u", - tmpui); - goto printint; - case 'x': - if (q) - tmpui = va_arg(ap, - unsigned long long int); - else if (l) - tmpui = va_arg(ap, unsigned long int); - else if (z) - tmpui = va_arg(ap, size_t); - else - tmpui = va_arg(ap, unsigned int); - if (alt) { - head = "0x"; - if (precision > 2U) - precision -= 2; - } - sprintf(buf, "%" LWRES_PRINT_QUADFORMAT "x", - tmpui); - goto printint; - case 'X': - if (q) - tmpui = va_arg(ap, - unsigned long long int); - else if (l) - tmpui = va_arg(ap, unsigned long int); - else if (z) - tmpui = va_arg(ap, size_t); - else - tmpui = va_arg(ap, unsigned int); - if (alt) { - head = "0X"; - if (precision > 2U) - precision -= 2; - } - sprintf(buf, "%" LWRES_PRINT_QUADFORMAT "X", - tmpui); - goto printint; - printint: - if (precision != 0U || width != 0U) { - length = strlen(buf); - if (length < precision) - zeropad = precision - length; - else if (length < width && zero) - zeropad = width - length; - if (width != 0U) { - pad = width - length - - zeropad - strlen(head); - if (pad < 0) - pad = 0; - } - } - count += strlen(head) + strlen(buf) + pad + - zeropad; - if (!left) { - while (pad > 0 && size > 1U) { - *str++ = ' '; - size--; - pad--; - } - } - cp = head; - while (*cp != '\0' && size > 1U) { - *str++ = *cp++; - size--; - } - while (zeropad > 0 && size > 1U) { - *str++ = '0'; - size--; - zeropad--; - } - cp = buf; - while (*cp != '\0' && size > 1U) { - *str++ = *cp++; - size--; - } - while (pad > 0 && size > 1U) { - *str++ = ' '; - size--; - pad--; - } - break; - default: - break; - } - break; - case 's': - cp = va_arg(ap, char *); - REQUIRE(cp != NULL); - - if (precision != 0U) { - /* - * cp need not be NULL terminated. - */ - const char *tp; - unsigned long n; - - n = precision; - tp = cp; - while (n != 0U && *tp != '\0') - n--, tp++; - length = precision - n; - } else { - length = strlen(cp); - } - if (width != 0U) { - pad = width - length; - if (pad < 0) - pad = 0; - } - count += pad + length; - if (!left) - while (pad > 0 && size > 1U) { - *str++ = ' '; - size--; - pad--; - } - if (precision != 0U) - while (precision > 0U && *cp != '\0' && - size > 1U) { - *str++ = *cp++; - size--; - precision--; - } - else - while (*cp != '\0' && size > 1U) { - *str++ = *cp++; - size--; - } - while (pad > 0 && size > 1U) { - *str++ = ' '; - size--; - pad--; - } - break; - case 'c': - c = va_arg(ap, int); - if (width > 0U) { - count += width; - width--; - if (left) { - *str++ = c; - size--; - } - while (width-- > 0U && size > 1U) { - *str++ = ' '; - size--; - } - if (!left && size > 1U) { - *str++ = c; - size--; - } - } else { - count++; - if (size > 1U) { - *str++ = c; - size--; - } - } - break; - case 'p': - v = va_arg(ap, void *); - sprintf(buf, "%p", v); - length = strlen(buf); - if (precision > length) - zeropad = precision - length; - if (width > 0U) { - pad = width - length - zeropad; - if (pad < 0) - pad = 0; - } - count += length + pad + zeropad; - if (!left) - while (pad > 0 && size > 1U) { - *str++ = ' '; - size--; - pad--; - } - cp = buf; - if (zeropad > 0 && buf[0] == '0' && - (buf[1] == 'x' || buf[1] == 'X')) { - if (size > 1U) { - *str++ = *cp++; - size--; - } - if (size > 1U) { - *str++ = *cp++; - size--; - } - while (zeropad > 0 && size > 1U) { - *str++ = '0'; - size--; - zeropad--; - } - } - while (*cp != '\0' && size > 1U) { - *str++ = *cp++; - size--; - } - while (pad > 0 && size > 1U) { - *str++ = ' '; - size--; - pad--; - } - break; - - case 'D': /*deprecated*/ - INSIST("use %ld instead of %D" == NULL); - break; - case 'O': /*deprecated*/ - INSIST("use %lo instead of %O" == NULL); - break; - case 'U': /*deprecated*/ - INSIST("use %lu instead of %U" == NULL); - break; - - case 'L': -#ifdef HAVE_LONG_DOUBLE - l = 1; -#else - INSIST("long doubles are not supported" == NULL); -#endif - /* FALLTHROUGH */ - case 'e': - case 'E': - case 'f': - case 'g': - case 'G': - if (!dot) - precision = 6; - /* - * IEEE floating point. - * MIN 2.2250738585072014E-308 - * MAX 1.7976931348623157E+308 - * VAX floating point has a smaller range than IEEE. - * - * precisions > 324 don't make much sense. - * if we cap the precision at 512 we will not - * overflow buf. - */ - if (precision > 512U) - precision = 512; - sprintf(fmt, "%%%s%s.%lu%s%c", alt ? "#" : "", - plus ? "+" : space ? " " : "", - precision, l ? "L" : "", *format); - switch (*format) { - case 'e': - case 'E': - case 'f': - case 'g': - case 'G': -#ifdef HAVE_LONG_DOUBLE - if (l) { - ldbl = va_arg(ap, long double); - sprintf(buf, fmt, ldbl); - } else -#endif - { - dbl = va_arg(ap, double); - sprintf(buf, fmt, dbl); - } - length = strlen(buf); - if (width > 0U) { - pad = width - length; - if (pad < 0) - pad = 0; - } - count += length + pad; - if (!left) - while (pad > 0 && size > 1U) { - *str++ = ' '; - size--; - pad--; - } - cp = buf; - while (*cp != ' ' && size > 1U) { - *str++ = *cp++; - size--; - } - while (pad > 0 && size > 1U) { - *str++ = ' '; - size--; - pad--; - } - break; - default: - continue; - } - break; - default: - continue; - } - format++; - } - if (size > 0U) - *str = '\0'; - return (count); -} diff --git a/lib/lwres/print_p.h b/lib/lwres/print_p.h deleted file mode 100644 index 30e2195ad1..0000000000 --- a/lib/lwres/print_p.h +++ /dev/null @@ -1,86 +0,0 @@ -/* - * Copyright (C) 1999-2001, 2003, 2004, 2007, 2010, 2016 Internet Systems Consortium, Inc. ("ISC") - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -/* $Id: print_p.h,v 1.6 2010/08/16 23:46:52 tbox Exp $ */ - -#ifndef LWRES_PRINT_P_H -#define LWRES_PRINT_P_H 1 - -/*** - *** Imports - ***/ - -#include -#include - -/* - * This block allows lib/lwres/print.c to be cleanly compiled even if - * the platform does not need it. The standard Makefile will still - * not compile print.c or archive print.o, so this is just to make test - * compilation ("make print.o") easier. - */ -#if !defined(LWRES_PLATFORM_NEEDVSNPRINTF) && defined(LWRES__PRINT_SOURCE) -#define LWRES_PLATFORM_NEEDVSNPRINTF -#endif - -#if !defined(LWRES_PLATFORM_NEEDSPRINTF) && defined(LWRES__PRINT_SOURCE) -#define LWRES_PLATFORM_NEEDSPRINTF -#endif - -/*** - *** Macros. - ***/ - -#ifdef __GNUC__ -#define LWRES_FORMAT_PRINTF(fmt, args) \ - __attribute__((__format__(__printf__, fmt, args))) -#else -#define LWRES_FORMAT_PRINTF(fmt, args) -#endif - -/*** - *** Functions - ***/ - -#ifdef LWRES_PLATFORM_NEEDVSNPRINTF -#include -#include -#endif - -LWRES_LANG_BEGINDECLS - -#ifdef LWRES_PLATFORM_NEEDVSNPRINTF -int -lwres__print_vsnprintf(char *str, size_t size, const char *format, va_list ap) - LWRES_FORMAT_PRINTF(3, 0); -#ifdef vsnprintf -#undef vsnprintf -#endif -#define vsnprintf lwres__print_vsnprintf - -int -lwres__print_snprintf(char *str, size_t size, const char *format, ...) - LWRES_FORMAT_PRINTF(3, 4); -#ifdef snprintf -#undef snprintf -#endif -#define snprintf lwres__print_snprintf -#endif /* LWRES_PLATFORM_NEEDVSNPRINTF */ - -#ifdef LWRES_PLATFORM_NEEDSPRINTF -int -lwres__print_sprintf(char *str, const char *format, ...) LWRES_FORMAT_PRINTF(2, 3); -#ifdef sprintf -#undef sprintf -#endif -#define sprintf lwres__print_sprintf -#endif - -LWRES_LANG_ENDDECLS - -#endif /* LWRES_PRINT_P_H */ diff --git a/lib/lwres/tests/Makefile.in b/lib/lwres/tests/Makefile.in deleted file mode 100644 index 7166d44526..0000000000 --- a/lib/lwres/tests/Makefile.in +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright (C) 2014-2016 Internet Systems Consortium, Inc. ("ISC") -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -# $Id$ - -srcdir = @srcdir@ -VPATH = @srcdir@ -top_srcdir = @top_srcdir@ - -# Attempt to disable parallel processing. -.NOTPARALLEL: -.NO_PARALLEL: - -VERSION=@BIND9_VERSION@ - -@BIND9_MAKE_INCLUDES@ - -CINCLUDES = -I. -Iinclude -I../include ${LWRES_INCLUDES} -CDEFINES = -DTESTS="\"${top_builddir}/lib/lwres/tests/\"" - -LWRESLIBS = ../liblwres.@A@ -LWRESDEPLIBS = ../liblwres.@A@ - -LIBS = @LIBS@ @ATFLIBS@ - -OBJS = -SRCS = config_test.c - -SUBDIRS = -TARGETS = config_test@EXEEXT@ - -@BIND9_MAKE_RULES@ - -config_test@EXEEXT@: config_test.@O@ ${LWRESDEPLIBS} - ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \ - config_test.@O@ ${LWRESLIBS} ${LIBS} - -unit:: - sh ${top_srcdir}/unit/unittest.sh - -clean distclean:: - rm -f ${TARGETS} - rm -f atf.out diff --git a/lib/lwres/tests/config_test.c b/lib/lwres/tests/config_test.c deleted file mode 100644 index cea79b51c3..0000000000 --- a/lib/lwres/tests/config_test.c +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (C) 2014, 2016 Internet Systems Consortium, Inc. ("ISC") - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#include - -#include - -#include -#include -#include -#include - -#include "../lwconfig.c" - -static void -setup_test() { - /* - * atf-run changes us to a /tmp directory, so tests - * that access test data files must first chdir to the proper - * location. - */ - ATF_CHECK(chdir(TESTS) != -1); -} - -ATF_TC(parse_linklocal); -ATF_TC_HEAD(parse_linklocal, tc) { - atf_tc_set_md_var(tc, "descr", "lwres_conf_parse link-local nameserver"); -} -ATF_TC_BODY(parse_linklocal, tc) { - lwres_result_t result; - lwres_context_t *ctx = NULL; - unsigned char addr[16] = { 0xfe, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x01 }; - - UNUSED(tc); - - setup_test(); - - lwres_context_create(&ctx, NULL, NULL, NULL, - LWRES_CONTEXT_USEIPV4 | LWRES_CONTEXT_USEIPV6); - ATF_CHECK_EQ(ctx->confdata.nsnext, 0); - ATF_CHECK_EQ(ctx->confdata.nameservers[0].zone, 0); - - result = lwres_conf_parse(ctx, "testdata/link-local.conf"); - ATF_CHECK_EQ(result, LWRES_R_SUCCESS); - ATF_CHECK_EQ(ctx->confdata.nsnext, 1); - ATF_CHECK_EQ(ctx->confdata.nameservers[0].zone, 1); - ATF_CHECK_EQ(memcmp(ctx->confdata.nameservers[0].address, addr, 16), 0); - lwres_context_destroy(&ctx); -} - -/* - * Main - */ -ATF_TP_ADD_TCS(tp) { - ATF_TP_ADD_TC(tp, parse_linklocal); - return (atf_no_error()); -} diff --git a/lib/lwres/tests/testdata/link-local.conf b/lib/lwres/tests/testdata/link-local.conf deleted file mode 100644 index 8a37963b58..0000000000 --- a/lib/lwres/tests/testdata/link-local.conf +++ /dev/null @@ -1 +0,0 @@ -nameserver fe80::1%1 diff --git a/lib/lwres/unix/Makefile.in b/lib/lwres/unix/Makefile.in deleted file mode 100644 index 9d1900e0b3..0000000000 --- a/lib/lwres/unix/Makefile.in +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright (C) 2001, 2004, 2007, 2012, 2016 Internet Systems Consortium, Inc. ("ISC") -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -# $Id: Makefile.in,v 1.4 2007/06/19 23:47:23 tbox Exp $ - -srcdir = @srcdir@ -VPATH = @srcdir@ -top_srcdir = @top_srcdir@ - -SUBDIRS = include -TARGETS = - -@BIND9_MAKE_RULES@ diff --git a/lib/lwres/unix/include/lwres/net.h b/lib/lwres/unix/include/lwres/net.h deleted file mode 100644 index fffe4a8edc..0000000000 --- a/lib/lwres/unix/include/lwres/net.h +++ /dev/null @@ -1,126 +0,0 @@ -/* - * Copyright (C) 2000-2002, 2004, 2005, 2007, 2016 Internet Systems Consortium, Inc. ("ISC") - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -/* $Id: net.h,v 1.9 2007/06/19 23:47:23 tbox Exp $ */ - -#ifndef LWRES_NET_H -#define LWRES_NET_H 1 - -/***** - ***** Module Info - *****/ - -/*! \file net.h - * This module is responsible for defining the following basic networking - * types: - * - *\li struct in_addr - *\li struct in6_addr - *\li struct sockaddr - *\li struct sockaddr_in - *\li struct sockaddr_in6 - * - * It ensures that the AF_ and PF_ macros are defined. - * - * It declares ntoh[sl]() and hton[sl](). - * - * It declares lwres_net_aton(), lwres_net_ntop(), and lwres_net_pton(). - * - * It ensures that #INADDR_LOOPBACK, #INADDR_ANY and #IN6ADDR_ANY_INIT - * are defined. - */ - -/*** - *** Imports. - ***/ - -#include /* Required for LWRES_PLATFORM_*. */ - -#include -#include -#include /* Contractual promise. */ -#include -#include -#include - -#include /* Contractual promise. */ -#include /* Contractual promise. */ -#ifdef LWRES_PLATFORM_NEEDNETINETIN6H -#include /* Required on UnixWare. */ -#endif -#ifdef LWRES_PLATFORM_NEEDNETINET6IN6H -#include /* Required on BSD/OS for in6_pktinfo. */ -#endif -#include - -#include - -#ifndef LWRES_PLATFORM_HAVEIPV6 -#include /* Contractual promise. */ -#endif - -#ifdef LWRES_PLATFORM_HAVEINADDR6 -#define in6_addr in_addr6 /* Required for pre RFC2133 implementations. */ -#endif - -/*! - * Required for some pre RFC2133 implementations. - * IN6ADDR_ANY_INIT and IN6ADDR_LOOPBACK_INIT were added in - * draft-ietf-ipngwg-bsd-api-04.txt or draft-ietf-ipngwg-bsd-api-05.txt. - * If 's6_addr' is defined then assume that there is a union and three - * levels otherwise assume two levels required. - */ -#ifndef IN6ADDR_ANY_INIT -#ifdef s6_addr -#define IN6ADDR_ANY_INIT { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } } } -#else -#define IN6ADDR_ANY_INIT { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } } -#endif -#endif - -/*! - * Initialize address loopback. See IN6ADDR_ANY_INIT - */ -#ifndef IN6ADDR_LOOPBACK_INIT -#ifdef s6_addr -#define IN6ADDR_LOOPBACK_INIT { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } } } -#else -#define IN6ADDR_LOOPBACK_INIT { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } } -#endif -#endif - -/*% Used by AI_ALL */ -#ifndef AF_INET6 -#define AF_INET6 99 -#endif - - -/*% Used to return IPV6 address types. */ -#ifndef PF_INET6 -#define PF_INET6 AF_INET6 -#endif - -/*% inaddr Loopback */ -#ifndef INADDR_LOOPBACK -#define INADDR_LOOPBACK 0x7f000001UL -#endif - -LWRES_LANG_BEGINDECLS - -const char * -lwres_net_ntop(int af, const void *src, char *dst, size_t size); - -int -lwres_net_pton(int af, const char *src, void *dst); - -int -lwres_net_aton(const char *cp, struct in_addr *addr); - -LWRES_LANG_ENDDECLS - -#endif /* LWRES_NET_H */ diff --git a/lib/lwres/version.c b/lib/lwres/version.c deleted file mode 100644 index 6eedfeee8a..0000000000 --- a/lib/lwres/version.c +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2000, 2001, 2004, 2005, 2007, 2016 Internet Systems Consortium, Inc. ("ISC") - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -/* $Id: version.c,v 1.12 2007/06/19 23:47:22 tbox Exp $ */ - -/*! \file */ - -#include - -const char lwres_version[] = VERSION; - -const unsigned int lwres_libinterface = LIBINTERFACE; -const unsigned int lwres_librevision = LIBREVISION; -const unsigned int lwres_libage = LIBAGE; diff --git a/lib/lwres/win32/Makefile.in b/lib/lwres/win32/Makefile.in deleted file mode 100644 index 9d1900e0b3..0000000000 --- a/lib/lwres/win32/Makefile.in +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright (C) 2001, 2004, 2007, 2012, 2016 Internet Systems Consortium, Inc. ("ISC") -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -# $Id: Makefile.in,v 1.4 2007/06/19 23:47:23 tbox Exp $ - -srcdir = @srcdir@ -VPATH = @srcdir@ -top_srcdir = @top_srcdir@ - -SUBDIRS = include -TARGETS = - -@BIND9_MAKE_RULES@ diff --git a/lib/lwres/win32/include/Makefile.in b/lib/lwres/win32/include/Makefile.in deleted file mode 100644 index 78b4c0972e..0000000000 --- a/lib/lwres/win32/include/Makefile.in +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright (C) 2001, 2004, 2007, 2012, 2016 Internet Systems Consortium, Inc. ("ISC") -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -# $Id: Makefile.in,v 1.4 2007/06/19 23:47:23 tbox Exp $ - -srcdir = @srcdir@ -VPATH = @srcdir@ -top_srcdir = @top_srcdir@ - -SUBDIRS = lwres -TARGETS = - -@BIND9_MAKE_RULES@ diff --git a/lib/lwres/win32/include/lwres/.gitignore b/lib/lwres/win32/include/lwres/.gitignore deleted file mode 100644 index a705f39f34..0000000000 --- a/lib/lwres/win32/include/lwres/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -!netdb.h -!platform.h diff --git a/lib/lwres/win32/include/lwres/Makefile.in b/lib/lwres/win32/include/lwres/Makefile.in deleted file mode 100644 index 3c3ef5e5c3..0000000000 --- a/lib/lwres/win32/include/lwres/Makefile.in +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright (C) 2001, 2004, 2007, 2012, 2016 Internet Systems Consortium, Inc. ("ISC") -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -# $Id: Makefile.in,v 1.4 2007/06/19 23:47:23 tbox Exp $ - -srcdir = @srcdir@ -VPATH = @srcdir@ -top_srcdir = @top_srcdir@ - -HEADERS = net.h -SUBDIRS = -TARGETS = - -@BIND9_MAKE_RULES@ - -installdirs: - $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${includedir}/lwres - -install:: installdirs - for i in ${HEADERS}; do \ - ${INSTALL_DATA} $(srcdir)/$$i ${DESTDIR}${includedir}/lwres ; \ - done diff --git a/lib/lwres/win32/include/lwres/int.h b/lib/lwres/win32/include/lwres/int.h deleted file mode 100644 index c9cacfa84e..0000000000 --- a/lib/lwres/win32/include/lwres/int.h +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (C) 2000, 2001, 2004, 2007, 2016 Internet Systems Consortium, Inc. ("ISC") - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -/* $Id: int.h,v 1.4 2007/06/19 23:47:23 tbox Exp $ */ - -#ifndef LWRES_INT_H -#define LWRES_INT_H 1 - -typedef char lwres_int8_t; -typedef unsigned char lwres_uint8_t; -typedef short lwres_int16_t; -typedef unsigned short lwres_uint16_t; -typedef int lwres_int32_t; -typedef unsigned int lwres_uint32_t; -typedef __int64 lwres_int64_t; -typedef unsigned __int64 lwres_uint64_t; - -#endif /* LWRES_INT_H */ diff --git a/lib/lwres/win32/include/lwres/net.h b/lib/lwres/win32/include/lwres/net.h deleted file mode 100644 index 5cbb4bd482..0000000000 --- a/lib/lwres/win32/include/lwres/net.h +++ /dev/null @@ -1,227 +0,0 @@ -/* - * Copyright (C) 2000, 2001, 2004, 2007, 2013, 2016 Internet Systems Consortium, Inc. ("ISC") - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -/* $Id: net.h,v 1.6 2007/06/19 23:47:23 tbox Exp $ */ - -#ifndef LWRES_NET_H -#define LWRES_NET_H 1 - -/***** - ***** Module Info - *****/ - -/* - * Basic Networking Types - * - * This module is responsible for defining the following basic networking - * types: - * - * struct in_addr - * struct in6_addr - * struct sockaddr - * struct sockaddr_in - * struct sockaddr_in6 - * - * It ensures that the AF_ and PF_ macros are defined. - * - * It declares ntoh[sl]() and hton[sl](). - * - * It declares lwres_net_aton(), lwres_net_ntop(), and lwres_net_pton(). - * - * It ensures that INADDR_LOOPBACK, INADDR_ANY and IN6ADDR_ANY_INIT - * are defined. - */ - -/*** - *** Imports. - ***/ - -/* - * Because of some sort of problem in the MS header files, this cannot - * be simple "#include ", because winsock2.h tries to include - * windows.h, which then generates an error out of mswsock.h. _You_ - * figure it out. - */ -#ifndef _WINSOCKAPI_ -#define _WINSOCKAPI_ /* Prevent inclusion of winsock.h in windows.h */ -#endif - -#include -#include - -#include -#include /* Required for LWRES_PLATFORM_*. */ - -#include - -#ifndef INADDR_LOOPBACK -#define INADDR_LOOPBACK 0x7f000001UL -#endif -/* - * Fix the FD_SET and FD_CLR Macros to properly cast - */ -#undef FD_CLR -#define FD_CLR(fd, set) do { \ - u_int __i; \ - for (__i = 0; __i < ((fd_set FAR *)(set))->fd_count; __i++) { \ - if (((fd_set FAR *)(set))->fd_array[__i] == (SOCKET) fd) { \ - while (__i < ((fd_set FAR *)(set))->fd_count-1) { \ - ((fd_set FAR *)(set))->fd_array[__i] = \ - ((fd_set FAR *)(set))->fd_array[__i+1]; \ - __i++; \ - } \ - ((fd_set FAR *)(set))->fd_count--; \ - break; \ - } \ - } \ -} while (0) - -#undef FD_SET -#define FD_SET(fd, set) do { \ - u_int __i; \ - for (__i = 0; __i < ((fd_set FAR *)(set))->fd_count; __i++) { \ - if (((fd_set FAR *)(set))->fd_array[__i] == (SOCKET)(fd)) { \ - break; \ - } \ - } \ - if (__i == ((fd_set FAR *)(set))->fd_count) { \ - if (((fd_set FAR *)(set))->fd_count < FD_SETSIZE) { \ - ((fd_set FAR *)(set))->fd_array[__i] = (SOCKET)(fd); \ - ((fd_set FAR *)(set))->fd_count++; \ - } \ - } \ -} while (0) - -/* - * Windows Sockets errors redefined as regular Berkeley error constants. - * These are usually commented out in Windows NT to avoid conflicts with errno.h. - * Use the WSA constants instead. - */ - -#include - -#ifndef EWOULDBLOCK -#define EWOULDBLOCK WSAEWOULDBLOCK -#endif -#ifndef EINPROGRESS -#define EINPROGRESS WSAEINPROGRESS -#endif -#ifndef EALREADY -#define EALREADY WSAEALREADY -#endif -#ifndef ENOTSOCK -#define ENOTSOCK WSAENOTSOCK -#endif -#ifndef EDESTADDRREQ -#define EDESTADDRREQ WSAEDESTADDRREQ -#endif -#ifndef EMSGSIZE -#define EMSGSIZE WSAEMSGSIZE -#endif -#ifndef EPROTOTYPE -#define EPROTOTYPE WSAEPROTOTYPE -#endif -#ifndef ENOPROTOOPT -#define ENOPROTOOPT WSAENOPROTOOPT -#endif -#ifndef EPROTONOSUPPORT -#define EPROTONOSUPPORT WSAEPROTONOSUPPORT -#endif -#ifndef ESOCKTNOSUPPORT -#define ESOCKTNOSUPPORT WSAESOCKTNOSUPPORT -#endif -#ifndef EOPNOTSUPP -#define EOPNOTSUPP WSAEOPNOTSUPP -#endif -#ifndef EPFNOSUPPORT -#define EPFNOSUPPORT WSAEPFNOSUPPORT -#endif -#ifndef EAFNOSUPPORT -#define EAFNOSUPPORT WSAEAFNOSUPPORT -#endif -#ifndef EADDRINUSE -#define EADDRINUSE WSAEADDRINUSE -#endif -#ifndef EADDRNOTAVAIL -#define EADDRNOTAVAIL WSAEADDRNOTAVAIL -#endif -#ifndef ENETDOWN -#define ENETDOWN WSAENETDOWN -#endif -#ifndef ENETUNREACH -#define ENETUNREACH WSAENETUNREACH -#endif -#ifndef ENETRESET -#define ENETRESET WSAENETRESET -#endif -#ifndef ECONNABORTED -#define ECONNABORTED WSAECONNABORTED -#endif -#ifndef ECONNRESET -#define ECONNRESET WSAECONNRESET -#endif -#ifndef ENOBUFS -#define ENOBUFS WSAENOBUFS -#endif -#ifndef EISCONN -#define EISCONN WSAEISCONN -#endif -#ifndef ENOTCONN -#define ENOTCONN WSAENOTCONN -#endif -#ifndef ESHUTDOWN -#define ESHUTDOWN WSAESHUTDOWN -#endif -#ifndef ETOOMANYREFS -#define ETOOMANYREFS WSAETOOMANYREFS -#endif -#ifndef ETIMEDOUT -#define ETIMEDOUT WSAETIMEDOUT -#endif -#ifndef ECONNREFUSED -#define ECONNREFUSED WSAECONNREFUSED -#endif -#ifndef ELOOP -#define ELOOP WSAELOOP -#endif -#ifndef EHOSTDOWN -#define EHOSTDOWN WSAEHOSTDOWN -#endif -#ifndef EHOSTUNREACH -#define EHOSTUNREACH WSAEHOSTUNREACH -#endif -#ifndef EPROCLIM -#define EPROCLIM WSAEPROCLIM -#endif -#ifndef EUSERS -#define EUSERS WSAEUSERS -#endif -#ifndef EDQUOT -#define EDQUOT WSAEDQUOT -#endif -#ifndef ESTALE -#define ESTALE WSAESTALE -#endif -#ifndef EREMOTE -#define EREMOTE WSAEREMOTE -#endif - -LWRES_LANG_BEGINDECLS - -const char * -lwres_net_ntop(int af, const void *src, char *dst, size_t size); - -int -lwres_net_pton(int af, const char *src, void *dst); - -int -lwres_net_aton(const char *cp, struct in_addr *addr); - -LWRES_LANG_ENDDECLS - -#endif /* LWRES_NET_H */ diff --git a/lib/lwres/win32/include/lwres/netdb.h b/lib/lwres/win32/include/lwres/netdb.h deleted file mode 100644 index ff52c73276..0000000000 --- a/lib/lwres/win32/include/lwres/netdb.h +++ /dev/null @@ -1,509 +0,0 @@ -/* - * Copyright (C) 2000, 2001, 2004, 2006, 2007, 2013, 2016 Internet Systems Consortium, Inc. ("ISC") - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -/* $Id: netdb.h,v 1.7 2007/06/19 23:47:23 tbox Exp $ */ - -#ifndef LWRES_NETDB_H -#define LWRES_NETDB_H 1 - -#include /* Required on FreeBSD (and others?) for size_t. */ - -#define off_t _off_t -#include - -#include -#include - -/* - * Define if does not declare struct addrinfo. - */ -#if _MSC_VER < 1600 -#define ISC_LWRES_NEEDADDRINFO 1 -#endif - -#ifdef ISC_LWRES_NEEDADDRINFO -struct addrinfo { - int ai_flags; /* AI_PASSIVE, AI_CANONNAME */ - int ai_family; /* PF_xxx */ - int ai_socktype; /* SOCK_xxx */ - int ai_protocol; /* 0 or IPPROTO_xxx for IPv4 and IPv6 */ - size_t ai_addrlen; /* Length of ai_addr */ - char *ai_canonname; /* Canonical name for hostname */ - struct sockaddr *ai_addr; /* Binary address */ - struct addrinfo *ai_next; /* Next structure in linked list */ -}; -#endif - -/* - * Undefine all \#defines we are interested in as may or may not have - * defined them. - */ - -/* - * Error return codes from gethostbyname() and gethostbyaddr() - * (left in extern int h_errno). - */ - -#undef NETDB_INTERNAL -#undef NETDB_SUCCESS -#undef HOST_NOT_FOUND -#undef TRY_AGAIN -#undef NO_RECOVERY -#undef NO_DATA -#undef NO_ADDRESS - -#define NETDB_INTERNAL -1 /* see errno */ -#define NETDB_SUCCESS 0 /* no problem */ -#define HOST_NOT_FOUND 1 /* Authoritative Answer Host not found */ -#define TRY_AGAIN 2 /* Non-Authoritative Host not found, or SERVERFAIL */ -#define NO_RECOVERY 3 /* Non recoverable errors, FORMERR, REFUSED, NOTIMP */ -#define NO_DATA 4 /* Valid name, no data record of requested type */ -#define NO_ADDRESS NO_DATA /* no address, look for MX record */ - -/* - * Error return codes from getaddrinfo() - */ - -#undef EAI_ADDRFAMILY -#undef EAI_AGAIN -#undef EAI_BADFLAGS -#undef EAI_FAIL -#undef EAI_FAMILY -#undef EAI_MEMORY -#undef EAI_NODATA -#undef EAI_NONAME -#undef EAI_SERVICE -#undef EAI_SOCKTYPE -#undef EAI_SYSTEM -#undef EAI_BADHINTS -#undef EAI_PROTOCOL -#undef EAI_MAX - -#define EAI_ADDRFAMILY 1 /* address family for hostname not supported */ -#define EAI_AGAIN 2 /* temporary failure in name resolution */ -#define EAI_BADFLAGS 3 /* invalid value for ai_flags */ -#define EAI_FAIL 4 /* non-recoverable failure in name resolution */ -#define EAI_FAMILY 5 /* ai_family not supported */ -#define EAI_MEMORY 6 /* memory allocation failure */ -#define EAI_NODATA 7 /* no address associated with hostname */ -#define EAI_NONAME 8 /* hostname nor servname provided, or not known */ -#define EAI_SERVICE 9 /* servname not supported for ai_socktype */ -#define EAI_SOCKTYPE 10 /* ai_socktype not supported */ -#define EAI_SYSTEM 11 /* system error returned in errno */ -#define EAI_BADHINTS 12 -#define EAI_PROTOCOL 13 -#define EAI_MAX 14 - -/* - * Flag values for getaddrinfo() - */ -#undef AI_PASSIVE -#undef AI_CANONNAME -#undef AI_NUMERICHOST - -#define AI_PASSIVE 0x00000001 -#define AI_CANONNAME 0x00000002 -#define AI_NUMERICHOST 0x00000004 - -/* - * Flag values for getipnodebyname() - */ -#undef AI_V4MAPPED -#undef AI_ALL -#undef AI_ADDRCONFIG -#undef AI_DEFAULT - -#define AI_V4MAPPED 0x00000008 -#define AI_ALL 0x00000010 -#define AI_ADDRCONFIG 0x00000020 -#define AI_DEFAULT (AI_V4MAPPED|AI_ADDRCONFIG) - -/* - * Constants for lwres_getnameinfo() - */ -#undef NI_MAXHOST -#undef NI_MAXSERV - -#define NI_MAXHOST 1025 -#define NI_MAXSERV 32 - -/* - * Flag values for lwres_getnameinfo() - */ -#undef NI_NOFQDN -#undef NI_NUMERICHOST -#undef NI_NAMEREQD -#undef NI_NUMERICSERV -#undef NI_DGRAM -#undef NI_NUMERICSCOPE - -#define NI_NOFQDN 0x00000001 -#define NI_NUMERICHOST 0x00000002 -#define NI_NAMEREQD 0x00000004 -#define NI_NUMERICSERV 0x00000008 -#define NI_DGRAM 0x00000010 -#define NI_NUMERICSCOPE 0x00000020 /*2553bis-00*/ - -/* - * Structures for getrrsetbyname() - */ -struct rdatainfo { - unsigned int rdi_length; - unsigned char *rdi_data; -}; - -struct rrsetinfo { - unsigned int rri_flags; - int rri_rdclass; - int rri_rdtype; - unsigned int rri_ttl; - unsigned int rri_nrdatas; - unsigned int rri_nsigs; - char *rri_name; - struct rdatainfo *rri_rdatas; - struct rdatainfo *rri_sigs; -}; - -/* - * Flags for getrrsetbyname() - */ -#define RRSET_VALIDATED 0x00000001 - /* Set was dnssec validated */ - -/* - * Return codes for getrrsetbyname() - */ -#define ERRSET_SUCCESS 0 -#define ERRSET_NOMEMORY 1 -#define ERRSET_FAIL 2 -#define ERRSET_INVAL 3 -#define ERRSET_NONAME 4 -#define ERRSET_NODATA 5 - -/* - * Define to map into lwres_ namespace. - */ - -#define LWRES_NAMESPACE - -#ifdef LWRES_NAMESPACE - -/* - * Use our versions not the ones from the C library. - */ - -#ifdef getnameinfo -#undef getnameinfo -#endif -#define getnameinfo lwres_getnameinfo - -#ifdef getaddrinfo -#undef getaddrinfo -#endif -#define getaddrinfo lwres_getaddrinfo - -#ifdef freeaddrinfo -#undef freeaddrinfo -#endif -#define freeaddrinfo lwres_freeaddrinfo - -#ifdef gai_strerror -#undef gai_strerror -#endif -#define gai_strerror lwres_gai_strerror - -#ifdef herror -#undef herror -#endif -#define herror lwres_herror - -#ifdef hstrerror -#undef hstrerror -#endif -#define hstrerror lwres_hstrerror - -#ifdef getipnodebyname -#undef getipnodebyname -#endif -#define getipnodebyname lwres_getipnodebyname - -#ifdef getipnodebyaddr -#undef getipnodebyaddr -#endif -#define getipnodebyaddr lwres_getipnodebyaddr - -#ifdef freehostent -#undef freehostent -#endif -#define freehostent lwres_freehostent - -#ifdef gethostbyname -#undef gethostbyname -#endif -#define gethostbyname lwres_gethostbyname - -#ifdef gethostbyname2 -#undef gethostbyname2 -#endif -#define gethostbyname2 lwres_gethostbyname2 - -#ifdef gethostbyaddr -#undef gethostbyaddr -#endif -#define gethostbyaddr lwres_gethostbyaddr - -#ifdef gethostent -#undef gethostent -#endif -#define gethostent lwres_gethostent - -#ifdef sethostent -#undef sethostent -#endif -#define sethostent lwres_sethostent - -#ifdef endhostent -#undef endhostent -#endif -#define endhostent lwres_endhostent - -/* #define sethostfile lwres_sethostfile */ - -#ifdef gethostbyname_r -#undef gethostbyname_r -#endif -#define gethostbyname_r lwres_gethostbyname_r - -#ifdef gethostbyaddr_r -#undef gethostbyaddr_r -#endif -#define gethostbyaddr_r lwres_gethostbyaddr_r - -#ifdef gethostent_r -#undef gethostent_r -#endif -#define gethostent_r lwres_gethostent_r - -#ifdef sethostent_r -#undef sethostent_r -#endif -#define sethostent_r lwres_sethostent_r - -#ifdef endhostent_r -#undef endhostent_r -#endif -#define endhostent_r lwres_endhostent_r - -#ifdef getrrsetbyname -#undef getrrsetbyname -#endif -#define getrrsetbyname lwres_getrrsetbyname - -#ifdef freerrset -#undef freerrset -#endif -#define freerrset lwres_freerrset - -#ifdef notyet -#define getservbyname lwres_getservbyname -#define getservbyport lwres_getservbyport -#define getservent lwres_getservent -#define setservent lwres_setservent -#define endservent lwres_endservent - -#define getservbyname_r lwres_getservbyname_r -#define getservbyport_r lwres_getservbyport_r -#define getservent_r lwres_getservent_r -#define setservent_r lwres_setservent_r -#define endservent_r lwres_endservent_r - -#define getprotobyname lwres_getprotobyname -#define getprotobynumber lwres_getprotobynumber -#define getprotoent lwres_getprotoent -#define setprotoent lwres_setprotoent -#define endprotoent lwres_endprotoent - -#define getprotobyname_r lwres_getprotobyname_r -#define getprotobynumber_r lwres_getprotobynumber_r -#define getprotoent_r lwres_getprotoent_r -#define setprotoent_r lwres_setprotoent_r -#define endprotoent_r lwres_endprotoent_r - -#ifdef getnetbyname -#undef getnetbyname -#endif -#define getnetbyname lwres_getnetbyname - -#ifdef getnetbyaddr -#undef getnetbyaddr -#endif -#define getnetbyaddr lwres_getnetbyaddr - -#ifdef getnetent -#undef getnetent -#endif -#define getnetent lwres_getnetent - -#ifdef setnetent -#undef setnetent -#endif -#define setnetent lwres_setnetent - -#ifdef endnetent -#undef endnetent -#endif -#define endnetent lwres_endnetent - - -#ifdef getnetbyname_r -#undef getnetbyname_r -#endif -#define getnetbyname_r lwres_getnetbyname_r - -#ifdef getnetbyaddr_r -#undef getnetbyaddr_r -#endif -#define getnetbyaddr_r lwres_getnetbyaddr_r - -#ifdef getnetent_r -#undef getnetent_r -#endif -#define getnetent_r lwres_getnetent_r - -#ifdef setnetent_r -#undef setnetent_r -#endif -#define setnetent_r lwres_setnetent_r - -#ifdef endnetent_r -#undef endnetent_r -#endif -#define endnetent_r lwres_endnetent_r -#endif /* notyet */ - -#ifdef h_errno -#undef h_errno -#endif -#define h_errno lwres_h_errno - -#endif /* LWRES_NAMESPACE */ - -LWRES_LANG_BEGINDECLS - -LIBLWRES_EXTERNAL_DATA extern int lwres_h_errno; - -int lwres_getaddrinfo(const char *, const char *, - const struct addrinfo *, struct addrinfo **); -int lwres_getnameinfo(const struct sockaddr *, size_t, char *, - size_t, char *, size_t, int); -void lwres_freeaddrinfo(struct addrinfo *); -char *lwres_gai_strerror(int); - -struct hostent *lwres_gethostbyaddr(const char *, int, int); -struct hostent *lwres_gethostbyname(const char *); -struct hostent *lwres_gethostbyname2(const char *, int); -struct hostent *lwres_gethostent(void); -struct hostent *lwres_getipnodebyname(const char *, int, int, int *); -struct hostent *lwres_getipnodebyaddr(const void *, size_t, int, int *); -void lwres_endhostent(void); -void lwres_sethostent(int); -/* void lwres_sethostfile(const char *); */ -void lwres_freehostent(struct hostent *); - -int lwres_getrrsetbyname(const char *, unsigned int, unsigned int, - unsigned int, struct rrsetinfo **); -void lwres_freerrset(struct rrsetinfo *); - -#ifdef notyet -struct netent *lwres_getnetbyaddr(unsigned long, int); -struct netent *lwres_getnetbyname(const char *); -struct netent *lwres_getnetent(void); -void lwres_endnetent(void); -void lwres_setnetent(int); - -struct protoent *lwres_getprotobyname(const char *); -struct protoent *lwres_getprotobynumber(int); -struct protoent *lwres_getprotoent(void); -void lwres_endprotoent(void); -void lwres_setprotoent(int); - -struct servent *lwres_getservbyname(const char *, const char *); -struct servent *lwres_getservbyport(int, const char *); -struct servent *lwres_getservent(void); -void lwres_endservent(void); -void lwres_setservent(int); -#endif /* notyet */ - -void lwres_herror(const char *); -const char *lwres_hstrerror(int); - - -#ifdef _REENTRANT -struct hostent *lwres_gethostbyaddr_r(const char *, int, int, struct hostent *, - char *, int, int *); -struct hostent *lwres_gethostbyname_r(const char *, struct hostent *, - char *, int, int *); -struct hostent *lwres_gethostent_r(struct hostent *, char *, int, int *); -void lwres_sethostent_r(int); -void lwres_endhostent_r(void); - -#ifdef notyet -struct netent *lwres_getnetbyname_r(const char *, struct netent *, - char *, int); -struct netent *lwres_getnetbyaddr_r(long, int, struct netent *, - char *, int); -struct netent *lwres_getnetent_r(struct netent *, char *, int); -void lwres_setnetent_r(int); -void lwres_endnetent_r(void); - -struct protoent *lwres_getprotobyname_r(const char *, - struct protoent *, char *, int); -struct protoent *lwres_getprotobynumber_r(int, - struct protoent *, char *, int); -struct protoent *lwres_getprotoent_r(struct protoent *, char *, int); -void lwres_setprotoent_r(int); -void lwres_endprotoent_r(void); - -struct servent *lwres_getservbyname_r(const char *name, const char *, - struct servent *, char *, int); -struct servent *lwres_getservbyport_r(int port, const char *, - struct servent *, char *, int); -struct servent *lwres_getservent_r(struct servent *, char *, int); -void lwres_setservent_r(int); -void lwres_endservent_r(void); -#endif /* notyet */ -#endif /* _REENTRANT */ - -LWRES_LANG_ENDDECLS - -#ifdef notyet -/* This is nec'y to make this include file properly replace the sun version. */ -#ifdef sun -#ifdef __GNU_LIBRARY__ -#include /* Required. */ -#else /* !__GNU_LIBRARY__ */ -struct rpcent { - char *r_name; /* name of server for this rpc program */ - char **r_aliases; /* alias list */ - int r_number; /* rpc program number */ -}; -struct rpcent *lwres_getrpcbyname(); -struct rpcent *lwres_getrpcbynumber(), -struct rpcent *lwres_getrpcent(); -#endif /* __GNU_LIBRARY__ */ -#endif /* sun */ -#endif /* notyet */ - -/* - * Tell Emacs to use C mode on this file. - * Local variables: - * mode: c - * End: - */ - -#endif /* LWRES_NETDB_H */ diff --git a/lib/lwres/win32/include/lwres/platform.h b/lib/lwres/win32/include/lwres/platform.h deleted file mode 100644 index ba29adc663..0000000000 --- a/lib/lwres/win32/include/lwres/platform.h +++ /dev/null @@ -1,96 +0,0 @@ -/* - * Copyright (C) 2000, 2001, 2004, 2007, 2014, 2016 Internet Systems Consortium, Inc. ("ISC") - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -/* $Id: platform.h,v 1.7 2007/06/18 23:47:52 tbox Exp $ */ - -#ifndef LWRES_PLATFORM_H -#define LWRES_PLATFORM_H 1 - -/***** - ***** Platform-dependent defines. - *****/ - -/*** - *** Network. - ***/ - -/* - * Define if this system needs the header file for IPv6. - */ -/*@LWRES_PLATFORM_NEEDNETINETIN6H@ */ - -/* - * Define if this system needs the header file for IPv6. - */ -/*@LWRES_PLATFORM_NEEDNETINET6IN6H@ */ - -/* - * If sockaddrs on this system have an sa_len field, LWRES_PLATFORM_HAVESALEN - * will be defined. - */ -/*@LWRES_PLATFORM_HAVESALEN@ */ - -/* - * If this system has the IPv6 structure definitions, LWRES_PLATFORM_HAVEIPV6 - * will be defined. - */ -/*@LWRES_PLATFORM_HAVEIPV6@ */ - -/* - * If this system is missing in6addr_any, LWRES_PLATFORM_NEEDIN6ADDRANY will - * be defined. - */ -#define LWRES_PLATFORM_NEEDIN6ADDRANY - -/* - * If this system has in_addr6, rather than in6_addr, - * LWRES_PLATFORM_HAVEINADDR6 will be defined. - */ -/*@LWRES_PLATFORM_HAVEINADDR6@ */ - -/* - * Defined if unistd.h does not cause fd_set to be delared. - */ -/*@LWRES_PLATFORM_NEEDSYSSELECTH@ */ - -/* VS2005 does not provide strlcpy() */ -#define LWRES_PLATFORM_NEEDSTRLCPY - -/* - * Define some Macros - */ -#ifdef LIBLWRES_EXPORTS -#define LIBLWRES_EXTERNAL_DATA __declspec(dllexport) -#else -#define LIBLWRES_EXTERNAL_DATA __declspec(dllimport) -#endif - -/* - * Define the MAKE_NONBLOCKING Macro here since it can get used in - * a number of places. - */ -#define MAKE_NONBLOCKING(sd, retval) \ -do { \ - int _on = 1; \ - retval = ioctlsocket((SOCKET) sd, FIONBIO, &_on); \ -} while (0) - -/* - * Need to define close here since lwres closes sockets and not files - */ -#undef close -#define close closesocket - -/* - * Internal to liblwres. - */ -void InitSockets(void); - -void DestroySockets(void); - -#endif /* LWRES_PLATFORM_H */ diff --git a/lib/lwres/win32/liblwres.def b/lib/lwres/win32/liblwres.def deleted file mode 100644 index e3ce6e5dbf..0000000000 --- a/lib/lwres/win32/liblwres.def +++ /dev/null @@ -1,90 +0,0 @@ -LIBRARY liblwres - -; Exported Functions -EXPORTS - -lwres_addr_parse -lwres_buffer_add -lwres_buffer_back -lwres_buffer_clear -lwres_buffer_first -lwres_buffer_forward -lwres_buffer_getmem -lwres_buffer_getuint16 -lwres_buffer_getuint32 -lwres_buffer_getuint8 -lwres_buffer_init -lwres_buffer_invalidate -lwres_buffer_putmem -lwres_buffer_putuint16 -lwres_buffer_putuint32 -lwres_buffer_putuint8 -lwres_buffer_subtract -lwres_conf_clear -lwres_conf_get -lwres_conf_init -lwres_conf_parse -lwres_conf_print -lwres_context_allocmem -lwres_context_create -lwres_context_destroy -lwres_context_freemem -lwres_context_getsocket -lwres_context_initserial -lwres_context_nextserial -lwres_context_recv -lwres_context_send -lwres_context_sendrecv -lwres_data_parse -lwres_freeaddrinfo -lwres_freehostent -lwres_freerrset -lwres_gabnrequest_free -lwres_gabnrequest_parse -lwres_gabnrequest_render -lwres_gabnresponse_free -lwres_gabnresponse_parse -lwres_gabnresponse_render -lwres_gai_strerror -lwres_getaddrinfo -lwres_getaddrsbyname -lwres_gethostbyaddr -lwres_gethostbyname -lwres_gethostbyname2 -lwres_getipnodebyaddr -lwres_getipnodebyname -lwres_getnamebyaddr -lwres_getnameinfo -lwres_getrdatabyname -lwres_getrrsetbyname -lwres_gnbarequest_free -lwres_gnbarequest_parse -lwres_gnbarequest_render -lwres_gnbaresponse_free -lwres_gnbaresponse_parse -lwres_gnbaresponse_render -lwres_grbnrequest_free -lwres_grbnrequest_parse -lwres_grbnrequest_render -lwres_grbnresponse_free -lwres_grbnresponse_parse -lwres_grbnresponse_render -lwres_hstrerror -lwres_lwpacket_parseheader -lwres_lwpacket_renderheader -lwres_net_aton -lwres_net_ntop -lwres_net_pton -lwres_nooprequest_free -lwres_nooprequest_parse -lwres_nooprequest_render -lwres_noopresponse_free -lwres_noopresponse_parse -lwres_noopresponse_render -lwres_string_parse - -; Exported Data - -EXPORTS - -;lwres_h_errno DATA diff --git a/lib/lwres/win32/liblwres.dsp.in b/lib/lwres/win32/liblwres.dsp.in deleted file mode 100644 index 5a66a95adc..0000000000 --- a/lib/lwres/win32/liblwres.dsp.in +++ /dev/null @@ -1,261 +0,0 @@ -# Microsoft Developer Studio Project File - Name="liblwres" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Dynamic-Link Library" 0x0102 - -CFG=liblwres - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "liblwres.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "liblwres.mak" CFG="liblwres - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "liblwres - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Dynamic-Link Library") -!MESSAGE "liblwres - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "liblwres - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "liblwres_EXPORTS" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../lib/lwres/win32/include/lwres" /I "include" /I "../include" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" @CRYPTO@ /D "LIBLWRES_EXPORTS" @COPTY@ /FD /c -# SUBTRACT CPP /X -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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@ -# ADD LINK32 user32.lib advapi32.lib ws2_32.lib iphlpapi.lib /nologo /dll @MACHINE@ /out:"../../../Build/Release/liblwres.dll" - -!ELSEIF "$(CFG)" == "liblwres - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "liblwres_EXPORTS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../lib/lwres/win32/include/lwres" /I "include" /I "../include" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" @CRYPTO@ /D "LIBLWRES_EXPORTS" /FR @COPTY@ /FD /GZ /c -# SUBTRACT CPP /X -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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@ /pdbtype:sept -# ADD LINK32 user32.lib advapi32.lib ws2_32.lib iphlpapi.lib /nologo /dll /debug @MACHINE@ /out:"../../../Build/Debug/liblwres.dll" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "liblwres - @PLATFORM@ Release" -# Name "liblwres - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\compat.c -# End Source File -# Begin Source File - -SOURCE=..\context.c -# End Source File -# Begin Source File - -SOURCE=.\DLLMain.c -# End Source File -# Begin Source File - -SOURCE=..\gai_strerror.c -# End Source File -# Begin Source File - -SOURCE=..\getaddrinfo.c -# End Source File -# Begin Source File - -SOURCE=..\gethost.c -# End Source File -# Begin Source File - -SOURCE=..\getipnode.c -# End Source File -# Begin Source File - -SOURCE=..\getnameinfo.c -# End Source File -# Begin Source File - -SOURCE=..\getrrset.c -# End Source File -# Begin Source File - -SOURCE=..\herror.c -# End Source File -# Begin Source File - -SOURCE=..\lwbuffer.c -# End Source File -# Begin Source File - -SOURCE=.\lwconfig.c -# End Source File -# Begin Source File - -SOURCE=..\lwinetaton.c -# End Source File -# Begin Source File - -SOURCE=..\lwinetntop.c -# End Source File -# Begin Source File - -SOURCE=..\lwinetpton.c -# End Source File -# Begin Source File - -SOURCE=..\lwpacket.c -# End Source File -# Begin Source File - -SOURCE=..\lwres_gabn.c -# End Source File -# Begin Source File - -SOURCE=..\lwres_gnba.c -# End Source File -# Begin Source File - -SOURCE=..\lwres_grbn.c -# End Source File -# Begin Source File - -SOURCE=..\lwres_noop.c -# End Source File -# Begin Source File - -SOURCE=..\lwresutil.c -# End Source File -# Begin Source File - -SOURCE=.\socket.c -# End Source File -# Begin Source File - -SOURCE=.\version.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\include\lwres\context.h -# End Source File -# Begin Source File - -SOURCE=.\include\lwres\int.h -# End Source File -# Begin Source File - -SOURCE=..\include\lwres\ipv6.h -# End Source File -# Begin Source File - -SOURCE=..\include\lwres\lang.h -# End Source File -# Begin Source File - -SOURCE=..\include\lwres\list.h -# End Source File -# Begin Source File - -SOURCE=..\include\lwres\lwbuffer.h -# End Source File -# Begin Source File - -SOURCE=..\include\lwres\lwpacket.h -# End Source File -# Begin Source File - -SOURCE=..\include\lwres\lwres.h -# End Source File -# Begin Source File - -SOURCE=.\include\lwres\net.h -# End Source File -# Begin Source File - -SOURCE=.\include\lwres\netdb.h -# End Source File -# Begin Source File - -SOURCE=.\include\lwres\platform.h -# End Source File -# Begin Source File - -SOURCE=..\include\lwres\result.h -# End Source File -# Begin Source File - -SOURCE=..\include\lwres\stdlib.h -# End Source File -# Begin Source File - -SOURCE=..\include\lwres\string.h -# End Source File -# Begin Source File - -SOURCE=..\include\lwres\version.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# Begin Source File - -SOURCE=.\liblwres.def -# End Source File -# End Target -# End Project diff --git a/lib/lwres/win32/liblwres.dsw b/lib/lwres/win32/liblwres.dsw deleted file mode 100644 index fa317209c9..0000000000 --- a/lib/lwres/win32/liblwres.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "liblwres"=".\liblwres.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/lib/lwres/win32/liblwres.mak.in b/lib/lwres/win32/liblwres.mak.in deleted file mode 100644 index 30ff30deef..0000000000 --- a/lib/lwres/win32/liblwres.mak.in +++ /dev/null @@ -1,798 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on liblwres.dsp -!IF "$(CFG)" == "" -CFG=liblwres - @PLATFORM@ Debug -!MESSAGE No configuration specified. Defaulting to liblwres - @PLATFORM@ Debug. -!ENDIF - -!IF "$(CFG)" != "liblwres - @PLATFORM@ Release" && "$(CFG)" != "liblwres - @PLATFORM@ Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "liblwres.mak" CFG="liblwres - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "liblwres - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Dynamic-Link Library") -!MESSAGE "liblwres - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Dynamic-Link Library") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "liblwres - @PLATFORM@ 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 - @PLATFORM@ Release" - -OUTDIR=.\Release -INTDIR=.\Release - -ALL : "..\..\..\Build\Release\liblwres.dll" - - -CLEAN : - -@erase "$(INTDIR)\compat.obj" - -@erase "$(INTDIR)\context.obj" - -@erase "$(INTDIR)\DLLMain.obj" - -@erase "$(INTDIR)\gai_strerror.obj" - -@erase "$(INTDIR)\getaddrinfo.obj" - -@erase "$(INTDIR)\gethost.obj" - -@erase "$(INTDIR)\getipnode.obj" - -@erase "$(INTDIR)\getnameinfo.obj" - -@erase "$(INTDIR)\getrrset.obj" - -@erase "$(INTDIR)\herror.obj" - -@erase "$(INTDIR)\lwbuffer.obj" - -@erase "$(INTDIR)\lwconfig.obj" - -@erase "$(INTDIR)\lwinetaton.obj" - -@erase "$(INTDIR)\lwinetntop.obj" - -@erase "$(INTDIR)\lwinetpton.obj" - -@erase "$(INTDIR)\lwpacket.obj" - -@erase "$(INTDIR)\lwres_gabn.obj" - -@erase "$(INTDIR)\lwres_gnba.obj" - -@erase "$(INTDIR)\lwres_grbn.obj" - -@erase "$(INTDIR)\lwres_noop.obj" - -@erase "$(INTDIR)\lwresutil.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\socket.obj" - -@erase "$(INTDIR)\version.obj" - -@erase "$(OUTDIR)\liblwres.exp" - -@erase "$(OUTDIR)\liblwres.lib" - -@erase "..\..\..\Build\Release\liblwres.dll" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../lib/lwres/win32/include/lwres" /I "include" /I "../include" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" @CRYPTO@ /D "LIBLWRES_EXPORTS" /Fp"$(INTDIR)\liblwres.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c -MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\liblwres.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib iphlpapi.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\liblwres.pdb" @MACHINE@ /def:".\liblwres.def" /out:"../../../Build/Release/liblwres.dll" /implib:"$(OUTDIR)\liblwres.lib" -DEF_FILE= \ - ".\liblwres.def" -LINK32_OBJS= \ - "$(INTDIR)\compat.obj" \ - "$(INTDIR)\context.obj" \ - "$(INTDIR)\DLLMain.obj" \ - "$(INTDIR)\gai_strerror.obj" \ - "$(INTDIR)\getaddrinfo.obj" \ - "$(INTDIR)\gethost.obj" \ - "$(INTDIR)\getipnode.obj" \ - "$(INTDIR)\getnameinfo.obj" \ - "$(INTDIR)\getrrset.obj" \ - "$(INTDIR)\herror.obj" \ - "$(INTDIR)\lwbuffer.obj" \ - "$(INTDIR)\lwinetaton.obj" \ - "$(INTDIR)\lwinetntop.obj" \ - "$(INTDIR)\lwinetpton.obj" \ - "$(INTDIR)\lwpacket.obj" \ - "$(INTDIR)\lwres_gabn.obj" \ - "$(INTDIR)\lwres_gnba.obj" \ - "$(INTDIR)\lwres_grbn.obj" \ - "$(INTDIR)\lwres_noop.obj" \ - "$(INTDIR)\lwresutil.obj" \ - "$(INTDIR)\socket.obj" \ - "$(INTDIR)\version.obj" \ - "$(INTDIR)\lwconfig.obj" - -"..\..\..\Build\Release\liblwres.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_DLL) - -!ELSEIF "$(CFG)" == "liblwres - @PLATFORM@ Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -ALL : "..\..\..\Build\Debug\liblwres.dll" "$(OUTDIR)\liblwres.bsc" - - -CLEAN : - -@erase "$(INTDIR)\compat.obj" - -@erase "$(INTDIR)\compat.sbr" - -@erase "$(INTDIR)\context.obj" - -@erase "$(INTDIR)\context.sbr" - -@erase "$(INTDIR)\DLLMain.obj" - -@erase "$(INTDIR)\DLLMain.sbr" - -@erase "$(INTDIR)\gai_strerror.obj" - -@erase "$(INTDIR)\gai_strerror.sbr" - -@erase "$(INTDIR)\getaddrinfo.obj" - -@erase "$(INTDIR)\getaddrinfo.sbr" - -@erase "$(INTDIR)\gethost.obj" - -@erase "$(INTDIR)\gethost.sbr" - -@erase "$(INTDIR)\getipnode.obj" - -@erase "$(INTDIR)\getipnode.sbr" - -@erase "$(INTDIR)\getnameinfo.obj" - -@erase "$(INTDIR)\getnameinfo.sbr" - -@erase "$(INTDIR)\getrrset.obj" - -@erase "$(INTDIR)\getrrset.sbr" - -@erase "$(INTDIR)\herror.obj" - -@erase "$(INTDIR)\herror.sbr" - -@erase "$(INTDIR)\lwbuffer.obj" - -@erase "$(INTDIR)\lwbuffer.sbr" - -@erase "$(INTDIR)\lwconfig.obj" - -@erase "$(INTDIR)\lwconfig.sbr" - -@erase "$(INTDIR)\lwinetaton.obj" - -@erase "$(INTDIR)\lwinetaton.sbr" - -@erase "$(INTDIR)\lwinetntop.obj" - -@erase "$(INTDIR)\lwinetntop.sbr" - -@erase "$(INTDIR)\lwinetpton.obj" - -@erase "$(INTDIR)\lwinetpton.sbr" - -@erase "$(INTDIR)\lwpacket.obj" - -@erase "$(INTDIR)\lwpacket.sbr" - -@erase "$(INTDIR)\lwres_gabn.obj" - -@erase "$(INTDIR)\lwres_gabn.sbr" - -@erase "$(INTDIR)\lwres_gnba.obj" - -@erase "$(INTDIR)\lwres_gnba.sbr" - -@erase "$(INTDIR)\lwres_grbn.obj" - -@erase "$(INTDIR)\lwres_grbn.sbr" - -@erase "$(INTDIR)\lwres_noop.obj" - -@erase "$(INTDIR)\lwres_noop.sbr" - -@erase "$(INTDIR)\lwresutil.obj" - -@erase "$(INTDIR)\lwresutil.sbr" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(INTDIR)\socket.obj" - -@erase "$(INTDIR)\socket.sbr" - -@erase "$(INTDIR)\version.obj" - -@erase "$(INTDIR)\version.sbr" - -@erase "$(OUTDIR)\liblwres.bsc" - -@erase "$(OUTDIR)\liblwres.exp" - -@erase "$(OUTDIR)\liblwres.lib" - -@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)" - -CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../lib/lwres/win32/include/lwres" /I "include" /I "../include" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" @CRYPTO@ /D "LIBLWRES_EXPORTS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\liblwres.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\liblwres.bsc" -BSC32_SBRS= \ - "$(INTDIR)\compat.sbr" \ - "$(INTDIR)\context.sbr" \ - "$(INTDIR)\DLLMain.sbr" \ - "$(INTDIR)\gai_strerror.sbr" \ - "$(INTDIR)\getaddrinfo.sbr" \ - "$(INTDIR)\gethost.sbr" \ - "$(INTDIR)\getipnode.sbr" \ - "$(INTDIR)\getnameinfo.sbr" \ - "$(INTDIR)\getrrset.sbr" \ - "$(INTDIR)\herror.sbr" \ - "$(INTDIR)\lwbuffer.sbr" \ - "$(INTDIR)\lwinetaton.sbr" \ - "$(INTDIR)\lwinetntop.sbr" \ - "$(INTDIR)\lwinetpton.sbr" \ - "$(INTDIR)\lwpacket.sbr" \ - "$(INTDIR)\lwres_gabn.sbr" \ - "$(INTDIR)\lwres_gnba.sbr" \ - "$(INTDIR)\lwres_grbn.sbr" \ - "$(INTDIR)\lwres_noop.sbr" \ - "$(INTDIR)\lwresutil.sbr" \ - "$(INTDIR)\socket.sbr" \ - "$(INTDIR)\version.sbr" \ - "$(INTDIR)\lwconfig.sbr" - -"$(OUTDIR)\liblwres.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib iphlpapi.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\liblwres.pdb" /debug @MACHINE@ /def:".\liblwres.def" /out:"../../../Build/Debug/liblwres.dll" /implib:"$(OUTDIR)\liblwres.lib" /pdbtype:sept -DEF_FILE= \ - ".\liblwres.def" -LINK32_OBJS= \ - "$(INTDIR)\compat.obj" \ - "$(INTDIR)\context.obj" \ - "$(INTDIR)\DLLMain.obj" \ - "$(INTDIR)\gai_strerror.obj" \ - "$(INTDIR)\getaddrinfo.obj" \ - "$(INTDIR)\gethost.obj" \ - "$(INTDIR)\getipnode.obj" \ - "$(INTDIR)\getnameinfo.obj" \ - "$(INTDIR)\getrrset.obj" \ - "$(INTDIR)\herror.obj" \ - "$(INTDIR)\lwbuffer.obj" \ - "$(INTDIR)\lwinetaton.obj" \ - "$(INTDIR)\lwinetntop.obj" \ - "$(INTDIR)\lwinetpton.obj" \ - "$(INTDIR)\lwpacket.obj" \ - "$(INTDIR)\lwres_gabn.obj" \ - "$(INTDIR)\lwres_gnba.obj" \ - "$(INTDIR)\lwres_grbn.obj" \ - "$(INTDIR)\lwres_noop.obj" \ - "$(INTDIR)\lwresutil.obj" \ - "$(INTDIR)\socket.obj" \ - "$(INTDIR)\version.obj" \ - "$(INTDIR)\lwconfig.obj" - -"..\..\..\Build\Debug\liblwres.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_DLL) - -!ENDIF - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("liblwres.dep") -!INCLUDE "liblwres.dep" -!ELSE -!MESSAGE Warning: cannot find "liblwres.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "liblwres - @PLATFORM@ Release" || "$(CFG)" == "liblwres - @PLATFORM@ Debug" -SOURCE=..\compat.c - -!IF "$(CFG)" == "liblwres - @PLATFORM@ Release" - - -"$(INTDIR)\compat.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "liblwres - @PLATFORM@ Debug" - - -"$(INTDIR)\compat.obj" "$(INTDIR)\compat.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=..\context.c - -!IF "$(CFG)" == "liblwres - @PLATFORM@ Release" - - -"$(INTDIR)\context.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "liblwres - @PLATFORM@ Debug" - - -"$(INTDIR)\context.obj" "$(INTDIR)\context.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=.\DLLMain.c - -!IF "$(CFG)" == "liblwres - @PLATFORM@ Release" - - -"$(INTDIR)\DLLMain.obj" : $(SOURCE) "$(INTDIR)" - - -!ELSEIF "$(CFG)" == "liblwres - @PLATFORM@ Debug" - - -"$(INTDIR)\DLLMain.obj" "$(INTDIR)\DLLMain.sbr" : $(SOURCE) "$(INTDIR)" - - -!ENDIF - -SOURCE=..\gai_strerror.c - -!IF "$(CFG)" == "liblwres - @PLATFORM@ Release" - - -"$(INTDIR)\gai_strerror.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "liblwres - @PLATFORM@ Debug" - - -"$(INTDIR)\gai_strerror.obj" "$(INTDIR)\gai_strerror.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=..\getaddrinfo.c - -!IF "$(CFG)" == "liblwres - @PLATFORM@ Release" - - -"$(INTDIR)\getaddrinfo.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "liblwres - @PLATFORM@ Debug" - - -"$(INTDIR)\getaddrinfo.obj" "$(INTDIR)\getaddrinfo.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=..\gethost.c - -!IF "$(CFG)" == "liblwres - @PLATFORM@ Release" - - -"$(INTDIR)\gethost.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "liblwres - @PLATFORM@ Debug" - - -"$(INTDIR)\gethost.obj" "$(INTDIR)\gethost.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=..\getipnode.c - -!IF "$(CFG)" == "liblwres - @PLATFORM@ Release" - - -"$(INTDIR)\getipnode.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "liblwres - @PLATFORM@ Debug" - - -"$(INTDIR)\getipnode.obj" "$(INTDIR)\getipnode.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=..\getnameinfo.c - -!IF "$(CFG)" == "liblwres - @PLATFORM@ Release" - - -"$(INTDIR)\getnameinfo.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "liblwres - @PLATFORM@ Debug" - - -"$(INTDIR)\getnameinfo.obj" "$(INTDIR)\getnameinfo.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=..\getrrset.c - -!IF "$(CFG)" == "liblwres - @PLATFORM@ Release" - - -"$(INTDIR)\getrrset.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "liblwres - @PLATFORM@ Debug" - - -"$(INTDIR)\getrrset.obj" "$(INTDIR)\getrrset.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=..\herror.c - -!IF "$(CFG)" == "liblwres - @PLATFORM@ Release" - - -"$(INTDIR)\herror.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "liblwres - @PLATFORM@ Debug" - - -"$(INTDIR)\herror.obj" "$(INTDIR)\herror.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=..\lwbuffer.c - -!IF "$(CFG)" == "liblwres - @PLATFORM@ Release" - - -"$(INTDIR)\lwbuffer.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "liblwres - @PLATFORM@ Debug" - - -"$(INTDIR)\lwbuffer.obj" "$(INTDIR)\lwbuffer.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=.\lwconfig.c - -!IF "$(CFG)" == "liblwres - @PLATFORM@ Release" - - -"$(INTDIR)\lwconfig.obj" : $(SOURCE) "$(INTDIR)" - - -!ELSEIF "$(CFG)" == "liblwres - @PLATFORM@ Debug" - - -"$(INTDIR)\lwconfig.obj" "$(INTDIR)\lwconfig.sbr" : $(SOURCE) "$(INTDIR)" - - -!ENDIF - -SOURCE=..\lwinetaton.c - -!IF "$(CFG)" == "liblwres - @PLATFORM@ Release" - - -"$(INTDIR)\lwinetaton.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "liblwres - @PLATFORM@ Debug" - - -"$(INTDIR)\lwinetaton.obj" "$(INTDIR)\lwinetaton.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=..\lwinetntop.c - -!IF "$(CFG)" == "liblwres - @PLATFORM@ Release" - - -"$(INTDIR)\lwinetntop.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "liblwres - @PLATFORM@ Debug" - - -"$(INTDIR)\lwinetntop.obj" "$(INTDIR)\lwinetntop.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=..\lwinetpton.c - -!IF "$(CFG)" == "liblwres - @PLATFORM@ Release" - - -"$(INTDIR)\lwinetpton.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "liblwres - @PLATFORM@ Debug" - - -"$(INTDIR)\lwinetpton.obj" "$(INTDIR)\lwinetpton.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=..\lwpacket.c - -!IF "$(CFG)" == "liblwres - @PLATFORM@ Release" - - -"$(INTDIR)\lwpacket.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "liblwres - @PLATFORM@ Debug" - - -"$(INTDIR)\lwpacket.obj" "$(INTDIR)\lwpacket.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=..\lwres_gabn.c - -!IF "$(CFG)" == "liblwres - @PLATFORM@ Release" - - -"$(INTDIR)\lwres_gabn.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "liblwres - @PLATFORM@ Debug" - - -"$(INTDIR)\lwres_gabn.obj" "$(INTDIR)\lwres_gabn.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=..\lwres_gnba.c - -!IF "$(CFG)" == "liblwres - @PLATFORM@ Release" - - -"$(INTDIR)\lwres_gnba.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "liblwres - @PLATFORM@ Debug" - - -"$(INTDIR)\lwres_gnba.obj" "$(INTDIR)\lwres_gnba.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=..\lwres_grbn.c - -!IF "$(CFG)" == "liblwres - @PLATFORM@ Release" - - -"$(INTDIR)\lwres_grbn.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "liblwres - @PLATFORM@ Debug" - - -"$(INTDIR)\lwres_grbn.obj" "$(INTDIR)\lwres_grbn.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=..\lwres_noop.c - -!IF "$(CFG)" == "liblwres - @PLATFORM@ Release" - - -"$(INTDIR)\lwres_noop.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "liblwres - @PLATFORM@ Debug" - - -"$(INTDIR)\lwres_noop.obj" "$(INTDIR)\lwres_noop.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=..\lwresutil.c - -!IF "$(CFG)" == "liblwres - @PLATFORM@ Release" - - -"$(INTDIR)\lwresutil.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "liblwres - @PLATFORM@ Debug" - - -"$(INTDIR)\lwresutil.obj" "$(INTDIR)\lwresutil.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=.\socket.c - -!IF "$(CFG)" == "liblwres - @PLATFORM@ Release" - - -"$(INTDIR)\socket.obj" : $(SOURCE) "$(INTDIR)" - - -!ELSEIF "$(CFG)" == "liblwres - @PLATFORM@ Debug" - - -"$(INTDIR)\socket.obj" "$(INTDIR)\socket.sbr" : $(SOURCE) "$(INTDIR)" - - -!ENDIF - -SOURCE=.\version.c - -!IF "$(CFG)" == "liblwres - @PLATFORM@ Release" - - -"$(INTDIR)\version.obj" : $(SOURCE) "$(INTDIR)" - - -!ELSEIF "$(CFG)" == "liblwres - @PLATFORM@ Debug" - - -"$(INTDIR)\version.obj" "$(INTDIR)\version.sbr" : $(SOURCE) "$(INTDIR)" - - -!ENDIF - - -!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 -1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest" -<< KEEP - -$(_VC_MANIFEST_BASENAME).auto.manifest : - type <<$@ - - - -<< KEEP diff --git a/lib/lwres/win32/liblwres.vcxproj.user b/lib/lwres/win32/liblwres.vcxproj.user deleted file mode 100644 index 695b5c78b9..0000000000 --- a/lib/lwres/win32/liblwres.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/lib/lwres/win32/lwconfig.c b/lib/lwres/win32/lwconfig.c deleted file mode 100644 index 5688c6b962..0000000000 --- a/lib/lwres/win32/lwconfig.c +++ /dev/null @@ -1,145 +0,0 @@ -/* - * Copyright (C) 2002, 2004, 2006, 2007, 2013, 2016 Internet Systems Consortium, Inc. ("ISC") - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -/* $Id: lwconfig.c,v 1.7 2007/12/14 01:40:42 marka Exp $ */ - -/* - * We do this so that we may incorporate everything in the main routines - * so that we can take advantage of the fixes and changes made there - * without having to add them twice. We can then call the parse routine - * if there is a resolv.conf file and fetch our own data from the - * Windows environment otherwise. - */ - -/* - * Note that on Win32 there is normally no resolv.conf since all information - * is stored in the registry. Therefore there is no ordering like the - * contents of resolv.conf. Since the "search" or "domain" keyword, on - * Win32 if a search list is found it is used, otherwise the domain name - * is used since they are mutually exclusive. The search list can be entered - * in the DNS tab of the "Advanced TCP/IP settings" window under the same place - * that you add your nameserver list. - */ - -#define lwres_conf_parse generic_lwres_conf_parse -#include "../lwconfig.c" -#undef lwres_conf_parse - -#include - -#define TCPIP_SUBKEY \ - "SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters" - -void -get_win32_searchlist(lwres_context_t *ctx) { - HKEY hKey; - BOOL keyFound = TRUE; - char searchlist[MAX_PATH]; - DWORD searchlen = MAX_PATH; - char *cp; - lwres_conf_t *confdata; - - REQUIRE(ctx != NULL); - confdata = &ctx->confdata; - - memset(searchlist, 0, MAX_PATH); - if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, TCPIP_SUBKEY, 0, KEY_READ, &hKey) - != ERROR_SUCCESS) - keyFound = FALSE; - - if (keyFound == TRUE) { - /* Get the named directory */ - if (RegQueryValueEx(hKey, "SearchList", NULL, NULL, - (LPBYTE)searchlist, &searchlen) != ERROR_SUCCESS) - keyFound = FALSE; - RegCloseKey(hKey); - } - - confdata->searchnxt = 0; - - if (!keyFound) - return; - - cp = strtok((char *)searchlist, ", \0"); - while (cp != NULL) { - if (confdata->searchnxt == LWRES_CONFMAXSEARCH) - break; - if (strlen(cp) <= MAX_PATH && strlen(cp) > 0) { - confdata->search[confdata->searchnxt] = lwres_strdup(ctx, cp); - if (confdata->search[confdata->searchnxt] != NULL) - confdata->searchnxt++; - } - cp = strtok(NULL, ", \0"); - } -} - -lwres_result_t -lwres_conf_parse(lwres_context_t *ctx, const char *filename) { - lwres_result_t ret; - lwres_conf_t *confdata; - FIXED_INFO * FixedInfo; - ULONG BufLen = sizeof(FIXED_INFO); - DWORD dwRetVal; - IP_ADDR_STRING *pIPAddr; - - REQUIRE(ctx != NULL); - confdata = &ctx->confdata; - REQUIRE(confdata != NULL); - - /* Use the resolver if there is one */ - ret = generic_lwres_conf_parse(ctx, filename); - if ((ret != LWRES_R_NOTFOUND && ret != LWRES_R_SUCCESS) || - (ret == LWRES_R_SUCCESS && confdata->nsnext > 0)) - return (ret); - - /* - * We didn't get any nameservers so we need to do this ourselves - */ - FixedInfo = (FIXED_INFO *) GlobalAlloc(GPTR, BufLen); - dwRetVal = GetNetworkParams(FixedInfo, &BufLen); - if (dwRetVal == ERROR_BUFFER_OVERFLOW) { - GlobalFree(FixedInfo); - FixedInfo = GlobalAlloc(GPTR, BufLen); - dwRetVal = GetNetworkParams(FixedInfo, &BufLen); - } - if (dwRetVal != ERROR_SUCCESS) { - GlobalFree(FixedInfo); - return (LWRES_R_FAILURE); - } - - /* Get the search list from the registry */ - get_win32_searchlist(ctx); - - /* Use only if there is no search list */ - if (confdata->searchnxt == 0 && strlen(FixedInfo->DomainName) > 0) { - confdata->domainname = lwres_strdup(ctx, FixedInfo->DomainName); - if (confdata->domainname == NULL) { - GlobalFree(FixedInfo); - return (LWRES_R_FAILURE); - } - } else - confdata->domainname = NULL; - - /* Get the list of nameservers */ - pIPAddr = &FixedInfo->DnsServerList; - while (pIPAddr) { - if (confdata->nsnext >= LWRES_CONFMAXNAMESERVERS) - break; - - ret = lwres_create_addr(pIPAddr->IpAddress.String, - &confdata->nameservers[confdata->nsnext++], 1); - if (ret != LWRES_R_SUCCESS) { - GlobalFree(FixedInfo); - return (ret); - } - pIPAddr = pIPAddr ->Next; - } - - GlobalFree(FixedInfo); - return (LWRES_R_SUCCESS); -} diff --git a/lib/lwres/win32/socket.c b/lib/lwres/win32/socket.c deleted file mode 100644 index 77f05cb635..0000000000 --- a/lib/lwres/win32/socket.c +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (C) 2007, 2015, 2016 Internet Systems Consortium, Inc. ("ISC") - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -/* $Id: socket.c,v 1.3 2007/06/18 23:47:51 tbox Exp $ */ - -#include -#include -#include -#include - -void -InitSockets(void) { - WORD wVersionRequested; - WSADATA wsaData; - int err; - - wVersionRequested = MAKEWORD(2, 0); - - err = WSAStartup( wVersionRequested, &wsaData ); - if (err != 0) { - fprintf(stderr, "WSAStartup() failed: %d\n", err); - exit(1); - } -} - -void -DestroySockets(void) { - WSACleanup(); -} diff --git a/lib/lwres/win32/version.c b/lib/lwres/win32/version.c deleted file mode 100644 index 4f3efa33fd..0000000000 --- a/lib/lwres/win32/version.c +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 1998-2001, 2004, 2007, 2016 Internet Systems Consortium, Inc. ("ISC") - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -/* $Id: version.c,v 1.6 2007/06/19 23:47:23 tbox Exp $ */ - -#include - -#include - -LIBLWRES_EXTERNAL_DATA const char lwres_version[] = VERSION; - -LIBLWRES_EXTERNAL_DATA const unsigned int lwres_libinterface = LIBINTERFACE; -LIBLWRES_EXTERNAL_DATA const unsigned int lwres_librevision = LIBREVISION; -LIBLWRES_EXTERNAL_DATA const unsigned int lwres_libage = LIBAGE; diff --git a/lib/lwres/Atffile b/lib/ns/Atffile similarity index 100% rename from lib/lwres/Atffile rename to lib/ns/Atffile diff --git a/lib/ns/Makefile.in b/lib/ns/Makefile.in new file mode 100644 index 0000000000..37d91b6acd --- /dev/null +++ b/lib/ns/Makefile.in @@ -0,0 +1,91 @@ +# Copyright (C) 2017 Internet Systems Consortium, Inc. ("ISC") +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +srcdir = @srcdir@ +VPATH = @srcdir@ +top_srcdir = @top_srcdir@ + +# Attempt to disable parallel processing. +.NOTPARALLEL: +.NO_PARALLEL: + +VERSION=@BIND9_VERSION@ +@BIND9_MAJOR@ + +@LIBNS_API@ + +@BIND9_MAKE_INCLUDES@ + +USE_ISC_SPNEGO = @USE_ISC_SPNEGO@ + +CINCLUDES = -I. -I${top_srcdir}/lib/ns -Iinclude \ + ${NS_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES} \ + @DST_OPENSSL_INC@ @DST_GSSAPI_INC@ + +CDEFINES = + +CWARNINGS = + +ISCLIBS = ../../lib/isc/libisc.@A@ + +ISCDEPLIBS = ../../lib/isc/libisc.@A@ + +DNSLIBS = ../../lib/dns/libdns.@A@ + +DNSDEPLIBS = ../../lib/dns/libdns.@A@ + +LIBS = @LIBS@ + +# Alphabetically +OBJS = client.@O@ interfacemgr.@O@ lib.@O@ \ + listenlist.@O@ log.@O@ notify.@O@ query.@O@ \ + server.@O@ sortlist.@O@ stats.@O@ update.@O@ \ + version.@O@ xfrout.@O@ + +SRCS = client.c interfacemgr.c lib.c listenlist.c \ + log.c notify.c query.c server.c sortlist.c stats.c \ + update.c version.c xfrout.c + +SUBDIRS = include +TARGETS = timestamp +TESTDIRS = @UNITTESTS@ + +@BIND9_MAKE_RULES@ + +version.@O@: version.c + ${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \ + -DVERSION=\"${VERSION}\" \ + -DMAJOR=\"${MAJOR}\" \ + -DLIBINTERFACE=${LIBINTERFACE} \ + -DLIBREVISION=${LIBREVISION} \ + -DLIBAGE=${LIBAGE} \ + -c ${srcdir}/version.c + +libns.@SA@: ${OBJS} + ${AR} ${ARFLAGS} $@ ${OBJS} + ${RANLIB} $@ + +libns.la: ${OBJS} + ${LIBTOOL_MODE_LINK} \ + ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libns.la -rpath ${libdir} \ + -version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \ + ${OBJS} ${ISCLIBS} @DNS_CRYPTO_LIBS@ ${LIBS} + +timestamp: libns.@A@ + touch timestamp + +installdirs: + $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir} + +install:: timestamp installdirs + ${LIBTOOL_MODE_INSTALL} ${INSTALL_LIBRARY} libns.@A@ \ + ${DESTDIR}${libdir} + +uninstall:: + ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${libdir}/libns.@A@ + +clean distclean:: + rm -f libns.@A@ timestamp diff --git a/lib/lwres/api b/lib/ns/api similarity index 61% rename from lib/lwres/api rename to lib/ns/api index 1425cb299f..4ee808585f 100644 --- a/lib/lwres/api +++ b/lib/ns/api @@ -3,11 +3,10 @@ # 9.7: 60-79 # 9.8: 80-89, 120-129 # 9.9: 90-109, 170-179 -# 9.9-sub: 130-139, 150-159, 200-209 -# 9.10: 140-149, 190-199 -# 9.10-sub: 180-189 +# 9.9-sub: 130-139, 150-159 +# 9.10: 140-149, 170-179 # 9.11: 160-169 # 9.12: 1200-1299 -LIBINTERFACE = 160 +LIBINTERFACE = 1200 LIBREVISION = 0 LIBAGE = 0 diff --git a/bin/named/client.c b/lib/ns/client.c similarity index 90% rename from bin/named/client.c rename to lib/ns/client.c index ecc13cb241..e750bbaa73 100644 --- a/bin/named/client.c +++ b/lib/ns/client.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999-2017 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2017 Internet Systems Consortium, Inc. ("ISC") * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -10,6 +10,7 @@ #include #include +#include #include #include #include @@ -47,13 +48,12 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include /*** *** Client @@ -79,8 +79,8 @@ NS_LOGMODULE_CLIENT, \ ISC_LOG_DEBUG(3), \ "%s", (m)) -#define MTRACE(m) isc_log_write(ns_g_lctx, \ - NS_LOGCATEGORY_GENERAL, \ +#define MTRACE(m) isc_log_write(ns_lctx, \ + NS_LOGCATEGORY_CLIENT, \ NS_LOGMODULE_CLIENT, \ ISC_LOG_DEBUG(3), \ "clientmgr @%p: %s", manager, (m)) @@ -130,8 +130,10 @@ struct ns_clientmgr { client_queue_t inactive; /*%< To be recycled */ isc_mem_t * mctx; + ns_server_t * sctx; isc_taskmgr_t * taskmgr; isc_timermgr_t * timermgr; + isc_task_t * excl; /* Lock covers manager state. */ isc_mutex_t lock; @@ -228,7 +230,7 @@ struct ns_clientmgr { #define NS_CLIENT_DROPPORT 1 #endif -unsigned int ns_client_requests; +LIBNS_EXTERNAL_DATA unsigned int ns_client_requests; static void read_settimeout(ns_client_t *client, isc_boolean_t newconn); static void client_read(ns_client_t *client, isc_boolean_t newconn); @@ -238,15 +240,11 @@ static void clientmgr_destroy(ns_clientmgr_t *manager); static isc_boolean_t exit_check(ns_client_t *client); static void ns_client_endrequest(ns_client_t *client); static void client_start(isc_task_t *task, isc_event_t *event); -static void client_request(isc_task_t *task, isc_event_t *event); static void ns_client_dumpmessage(ns_client_t *client, const char *reason); static isc_result_t get_client(ns_clientmgr_t *manager, ns_interface_t *ifp, dns_dispatch_t *disp, isc_boolean_t tcp); static isc_result_t get_worker(ns_clientmgr_t *manager, ns_interface_t *ifp, isc_socket_t *sock); -static inline isc_boolean_t -allowed(isc_netaddr_t *addr, dns_name_t *signer, isc_netaddr_t *ecs_addr, - isc_uint8_t ecs_addrlen, isc_uint8_t *ecs_scope, dns_acl_t *acl); static void compute_cookie(ns_client_t *client, isc_uint32_t when, isc_uint32_t nonce, const unsigned char *secret, isc_buffer_t *buf); @@ -302,11 +300,11 @@ read_settimeout(ns_client_t *client, isc_boolean_t newconn) { unsigned int ds; if (newconn) - ds = ns_g_initialtimo; + ds = client->sctx->initialtimo; else if (USEKEEPALIVE(client)) - ds = ns_g_keepalivetimo; + ds = client->sctx->keepalivetimo; else - ds = ns_g_idletimo; + ds = client->sctx->idletimo; isc_interval_set(&interval, ds / 10, 100000000 * (ds % 10)); result = isc_timer_reset(client->timer, isc_timertype_once, NULL, @@ -471,7 +469,9 @@ exit_check(ns_client_t *client) { * may remain active if we have fewer active TCP client * objects than desired due to an earlier quota exhaustion. */ - if (client->mortal && TCP_CLIENT(client) && !ns_g_clienttest) { + if (client->mortal && TCP_CLIENT(client) && + ((client->sctx->options & NS_SERVER_CLIENTTEST) == 0)) + { LOCK(&client->interface->lock); if (client->interface->ntcpcurrent < client->interface->ntcptarget) @@ -542,6 +542,7 @@ exit_check(ns_client_t *client) { client->attributes = 0; client->mortal = ISC_FALSE; + client->sendcb = NULL; /* * Put the client on the inactive list. If we are aiming for @@ -555,10 +556,13 @@ exit_check(ns_client_t *client) { if (client->state == client->newstate) { client->newstate = NS_CLIENTSTATE_MAX; - if (!ns_g_clienttest && manager != NULL && - !manager->exiting) + if ((client->sctx->options & + NS_SERVER_CLIENTTEST) == 0 && + manager != NULL && !manager->exiting) + { ISC_QUEUE_PUSH(manager->inactive, client, ilink); + } if (client->needshutdown) isc_task_shutdown(client->task); return (ISC_TRUE); @@ -626,7 +630,9 @@ exit_check(ns_client_t *client) { * Check that there are no other external references to * the memory context. */ - if (ns_g_clienttest && isc_mem_references(client->mctx) != 1) { + if ((client->sctx->options & NS_SERVER_CLIENTTEST) != 0 && + isc_mem_references(client->mctx) != 1) + { isc_mem_stats(client->mctx, stderr); INSIST(0); } @@ -637,6 +643,9 @@ exit_check(ns_client_t *client) { */ DESTROYLOCK(&client->query.fetchlock); + if (client->sctx != NULL) + ns_server_detach(&client->sctx); + isc_mem_putanddetach(&client->mctx, client, sizeof(*client)); } @@ -728,7 +737,7 @@ ns_client_endrequest(ns_client_t *client) { if (client->view != NULL) { #ifdef ENABLE_AFL - if (ns_g_fuzz_type == ns_fuzz_resolver) { + if (client->sctx->fuzztype == isc_fuzz_resolver) { dns_cache_clean(client->view->cache, INT_MAX); dns_adb_flush(client->view->adb); } @@ -749,8 +758,8 @@ ns_client_endrequest(ns_client_t *client) { if (client->recursionquota != NULL) { isc_quota_detach(&client->recursionquota); - isc_stats_decrement(ns_g_server->nsstats, - dns_nsstatscounter_recursclients); + ns_stats_decrement(client->sctx->nsstats, + ns_statscounter_recursclients); } /* @@ -759,10 +768,12 @@ ns_client_endrequest(ns_client_t *client) { */ client->attributes &= NS_CLIENTATTR_TCP; #ifdef ENABLE_AFL - if (ns_g_fuzz_type == ns_fuzz_client || - ns_g_fuzz_type == ns_fuzz_tcpclient || - ns_g_fuzz_type == ns_fuzz_resolver) { - named_fuzz_notify(); + if (client->sctx->fuzznotify != NULL && + (client->sctx->fuzztype == isc_fuzz_client || + client->sctx->fuzztype == isc_fuzz_tcpclient || + client->sctx->fuzztype == isc_fuzz_resolver)) + { + client->sctx->fuzznotify(); } #endif /* ENABLE_AFL */ @@ -917,15 +928,17 @@ client_sendpkg(ns_client_t *client, isc_buffer_t *buffer) { sock = client->tcpsocket; address = NULL; } else { + dns_aclenv_t *env = + ns_interfacemgr_getaclenv(client->interface->mgr); + sock = client->udpsocket; address = &client->peeraddr; isc_netaddr_fromsockaddr(&netaddr, &client->peeraddr); - if (ns_g_server->blackholeacl != NULL && + if (client->sctx->blackholeacl != NULL && dns_acl_match(&netaddr, NULL, - ns_g_server->blackholeacl, - &ns_g_server->aclenv, - &match, NULL) == ISC_R_SUCCESS && + client->sctx->blackholeacl, + env, &match, NULL) == ISC_R_SUCCESS && match > 0) return (DNS_R_BLACKHOLED); sockflags |= ISC_SOCKFLAG_NORETRY; @@ -1038,6 +1051,7 @@ client_send(ns_client_t *client) { unsigned int preferred_glue; isc_boolean_t opt_included = ISC_FALSE; size_t respsize; + dns_aclenv_t *env = ns_interfacemgr_getaclenv(client->interface->mgr); #ifdef HAVE_DNSTAP unsigned char zone[DNS_NAME_MAXWIRE]; dns_dtmsgtype_t dtmsgtype; @@ -1120,8 +1134,8 @@ client_send(ns_client_t *client) { name = &client->message->tsigkey->name; if (client->view->nocasecompress == NULL || - !allowed(&netaddr, name, NULL, 0, NULL, - client->view->nocasecompress)) + !dns_acl_allowed(&netaddr, name, NULL, 0, NULL, + client->view->nocasecompress, env)) { dns_compress_setsensitive(&cctx, ISC_TRUE); } @@ -1183,7 +1197,6 @@ client_send(ns_client_t *client) { goto done; renderend: result = dns_message_renderend(client->message); - if (result != ISC_R_SUCCESS) goto done; @@ -1214,7 +1227,9 @@ client_send(ns_client_t *client) { cleanup_cctx = ISC_FALSE; } - if (TCP_CLIENT(client)) { + if (client->sendcb != NULL) { + client->sendcb(&buffer); + } else if (TCP_CLIENT(client)) { isc_buffer_usedregion(&buffer, &r); isc_buffer_putuint16(&tcpbuffer, (isc_uint16_t) r.length); isc_buffer_add(&tcpbuffer, r.length); @@ -1233,11 +1248,11 @@ client_send(ns_client_t *client) { switch (isc_sockaddr_pf(&client->peeraddr)) { case AF_INET: - isc_stats_increment(ns_g_server->tcpoutstats4, + isc_stats_increment(client->sctx->tcpoutstats4, ISC_MIN((int)respsize / 16, 256)); break; case AF_INET6: - isc_stats_increment(ns_g_server->tcpoutstats6, + isc_stats_increment(client->sctx->tcpoutstats6, ISC_MIN((int)respsize / 16, 256)); break; default: @@ -1259,11 +1274,11 @@ client_send(ns_client_t *client) { switch (isc_sockaddr_pf(&client->peeraddr)) { case AF_INET: - isc_stats_increment(ns_g_server->udpoutstats4, + isc_stats_increment(client->sctx->udpoutstats4, ISC_MIN((int)respsize / 16, 256)); break; case AF_INET6: - isc_stats_increment(ns_g_server->udpoutstats6, + isc_stats_increment(client->sctx->udpoutstats6, ISC_MIN((int)respsize / 16, 256)); break; default: @@ -1273,25 +1288,25 @@ client_send(ns_client_t *client) { } /* update statistics (XXXJT: is it okay to access message->xxxkey?) */ - isc_stats_increment(ns_g_server->nsstats, dns_nsstatscounter_response); + ns_stats_increment(client->sctx->nsstats, ns_statscounter_response); - dns_rcodestats_increment(ns_g_server->rcodestats, + dns_rcodestats_increment(client->sctx->rcodestats, client->message->rcode); if (opt_included) { - isc_stats_increment(ns_g_server->nsstats, - dns_nsstatscounter_edns0out); + ns_stats_increment(client->sctx->nsstats, + ns_statscounter_edns0out); } if (client->message->tsigkey != NULL) { - isc_stats_increment(ns_g_server->nsstats, - dns_nsstatscounter_tsigout); + ns_stats_increment(client->sctx->nsstats, + ns_statscounter_tsigout); } if (client->message->sig0key != NULL) { - isc_stats_increment(ns_g_server->nsstats, - dns_nsstatscounter_sig0out); + ns_stats_increment(client->sctx->nsstats, + ns_statscounter_sig0out); } if ((client->message->flags & DNS_MESSAGEFLAG_TC) != 0) - isc_stats_increment(ns_g_server->nsstats, - dns_nsstatscounter_truncatedresp); + ns_stats_increment(client->sctx->nsstats, + ns_statscounter_truncatedresp); if (result == ISC_R_SUCCESS) return; @@ -1336,11 +1351,10 @@ client_delay(isc_task_t *task, isc_event_t *event) { void ns_client_send(ns_client_t *client) { - /* - * Delay the response by ns_g_delay ms. + * Delay the response according to the -T delay option */ - if (ns_g_delay != 0) { + if (client->sctx->delay != 0) { ns_client_t *dummy = NULL; isc_result_t result; isc_interval_t interval; @@ -1355,11 +1369,12 @@ ns_client_send(ns_client_t *client) { } ns_client_attach(client, &dummy); - if (ns_g_delay >= 1000) - isc_interval_set(&interval, ns_g_delay / 1000, - (ns_g_delay % 1000) * 1000000); + if (client->sctx->delay >= 1000) + isc_interval_set(&interval, client->sctx->delay / 1000, + (client->sctx->delay % 1000) * 1000000); else - isc_interval_set(&interval, 0, ns_g_delay * 1000000); + isc_interval_set(&interval, 0, + client->sctx->delay * 1000000); result = isc_timer_create(client->manager->timermgr, isc_timertype_once, NULL, &interval, client->task, client_delay, @@ -1447,11 +1462,11 @@ ns_client_error(ns_client_t *client, isc_result_t result) { INSIST(rcode != dns_rcode_noerror && rcode != dns_rcode_nxdomain); - if (ns_g_server->log_queries) + if ((client->sctx->options & NS_SERVER_LOGQUERIES) != 0) loglevel = DNS_RRL_LOG_DROP; else loglevel = ISC_LOG_DEBUG(1); - wouldlog = isc_log_wouldlog(ns_g_lctx, loglevel); + wouldlog = isc_log_wouldlog(ns_lctx, loglevel); rrl_result = dns_rrl(client->view, &client->peeraddr, TCP_CLIENT(client), dns_rdataclass_in, dns_rdatatype_none, @@ -1476,10 +1491,10 @@ ns_client_error(ns_client_t *client, isc_result_t result) { * so don't try to slip any error responses. */ if (!client->view->rrl->log_only) { - isc_stats_increment(ns_g_server->nsstats, - dns_nsstatscounter_ratedropped); - isc_stats_increment(ns_g_server->nsstats, - dns_nsstatscounter_dropped); + ns_stats_increment(client->sctx->nsstats, + ns_statscounter_ratedropped); + ns_stats_increment(client->sctx->nsstats, + ns_statscounter_dropped); ns_client_next(client, DNS_R_DROP); return; } @@ -1580,6 +1595,7 @@ ns_client_addopt(ns_client_t *client, dns_message_t *message, unsigned int flags; unsigned char expire[4]; unsigned char advtimo[2]; + dns_aclenv_t *env = ns_interfacemgr_getaclenv(client->interface->mgr); REQUIRE(NS_CLIENT_VALID(client)); REQUIRE(opt != NULL && *opt == NULL); @@ -1590,23 +1606,23 @@ ns_client_addopt(ns_client_t *client, dns_message_t *message, if (resolver != NULL) udpsize = dns_resolver_getudpsize(resolver); else - udpsize = ns_g_udpsize; + udpsize = client->sctx->udpsize; flags = client->extflags & DNS_MESSAGEEXTFLAG_REPLYPRESERVE; /* Set EDNS options if applicable */ - if (WANTNSID(client) && - (ns_g_server->server_id != NULL || - ns_g_server->server_usehostname)) - { - if (ns_g_server->server_usehostname) { - result = ns_os_gethostname(nsid, sizeof(nsid)); + if (WANTNSID(client)) { + if (client->sctx->server_id != NULL) { + nsidp = client->sctx->server_id; + } else if (client->sctx->gethostname != NULL) { + result = client->sctx->gethostname(nsid, sizeof(nsid)); if (result != ISC_R_SUCCESS) { goto no_nsid; } nsidp = nsid; - } else - nsidp = ns_g_server->server_id; + } else { + goto no_nsid; + } INSIST(count < DNS_EDNSOPTIONS); ednsopts[count].code = DNS_OPT_NSID; @@ -1624,7 +1640,7 @@ ns_client_addopt(ns_client_t *client, dns_message_t *message, isc_stdtime_get(&now); isc_random_get(&nonce); - compute_cookie(client, now, nonce, ns_g_server->secret, &buf); + compute_cookie(client, now, nonce, client->sctx->secret, &buf); INSIST(count < DNS_EDNSOPTIONS); ednsopts[count].code = DNS_OPT_COOKIE; @@ -1709,7 +1725,8 @@ ns_client_addopt(ns_client_t *client, dns_message_t *message, INSIST(count < DNS_EDNSOPTIONS); isc_buffer_init(&buf, advtimo, sizeof(advtimo)); - isc_buffer_putuint16(&buf, (isc_uint16_t) ns_g_advertisedtimo); + isc_buffer_putuint16(&buf, + (isc_uint16_t) client->sctx->advertisedtimo); ednsopts[count].code = DNS_OPT_TCP_KEEPALIVE; ednsopts[count].length = 2; ednsopts[count].value = advtimo; @@ -1725,10 +1742,8 @@ ns_client_addopt(ns_client_t *client, dns_message_t *message, int match; isc_netaddr_fromsockaddr(&netaddr, &client->peeraddr); - result = dns_acl_match(&netaddr, NULL, - view->pad_acl, - &ns_g_server->aclenv, - &match, NULL); + result = dns_acl_match(&netaddr, NULL, view->pad_acl, + env, &match, NULL); if (result == ISC_R_SUCCESS && match > 0) { INSIST(count < DNS_EDNSOPTIONS); @@ -1746,94 +1761,11 @@ ns_client_addopt(ns_client_t *client, dns_message_t *message, return (result); } -static inline isc_boolean_t -allowed(isc_netaddr_t *addr, dns_name_t *signer, - isc_netaddr_t *ecs_addr, isc_uint8_t ecs_addrlen, - isc_uint8_t *ecs_scope, dns_acl_t *acl) -{ - int match; - isc_result_t result; - - if (acl == NULL) - return (ISC_TRUE); - result = dns_acl_match2(addr, signer, ecs_addr, ecs_addrlen, ecs_scope, - acl, &ns_g_server->aclenv, &match, NULL); - if (result == ISC_R_SUCCESS && match > 0) - return (ISC_TRUE); - return (ISC_FALSE); -} - -/* - * Callback to see if a non-recursive query coming from 'srcaddr' to - * 'destaddr', with optional key 'mykey' for class 'rdclass' would be - * delivered to 'myview'. - * - * We run this unlocked as both the view list and the interface list - * are updated when the appropriate task has exclusivity. - */ -isc_boolean_t -ns_client_isself(dns_view_t *myview, dns_tsigkey_t *mykey, - const isc_sockaddr_t *srcaddr, const isc_sockaddr_t *dstaddr, - dns_rdataclass_t rdclass, void *arg) -{ - dns_view_t *view; - dns_tsigkey_t *key = NULL; - dns_name_t *tsig = NULL; - isc_netaddr_t netsrc; - isc_netaddr_t netdst; - - UNUSED(arg); - - /* - * ns_g_server->interfacemgr is task exclusive locked. - */ - if (ns_g_server->interfacemgr == NULL) - return (ISC_TRUE); - - if (!ns_interfacemgr_listeningon(ns_g_server->interfacemgr, dstaddr)) - return (ISC_FALSE); - - isc_netaddr_fromsockaddr(&netsrc, srcaddr); - isc_netaddr_fromsockaddr(&netdst, dstaddr); - - for (view = ISC_LIST_HEAD(ns_g_server->viewlist); - view != NULL; - view = ISC_LIST_NEXT(view, link)) { - - if (view->matchrecursiveonly) - continue; - - if (rdclass != view->rdclass) - continue; - - if (mykey != NULL) { - isc_boolean_t match; - isc_result_t result; - - result = dns_view_gettsig(view, &mykey->name, &key); - if (result != ISC_R_SUCCESS) - continue; - match = dst_key_compare(mykey->key, key->key); - dns_tsigkey_detach(&key); - if (!match) - continue; - tsig = dns_tsigkey_identity(mykey); - } - - if (allowed(&netsrc, tsig, NULL, 0, NULL, - view->matchclients) && - allowed(&netdst, tsig, NULL, 0, NULL, - view->matchdestinations)) - break; - } - return (ISC_TF(view == myview)); -} - static void compute_cookie(ns_client_t *client, isc_uint32_t when, isc_uint32_t nonce, const unsigned char *secret, isc_buffer_t *buf) { - switch (ns_g_server->cookiealg) { + switch (client->sctx->cookiealg) { #if defined(HAVE_OPENSSL_AES) || defined(HAVE_OPENSSL_EVP_AES) case ns_cookiealg_aes: { unsigned char digest[ISC_AES_BLOCK_LENGTH]; @@ -1865,7 +1797,7 @@ compute_cookie(ns_client_t *client, isc_uint32_t when, isc_uint32_t nonce, isc_aes128_crypt(secret, input, digest); for (i = 0; i < 8; i++) input[i + 8] = digest[i] ^ digest[i + 8]; - isc_aes128_crypt(ns_g_server->secret, input + 8, + isc_aes128_crypt(client->sctx->secret, input + 8, digest); break; } @@ -1973,7 +1905,7 @@ process_cookie(ns_client_t *client, isc_buffer_t *buf, size_t optlen) { client->attributes |= NS_CLIENTATTR_WANTCOOKIE; - isc_stats_increment(ns_g_server->nsstats, dns_nsstatscounter_cookiein); + ns_stats_increment(client->sctx->nsstats, ns_statscounter_cookiein); if (optlen != COOKIE_SIZE) { /* @@ -1984,11 +1916,11 @@ process_cookie(ns_client_t *client, isc_buffer_t *buf, size_t optlen) { isc_buffer_forward(buf, (unsigned int)optlen); if (optlen == 8U) - isc_stats_increment(ns_g_server->nsstats, - dns_nsstatscounter_cookienew); + ns_stats_increment(client->sctx->nsstats, + ns_statscounter_cookienew); else - isc_stats_increment(ns_g_server->nsstats, - dns_nsstatscounter_cookiebadsize); + ns_stats_increment(client->sctx->nsstats, + ns_statscounter_cookiebadsize); return; } @@ -2009,37 +1941,37 @@ process_cookie(ns_client_t *client, isc_buffer_t *buf, size_t optlen) { isc_stdtime_get(&now); if (isc_serial_gt(when, (now + 300)) || /* In the future. */ isc_serial_lt(when, (now - 3600))) { /* In the past. */ - isc_stats_increment(ns_g_server->nsstats, - dns_nsstatscounter_cookiebadtime); + ns_stats_increment(client->sctx->nsstats, + ns_statscounter_cookiebadtime); return; } isc_buffer_init(&db, dbuf, sizeof(dbuf)); - compute_cookie(client, when, nonce, ns_g_server->secret, &db); + compute_cookie(client, when, nonce, client->sctx->secret, &db); if (isc_safe_memequal(old, dbuf, COOKIE_SIZE)) { - isc_stats_increment(ns_g_server->nsstats, - dns_nsstatscounter_cookiematch); + ns_stats_increment(client->sctx->nsstats, + ns_statscounter_cookiematch); client->attributes |= NS_CLIENTATTR_HAVECOOKIE; return; } - for (altsecret = ISC_LIST_HEAD(ns_g_server->altsecrets); + for (altsecret = ISC_LIST_HEAD(client->sctx->altsecrets); altsecret != NULL; altsecret = ISC_LIST_NEXT(altsecret, link)) { isc_buffer_init(&db, dbuf, sizeof(dbuf)); compute_cookie(client, when, nonce, altsecret->secret, &db); if (isc_safe_memequal(old, dbuf, COOKIE_SIZE)) { - isc_stats_increment(ns_g_server->nsstats, - dns_nsstatscounter_cookiematch); + ns_stats_increment(client->sctx->nsstats, + ns_statscounter_cookiematch); client->attributes |= NS_CLIENTATTR_HAVECOOKIE; return; } } - isc_stats_increment(ns_g_server->nsstats, - dns_nsstatscounter_cookienomatch); + ns_stats_increment(client->sctx->nsstats, + ns_statscounter_cookienomatch); } static isc_result_t @@ -2192,14 +2124,14 @@ process_opt(ns_client_t *client, dns_rdataset_t *opt) { */ client->ednsversion = (opt->ttl & 0x00FF0000) >> 16; if (client->ednsversion > DNS_EDNS_VERSION) { - isc_stats_increment(ns_g_server->nsstats, - dns_nsstatscounter_badednsver); + ns_stats_increment(client->sctx->nsstats, + ns_statscounter_badednsver); result = ns_client_addopt(client, client->message, &client->opt); if (result == ISC_R_SUCCESS) result = DNS_R_BADVERS; ns_client_error(client, result); - goto cleanup; + return (result); } /* Check for NSID request */ @@ -2215,9 +2147,9 @@ process_opt(ns_client_t *client, dns_rdataset_t *opt) { switch (optcode) { case DNS_OPT_NSID: if (!WANTNSID(client)) - isc_stats_increment( - ns_g_server->nsstats, - dns_nsstatscounter_nsidopt); + ns_stats_increment( + client->sctx->nsstats, + ns_statscounter_nsidopt); client->attributes |= NS_CLIENTATTR_WANTNSID; isc_buffer_forward(&optbuf, optlen); break; @@ -2226,9 +2158,9 @@ process_opt(ns_client_t *client, dns_rdataset_t *opt) { break; case DNS_OPT_EXPIRE: if (!WANTEXPIRE(client)) - isc_stats_increment( - ns_g_server->nsstats, - dns_nsstatscounter_expireopt); + ns_stats_increment( + client->sctx->nsstats, + ns_statscounter_expireopt); client->attributes |= NS_CLIENTATTR_WANTEXPIRE; isc_buffer_forward(&optbuf, optlen); break; @@ -2236,39 +2168,38 @@ process_opt(ns_client_t *client, dns_rdataset_t *opt) { result = process_ecs(client, &optbuf, optlen); if (result != ISC_R_SUCCESS) { ns_client_error(client, result); - goto cleanup; + return (result); } - isc_stats_increment(ns_g_server->nsstats, - dns_nsstatscounter_ecsopt); + ns_stats_increment(client->sctx->nsstats, + ns_statscounter_ecsopt); break; case DNS_OPT_TCP_KEEPALIVE: if (!USEKEEPALIVE(client)) - isc_stats_increment( - ns_g_server->nsstats, - dns_nsstatscounter_keepaliveopt); + ns_stats_increment( + client->sctx->nsstats, + ns_statscounter_keepaliveopt); client->attributes |= NS_CLIENTATTR_USEKEEPALIVE; isc_buffer_forward(&optbuf, optlen); break; case DNS_OPT_PAD: client->attributes |= NS_CLIENTATTR_WANTPAD; - isc_stats_increment(ns_g_server->nsstats, - dns_nsstatscounter_padopt); + ns_stats_increment(client->sctx->nsstats, + ns_statscounter_padopt); isc_buffer_forward(&optbuf, optlen); break; default: - isc_stats_increment(ns_g_server->nsstats, - dns_nsstatscounter_otheropt); + ns_stats_increment(client->sctx->nsstats, + ns_statscounter_otheropt); isc_buffer_forward(&optbuf, optlen); break; } } } - isc_stats_increment(ns_g_server->nsstats, dns_nsstatscounter_edns0in); + ns_stats_increment(client->sctx->nsstats, ns_statscounter_edns0in); client->attributes |= NS_CLIENTATTR_WANTOPT; - cleanup: return (result); } @@ -2276,15 +2207,14 @@ process_opt(ns_client_t *client, dns_rdataset_t *opt) { * Handle an incoming request event from the socket (UDP case) * or tcpmsg (TCP case). */ -static void -client_request(isc_task_t *task, isc_event_t *event) { +void +ns__client_request(isc_task_t *task, isc_event_t *event) { ns_client_t *client; isc_socketevent_t *sevent; isc_result_t result; isc_result_t sigresult = ISC_R_SUCCESS; isc_buffer_t *buffer; isc_buffer_t tbuffer; - dns_view_t *view; dns_rdataset_t *opt; const dns_name_t *signame; isc_boolean_t ra; /* Recursion available. */ @@ -2294,6 +2224,7 @@ client_request(isc_task_t *task, isc_event_t *event) { unsigned int flags; isc_boolean_t notimp; size_t reqsize; + dns_ecs_t *ecs = NULL; #ifdef HAVE_DNSTAP dns_dtmsgtype_t dtmsgtype; #endif @@ -2355,8 +2286,9 @@ client_request(isc_task_t *task, isc_event_t *event) { if (TCP_CLIENT(client)) reqsize -= 2; - if (exit_check(client)) - goto cleanup; + if (exit_check(client)) { + return; + } client->state = client->newstate = NS_CLIENTSTATE_WORKING; isc_task_getcurrenttimex(task, &client->requesttime); @@ -2368,7 +2300,7 @@ client_request(isc_task_t *task, isc_event_t *event) { ns_client_next(client, result); } else { if (result != ISC_R_CANCELED) - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_CLIENT, + isc_log_write(ns_lctx, NS_LOGCATEGORY_CLIENT, NS_LOGMODULE_CLIENT, ISC_LOG_ERROR, "UDP client handler shutting " @@ -2377,7 +2309,7 @@ client_request(isc_task_t *task, isc_event_t *event) { isc_result_totext(result)); isc_task_shutdown(client->task); } - goto cleanup; + return; } isc_netaddr_fromsockaddr(&netaddr, &client->peeraddr); @@ -2389,7 +2321,7 @@ client_request(isc_task_t *task, isc_event_t *event) { NS_LOGMODULE_CLIENT, ISC_LOG_DEBUG(10), "dropped request: suspicious port"); ns_client_next(client, ISC_R_SUCCESS); - goto cleanup; + return; } #endif @@ -2403,17 +2335,18 @@ client_request(isc_task_t *task, isc_event_t *event) { * client_newconn. */ if (!TCP_CLIENT(client)) { - if (ns_g_server->blackholeacl != NULL && - dns_acl_match(&netaddr, NULL, ns_g_server->blackholeacl, - &ns_g_server->aclenv, - &match, NULL) == ISC_R_SUCCESS && + dns_aclenv_t *env = + ns_interfacemgr_getaclenv(client->interface->mgr); + if (client->sctx->blackholeacl != NULL && + dns_acl_match(&netaddr, NULL, client->sctx->blackholeacl, + env, &match, NULL) == ISC_R_SUCCESS && match > 0) { ns_client_log(client, DNS_LOGCATEGORY_SECURITY, NS_LOGMODULE_CLIENT, ISC_LOG_DEBUG(10), "blackholed UDP datagram"); ns_client_next(client, ISC_R_SUCCESS); - goto cleanup; + return; } } @@ -2426,7 +2359,7 @@ client_request(isc_task_t *task, isc_event_t *event) { NS_LOGMODULE_CLIENT, ISC_LOG_DEBUG(2), "dropping multicast request"); ns_client_next(client, DNS_R_REFUSED); - goto cleanup; + return; } result = dns_message_peekheader(buffer, &id, &flags); @@ -2436,7 +2369,7 @@ client_request(isc_task_t *task, isc_event_t *event) { * this was a request or a response. Drop it. */ ns_client_next(client, result); - goto cleanup; + return; } /* @@ -2448,11 +2381,11 @@ client_request(isc_task_t *task, isc_event_t *event) { if (TCP_CLIENT(client)) { CTRACE("unexpected response"); ns_client_next(client, DNS_R_FORMERR); - goto cleanup; + return; } else { dns_dispatch_importrecv(client->dispatch, event); ns_client_next(client, ISC_R_SUCCESS); - goto cleanup; + return; } } @@ -2460,22 +2393,22 @@ client_request(isc_task_t *task, isc_event_t *event) { * Update some statistics counters. Don't count responses. */ if (isc_sockaddr_pf(&client->peeraddr) == PF_INET) { - isc_stats_increment(ns_g_server->nsstats, - dns_nsstatscounter_requestv4); + ns_stats_increment(client->sctx->nsstats, + ns_statscounter_requestv4); } else { - isc_stats_increment(ns_g_server->nsstats, - dns_nsstatscounter_requestv6); + ns_stats_increment(client->sctx->nsstats, + ns_statscounter_requestv6); } if (TCP_CLIENT(client)) { - isc_stats_increment(ns_g_server->nsstats, - dns_nsstatscounter_requesttcp); + ns_stats_increment(client->sctx->nsstats, + ns_statscounter_requesttcp); switch (isc_sockaddr_pf(&client->peeraddr)) { case AF_INET: - isc_stats_increment(ns_g_server->tcpinstats4, + isc_stats_increment(client->sctx->tcpinstats4, ISC_MIN((int)reqsize / 16, 18)); break; case AF_INET6: - isc_stats_increment(ns_g_server->tcpinstats6, + isc_stats_increment(client->sctx->tcpinstats6, ISC_MIN((int)reqsize / 16, 18)); break; default: @@ -2485,11 +2418,11 @@ client_request(isc_task_t *task, isc_event_t *event) { } else { switch (isc_sockaddr_pf(&client->peeraddr)) { case AF_INET: - isc_stats_increment(ns_g_server->udpinstats4, + isc_stats_increment(client->sctx->udpinstats4, ISC_MIN((int)reqsize / 16, 18)); break; case AF_INET6: - isc_stats_increment(ns_g_server->udpinstats6, + isc_stats_increment(client->sctx->udpinstats6, ISC_MIN((int)reqsize / 16, 18)); break; default: @@ -2516,7 +2449,7 @@ client_request(isc_task_t *task, isc_event_t *event) { "message parsing failed: %s", isc_result_totext(result)); ns_client_error(client, result); - goto cleanup; + return; } /* @@ -2525,7 +2458,7 @@ client_request(isc_task_t *task, isc_event_t *event) { if (client->message->opcode != dns_opcode_query) client->pipelined = ISC_FALSE; if (TCP_CLIENT(client) && client->pipelined) { - result = isc_quota_reserve(&ns_g_server->tcpquota); + result = isc_quota_reserve(&client->sctx->tcpquota); if (result == ISC_R_SUCCESS) result = ns_client_replace(client); if (result != ISC_R_SUCCESS) { @@ -2537,7 +2470,7 @@ client_request(isc_task_t *task, isc_event_t *event) { } } - dns_opcodestats_increment(ns_g_server->opcodestats, + dns_opcodestats_increment(client->sctx->opcodestats, client->message->opcode); switch (client->message->opcode) { case dns_opcode_query: @@ -2560,7 +2493,7 @@ client_request(isc_task_t *task, isc_event_t *event) { /* * Deal with EDNS. */ - if (ns_g_noedns) + if ((client->sctx->options & NS_SERVER_NOEDNS) != 0) opt = NULL; else opt = dns_message_getopt(client->message); @@ -2572,13 +2505,13 @@ client_request(isc_task_t *task, isc_event_t *event) { /* * Are we dropping all EDNS queries? */ - if (ns_g_dropedns) { + if ((client->sctx->options & NS_SERVER_DROPEDNS) != 0) { ns_client_next(client, ISC_R_SUCCESS); - goto cleanup; + return; } result = process_opt(client, opt); if (result != ISC_R_SUCCESS) - goto cleanup; + return; } if (client->message->rdclass == 0) { @@ -2601,7 +2534,7 @@ client_request(isc_task_t *task, isc_event_t *event) { ns_client_dumpmessage(client, "message class could not be determined"); ns_client_error(client, notimp ? DNS_R_NOTIMP : DNS_R_FORMERR); - goto cleanup; + return; } /* @@ -2651,51 +2584,17 @@ client_request(isc_task_t *task, isc_event_t *event) { "destination: %s", isc_result_totext(result)); ns_client_next(client, ISC_R_SUCCESS); - goto cleanup; + return; } } - /* - * Find a view that matches the client's source address. - */ - for (view = ISC_LIST_HEAD(ns_g_server->viewlist); - view != NULL; - view = ISC_LIST_NEXT(view, link)) { - if (client->message->rdclass == view->rdclass || - client->message->rdclass == dns_rdataclass_any) - { - dns_name_t *tsig = NULL; - isc_netaddr_t *addr = NULL; - isc_uint8_t *scope = NULL; - - sigresult = dns_message_rechecksig(client->message, - view); - if (sigresult == ISC_R_SUCCESS) { - dns_tsigkey_t *tsigkey; - - tsigkey = client->message->tsigkey; - tsig = dns_tsigkey_identity(tsigkey); - } - - if ((client->attributes & NS_CLIENTATTR_HAVEECS) != 0) { - addr = &client->ecs.addr; - scope = &client->ecs.scope; - } - - if (allowed(&netaddr, tsig, addr, client->ecs.source, - scope, view->matchclients) && - allowed(&client->destaddr, tsig, NULL, - 0, NULL, view->matchdestinations) && - !(view->matchrecursiveonly && - (client->message->flags & DNS_MESSAGEFLAG_RD) == 0)) - { - dns_view_attach(view, &client->view); - break; - } - } + if ((client->attributes & NS_CLIENTATTR_HAVEECS) != 0) { + ecs = &client->ecs; } - - if (view == NULL) { + result = client->sctx->matchingview(&netaddr, &client->destaddr, + client->message, ecs, + &sigresult, &client->view); + if (result != ISC_R_SUCCESS) { char classname[DNS_RDATACLASS_FORMATSIZE]; /* @@ -2720,12 +2619,12 @@ client_request(isc_task_t *task, isc_event_t *event) { "no matching view in class '%s'", classname); ns_client_dumpmessage(client, "no matching view in class"); ns_client_error(client, notimp ? DNS_R_NOTIMP : DNS_R_REFUSED); - goto cleanup; + return; } ns_client_log(client, NS_LOGCATEGORY_CLIENT, NS_LOGMODULE_CLIENT, ISC_LOG_DEBUG(5), - "using view '%s'", view->name); + "using view '%s'", client->view->name); /* * Check for a signature. We log bad signatures regardless of @@ -2739,11 +2638,11 @@ client_request(isc_task_t *task, isc_event_t *event) { if (result != ISC_R_NOTFOUND) { signame = NULL; if (dns_message_gettsig(client->message, &signame) != NULL) { - isc_stats_increment(ns_g_server->nsstats, - dns_nsstatscounter_tsigin); + ns_stats_increment(client->sctx->nsstats, + ns_statscounter_tsigin); } else { - isc_stats_increment(ns_g_server->nsstats, - dns_nsstatscounter_sig0in); + ns_stats_increment(client->sctx->nsstats, + ns_statscounter_sig0in); } } @@ -2769,8 +2668,8 @@ client_request(isc_task_t *task, isc_event_t *event) { isc_result_t tresult; /* There is a signature, but it is bad. */ - isc_stats_increment(ns_g_server->nsstats, - dns_nsstatscounter_invalidsig); + ns_stats_increment(client->sctx->nsstats, + ns_statscounter_invalidsig); signame = NULL; if (dns_message_gettsig(client->message, &signame) != NULL) { char namebuf[DNS_NAME_FORMATSIZE]; @@ -2820,7 +2719,7 @@ client_request(isc_task_t *task, isc_event_t *event) { if (!(client->message->tsigstatus == dns_tsigerror_badkey && client->message->opcode == dns_opcode_update)) { ns_client_error(client, sigresult); - goto cleanup; + return; } } @@ -2860,8 +2759,9 @@ client_request(isc_task_t *task, isc_event_t *event) { */ if (client->udpsize > 512) { dns_peer_t *peer = NULL; - isc_uint16_t udpsize = view->maxudp; - (void) dns_peerlist_peerbyaddr(view->peers, &netaddr, &peer); + isc_uint16_t udpsize = client->view->maxudp; + (void) dns_peerlist_peerbyaddr(client->view->peers, + &netaddr, &peer); if (peer != NULL) dns_peer_getmaxudp(peer, &udpsize); if (client->udpsize > udpsize) @@ -2880,7 +2780,7 @@ client_request(isc_task_t *task, isc_event_t *event) { else dtmsgtype = DNS_DTTYPE_AQ; - dns_dt_send(view, dtmsgtype, &client->peeraddr, + dns_dt_send(client->view, dtmsgtype, &client->peeraddr, &client->interface->addr, TCP_CLIENT(client), NULL, &client->requesttime, NULL, buffer); #endif /* HAVE_DNSTAP */ @@ -2905,9 +2805,6 @@ client_request(isc_task_t *task, isc_event_t *event) { CTRACE("unknown opcode"); ns_client_error(client, DNS_R_NOTIMP); } - - cleanup: - return; } static void @@ -2952,7 +2849,7 @@ get_clientmctx(ns_clientmgr_t *manager, isc_mem_t **mctxp) { /* * Caller must be holding the manager lock. */ - if (ns_g_clienttest) { + if ((manager->sctx->options & NS_SERVER_CLIENTTEST) != 0) { result = isc_mem_create(0, 0, mctxp); if (result == ISC_R_SUCCESS) isc_mem_setname(*mctxp, "client", NULL); @@ -3010,6 +2907,9 @@ client_create(ns_clientmgr_t *manager, ns_client_t **clientp) { } client->mctx = mctx; + client->sctx = NULL; + ns_server_attach(manager->sctx, &client->sctx); + client->task = NULL; result = isc_task_create(manager->taskmgr, 0, &client->task); if (result != ISC_R_SUCCESS) @@ -3050,7 +2950,7 @@ client_create(ns_clientmgr_t *manager, ns_client_t **clientp) { client->recvevent = isc_socket_socketevent(client->mctx, client, ISC_SOCKEVENT_RECVDONE, - client_request, client); + ns__client_request, client); if (client->recvevent == NULL) { result = ISC_R_NOMEMORY; goto cleanup_recvbuf; @@ -3086,6 +2986,7 @@ client_create(ns_clientmgr_t *manager, ns_client_t **clientp) { client->signer = NULL; dns_name_init(&client->signername, NULL); client->mortal = ISC_FALSE; + client->sendcb = NULL; client->pipelined = ISC_FALSE; client->tcpquota = NULL; client->recursionquota = NULL; @@ -3095,7 +2996,8 @@ client_create(ns_clientmgr_t *manager, ns_client_t **clientp) { #ifdef ALLOW_FILTER_AAAA client->filter_aaaa = dns_aaaa_ok; #endif - client->needshutdown = ns_g_clienttest; + client->needshutdown = ISC_TF((client->sctx->options & + NS_SERVER_CLIENTTEST) != 0); ISC_EVENT_INIT(&client->ctlevent, sizeof(client->ctlevent), 0, NULL, NS_EVENT_CLIENTCONTROL, client_start, client, client, @@ -3154,6 +3056,8 @@ client_create(ns_clientmgr_t *manager, ns_client_t **clientp) { isc_task_detach(&client->task); cleanup_client: + if (client->sctx != NULL) + ns_server_detach(&client->sctx); isc_mem_putanddetach(&client->mctx, client, sizeof(*client)); return (result); @@ -3166,7 +3070,7 @@ client_read(ns_client_t *client, isc_boolean_t newconn) { CTRACE("read"); result = dns_tcpmsg_readmessage(&client->tcpmsg, client->task, - client_request, client); + ns__client_request, client); if (result != ISC_R_SUCCESS) goto fail; @@ -3190,6 +3094,7 @@ static void client_newconn(isc_task_t *task, isc_event_t *event) { ns_client_t *client = event->ev_arg; isc_socket_newconnev_t *nevent = (isc_socket_newconnev_t *)event; + dns_aclenv_t *env = ns_interfacemgr_getaclenv(client->interface->mgr); isc_result_t result; REQUIRE(event->ev_type == ISC_SOCKEVENT_NEWCONN); @@ -3250,11 +3155,10 @@ client_newconn(isc_task_t *task, isc_event_t *event) { isc_netaddr_fromsockaddr(&netaddr, &client->peeraddr); - if (ns_g_server->blackholeacl != NULL && + if (client->sctx->blackholeacl != NULL && dns_acl_match(&netaddr, NULL, - ns_g_server->blackholeacl, - &ns_g_server->aclenv, - &match, NULL) == ISC_R_SUCCESS && + client->sctx->blackholeacl, + env, &match, NULL) == ISC_R_SUCCESS && match > 0) { ns_client_log(client, DNS_LOGCATEGORY_SECURITY, @@ -3277,7 +3181,7 @@ client_newconn(isc_task_t *task, isc_event_t *event) { * deny service to legitimate TCP clients. */ client->pipelined = ISC_FALSE; - result = isc_quota_attach(&ns_g_server->tcpquota, + result = isc_quota_attach(&client->sctx->tcpquota, &client->tcpquota); if (result == ISC_R_SUCCESS) result = ns_client_replace(client); @@ -3286,9 +3190,10 @@ client_newconn(isc_task_t *task, isc_event_t *event) { NS_LOGMODULE_CLIENT, ISC_LOG_WARNING, "no more TCP clients(accept): %s", isc_result_totext(result)); - } else if (ns_g_server->keepresporder == NULL || - !allowed(&netaddr, NULL, NULL, 0, NULL, - ns_g_server->keepresporder)) { + } else if (client->sctx->keepresporder == NULL || + !dns_acl_allowed(&netaddr, NULL, NULL, 0, NULL, + client->sctx->keepresporder, env)) + { client->pipelined = ISC_TRUE; } @@ -3437,15 +3342,22 @@ clientmgr_destroy(ns_clientmgr_t *manager) { #endif ISC_QUEUE_DESTROY(manager->inactive); + DESTROYLOCK(&manager->lock); DESTROYLOCK(&manager->listlock); DESTROYLOCK(&manager->reclock); + + if (manager->excl != NULL) + isc_task_detach(&manager->excl); + + ns_server_detach(&manager->sctx); + manager->magic = 0; isc_mem_put(manager->mctx, manager, sizeof(*manager)); } isc_result_t -ns_clientmgr_create(isc_mem_t *mctx, isc_taskmgr_t *taskmgr, +ns_clientmgr_create(isc_mem_t *mctx, ns_server_t *sctx, isc_taskmgr_t *taskmgr, isc_timermgr_t *timermgr, ns_clientmgr_t **managerp) { ns_clientmgr_t *manager; @@ -3470,10 +3382,20 @@ ns_clientmgr_create(isc_mem_t *mctx, isc_taskmgr_t *taskmgr, if (result != ISC_R_SUCCESS) goto cleanup_listlock; + manager->excl = NULL; + result = isc_taskmgr_excltask(taskmgr, &manager->excl); + if (result != ISC_R_SUCCESS) { + goto cleanup_reclock; + } + manager->mctx = mctx; manager->taskmgr = taskmgr; manager->timermgr = timermgr; manager->exiting = ISC_FALSE; + + manager->sctx = NULL; + ns_server_attach(sctx, &manager->sctx); + ISC_LIST_INIT(manager->clients); ISC_LIST_INIT(manager->recursing); ISC_QUEUE_INIT(manager->inactive, ilink); @@ -3490,6 +3412,9 @@ ns_clientmgr_create(isc_mem_t *mctx, isc_taskmgr_t *taskmgr, return (ISC_R_SUCCESS); + cleanup_reclock: + (void) isc_mutex_destroy(&manager->reclock); + cleanup_listlock: (void) isc_mutex_destroy(&manager->listlock); @@ -3520,7 +3445,7 @@ ns_clientmgr_destroy(ns_clientmgr_t **managerp) { * at this point. Only if we succeed at obtaining an exclusive * lock now will we need to relinquish it later. */ - result = isc_task_beginexclusive(ns_g_server->task); + result = isc_task_beginexclusive(manager->excl); if (result == ISC_R_SUCCESS) unlock = ISC_TRUE; @@ -3535,7 +3460,7 @@ ns_clientmgr_destroy(ns_clientmgr_t **managerp) { need_destroy = ISC_TRUE; if (unlock) - isc_task_endexclusive(ns_g_server->task); + isc_task_endexclusive(manager->excl); if (need_destroy) clientmgr_destroy(manager); @@ -3562,7 +3487,7 @@ get_client(ns_clientmgr_t *manager, ns_interface_t *ifp, * if that fails, make a new one. */ client = NULL; - if (!ns_g_clienttest) + if ((manager->sctx->options & NS_SERVER_CLIENTTEST) != 0) ISC_QUEUE_POP(manager->inactive, ilink, client); if (client != NULL) @@ -3584,6 +3509,7 @@ get_client(ns_clientmgr_t *manager, ns_interface_t *ifp, client->manager = manager; ns_interface_attach(ifp, &client->interface); client->state = NS_CLIENTSTATE_READY; + client->sctx = manager->sctx; INSIST(client->recursionquota == NULL); client->dscp = ifp->dscp; @@ -3609,8 +3535,7 @@ get_client(ns_clientmgr_t *manager, ns_interface_t *ifp, } static isc_result_t -get_worker(ns_clientmgr_t *manager, ns_interface_t *ifp, isc_socket_t *sock) -{ +get_worker(ns_clientmgr_t *manager, ns_interface_t *ifp, isc_socket_t *sock) { isc_result_t result = ISC_R_SUCCESS; isc_event_t *ev; ns_client_t *client; @@ -3626,7 +3551,7 @@ get_worker(ns_clientmgr_t *manager, ns_interface_t *ifp, isc_socket_t *sock) * if that fails, make a new one. */ client = NULL; - if (!ns_g_clienttest) + if ((manager->sctx->options & NS_SERVER_CLIENTTEST) != 0) ISC_QUEUE_POP(manager->inactive, ilink, client); if (client != NULL) @@ -3649,13 +3574,15 @@ get_worker(ns_clientmgr_t *manager, ns_interface_t *ifp, isc_socket_t *sock) ns_interface_attach(ifp, &client->interface); client->newstate = client->state = NS_CLIENTSTATE_WORKING; INSIST(client->recursionquota == NULL); - client->tcpquota = &ns_g_server->tcpquota; + client->sctx = manager->sctx; + client->tcpquota = &client->sctx->tcpquota; client->dscp = ifp->dscp; client->attributes |= NS_CLIENTATTR_TCP; client->pipelined = ISC_TRUE; client->mortal = ISC_TRUE; + client->sendcb = NULL; isc_socket_attach(ifp->tcpsocket, &client->tcplistener); isc_socket_attach(sock, &client->tcpsocket); @@ -3675,6 +3602,55 @@ get_worker(ns_clientmgr_t *manager, ns_interface_t *ifp, isc_socket_t *sock) return (ISC_R_SUCCESS); } +isc_result_t +ns__clientmgr_getclient(ns_clientmgr_t *manager, ns_interface_t *ifp, + isc_boolean_t tcp, ns_client_t **clientp) +{ + isc_result_t result = ISC_R_SUCCESS; + ns_client_t *client; + MTRACE("getclient"); + + REQUIRE(VALID_MANAGER(manager)); + REQUIRE(clientp != NULL && *clientp == NULL); + + if (manager->exiting) + return (ISC_R_SHUTTINGDOWN); + + client = NULL; + ISC_QUEUE_POP(manager->inactive, ilink, client); + if (client != NULL) + MTRACE("getclient (recycle)"); + else { + MTRACE("getclient (create)"); + + LOCK(&manager->lock); + result = client_create(manager, &client); + UNLOCK(&manager->lock); + if (result != ISC_R_SUCCESS) + return (result); + + LOCK(&manager->listlock); + ISC_LIST_APPEND(manager->clients, client, link); + UNLOCK(&manager->listlock); + } + + client->manager = manager; + ns_interface_attach(ifp, &client->interface); + client->state = NS_CLIENTSTATE_READY; + INSIST(client->recursionquota == NULL); + + client->dscp = ifp->dscp; + client->references++; + + if (tcp) { + client->attributes |= NS_CLIENTATTR_TCP; + } + + *clientp = client; + + return (ISC_R_SUCCESS); +} + isc_result_t ns_clientmgr_createclients(ns_clientmgr_t *manager, unsigned int n, ns_interface_t *ifp, isc_boolean_t tcp) @@ -3706,6 +3682,7 @@ ns_client_checkaclsilent(ns_client_t *client, isc_netaddr_t *netaddr, dns_acl_t *acl, isc_boolean_t default_allow) { isc_result_t result; + dns_aclenv_t *env = ns_interfacemgr_getaclenv(client->interface->mgr); isc_netaddr_t tmpnetaddr; isc_netaddr_t *ecs_addr = NULL; isc_uint8_t ecs_addrlen = 0; @@ -3730,7 +3707,7 @@ ns_client_checkaclsilent(ns_client_t *client, isc_netaddr_t *netaddr, result = dns_acl_match2(netaddr, client->signer, ecs_addr, ecs_addrlen, NULL, acl, - &ns_g_server->aclenv, &match, NULL); + env, &match, NULL); if (result != ISC_R_SUCCESS) goto deny; /* Internal error, already logged. */ @@ -3822,7 +3799,7 @@ ns_client_logv(ns_client_t *client, isc_logcategory_t *category, snprintf(peerbuf, sizeof(peerbuf), "(no-peer)"); } - isc_log_write(ns_g_lctx, category, module, level, + isc_log_write(ns_lctx, category, module, level, "client @%p %s%s%s%s%s%s%s%s: %s", client, peerbuf, sep1, signer, sep2, qname, sep3, sep4, viewname, msgbuf); @@ -3834,7 +3811,7 @@ ns_client_log(ns_client_t *client, isc_logcategory_t *category, { va_list ap; - if (! isc_log_wouldlog(ns_g_lctx, level)) + if (! isc_log_wouldlog(ns_lctx, level)) return; va_start(ap, fmt); @@ -3864,7 +3841,7 @@ ns_client_dumpmessage(ns_client_t *client, const char *reason) { int len = 1024; isc_result_t result; - if (!isc_log_wouldlog(ns_g_lctx, ISC_LOG_DEBUG(1))) + if (!isc_log_wouldlog(ns_lctx, ISC_LOG_DEBUG(1))) return; /* @@ -3884,7 +3861,7 @@ ns_client_dumpmessage(ns_client_t *client, const char *reason) { isc_mem_put(client->mctx, buf, len); len += 1024; } else if (result == ISC_R_SUCCESS) - ns_client_log(client, NS_LOGCATEGORY_UNMATCHED, + ns_client_log(client, NS_LOGCATEGORY_CLIENT, NS_LOGMODULE_CLIENT, ISC_LOG_DEBUG(1), "%s\n%.*s", reason, (int)isc_buffer_usedlength(&buffer), diff --git a/lib/lwres/unix/include/Makefile.in b/lib/ns/include/Makefile.in similarity index 64% rename from lib/lwres/unix/include/Makefile.in rename to lib/ns/include/Makefile.in index 78b4c0972e..27d3b2f719 100644 --- a/lib/lwres/unix/include/Makefile.in +++ b/lib/ns/include/Makefile.in @@ -1,16 +1,14 @@ -# Copyright (C) 2001, 2004, 2007, 2012, 2016 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2017 Internet Systems Consortium, Inc. ("ISC") # # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -# $Id: Makefile.in,v 1.4 2007/06/19 23:47:23 tbox Exp $ - srcdir = @srcdir@ VPATH = @srcdir@ top_srcdir = @top_srcdir@ -SUBDIRS = lwres +SUBDIRS = nserv TARGETS = @BIND9_MAKE_RULES@ diff --git a/lib/lwres/unix/include/lwres/Makefile.in b/lib/ns/include/ns/Makefile.in similarity index 50% rename from lib/lwres/unix/include/lwres/Makefile.in rename to lib/ns/include/ns/Makefile.in index 7e66e69c98..f20e26b36c 100644 --- a/lib/lwres/unix/include/lwres/Makefile.in +++ b/lib/ns/include/ns/Makefile.in @@ -1,30 +1,32 @@ -# Copyright (C) 2001, 2004, 2007, 2012, 2016 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2017 Internet Systems Consortium, Inc. ("ISC") # # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -# $Id: Makefile.in,v 1.4 2007/06/19 23:47:23 tbox Exp $ - srcdir = @srcdir@ VPATH = @srcdir@ top_srcdir = @top_srcdir@ -HEADERS = net.h +VERSION=@BIND9_VERSION@ + +HEADERS = client.h interfacemgr.h lib.h listenlist.h log.h \ + notify.h query.h server.h sortlist.h stats.h \ + types.h update.h version.h xfrout.h SUBDIRS = TARGETS = @BIND9_MAKE_RULES@ installdirs: - $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${includedir}/lwres + $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${includedir}/ns install:: installdirs for i in ${HEADERS}; do \ - ${INSTALL_DATA} $(srcdir)/$$i ${DESTDIR}${includedir}/lwres ; \ + ${INSTALL_DATA} ${srcdir}/$$i ${DESTDIR}${includedir}/ns ; \ done uninstall:: for i in ${HEADERS}; do \ - rm -f ${DESTDIR}${includedir}/lwres/$$i ; \ + rm -f ${DESTDIR}${includedir}/ns/$$i ; \ done diff --git a/bin/named/include/named/client.h b/lib/ns/include/ns/client.h similarity index 81% rename from bin/named/include/named/client.h rename to lib/ns/include/ns/client.h index 1b0311930c..4b9ccf424d 100644 --- a/bin/named/include/named/client.h +++ b/lib/ns/include/ns/client.h @@ -1,15 +1,13 @@ /* - * Copyright (C) 1999-2009, 2011-2017 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2017 Internet Systems Consortium, Inc. ("ISC") * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -/* $Id: client.h,v 1.96 2012/01/31 23:47:31 tbox Exp $ */ - -#ifndef NAMED_CLIENT_H -#define NAMED_CLIENT_H 1 +#ifndef NS_CLIENT_H +#define NS_CLIENT_H 1 /***** ***** Module Info @@ -58,6 +56,7 @@ #include #include #include +#include #include #include @@ -68,8 +67,8 @@ #include #include -#include -#include +#include +#include /*** *** Types @@ -79,6 +78,7 @@ struct ns_client { unsigned int magic; isc_mem_t * mctx; + ns_server_t * sctx; ns_clientmgr_t * manager; int state; int newstate; @@ -156,6 +156,9 @@ struct ns_client { dns_messageid_t id; } formerrcache; + /*% Callback function to send a response when unit testing */ + void (*sendcb)(isc_buffer_t *buf); + ISC_LINK(ns_client_t) link; ISC_LINK(ns_client_t) rlink; ISC_QLINK(ns_client_t) ilink; @@ -169,27 +172,27 @@ typedef ISC_LIST(ns_client_t) client_list_t; #define NS_CLIENT_MAGIC ISC_MAGIC('N','S','C','c') #define NS_CLIENT_VALID(c) ISC_MAGIC_VALID(c, NS_CLIENT_MAGIC) -#define NS_CLIENTATTR_TCP 0x0001 -#define NS_CLIENTATTR_RA 0x0002 /*%< Client gets recursive service */ -#define NS_CLIENTATTR_PKTINFO 0x0004 /*%< pktinfo is valid */ -#define NS_CLIENTATTR_MULTICAST 0x0008 /*%< recv'd from multicast */ -#define NS_CLIENTATTR_WANTDNSSEC 0x0010 /*%< include dnssec records */ -#define NS_CLIENTATTR_WANTNSID 0x0020 /*%< include nameserver ID */ +#define NS_CLIENTATTR_TCP 0x00001 +#define NS_CLIENTATTR_RA 0x00002 /*%< Client gets recursive service */ +#define NS_CLIENTATTR_PKTINFO 0x00004 /*%< pktinfo is valid */ +#define NS_CLIENTATTR_MULTICAST 0x00008 /*%< recv'd from multicast */ +#define NS_CLIENTATTR_WANTDNSSEC 0x00010 /*%< include dnssec records */ +#define NS_CLIENTATTR_WANTNSID 0x00020 /*%< include nameserver ID */ #ifdef ALLOW_FILTER_AAAA -#define NS_CLIENTATTR_FILTER_AAAA 0x0040 /*%< suppress AAAAs */ -#define NS_CLIENTATTR_FILTER_AAAA_RC 0x0080 /*%< recursing for A against AAAA */ +#define NS_CLIENTATTR_FILTER_AAAA 0x00040 /*%< suppress AAAAs */ +#define NS_CLIENTATTR_FILTER_AAAA_RC 0x00080 /*%< recursing for A against AAAA */ #endif -#define NS_CLIENTATTR_WANTAD 0x0100 /*%< want AD in response if possible */ -#define NS_CLIENTATTR_WANTCOOKIE 0x0200 /*%< return a COOKIE */ -#define NS_CLIENTATTR_HAVECOOKIE 0x0400 /*%< has a valid COOKIE */ -#define NS_CLIENTATTR_WANTEXPIRE 0x0800 /*%< return seconds to expire */ -#define NS_CLIENTATTR_HAVEEXPIRE 0x1000 /*%< return seconds to expire */ -#define NS_CLIENTATTR_WANTOPT 0x2000 /*%< add opt to reply */ -#define NS_CLIENTATTR_HAVEECS 0x4000 /*%< received an ECS option */ -#define NS_CLIENTATTR_WANTPAD 0x8000 /*%< pad reply */ -#define NS_CLIENTATTR_USEKEEPALIVE 0x10000 /*%< use TCP keepalive */ +#define NS_CLIENTATTR_WANTAD 0x00100 /*%< want AD in response if possible */ +#define NS_CLIENTATTR_WANTCOOKIE 0x00200 /*%< return a COOKIE */ +#define NS_CLIENTATTR_HAVECOOKIE 0x00400 /*%< has a valid COOKIE */ +#define NS_CLIENTATTR_WANTEXPIRE 0x00800 /*%< return seconds to expire */ +#define NS_CLIENTATTR_HAVEEXPIRE 0x01000 /*%< return seconds to expire */ +#define NS_CLIENTATTR_WANTOPT 0x02000 /*%< add opt to reply */ +#define NS_CLIENTATTR_HAVEECS 0x04000 /*%< received an ECS option */ +#define NS_CLIENTATTR_WANTPAD 0x08000 /*%< pad reply */ +#define NS_CLIENTATTR_USEKEEPALIVE 0x10000 /*%< use TCP keepalive */ -#define NS_CLIENTATTR_NOSETFC 0x20000 /*%< don't set servfail cache */ +#define NS_CLIENTATTR_NOSETFC 0x20000 /*%< don't set servfail cache */ /* * Flag to use with the SERVFAIL cache to indicate @@ -197,22 +200,20 @@ typedef ISC_LIST(ns_client_t) client_list_t; */ #define NS_FAILCACHE_CD 0x01 - - -extern unsigned int ns_client_requests; +LIBNS_EXTERNAL_DATA extern unsigned int ns_client_requests; /*** *** Functions ***/ -/*% +/* * Note! These ns_client_ routines MUST be called ONLY from the client's * task in order to ensure synchronization. */ void ns_client_send(ns_client_t *client); -/*% +/*%< * Finish processing the current client request and * send client->message as a response. * \brief @@ -222,14 +223,14 @@ ns_client_send(ns_client_t *client); void ns_client_sendraw(ns_client_t *client, dns_message_t *msg); -/*% +/*%< * Finish processing the current client request and * send msg as a response using client->message->id for the id. */ void ns_client_error(ns_client_t *client, isc_result_t result); -/*% +/*%< * Finish processing the current client request and return * an error response to the client. The error response * will have an RCODE determined by 'result'. @@ -237,32 +238,32 @@ ns_client_error(ns_client_t *client, isc_result_t result); void ns_client_next(ns_client_t *client, isc_result_t result); -/*% +/*%< * Finish processing the current client request, * return no response to the client. */ isc_boolean_t ns_client_shuttingdown(ns_client_t *client); -/*% +/*%< * Return ISC_TRUE iff the client is currently shutting down. */ void ns_client_attach(ns_client_t *source, ns_client_t **target); -/*% +/*%< * Attach '*targetp' to 'source'. */ void ns_client_detach(ns_client_t **clientp); -/*% +/*%< * Detach '*clientp' from its client. */ isc_result_t ns_client_replace(ns_client_t *client); -/*% +/*%< * Try to replace the current client with a new one, so that the * current one can go off and do some lengthy work without * leaving the dispatch/socket without service. @@ -270,20 +271,20 @@ ns_client_replace(ns_client_t *client); void ns_client_settimeout(ns_client_t *client, unsigned int seconds); -/*% +/*%< * Set a timer in the client to go off in the specified amount of time. */ isc_result_t -ns_clientmgr_create(isc_mem_t *mctx, isc_taskmgr_t *taskmgr, +ns_clientmgr_create(isc_mem_t *mctx, ns_server_t *sctx, isc_taskmgr_t *taskmgr, isc_timermgr_t *timermgr, ns_clientmgr_t **managerp); -/*% +/*%< * Create a client manager. */ void ns_clientmgr_destroy(ns_clientmgr_t **managerp); -/*% +/*%< * Destroy a client manager and all ns_client_t objects * managed by it. */ @@ -291,7 +292,7 @@ ns_clientmgr_destroy(ns_clientmgr_t **managerp); isc_result_t ns_clientmgr_createclients(ns_clientmgr_t *manager, unsigned int n, ns_interface_t *ifp, isc_boolean_t tcp); -/*% +/*%< * Create up to 'n' clients listening on interface 'ifp'. * If 'tcp' is ISC_TRUE, the clients will listen for TCP connections, * otherwise for UDP requests. @@ -299,7 +300,7 @@ ns_clientmgr_createclients(ns_clientmgr_t *manager, unsigned int n, isc_sockaddr_t * ns_client_getsockaddr(ns_client_t *client); -/*% +/*%< * Get the socket address of the client whose request is * currently being processed. */ @@ -308,7 +309,7 @@ isc_result_t ns_client_checkaclsilent(ns_client_t *client, isc_netaddr_t *netaddr, dns_acl_t *acl, isc_boolean_t default_allow); -/*% +/*%< * Convenience function for client request ACL checking. * * Check the current client request against 'acl'. If 'acl' @@ -340,7 +341,7 @@ ns_client_checkacl(ns_client_t *client, const char *opname, dns_acl_t *acl, isc_boolean_t default_allow, int log_level); -/*% +/*%< * Like ns_client_checkaclsilent, except the outcome of the check is * logged at log level 'log_level' if denied, and at debug 3 if approved. * Log messages will refer to the request as an 'opname' request. @@ -371,36 +372,28 @@ ns_client_aclmsg(const char *msg, const dns_name_t *name, dns_rdatatype_t type, void ns_client_recursing(ns_client_t *client); -/*% +/*%< * Add client to end of th recursing list. */ void ns_client_killoldestquery(ns_client_t *client); -/*% +/*%< * Kill the oldest recursive query (recursing list head). */ void ns_client_dumprecursing(FILE *f, ns_clientmgr_t *manager); -/*% +/*%< * Dump the outstanding recursive queries to 'f'. */ void ns_client_qnamereplace(ns_client_t *client, dns_name_t *name); -/*% +/*%< * Replace the qname. */ -isc_boolean_t -ns_client_isself(dns_view_t *myview, dns_tsigkey_t *mykey, - const isc_sockaddr_t *srcaddr, const isc_sockaddr_t *destaddr, - dns_rdataclass_t rdclass, void *arg); -/*% - * Isself callback. - */ - isc_result_t ns_client_sourceip(dns_clientinfo_t *ci, isc_sockaddr_t **addrp); @@ -408,4 +401,18 @@ isc_result_t ns_client_addopt(ns_client_t *client, dns_message_t *message, dns_rdataset_t **opt); -#endif /* NAMED_CLIENT_H */ +isc_result_t +ns__clientmgr_getclient(ns_clientmgr_t *manager, ns_interface_t *ifp, + isc_boolean_t tcp, ns_client_t **clientp); +/* + * Get a client object from the inactive queue, or create one, as needed. + * (Not intended for use outside this module and associated tests.) + */ + +void +ns__client_request(isc_task_t *task, isc_event_t *event); +/* + * Handle client requests. + * (Not intended for use outside this module and associated tests.) + */ +#endif /* NS_CLIENT_H */ diff --git a/bin/named/include/named/interfacemgr.h b/lib/ns/include/ns/interfacemgr.h similarity index 83% rename from bin/named/include/named/interfacemgr.h rename to lib/ns/include/ns/interfacemgr.h index 963fcf2005..7ff50f9e6e 100644 --- a/bin/named/include/named/interfacemgr.h +++ b/lib/ns/include/ns/interfacemgr.h @@ -1,15 +1,13 @@ /* - * Copyright (C) 1999-2002, 2004, 2005, 2007, 2011, 2013, 2014, 2016 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2017 Internet Systems Consortium, Inc. ("ISC") * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -/* $Id: interfacemgr.h,v 1.35 2011/07/28 23:47:58 tbox Exp $ */ - -#ifndef NAMED_INTERFACEMGR_H -#define NAMED_INTERFACEMGR_H 1 +#ifndef NS_INTERFACEMGR_H +#define NS_INTERFACEMGR_H 1 /***** ***** Module Info @@ -43,10 +41,11 @@ #include #include +#include #include -#include -#include +#include +#include /*** *** Types @@ -85,11 +84,17 @@ struct ns_interface { ***/ isc_result_t -ns_interfacemgr_create(isc_mem_t *mctx, isc_taskmgr_t *taskmgr, +ns_interfacemgr_create(isc_mem_t *mctx, + ns_server_t *sctx, + isc_taskmgr_t *taskmgr, + isc_timermgr_t *timermgr, isc_socketmgr_t *socketmgr, dns_dispatchmgr_t *dispatchmgr, - isc_task_t *task, ns_interfacemgr_t **mgrp); -/*% + isc_task_t *task, + unsigned int udpdisp, + dns_geoip_databases_t *geoip, + ns_interfacemgr_t **mgrp); +/*%< * Create a new interface manager. * * Initially, the new manager will not listen on any interfaces. @@ -106,16 +111,22 @@ ns_interfacemgr_detach(ns_interfacemgr_t **targetp); void ns_interfacemgr_shutdown(ns_interfacemgr_t *mgr); +void +ns_interfacemgr_setbacklog(ns_interfacemgr_t *mgr, int backlog); +/*%< + * Set the size of the listen() backlog queue. + */ + isc_boolean_t ns_interfacemgr_islistening(ns_interfacemgr_t *mgr); -/*% +/*%< * Return if the manager is listening on any interface. It can be called * after a scan or adjust. */ isc_result_t ns_interfacemgr_scan(ns_interfacemgr_t *mgr, isc_boolean_t verbose); -/*% +/*%< * Scan the operatings system's list of network interfaces * and create listeners when new interfaces are discovered. * Shut down the sockets for interfaces that go away. @@ -128,7 +139,7 @@ ns_interfacemgr_scan(ns_interfacemgr_t *mgr, isc_boolean_t verbose); isc_result_t ns_interfacemgr_adjust(ns_interfacemgr_t *mgr, ns_listenlist_t *list, isc_boolean_t verbose); -/*% +/*%< * Similar to ns_interfacemgr_scan(), but this function also tries to see the * need for an explicit listen-on when a list element in 'list' is going to * override an already-listening a wildcard interface. @@ -141,14 +152,14 @@ ns_interfacemgr_adjust(ns_interfacemgr_t *mgr, ns_listenlist_t *list, void ns_interfacemgr_setlistenon4(ns_interfacemgr_t *mgr, ns_listenlist_t *value); -/*% +/*%< * Set the IPv4 "listen-on" list of 'mgr' to 'value'. * The previous IPv4 listen-on list is freed. */ void ns_interfacemgr_setlistenon6(ns_interfacemgr_t *mgr, ns_listenlist_t *value); -/*% +/*%< * Set the IPv6 "listen-on" list of 'mgr' to 'value'. * The previous IPv6 listen-on list is freed. */ @@ -164,7 +175,7 @@ ns_interface_detach(ns_interface_t **targetp); void ns_interface_shutdown(ns_interface_t *ifp); -/*% +/*%< * Stop listening for queries on interface 'ifp'. * May safely be called multiple times. */ @@ -175,4 +186,12 @@ ns_interfacemgr_dumprecursing(FILE *f, ns_interfacemgr_t *mgr); isc_boolean_t ns_interfacemgr_listeningon(ns_interfacemgr_t *mgr, const isc_sockaddr_t *addr); -#endif /* NAMED_INTERFACEMGR_H */ +ns_interface_t * +ns__interfacemgr_getif(ns_interfacemgr_t *mgr); +ns_interface_t * +ns__interfacemgr_nextif(ns_interface_t *ifp); +/* + * Functions to allow external callers to walk the interfaces list. + * (Not intended for use outside this module and associated tests.) + */ +#endif /* NS_INTERFACEMGR_H */ diff --git a/lib/ns/include/ns/lib.h b/lib/ns/include/ns/lib.h new file mode 100644 index 0000000000..3388267c30 --- /dev/null +++ b/lib/ns/include/ns/lib.h @@ -0,0 +1,36 @@ +/* + * Copyright (C) 2017 Internet Systems Consortium, Inc. ("ISC") + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#ifndef NS_LIB_H +#define NS_LIB_H 1 + +/*! \file ns/lib.h */ + +#include +#include + +ISC_LANG_BEGINDECLS + +LIBNS_EXTERNAL_DATA extern unsigned int ns_pps; +LIBNS_EXTERNAL_DATA extern isc_msgcat_t *ns_msgcat; + +isc_result_t +ns_lib_init(void); +/*%< + * A set of initialization procedures used in the NS library. + */ + +void +ns_lib_shutdown(void); +/*%< + * Free temporary resources allocated in ns_lib_init(). + */ + +ISC_LANG_ENDDECLS + +#endif /* NS_LIB_H */ diff --git a/bin/named/include/named/listenlist.h b/lib/ns/include/ns/listenlist.h similarity index 86% rename from bin/named/include/named/listenlist.h rename to lib/ns/include/ns/listenlist.h index 6debb8a735..d16a2fd1d2 100644 --- a/bin/named/include/named/listenlist.h +++ b/lib/ns/include/ns/listenlist.h @@ -1,15 +1,13 @@ /* - * Copyright (C) 2000, 2001, 2004, 2005, 2007, 2013, 2016 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2017 Internet Systems Consortium, Inc. ("ISC") * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -/* $Id: listenlist.h,v 1.15 2007/06/19 23:46:59 tbox Exp $ */ - -#ifndef NAMED_LISTENLIST_H -#define NAMED_LISTENLIST_H 1 +#ifndef NS_LISTENLIST_H +#define NS_LISTENLIST_H 1 /***** ***** Module Info @@ -55,43 +53,43 @@ struct ns_listenlist { isc_result_t ns_listenelt_create(isc_mem_t *mctx, in_port_t port, isc_dscp_t dscp, dns_acl_t *acl, ns_listenelt_t **target); -/*% +/*%< * Create a listen-on list element. */ void ns_listenelt_destroy(ns_listenelt_t *elt); -/*% +/*%< * Destroy a listen-on list element. */ isc_result_t ns_listenlist_create(isc_mem_t *mctx, ns_listenlist_t **target); -/*% +/*%< * Create a new, empty listen-on list. */ void ns_listenlist_attach(ns_listenlist_t *source, ns_listenlist_t **target); -/*% +/*%< * Attach '*target' to '*source'. */ void ns_listenlist_detach(ns_listenlist_t **listp); -/*% +/*%< * Detach 'listp'. */ isc_result_t ns_listenlist_default(isc_mem_t *mctx, in_port_t port, isc_dscp_t dscp, isc_boolean_t enabled, ns_listenlist_t **target); -/*% +/*%< * Create a listen-on list with default contents, matching * all addresses with port 'port' (if 'enabled' is ISC_TRUE), * or no addresses (if 'enabled' is ISC_FALSE). */ -#endif /* NAMED_LISTENLIST_H */ +#endif /* NS_LISTENLIST_H */ diff --git a/lib/ns/include/ns/log.h b/lib/ns/include/ns/log.h new file mode 100644 index 0000000000..0355e84e68 --- /dev/null +++ b/lib/ns/include/ns/log.h @@ -0,0 +1,66 @@ +/* + * Copyright (C) 2017 Internet Systems Consortium, Inc. ("ISC") + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#ifndef NS_LOG_H +#define NS_LOG_H 1 + +/*! \file */ + +#include +#include + +LIBNS_EXTERNAL_DATA extern isc_log_t *ns_lctx; +LIBNS_EXTERNAL_DATA extern isc_logcategory_t ns_categories[]; +LIBNS_EXTERNAL_DATA extern isc_logmodule_t ns_modules[]; + +#define NS_LOGCATEGORY_CLIENT (&ns_categories[0]) +#define NS_LOGCATEGORY_NETWORK (&ns_categories[1]) +#define NS_LOGCATEGORY_UPDATE (&ns_categories[2]) +#define NS_LOGCATEGORY_QUERIES (&ns_categories[3]) +#define NS_LOGCATEGORY_UPDATE_SECURITY (&ns_categories[4]) +#define NS_LOGCATEGORY_QUERY_ERRORS (&ns_categories[5]) + +/* + * Backwards compatibility. + */ +#define NS_LOGCATEGORY_GENERAL ISC_LOGCATEGORY_GENERAL + +#define NS_LOGMODULE_CLIENT (&ns_modules[0]) +#define NS_LOGMODULE_QUERY (&ns_modules[1]) +#define NS_LOGMODULE_INTERFACEMGR (&ns_modules[2]) +#define NS_LOGMODULE_UPDATE (&ns_modules[3]) +#define NS_LOGMODULE_XFER_IN (&ns_modules[4]) +#define NS_LOGMODULE_XFER_OUT (&ns_modules[5]) +#define NS_LOGMODULE_NOTIFY (&ns_modules[6]) + +void +ns_log_init(isc_log_t *lctx); +/*%< + * Make the libns categories and modules available for use with the + * ISC logging library. + * + * Requires: + *\li lctx is a valid logging context. + * + *\li ns_log_init() is called only once. + * + * Ensures: + *\li The categories and modules defined above are available for + * use by isc_log_usechannnel() and isc_log_write(). + */ + +void +ns_log_setcontext(isc_log_t *lctx); +/*%< + * Make the libns library use the provided context for logging internal + * messages. + * + * Requires: + *\li lctx is a valid logging context. + */ +#endif /* NS_LOG_H */ diff --git a/bin/named/include/named/notify.h b/lib/ns/include/ns/notify.h similarity index 72% rename from bin/named/include/named/notify.h rename to lib/ns/include/ns/notify.h index 2f4fc29f8e..19b4460cac 100644 --- a/bin/named/include/named/notify.h +++ b/lib/ns/include/ns/notify.h @@ -1,18 +1,15 @@ /* - * Copyright (C) 1999-2001, 2004, 2005, 2007, 2009, 2016 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2017 Internet Systems Consortium, Inc. ("ISC") * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -/* $Id: notify.h,v 1.16 2009/01/17 23:47:42 tbox Exp $ */ +#ifndef NS_NOTIFY_H +#define NS_NOTIFY_H 1 -#ifndef NAMED_NOTIFY_H -#define NAMED_NOTIFY_H 1 - -#include -#include +#include /*** *** Module Info @@ -42,5 +39,5 @@ ns_notify_start(ns_client_t *client); *\li client to be valid. */ -#endif /* NAMED_NOTIFY_H */ +#endif /* NS_NOTIFY_H */ diff --git a/bin/named/include/named/query.h b/lib/ns/include/ns/query.h similarity index 92% rename from bin/named/include/named/query.h rename to lib/ns/include/ns/query.h index 4f4a871958..ce6d06fc77 100644 --- a/bin/named/include/named/query.h +++ b/lib/ns/include/ns/query.h @@ -1,13 +1,13 @@ /* - * Copyright (C) 1999-2002, 2004, 2005, 2007, 2010, 2011, 2013-2017 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2017 Internet Systems Consortium, Inc. ("ISC") * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef NAMED_QUERY_H -#define NAMED_QUERY_H 1 +#ifndef NS_QUERY_H +#define NS_QUERY_H 1 /*! \file */ @@ -19,7 +19,7 @@ #include #include -#include +#include /*% nameserver database version structure */ typedef struct ns_dbversion { @@ -104,4 +104,4 @@ ns_query_start(ns_client_t *client); void ns_query_cancel(ns_client_t *client); -#endif /* NAMED_QUERY_H */ +#endif /* NS_QUERY_H */ diff --git a/lib/ns/include/ns/server.h b/lib/ns/include/ns/server.h new file mode 100644 index 0000000000..0ae3263129 --- /dev/null +++ b/lib/ns/include/ns/server.h @@ -0,0 +1,199 @@ +/* + * Copyright (C) 2017 Internet Systems Consortium, Inc. ("ISC") + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#ifndef NS_SERVER_H +#define NS_SERVER_H 1 + +/*! \file */ + +#include +#include +#include +#include +#include +#include + +#include +#include + +#include + +#define NS_EVENT_CLIENTCONTROL (ISC_EVENTCLASS_NS + 0) + +#define NS_SERVER_LOGQUERIES 0x00000001U /*%< log queries */ +#define NS_SERVER_NOAA 0x00000002U /*%< -T noaa */ +#define NS_SERVER_NOSOA 0x00000004U /*%< -T nosoa */ +#define NS_SERVER_NONEAREST 0x00000008U /*%< -T nonearest */ +#define NS_SERVER_CLIENTTEST 0x00000010U /*%< -T clienttest */ +#define NS_SERVER_NOEDNS 0x00000020U /*%< -T noedns */ +#define NS_SERVER_DROPEDNS 0x00000040U /*%< -T dropedns */ +#define NS_SERVER_NOTCP 0x00000080U /*%< -T notcp */ +#define NS_SERVER_DISABLE4 0x00000100U /*%< -6 */ +#define NS_SERVER_DISABLE6 0x00000100U /*%< -4 */ + +/*% + * Type for callback function to get hostname. + */ +typedef isc_result_t +(*ns_hostnamecb_t)(char *buf, size_t len); + +/*% + * Type for callback function to signal the fuzzer thread + * when built with AFL. + */ +typedef void +(*ns_fuzzcb_t)(void); + +/*% + * Type for callback function to get the view that can answer a query. + */ +typedef isc_result_t +(*ns_matchview_t)(isc_netaddr_t *srcaddr, isc_netaddr_t *destaddr, + dns_message_t *message, dns_ecs_t *ecs, + isc_result_t *sigresultp, dns_view_t **viewp); + +/*% + * Server context. + */ +struct ns_server { + unsigned int magic; + isc_mem_t * mctx; + + isc_refcount_t references; + + /*% Server cookie secret and algorithm */ + unsigned char secret[32]; + ns_cookiealg_t cookiealg; + ns_altsecretlist_t altsecrets; + + /*% Quotas */ + isc_quota_t recursionquota; + isc_quota_t tcpquota; + isc_quota_t xfroutquota; + + /*% Test options and other configurables */ + isc_uint32_t options; + unsigned int delay; + + unsigned int initialtimo; + unsigned int idletimo; + unsigned int keepalivetimo; + unsigned int advertisedtimo; + + dns_acl_t *blackholeacl; + dns_acl_t *keepresporder; + isc_uint16_t udpsize; + isc_uint16_t transfer_tcp_message_size; + isc_boolean_t interface_auto; + dns_tkeyctx_t * tkeyctx; + + /*% Server id for NSID */ + char * server_id; + ns_hostnamecb_t gethostname; + + /*% Fuzzer callback */ + isc_fuzztype_t fuzztype; + ns_fuzzcb_t fuzznotify; + + /*% Callback to find a matching view for a query */ + ns_matchview_t matchingview; + + /*% Stats counters */ + ns_stats_t * nsstats; + dns_stats_t * rcvquerystats; + dns_stats_t * opcodestats; + dns_stats_t * rcodestats; + + isc_stats_t * udpinstats4; + isc_stats_t * udpoutstats4; + isc_stats_t * udpinstats6; + isc_stats_t * udpoutstats6; + + isc_stats_t * tcpinstats4; + isc_stats_t * tcpoutstats4; + isc_stats_t * tcpinstats6; + isc_stats_t * tcpoutstats6; +}; + +struct ns_altsecret { + ISC_LINK(ns_altsecret_t) link; + unsigned char secret[32]; +}; + +isc_result_t +ns_server_create(isc_mem_t *mctx, isc_entropy_t *entropy, + ns_matchview_t matchingview, ns_server_t **sctxp); +/*%< + * Create a server context object with default settings. + */ + +void +ns_server_attach(ns_server_t *src, ns_server_t **dest); +/*%< + * Attach a server context. + * + * Requires: + *\li 'src' is valid. + */ + +void +ns_server_detach(ns_server_t **sctxp); +/*%< + * Detach from a server context. If its reference count drops to zero, destroy + * it, freeing its memory. + * + * Requires: + *\li '*sctxp' is valid. + * Ensures: + *\li '*sctxp' is NULL on return. + */ + +isc_result_t +ns_server_setserverid(ns_server_t *sctx, const char *serverid); +/*%< + * Set sctx->server_id to 'serverid'. If it was set previously, free the memory. + * + * Requires: + *\li 'sctx' is valid. + */ + +void +ns_server_settimeouts(ns_server_t *sctx, unsigned int initial, + unsigned int idle, unsigned int keepalive, + unsigned int advertised); +void +ns_server_gettimeouts(ns_server_t *sctx, unsigned int *initial, + unsigned int *idle, unsigned int *keepalive, + unsigned int *advertised); +/*%< + * Set/get tcp-timeout values. + * + * Requires: + *\li 'sctx' is valid. + */ + +void +ns_server_setoption(ns_server_t *sctx, unsigned int option, + isc_boolean_t value); +/*%< + * Set the given options on (if 'value' == #ISC_TRUE) + * or off (if 'value' == #ISC_FALSE). + * + * Requires: + *\li 'sctx' is valid + */ + +isc_boolean_t +ns_server_getoption(ns_server_t *sctx, unsigned int option); +/*%< + * Returns the current value of the specified server option. + * + * Requires: + *\li 'sctx' is valid. + */ +#endif /* NS_SERVER_H */ diff --git a/bin/named/include/named/sortlist.h b/lib/ns/include/ns/sortlist.h similarity index 79% rename from bin/named/include/named/sortlist.h rename to lib/ns/include/ns/sortlist.h index cb10c38a13..da30a3ee9a 100644 --- a/bin/named/include/named/sortlist.h +++ b/lib/ns/include/ns/sortlist.h @@ -1,20 +1,19 @@ /* - * Copyright (C) 2000, 2001, 2004-2007, 2016 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2017 Internet Systems Consortium, Inc. ("ISC") * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -/* $Id: sortlist.h,v 1.11 2007/06/19 23:46:59 tbox Exp $ */ - -#ifndef NAMED_SORTLIST_H -#define NAMED_SORTLIST_H 1 +#ifndef NS_SORTLIST_H +#define NS_SORTLIST_H 1 /*! \file */ #include +#include #include /*% @@ -33,10 +32,11 @@ typedef enum { } ns_sortlisttype_t; ns_sortlisttype_t -ns_sortlist_setup(dns_acl_t *acl, isc_netaddr_t *clientaddr, - const void **argp); +ns_sortlist_setup(dns_acl_t *acl, dns_aclenv_t *env, + isc_netaddr_t *clientaddr, const void **argp); /*%< - * Find the sortlist statement in 'acl' that applies to 'clientaddr', if any. + * Find the sortlist statement in 'acl' (for ACL environment 'env') + * that applies to 'clientaddr', if any. * * If a 1-element sortlist item applies, return NS_SORTLISTTYPE_1ELEMENT and * make '*argp' point to the matching subelement. @@ -64,7 +64,8 @@ ns_sortlist_addrorder2(const isc_netaddr_t *addr, const void *arg); */ void -ns_sortlist_byaddrsetup(dns_acl_t *sortlist_acl, isc_netaddr_t *client_addr, +ns_sortlist_byaddrsetup(dns_acl_t *sortlist_acl, dns_aclenv_t *env, + isc_netaddr_t *client_addr, dns_addressorderfunc_t *orderp, const void **argp); /*%< @@ -75,4 +76,4 @@ ns_sortlist_byaddrsetup(dns_acl_t *sortlist_acl, isc_netaddr_t *client_addr, * applies, set '*orderp' and '*argp' to NULL. */ -#endif /* NAMED_SORTLIST_H */ +#endif /* NS_SORTLIST_H */ diff --git a/lib/ns/include/ns/stats.h b/lib/ns/include/ns/stats.h new file mode 100644 index 0000000000..f3e485eae7 --- /dev/null +++ b/lib/ns/include/ns/stats.h @@ -0,0 +1,120 @@ +/* + * Copyright (C) 2017 Internet Systems Consortium, Inc. ("ISC") + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#ifndef NS_STATS_H +#define NS_STATS_H 1 + +/*! \file ns/stats.h */ + +#include + +/*% + * Server statistics counters. Used as isc_statscounter_t values. + */ +enum { + ns_statscounter_requestv4 = 0, + ns_statscounter_requestv6 = 1, + ns_statscounter_edns0in = 2, + ns_statscounter_badednsver = 3, + ns_statscounter_tsigin = 4, + ns_statscounter_sig0in = 5, + ns_statscounter_invalidsig = 6, + ns_statscounter_requesttcp = 7, + + ns_statscounter_authrej = 8, + ns_statscounter_recurserej = 9, + ns_statscounter_xfrrej = 10, + ns_statscounter_updaterej = 11, + + ns_statscounter_response = 12, + ns_statscounter_truncatedresp = 13, + ns_statscounter_edns0out = 14, + ns_statscounter_tsigout = 15, + ns_statscounter_sig0out = 16, + + ns_statscounter_success = 17, + ns_statscounter_authans = 18, + ns_statscounter_nonauthans = 19, + ns_statscounter_referral = 20, + ns_statscounter_nxrrset = 21, + ns_statscounter_servfail = 22, + ns_statscounter_formerr = 23, + ns_statscounter_nxdomain = 24, + ns_statscounter_recursion = 25, + ns_statscounter_duplicate = 26, + ns_statscounter_dropped = 27, + ns_statscounter_failure = 28, + + ns_statscounter_xfrdone = 29, + + ns_statscounter_updatereqfwd = 30, + ns_statscounter_updaterespfwd = 31, + ns_statscounter_updatefwdfail = 32, + ns_statscounter_updatedone = 33, + ns_statscounter_updatefail = 34, + ns_statscounter_updatebadprereq = 35, + + ns_statscounter_recursclients = 36, + + ns_statscounter_dns64 = 37, + + ns_statscounter_ratedropped = 38, + ns_statscounter_rateslipped = 39, + + ns_statscounter_rpz_rewrites = 40, + + ns_statscounter_udp = 41, + ns_statscounter_tcp = 42, + + ns_statscounter_nsidopt = 43, + ns_statscounter_expireopt = 44, + ns_statscounter_otheropt = 45, + ns_statscounter_ecsopt = 46, + ns_statscounter_padopt = 47, + ns_statscounter_keepaliveopt = 48, + + ns_statscounter_nxdomainredirect = 49, + ns_statscounter_nxdomainredirect_rlookup = 50, + + ns_statscounter_cookiein = 51, + ns_statscounter_cookiebadsize = 52, + ns_statscounter_cookiebadtime = 53, + ns_statscounter_cookienomatch = 54, + ns_statscounter_cookiematch = 55, + ns_statscounter_cookienew = 56, + ns_statscounter_badcookie = 57, + + ns_statscounter_nxdomainsynth = 58, + ns_statscounter_nodatasynth = 59, + ns_statscounter_wildcardsynth = 60, + + ns_statscounter_trystale = 61, + ns_statscounter_usedstale = 62, + + ns_statscounter_max = 63 +}; + +void +ns_stats_attach(ns_stats_t *stats, ns_stats_t **statsp); + +void +ns_stats_detach(ns_stats_t **statsp); + +isc_result_t +ns_stats_create(isc_mem_t *mctx, int ncounters, ns_stats_t **statsp); + +void +ns_stats_increment(ns_stats_t *stats, isc_statscounter_t counter); + +void +ns_stats_decrement(ns_stats_t *stats, isc_statscounter_t counter); + +isc_stats_t * +ns_stats_get(ns_stats_t *stats); + +#endif /* NS_STATS_H */ diff --git a/lib/ns/include/ns/types.h b/lib/ns/include/ns/types.h new file mode 100644 index 0000000000..cc71d3d160 --- /dev/null +++ b/lib/ns/include/ns/types.h @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2017 Internet Systems Consortium, Inc. ("ISC") + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#ifndef NS_TYPES_H +#define NS_TYPES_H 1 + +/*! \file */ + +typedef struct ns_altsecret ns_altsecret_t; +typedef ISC_LIST(ns_altsecret_t) ns_altsecretlist_t; +typedef struct ns_client ns_client_t; +typedef struct ns_clientmgr ns_clientmgr_t; +typedef struct ns_interface ns_interface_t; +typedef struct ns_interfacemgr ns_interfacemgr_t; +typedef struct ns_query ns_query_t; +typedef struct ns_server ns_server_t; +typedef struct ns_stats ns_stats_t; + +typedef enum { + ns_cookiealg_aes, + ns_cookiealg_sha1, + ns_cookiealg_sha256 +} ns_cookiealg_t; + +#endif /* NS_TYPES_H */ diff --git a/bin/named/include/named/update.h b/lib/ns/include/ns/update.h similarity index 68% rename from bin/named/include/named/update.h rename to lib/ns/include/ns/update.h index dc4d00dce6..22a5d9898c 100644 --- a/bin/named/include/named/update.h +++ b/lib/ns/include/ns/update.h @@ -1,15 +1,13 @@ /* - * Copyright (C) 1999-2001, 2004, 2005, 2007, 2016 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2017 Internet Systems Consortium, Inc. ("ISC") * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -/* $Id: update.h,v 1.13 2007/06/19 23:46:59 tbox Exp $ */ - -#ifndef NAMED_UPDATE_H -#define NAMED_UPDATE_H 1 +#ifndef NS_UPDATE_H +#define NS_UPDATE_H 1 /***** ***** Module Info @@ -38,4 +36,4 @@ void ns_update_start(ns_client_t *client, isc_result_t sigresult); -#endif /* NAMED_UPDATE_H */ +#endif /* NS_UPDATE_H */ diff --git a/lib/ns/include/ns/version.h b/lib/ns/include/ns/version.h new file mode 100644 index 0000000000..0e2f025dd9 --- /dev/null +++ b/lib/ns/include/ns/version.h @@ -0,0 +1,17 @@ +/* + * Copyright (C) 2017 Internet Systems Consortium, Inc. ("ISC") + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +/*! \file ns/version.h */ + +#include + +LIBNS_EXTERNAL_DATA extern const char ns_version[]; + +LIBNS_EXTERNAL_DATA extern const unsigned int ns_libinterface; +LIBNS_EXTERNAL_DATA extern const unsigned int ns_librevision; +LIBNS_EXTERNAL_DATA extern const unsigned int ns_libage; diff --git a/bin/named/include/named/xfrout.h b/lib/ns/include/ns/xfrout.h similarity index 64% rename from bin/named/include/named/xfrout.h rename to lib/ns/include/ns/xfrout.h index 27ced6cb06..2a2d4eec74 100644 --- a/bin/named/include/named/xfrout.h +++ b/lib/ns/include/ns/xfrout.h @@ -1,15 +1,13 @@ /* - * Copyright (C) 1999-2001, 2004, 2005, 2007, 2016 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2017 Internet Systems Consortium, Inc. ("ISC") * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -/* $Id: xfrout.h,v 1.12 2007/06/19 23:46:59 tbox Exp $ */ - -#ifndef NAMED_XFROUT_H -#define NAMED_XFROUT_H 1 +#ifndef NS_XFROUT_H +#define NS_XFROUT_H 1 /***** ***** Module Info @@ -27,4 +25,4 @@ void ns_xfr_start(ns_client_t *client, dns_rdatatype_t xfrtype); -#endif /* NAMED_XFROUT_H */ +#endif /* NS_XFROUT_H */ diff --git a/bin/named/interfacemgr.c b/lib/ns/interfacemgr.c similarity index 91% rename from bin/named/interfacemgr.c rename to lib/ns/interfacemgr.c index 10cec44321..461692ba1c 100644 --- a/bin/named/interfacemgr.c +++ b/lib/ns/interfacemgr.c @@ -1,13 +1,11 @@ /* - * Copyright (C) 1999-2002, 2004-2009, 2011-2016 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2017 Internet Systems Consortium, Inc. ("ISC") * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -/* $Id: interfacemgr.c,v 1.101 2011/11/09 18:44:03 each Exp $ */ - /*! \file */ #include @@ -21,10 +19,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #ifdef HAVE_NET_ROUTE_H #include @@ -57,7 +55,7 @@ #define NS_INTERFACEMGR_VALID(t) ISC_MAGIC_VALID(t, IFMGR_MAGIC) #define IFMGR_COMMON_LOGARGS \ - ns_g_lctx, NS_LOGCATEGORY_NETWORK, NS_LOGMODULE_INTERFACEMGR + ns_lctx, NS_LOGCATEGORY_NETWORK, NS_LOGMODULE_INTERFACEMGR /*% nameserver interface manager structure */ struct ns_interfacemgr { @@ -65,7 +63,10 @@ struct ns_interfacemgr { int references; isc_mutex_t lock; isc_mem_t * mctx; /*%< Memory context. */ + ns_server_t * sctx; /*%< Server context. */ isc_taskmgr_t * taskmgr; /*%< Task manager. */ + isc_task_t * excl; /*%< Exclusive task. */ + isc_timermgr_t * timermgr; /*%< Timer manager. */ isc_socketmgr_t * socketmgr; /*%< Socket manager. */ dns_dispatchmgr_t * dispatchmgr; unsigned int generation; /*%< Current generation no. */ @@ -74,6 +75,8 @@ struct ns_interfacemgr { dns_aclenv_t aclenv; /*%< Localhost/localnets ACLs */ ISC_LIST(ns_interface_t) interfaces; /*%< List of interfaces. */ ISC_LIST(isc_sockaddr_t) listenon; + int backlog; /*%< Listen queue size */ + unsigned int udpdisp; /*%< UDP dispatch count */ #ifdef USE_ROUTE_SOCKET isc_task_t * task; isc_socket_t * route; @@ -131,8 +134,8 @@ route_event(isc_task_t *task, isc_event_t *event) { switch (rtm->MSGTYPE) { case RTM_NEWADDR: case RTM_DELADDR: - if (mgr->route != NULL && ns_g_server->interface_auto) - ns_server_scan_interfaces(ns_g_server); + if (mgr->route != NULL && mgr->sctx->interface_auto) + ns_interfacemgr_scan(mgr, ISC_FALSE); break; default: break; @@ -160,10 +163,16 @@ route_event(isc_task_t *task, isc_event_t *event) { #endif isc_result_t -ns_interfacemgr_create(isc_mem_t *mctx, isc_taskmgr_t *taskmgr, +ns_interfacemgr_create(isc_mem_t *mctx, + ns_server_t *sctx, + isc_taskmgr_t *taskmgr, + isc_timermgr_t *timermgr, isc_socketmgr_t *socketmgr, dns_dispatchmgr_t *dispatchmgr, - isc_task_t *task, ns_interfacemgr_t **mgrp) + isc_task_t *task, + unsigned int udpdisp, + dns_geoip_databases_t *geoip, + ns_interfacemgr_t **mgrp) { isc_result_t result; ns_interfacemgr_t *mgr; @@ -183,16 +192,27 @@ ns_interfacemgr_create(isc_mem_t *mctx, isc_taskmgr_t *taskmgr, mgr->mctx = NULL; isc_mem_attach(mctx, &mgr->mctx); + mgr->sctx = NULL; + ns_server_attach(sctx, &mgr->sctx); + result = isc_mutex_init(&mgr->lock); if (result != ISC_R_SUCCESS) - goto cleanup_mem; + goto cleanup_ctx; + + mgr->excl = NULL; + result = isc_taskmgr_excltask(taskmgr, &mgr->excl); + if (result != ISC_R_SUCCESS) { + goto cleanup_lock; + } mgr->taskmgr = taskmgr; + mgr->timermgr = timermgr; mgr->socketmgr = socketmgr; mgr->dispatchmgr = dispatchmgr; mgr->generation = 1; mgr->listenon4 = NULL; mgr->listenon6 = NULL; + mgr->udpdisp = udpdisp; ISC_LIST_INIT(mgr->interfaces); ISC_LIST_INIT(mgr->listenon); @@ -202,14 +222,16 @@ ns_interfacemgr_create(isc_mem_t *mctx, isc_taskmgr_t *taskmgr, */ result = ns_listenlist_create(mctx, &mgr->listenon4); if (result != ISC_R_SUCCESS) - goto cleanup_mem; + goto cleanup_ctx; ns_listenlist_attach(mgr->listenon4, &mgr->listenon6); result = dns_aclenv_init(mctx, &mgr->aclenv); if (result != ISC_R_SUCCESS) goto cleanup_listenon; #ifdef HAVE_GEOIP - mgr->aclenv.geoip = ns_g_geoip; + mgr->aclenv.geoip = geoip; +#else + UNUSED(geoip); #endif #ifdef USE_ROUTE_SOCKET @@ -258,7 +280,10 @@ ns_interfacemgr_create(isc_mem_t *mctx, isc_taskmgr_t *taskmgr, cleanup_listenon: ns_listenlist_detach(&mgr->listenon4); ns_listenlist_detach(&mgr->listenon6); - cleanup_mem: + cleanup_lock: + isc_mutex_destroy(&mgr->lock); + cleanup_ctx: + ns_server_detach(&mgr->sctx); isc_mem_putanddetach(&mgr->mctx, mgr, sizeof(*mgr)); return (result); } @@ -278,12 +303,27 @@ ns_interfacemgr_destroy(ns_interfacemgr_t *mgr) { ns_listenlist_detach(&mgr->listenon6); clearlistenon(mgr); DESTROYLOCK(&mgr->lock); + if (mgr->sctx != NULL) + ns_server_detach(&mgr->sctx); + if (mgr->excl != NULL) + isc_task_detach(&mgr->excl); mgr->magic = 0; isc_mem_putanddetach(&mgr->mctx, mgr, sizeof(*mgr)); } +void +ns_interfacemgr_setbacklog(ns_interfacemgr_t *mgr, int backlog) { + REQUIRE(NS_INTERFACEMGR_VALID(mgr)); + LOCK(&mgr->lock); + mgr->backlog = backlog; + UNLOCK(&mgr->lock); + +} + dns_aclenv_t * ns_interfacemgr_getaclenv(ns_interfacemgr_t *mgr) { + REQUIRE(NS_INTERFACEMGR_VALID(mgr)); + return (&mgr->aclenv); } @@ -363,8 +403,8 @@ ns_interface_create(ns_interfacemgr_t *mgr, isc_sockaddr_t *addr, if (result != ISC_R_SUCCESS) goto lock_create_failure; - result = ns_clientmgr_create(mgr->mctx, mgr->taskmgr, - ns_g_timermgr, + result = ns_clientmgr_create(mgr->mctx, mgr->sctx, + mgr->taskmgr, mgr->timermgr, &ifp->clientmgr); if (result != ISC_R_SUCCESS) { isc_log_write(IFMGR_COMMON_LOGARGS, ISC_LOG_ERROR, @@ -429,11 +469,11 @@ ns_interface_listenudp(ns_interface_t *ifp) { attrmask |= DNS_DISPATCHATTR_UDP | DNS_DISPATCHATTR_TCP; attrmask |= DNS_DISPATCHATTR_IPV4 | DNS_DISPATCHATTR_IPV6; - ifp->nudpdispatch = ISC_MIN(ns_g_udpdisp, MAX_UDP_DISPATCH); + ifp->nudpdispatch = ISC_MIN(ifp->mgr->udpdisp, MAX_UDP_DISPATCH); for (disp = 0; disp < ifp->nudpdispatch; disp++) { result = dns_dispatch_getudp_dup(ifp->mgr->dispatchmgr, - ns_g_socketmgr, - ns_g_taskmgr, &ifp->addr, + ifp->mgr->socketmgr, + ifp->mgr->taskmgr, &ifp->addr, 4096, UDPBUFFERS, 32768, 8219, 8237, attrs, attrmask, @@ -506,7 +546,7 @@ ns_interface_accepttcp(ns_interface_t *ifp) { if (ifp->dscp != -1) isc_socket_dscp(ifp->tcpsocket, ifp->dscp); - result = isc_socket_listen(ifp->tcpsocket, ns_g_listen); + result = isc_socket_listen(ifp->tcpsocket, ifp->mgr->backlog); if (result != ISC_R_SUCCESS) { isc_log_write(IFMGR_COMMON_LOGARGS, ISC_LOG_ERROR, "listening on TCP socket: %s", @@ -563,7 +603,9 @@ ns_interface_setup(ns_interfacemgr_t *mgr, isc_sockaddr_t *addr, goto cleanup_interface; } - if (!ns_g_notcp && accept_tcp == ISC_TRUE) { + if (((mgr->sctx->options & NS_SERVER_NOTCP) == 0) && + accept_tcp == ISC_TRUE) + { result = ns_interface_accepttcp(ifp); if (result != ISC_R_SUCCESS) { if ((result == ISC_R_ADDRINUSE) && @@ -816,7 +858,7 @@ do_scan(ns_interfacemgr_t *mgr, ns_listenlist_t *ext_listen, if (isc_net_probeipv6() == ISC_R_SUCCESS) scan_ipv6 = ISC_TRUE; #ifdef WANT_IPV6 - else if (!ns_g_disable6) + else if ((mgr->sctx->options & NS_SERVER_DISABLE6) == 0) isc_log_write(IFMGR_COMMON_LOGARGS, verbose ? ISC_LOG_INFO : ISC_LOG_DEBUG(1), "no IPv6 interfaces found"); @@ -824,7 +866,7 @@ do_scan(ns_interfacemgr_t *mgr, ns_listenlist_t *ext_listen, if (isc_net_probeipv4() == ISC_R_SUCCESS) scan_ipv4 = ISC_TRUE; - else if (!ns_g_disable4) + else if ((mgr->sctx->options & NS_SERVER_DISABLE4) == 0) isc_log_write(IFMGR_COMMON_LOGARGS, verbose ? ISC_LOG_INFO : ISC_LOG_DEBUG(1), "no IPv4 interfaces found"); @@ -1158,12 +1200,11 @@ ns_interfacemgr_scan0(ns_interfacemgr_t *mgr, ns_listenlist_t *ext_listen, purge_old_interfaces(mgr); /* - * Warn if we are not listening on any interface, unless - * we're in lwresd-only mode, in which case that is to - * be expected. + * Warn if we are not listening on any interface. */ if (ext_listen == NULL && - ISC_LIST_EMPTY(mgr->interfaces) && ! ns_g_lwresdonly) { + ISC_LIST_EMPTY(mgr->interfaces)) + { isc_log_write(IFMGR_COMMON_LOGARGS, ISC_LOG_WARNING, "not listening on any interfaces"); } @@ -1180,7 +1221,24 @@ ns_interfacemgr_islistening(ns_interfacemgr_t *mgr) { isc_result_t ns_interfacemgr_scan(ns_interfacemgr_t *mgr, isc_boolean_t verbose) { - return (ns_interfacemgr_scan0(mgr, NULL, verbose)); + isc_result_t result; + isc_boolean_t unlock = ISC_FALSE; + + /* + * Check for success because we may already be task-exclusive + * at this point. Only if we succeed at obtaining an exclusive + * lock now will we need to relinquish it later. + */ + result = isc_task_beginexclusive(mgr->excl); + if (result == ISC_R_SUCCESS) + unlock = ISC_TRUE; + + result = ns_interfacemgr_scan0(mgr, NULL, verbose); + + if (unlock) + isc_task_endexclusive(mgr->excl); + + return (result); } isc_result_t @@ -1192,6 +1250,8 @@ ns_interfacemgr_adjust(ns_interfacemgr_t *mgr, ns_listenlist_t *list, void ns_interfacemgr_setlistenon4(ns_interfacemgr_t *mgr, ns_listenlist_t *value) { + REQUIRE(NS_INTERFACEMGR_VALID(mgr)); + LOCK(&mgr->lock); ns_listenlist_detach(&mgr->listenon4); ns_listenlist_attach(value, &mgr->listenon4); @@ -1200,6 +1260,8 @@ ns_interfacemgr_setlistenon4(ns_interfacemgr_t *mgr, ns_listenlist_t *value) { void ns_interfacemgr_setlistenon6(ns_interfacemgr_t *mgr, ns_listenlist_t *value) { + REQUIRE(NS_INTERFACEMGR_VALID(mgr)); + LOCK(&mgr->lock); ns_listenlist_detach(&mgr->listenon6); ns_listenlist_attach(value, &mgr->listenon6); @@ -1210,6 +1272,8 @@ void ns_interfacemgr_dumprecursing(FILE *f, ns_interfacemgr_t *mgr) { ns_interface_t *interface; + REQUIRE(NS_INTERFACEMGR_VALID(mgr)); + LOCK(&mgr->lock); interface = ISC_LIST_HEAD(mgr->interfaces); while (interface != NULL) { @@ -1226,6 +1290,8 @@ ns_interfacemgr_listeningon(ns_interfacemgr_t *mgr, { isc_sockaddr_t *old; + REQUIRE(NS_INTERFACEMGR_VALID(mgr)); + for (old = ISC_LIST_HEAD(mgr->listenon); old != NULL; old = ISC_LIST_NEXT(old, link)) @@ -1233,3 +1299,15 @@ ns_interfacemgr_listeningon(ns_interfacemgr_t *mgr, return (ISC_TRUE); return (ISC_FALSE); } + +ns_interface_t * +ns__interfacemgr_getif(ns_interfacemgr_t *mgr) { + REQUIRE(NS_INTERFACEMGR_VALID(mgr)); + + return (ISC_LIST_HEAD(mgr->interfaces)); +} + +ns_interface_t * +ns__interfacemgr_nextif(ns_interface_t *ifp) { + return (ISC_LIST_NEXT(ifp, link)); +} diff --git a/lib/ns/lib.c b/lib/ns/lib.c new file mode 100644 index 0000000000..3409bbed9c --- /dev/null +++ b/lib/ns/lib.c @@ -0,0 +1,102 @@ +/* + * Copyright (C) 2017 Internet Systems Consortium, Inc. ("ISC") + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +/*! \file */ + +#include + +#include + +#include +#include +#include +#include +#include + +#include + +#include + + +/*** + *** Globals + ***/ + +LIBNS_EXTERNAL_DATA unsigned int ns_pps = 0U; + + +/*** + *** Private + ***/ + +static isc_once_t init_once = ISC_ONCE_INIT; +static isc_mem_t *ns_g_mctx = NULL; +static isc_boolean_t initialize_done = ISC_FALSE; +static isc_mutex_t reflock; +static unsigned int references = 0; + +static void +initialize(void) { + isc_result_t result; + + REQUIRE(initialize_done == ISC_FALSE); + + result = isc_mem_create(0, 0, &ns_g_mctx); + if (result != ISC_R_SUCCESS) + return; + + result = isc_mutex_init(&reflock); + if (result != ISC_R_SUCCESS) + goto cleanup_mctx; + + initialize_done = ISC_TRUE; + return; + + cleanup_mctx: + if (ns_g_mctx != NULL) + isc_mem_detach(&ns_g_mctx); +} + +isc_result_t +ns_lib_init(void) { + isc_result_t result; + + /* + * Since this routine is expected to be used by a normal application, + * it should be better to return an error, instead of an emergency + * abort, on any failure. + */ + result = isc_once_do(&init_once, initialize); + if (result != ISC_R_SUCCESS) + return (result); + + if (!initialize_done) + return (ISC_R_FAILURE); + + LOCK(&reflock); + references++; + UNLOCK(&reflock); + + return (ISC_R_SUCCESS); +} + +void +ns_lib_shutdown(void) { + isc_boolean_t cleanup_ok = ISC_FALSE; + + LOCK(&reflock); + if (--references == 0) + cleanup_ok = ISC_TRUE; + UNLOCK(&reflock); + + if (!cleanup_ok) + return; + + if (ns_g_mctx != NULL) + isc_mem_detach(&ns_g_mctx); +} diff --git a/bin/named/listenlist.c b/lib/ns/listenlist.c similarity index 93% rename from bin/named/listenlist.c rename to lib/ns/listenlist.c index 6ae7ddec21..95735eb1d7 100644 --- a/bin/named/listenlist.c +++ b/lib/ns/listenlist.c @@ -1,13 +1,11 @@ /* - * Copyright (C) 2000, 2001, 2004, 2005, 2007, 2013, 2016 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2017 Internet Systems Consortium, Inc. ("ISC") * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -/* $Id: listenlist.c,v 1.14 2007/06/19 23:46:59 tbox Exp $ */ - /*! \file */ #include @@ -17,7 +15,7 @@ #include -#include +#include static void destroy(ns_listenlist_t *list); diff --git a/lib/ns/log.c b/lib/ns/log.c new file mode 100644 index 0000000000..82860780f9 --- /dev/null +++ b/lib/ns/log.c @@ -0,0 +1,68 @@ +/* + * Copyright (C) 2017 Internet Systems Consortium, Inc. ("ISC") + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +/*! \file */ + +#include + +#include +#include + +#include + +#ifndef ISC_FACILITY +#define ISC_FACILITY LOG_DAEMON +#endif + +/*% + * When adding a new category, be sure to add the appropriate + * \#define to + */ +LIBNS_EXTERNAL_DATA isc_logcategory_t ns_categories[] = { + { "client", 0 }, + { "network", 0 }, + { "update", 0 }, + { "queries", 0 }, + { "unmatched", 0 }, + { "update-security", 0 }, + { "query-errors", 0 }, + { NULL, 0 } +}; + +/*% + * When adding a new module, be sure to add the appropriate + * \#define to . + */ +LIBNS_EXTERNAL_DATA isc_logmodule_t ns_modules[] = { + { "ns/main", 0 }, + { "ns/client", 0 }, + { "ns/server", 0 }, + { "ns/query", 0 }, + { "ns/interfacemgr", 0 }, + { "ns/update", 0 }, + { "ns/xfer-in", 0 }, + { "ns/xfer-out", 0 }, + { "ns/notify", 0 }, + { "ns/control", 0 }, + { NULL, 0 } +}; + +LIBNS_EXTERNAL_DATA isc_log_t *ns_lctx = NULL; + +void +ns_log_init(isc_log_t *lctx) { + REQUIRE(lctx != NULL); + + isc_log_registercategories(lctx, ns_categories); + isc_log_registermodules(lctx, ns_modules); +} + +void +ns_log_setcontext(isc_log_t *lctx) { + ns_lctx = lctx; +} diff --git a/bin/named/notify.c b/lib/ns/notify.c similarity index 95% rename from bin/named/notify.c rename to lib/ns/notify.c index dd615bf7d6..29084124c9 100644 --- a/bin/named/notify.c +++ b/lib/ns/notify.c @@ -1,13 +1,11 @@ /* - * Copyright (C) 1999-2007, 2016 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2017 Internet Systems Consortium, Inc. ("ISC") * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -/* $Id: notify.c,v 1.37 2007/06/19 23:46:59 tbox Exp $ */ - #include #include @@ -21,8 +19,9 @@ #include #include -#include -#include +#include +#include +#include /*! \file * \brief diff --git a/bin/named/query.c b/lib/ns/query.c similarity index 98% rename from bin/named/query.c rename to lib/ns/query.c index 3bbaa22511..4d6f6524f2 100644 --- a/bin/named/query.c +++ b/lib/ns/query.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999-2017 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2017 Internet Systems Consortium, Inc. ("ISC") * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -52,12 +52,13 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #if 0 /* @@ -158,14 +159,14 @@ do { \ static inline void client_trace(ns_client_t *client, int level, const char *message) { if (client != NULL && client->query.qname != NULL) { - if (isc_log_wouldlog(ns_g_lctx, level)) { + if (isc_log_wouldlog(ns_lctx, level)) { char qbuf[DNS_NAME_FORMATSIZE]; char tbuf[DNS_RDATATYPE_FORMATSIZE]; dns_name_format(client->query.qname, qbuf, sizeof(qbuf)); dns_rdatatype_format(client->query.qtype, tbuf, sizeof(tbuf)); - isc_log_write(ns_g_lctx, + isc_log_write(ns_lctx, NS_LOGCATEGORY_CLIENT, NS_LOGMODULE_QUERY, level, "query client=%p thread=0x%lx " @@ -175,7 +176,7 @@ client_trace(ns_client_t *client, int level, const char *message) { qbuf, tbuf, message); } } else { - isc_log_write(ns_g_lctx, + isc_log_write(ns_lctx, NS_LOGCATEGORY_CLIENT, NS_LOGMODULE_QUERY, level, "query client=%p thread=0x%lx " @@ -487,7 +488,7 @@ inc_stats(ns_client_t *client, isc_statscounter_t counter) { isc_stats_t *zonestats; dns_stats_t *querystats = NULL; - isc_stats_increment(ns_g_server->nsstats, counter); + ns_stats_increment(client->sctx->nsstats, counter); if (zone == NULL) return; @@ -503,7 +504,7 @@ inc_stats(ns_client_t *client, isc_statscounter_t counter) { * We only increment per-type if we're using the authoritative * answer counter, preventing double-counting. */ - if (counter == dns_nsstatscounter_authans) { + if (counter == ns_statscounter_authans) { querystats = dns_zone_getrcvquerystats(zone); if (querystats != NULL) { rdataset = ISC_LIST_HEAD(client->query.qname->list); @@ -520,25 +521,25 @@ query_send(ns_client_t *client) { isc_statscounter_t counter; if ((client->message->flags & DNS_MESSAGEFLAG_AA) == 0) - inc_stats(client, dns_nsstatscounter_nonauthans); + inc_stats(client, ns_statscounter_nonauthans); else - inc_stats(client, dns_nsstatscounter_authans); + inc_stats(client, ns_statscounter_authans); if (client->message->rcode == dns_rcode_noerror) { dns_section_t answer = DNS_SECTION_ANSWER; if (ISC_LIST_EMPTY(client->message->sections[answer])) { if (client->query.isreferral) - counter = dns_nsstatscounter_referral; + counter = ns_statscounter_referral; else - counter = dns_nsstatscounter_nxrrset; + counter = ns_statscounter_nxrrset; } else - counter = dns_nsstatscounter_success; + counter = ns_statscounter_success; } else if (client->message->rcode == dns_rcode_nxdomain) - counter = dns_nsstatscounter_nxdomain; + counter = ns_statscounter_nxdomain; else if (client->message->rcode == dns_rcode_badcookie) - counter = dns_nsstatscounter_badcookie; + counter = ns_statscounter_badcookie; else /* We end up here in case of YXDOMAIN, and maybe others */ - counter = dns_nsstatscounter_failure; + counter = ns_statscounter_failure; inc_stats(client, counter); ns_client_send(client); @@ -551,17 +552,17 @@ query_error(ns_client_t *client, isc_result_t result, int line) { switch (result) { case DNS_R_SERVFAIL: loglevel = ISC_LOG_DEBUG(1); - inc_stats(client, dns_nsstatscounter_servfail); + inc_stats(client, ns_statscounter_servfail); break; case DNS_R_FORMERR: - inc_stats(client, dns_nsstatscounter_formerr); + inc_stats(client, ns_statscounter_formerr); break; default: - inc_stats(client, dns_nsstatscounter_failure); + inc_stats(client, ns_statscounter_failure); break; } - if (ns_g_server->log_queries) + if ((client->sctx->options & NS_SERVER_LOGQUERIES) != 0) loglevel = ISC_LOG_INFO; log_queryerror(client, result, line, loglevel); @@ -572,11 +573,11 @@ query_error(ns_client_t *client, isc_result_t result, int line) { static void query_next(ns_client_t *client, isc_result_t result) { if (result == DNS_R_DUPLICATE) - inc_stats(client, dns_nsstatscounter_duplicate); + inc_stats(client, ns_statscounter_duplicate); else if (result == DNS_R_DROP) - inc_stats(client, dns_nsstatscounter_dropped); + inc_stats(client, ns_statscounter_dropped); else - inc_stats(client, dns_nsstatscounter_failure); + inc_stats(client, ns_statscounter_failure); ns_client_next(client, result); } @@ -1108,7 +1109,7 @@ query_validatezonedb(ns_client_t *client, const dns_name_t *name, if ((options & DNS_GETDB_NOLOG) == 0) { char msg[NS_CLIENT_ACLMSGSIZE("query")]; if (result == ISC_R_SUCCESS) { - if (isc_log_wouldlog(ns_g_lctx, ISC_LOG_DEBUG(3))) { + if (isc_log_wouldlog(ns_lctx, ISC_LOG_DEBUG(3))) { ns_client_aclmsg("query", name, qtype, client->view->rdclass, msg, sizeof(msg)); @@ -1245,17 +1246,17 @@ rpz_log_rewrite(ns_client_t *client, isc_boolean_t disabled, * Count both enabled and disabled rewrites for each zone. */ if (!disabled && policy != DNS_RPZ_POLICY_PASSTHRU) { - isc_stats_increment(ns_g_server->nsstats, - dns_nsstatscounter_rpz_rewrites); + ns_stats_increment(client->sctx->nsstats, + ns_statscounter_rpz_rewrites); } if (p_zone != NULL) { zonestats = dns_zone_getrequeststats(p_zone); if (zonestats != NULL) isc_stats_increment(zonestats, - dns_nsstatscounter_rpz_rewrites); + ns_statscounter_rpz_rewrites); } - if (!isc_log_wouldlog(ns_g_lctx, DNS_RPZ_INFO_LEVEL)) + if (!isc_log_wouldlog(ns_lctx, DNS_RPZ_INFO_LEVEL)) return; st = client->query.rpz_st; @@ -1289,7 +1290,7 @@ rpz_log_fail_helper(ns_client_t *client, int level, dns_name_t *p_name, const char *rpztypestr1; const char *rpztypestr2; - if (!isc_log_wouldlog(ns_g_lctx, level)) + if (!isc_log_wouldlog(ns_lctx, level)) return; /* @@ -1351,7 +1352,7 @@ rpz_getdb(ns_client_t *client, dns_name_t *p_name, dns_rpz_type_t rpz_type, * logging is disabled for some policy zones. */ if (st->popt.no_log == 0 && - isc_log_wouldlog(ns_g_lctx, DNS_RPZ_DEBUG_LEVEL2)) + isc_log_wouldlog(ns_lctx, DNS_RPZ_DEBUG_LEVEL2)) { dns_name_format(client->query.qname, qnamebuf, sizeof(qnamebuf)); @@ -1421,7 +1422,7 @@ query_getcachedb(ns_client_t *client, const dns_name_t *name, */ client->query.attributes |= NS_QUERYATTR_CACHEACLOK; - if (log && isc_log_wouldlog(ns_g_lctx, + if (log && isc_log_wouldlog(ns_lctx, ISC_LOG_DEBUG(3))) { ns_client_aclmsg("query (cache)", name, qtype, @@ -1903,14 +1904,12 @@ query_addadditional(void *arg, const dns_name_t *name, dns_rdatatype_t qtype) { if (sigrdataset != NULL && dns_rdataset_isassociated(sigrdataset)) dns_rdataset_disassociate(sigrdataset); - /* treat as if not found */ + result = ISC_R_NOTFOUND; } else if (!query_isduplicate(client, fname, - dns_rdatatype_a, &mname)) - { + dns_rdatatype_a, &mname)) { if (mname != fname) { if (mname != NULL) { - query_releasename(client, - &fname); + query_releasename(client, &fname); fname = mname; } else need_addname = ISC_TRUE; @@ -1973,14 +1972,12 @@ query_addadditional(void *arg, const dns_name_t *name, dns_rdatatype_t qtype) { if (sigrdataset != NULL && dns_rdataset_isassociated(sigrdataset)) dns_rdataset_disassociate(sigrdataset); - /* treat as if not found */ + result = ISC_R_NOTFOUND; } else if (!query_isduplicate(client, fname, - dns_rdatatype_aaaa, &mname)) - { + dns_rdatatype_aaaa, &mname)) { if (mname != fname) { if (mname != NULL) { - query_releasename(client, - &fname); + query_releasename(client, &fname); fname = mname; } else need_addname = ISC_TRUE; @@ -2434,14 +2431,14 @@ query_prefetch(ns_client_t *client, dns_name_t *qname, return; if (client->recursionquota == NULL) { - result = isc_quota_attach(&ns_g_server->recursionquota, + result = isc_quota_attach(&client->sctx->recursionquota, &client->recursionquota); if (result == ISC_R_SUCCESS && !client->mortal && !TCP(client)) result = ns_client_replace(client); if (result != ISC_R_SUCCESS) return; - isc_stats_increment(ns_g_server->nsstats, - dns_nsstatscounter_recursclients); + ns_stats_increment(client->sctx->nsstats, + ns_statscounter_recursclients); } tmprdataset = query_newrdataset(client); @@ -2617,14 +2614,14 @@ query_rpzfetch(ns_client_t *client, dns_name_t *qname, dns_rdatatype_t type) { return; if (client->recursionquota == NULL) { - result = isc_quota_attach(&ns_g_server->recursionquota, + result = isc_quota_attach(&client->sctx->recursionquota, &client->recursionquota); if (result == ISC_R_SUCCESS && !client->mortal && !TCP(client)) result = ns_client_replace(client); if (result != ISC_R_SUCCESS) return; - isc_stats_increment(ns_g_server->nsstats, - dns_nsstatscounter_recursclients); + ns_stats_increment(client->sctx->nsstats, + ns_statscounter_recursclients); } tmprdataset = query_newrdataset(client); @@ -4266,6 +4263,7 @@ dns64_aaaaok(ns_client_t *client, dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset) { isc_netaddr_t netaddr; + dns_aclenv_t *env = ns_interfacemgr_getaclenv(client->interface->mgr); dns_dns64_t *dns64 = ISC_LIST_HEAD(client->view->dns64); unsigned int flags = 0; unsigned int i, count; @@ -4291,8 +4289,8 @@ dns64_aaaaok(ns_client_t *client, dns_rdataset_t *rdataset, isc_netaddr_fromsockaddr(&netaddr, &client->peeraddr); if (dns_dns64_aaaaok(dns64, &netaddr, client->signer, - &ns_g_server->aclenv, flags, rdataset, - aaaaok, count)) { + env, flags, rdataset, aaaaok, count)) + { for (i = 0; i < count; i++) { if (aaaaok != NULL && !aaaaok[i]) { SAVE(client->query.dns64_aaaaok, aaaaok); @@ -4874,10 +4872,10 @@ query_start(query_ctx_t *qctx) { if (result == DNS_R_REFUSED) { if (WANTRECURSION(qctx->client)) { inc_stats(qctx->client, - dns_nsstatscounter_recurserej); + ns_statscounter_recurserej); } else { inc_stats(qctx->client, - dns_nsstatscounter_authrej); + ns_statscounter_authrej); } if (!PARTIALANSWER(qctx->client)) { QUERY_ERROR(qctx, DNS_R_REFUSED); @@ -4916,9 +4914,9 @@ query_start(query_ctx_t *qctx) { /* Track TCP vs UDP stats per zone */ if (TCP(qctx->client)) { - inc_stats(qctx->client, dns_nsstatscounter_tcp); + inc_stats(qctx->client, ns_statscounter_tcp); } else { - inc_stats(qctx->client, dns_nsstatscounter_udp); + inc_stats(qctx->client, ns_statscounter_udp); } } @@ -5033,7 +5031,7 @@ query_lookup(query_ctx_t *qctx) { dns_name_format(qctx->client->query.qname, namebuf, sizeof(namebuf)); - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, + isc_log_write(ns_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_QUERY, ISC_LOG_INFO, "%s resolver failure, stale answer %s", namebuf, success ? "used" : "unavailable"); @@ -5134,8 +5132,8 @@ fetch_callback(isc_task_t *task, isc_event_t *event) { } else { errorloglevel = ISC_LOG_DEBUG(4); } - if (isc_log_wouldlog(ns_g_lctx, errorloglevel)) { - dns_resolver_logfetch(fetch, ns_g_lctx, + if (isc_log_wouldlog(ns_lctx, errorloglevel)) { + dns_resolver_logfetch(fetch, ns_lctx, logcategory, NS_LOGMODULE_QUERY, errorloglevel, ISC_FALSE); @@ -5164,7 +5162,7 @@ query_recurse(ns_client_t *client, dns_rdatatype_t qtype, dns_name_t *qname, CTRACE(ISC_LOG_DEBUG(3), "query_recurse"); if (!resuming) - inc_stats(client, dns_nsstatscounter_recursion); + inc_stats(client, ns_statscounter_recursion); /* * We are about to recurse, which means that this client will @@ -5177,11 +5175,11 @@ query_recurse(ns_client_t *client, dns_rdatatype_t qtype, dns_name_t *qname, * connection was accepted (if allowed by the TCP quota). */ if (client->recursionquota == NULL) { - result = isc_quota_attach(&ns_g_server->recursionquota, + result = isc_quota_attach(&client->sctx->recursionquota, &client->recursionquota); - isc_stats_increment(ns_g_server->nsstats, - dns_nsstatscounter_recursclients); + ns_stats_increment(client->sctx->nsstats, + ns_statscounter_recursclients); if (result == ISC_R_SOFTQUOTA) { static isc_stdtime_t last = 0; @@ -5212,9 +5210,9 @@ query_recurse(ns_client_t *client, dns_rdatatype_t qtype, dns_name_t *qname, ISC_LOG_WARNING, "no more recursive clients " "(%d/%d/%d): %s", - ns_g_server->recursionquota.used, - ns_g_server->recursionquota.soft, - ns_g_server->recursionquota.max, + client->sctx->recursionquota.used, + client->sctx->recursionquota.soft, + client->sctx->recursionquota.max, isc_result_totext(result)); } ns_client_killoldestquery(client); @@ -5229,8 +5227,8 @@ query_recurse(ns_client_t *client, dns_rdatatype_t qtype, dns_name_t *qname, "ns_client_replace() failed: %s", isc_result_totext(result)); isc_quota_detach(&client->recursionquota); - isc_stats_decrement(ns_g_server->nsstats, - dns_nsstatscounter_recursclients); + ns_stats_decrement(client->sctx->nsstats, + ns_statscounter_recursclients); } } if (result != ISC_R_SUCCESS) @@ -5513,7 +5511,7 @@ query_sfcache(query_ctx_t *qctx) { flags = 0; #ifdef ENABLE_AFL - if (ns_g_fuzz_type == ns_fuzz_resolver) { + if (qctx->client->sctx->fuzztype == isc_fuzz_resolver) { failcache = ISC_FALSE; } else { failcache = @@ -5532,7 +5530,7 @@ query_sfcache(query_ctx_t *qctx) { (((flags & NS_FAILCACHE_CD) != 0) || ((qctx->client->message->flags & DNS_MESSAGEFLAG_CD) == 0))) { - if (isc_log_wouldlog(ns_g_lctx, ISC_LOG_DEBUG(1))) { + if (isc_log_wouldlog(ns_lctx, ISC_LOG_DEBUG(1))) { char namebuf[DNS_NAME_FORMATSIZE]; char typename[DNS_RDATATYPE_FORMATSIZE]; @@ -5594,7 +5592,7 @@ query_checkrrl(query_ctx_t *qctx, isc_result_t result) { qctx->client->query.attributes |= NS_QUERYATTR_RRL_CHECKED; - wouldlog = isc_log_wouldlog(ns_g_lctx, DNS_RRL_LOG_DROP); + wouldlog = isc_log_wouldlog(ns_lctx, DNS_RRL_LOG_DROP); constname = qctx->fname; if (result == DNS_R_NXDOMAIN) { /* @@ -5674,18 +5672,18 @@ query_checkrrl(query_ctx_t *qctx, isc_result_t result) { if (rrl_result == DNS_RRL_RESULT_DROP) { /* * These will also be counted in - * dns_nsstatscounter_dropped + * ns_statscounter_dropped */ inc_stats(qctx->client, - dns_nsstatscounter_ratedropped); + ns_statscounter_ratedropped); QUERY_ERROR(qctx, DNS_R_DROP); } else { /* * These will also be counted in - * dns_nsstatscounter_truncatedresp + * ns_statscounter_truncatedresp */ inc_stats(qctx->client, - dns_nsstatscounter_rateslipped); + ns_statscounter_rateslipped); if (WANTCOOKIE(qctx->client)) { qctx->client->message->flags &= ~DNS_MESSAGEFLAG_AA; @@ -6645,6 +6643,7 @@ query_respond(query_ctx_t *qctx) { static isc_result_t query_dns64(query_ctx_t *qctx) { ns_client_t *client = qctx->client; + dns_aclenv_t *env = ns_interfacemgr_getaclenv(client->interface->mgr); dns_name_t *name, *mname; dns_rdata_t *dns64_rdata; dns_rdata_t rdata = DNS_RDATA_INIT; @@ -6760,9 +6759,8 @@ query_dns64(query_ctx_t *qctx) { isc_buffer_availableregion(buffer, &r); INSIST(r.length >= 16); result = dns_dns64_aaaafroma(dns64, &netaddr, - client->signer, - &ns_g_server->aclenv, - flags, rdata.data, r.base); + client->signer, env, flags, + rdata.data, r.base); if (result != ISC_R_SUCCESS) { dns_rdata_reset(&rdata); continue; @@ -6799,7 +6797,7 @@ query_dns64(query_ctx_t *qctx) { dns64_rdataset = NULL; dns64_rdatalist = NULL; dns_message_takebuffer(client->message, &buffer); - inc_stats(client, dns_nsstatscounter_dns64); + inc_stats(client, ns_statscounter_dns64); result = ISC_R_SUCCESS; cleanup: @@ -7617,8 +7615,9 @@ query_sign_nodata(query_ctx_t *qctx) { */ if (dns_rdataset_isassociated(qctx->rdataset) && !dns_name_equal(qname, found) && - !(ns_g_nonearest && - qctx->qtype != dns_rdatatype_ds)) + (((qctx->client->sctx->options & + NS_SERVER_NONEAREST) == 0) || + qctx->qtype == dns_rdatatype_ds)) { unsigned int count; unsigned int skip; @@ -7872,7 +7871,7 @@ query_redirect(query_ctx_t *qctx) { switch (result) { case ISC_R_SUCCESS: inc_stats(qctx->client, - dns_nsstatscounter_nxdomainredirect); + ns_statscounter_nxdomainredirect); return (query_prepresponse(qctx)); case DNS_R_NXRRSET: qctx->redirected = ISC_TRUE; @@ -7892,11 +7891,11 @@ query_redirect(query_ctx_t *qctx) { switch (result) { case ISC_R_SUCCESS: inc_stats(qctx->client, - dns_nsstatscounter_nxdomainredirect); + ns_statscounter_nxdomainredirect); return (query_prepresponse(qctx)); case DNS_R_CONTINUE: inc_stats(qctx->client, - dns_nsstatscounter_nxdomainredirect_rlookup); + ns_statscounter_nxdomainredirect_rlookup); SAVE(qctx->client->query.redirect.db, qctx->db); SAVE(qctx->client->query.redirect.node, qctx->node); SAVE(qctx->client->query.redirect.zone, qctx->zone); @@ -8207,7 +8206,7 @@ query_coveringnsec(query_ctx_t *qctx) { dbuf, DNS_SECTION_AUTHORITY); } - inc_stats(qctx->client, dns_nsstatscounter_nxdomainsynth); + inc_stats(qctx->client, ns_statscounter_nxdomainsynth); done = ISC_TRUE; @@ -8730,7 +8729,7 @@ query_addsoa(query_ctx_t *qctx, unsigned int override_ttl, /* * Don't add the SOA record for test which set "-T nosoa". */ - if (ns_g_nosoa && + if (((client->sctx->options & NS_SERVER_NOSOA) != 0) && (!WANTDNSSEC(client) || !dns_rdataset_isassociated(qctx->rdataset))) { return (ISC_R_SUCCESS); @@ -9494,28 +9493,30 @@ query_sortlist_order_1element(const dns_rdata_t *rdata, const void *arg) { static void query_setup_sortlist(query_ctx_t *qctx) { isc_netaddr_t netaddr; - dns_rdatasetorderfunc_t order = NULL; + ns_client_t *client = qctx->client; + dns_aclenv_t *env = ns_interfacemgr_getaclenv(client->interface->mgr); const void *order_arg = NULL; - isc_netaddr_fromsockaddr(&netaddr, &qctx->client->peeraddr); - switch (ns_sortlist_setup(qctx->client->view->sortlist, + isc_netaddr_fromsockaddr(&netaddr, &client->peeraddr); + switch (ns_sortlist_setup(client->view->sortlist, env, &netaddr, &order_arg)) { case NS_SORTLISTTYPE_1ELEMENT: - order = query_sortlist_order_1element; + dns_message_setsortorder(client->message, + query_sortlist_order_1element, + env, NULL, order_arg); break; case NS_SORTLISTTYPE_2ELEMENT: - order = query_sortlist_order_2element; + dns_message_setsortorder(client->message, + query_sortlist_order_2element, + env, order_arg, NULL); break; case NS_SORTLISTTYPE_NONE: - order = NULL; break; default: INSIST(0); break; } - - dns_message_setsortorder(qctx->client->message, order, order_arg); } /* @@ -9633,7 +9634,7 @@ query_done(query_ctx_t *qctx) { if (staleanswersok) { qctx->client->query.dboptions |= DNS_DBFIND_STALEOK; - inc_stats(qctx->client, dns_nsstatscounter_trystale); + inc_stats(qctx->client, ns_statscounter_trystale); if (qctx->client->query.fetch != NULL) dns_resolver_destroyfetch( &qctx->client->query.fetch); @@ -9726,7 +9727,7 @@ log_query(ns_client_t *client, unsigned int flags, unsigned int extflags) { dns_rdataset_t *rdataset; int level = ISC_LOG_INFO; - if (! isc_log_wouldlog(ns_g_lctx, level)) + if (! isc_log_wouldlog(ns_lctx, level)) return; rdataset = ISC_LIST_HEAD(client->query.qname->list); @@ -9766,7 +9767,7 @@ log_queryerror(ns_client_t *client, isc_result_t result, int line, int level) { const char *namep, *typep, *classp, *sep1, *sep2; dns_rdataset_t *rdataset; - if (!isc_log_wouldlog(ns_g_lctx, level)) + if (!isc_log_wouldlog(ns_lctx, level)) return; namep = typep = classp = sep1 = sep2 = ""; @@ -9815,7 +9816,9 @@ ns_query_start(ns_client_t *client) { /* * Test only. */ - if (ns_g_clienttest && !TCP(client)) { + if (((client->sctx->options & NS_SERVER_CLIENTTEST) != 0) && + !TCP(client)) + { result = ns_client_replace(client); if (result == ISC_R_SHUTTINGDOWN) { ns_client_next(client, result); @@ -9913,7 +9916,7 @@ ns_query_start(ns_client_t *client) { return; } - if (ns_g_server->log_queries) + if ((client->sctx->options & NS_SERVER_LOGQUERIES) != 0) log_query(client, saved_flags, saved_extflags); /* @@ -9922,7 +9925,7 @@ ns_query_start(ns_client_t *client) { rdataset = ISC_LIST_HEAD(client->query.qname->list); INSIST(rdataset != NULL); client->query.qtype = qtype = rdataset->type; - dns_rdatatypestats_increment(ns_g_server->rcvquerystats, qtype); + dns_rdatatypestats_increment(client->sctx->rcvquerystats, qtype); if (dns_rdatatype_ismeta(qtype)) { switch (qtype) { @@ -9938,8 +9941,8 @@ ns_query_start(ns_client_t *client) { return; case dns_rdatatype_tkey: result = dns_tkey_processquery(client->message, - ns_g_server->tkeyctx, - client->view->dynamickeys); + client->sctx->tkeyctx, + client->view->dynamickeys); if (result == ISC_R_SUCCESS) query_send(client); else @@ -10022,7 +10025,7 @@ ns_query_start(ns_client_t *client) { * If "-T noaa" has been set on the command line don't set * AA on authoritative answers. */ - if (!ns_g_noaa) + if ((client->sctx->options & NS_SERVER_NOAA) == 0) message->flags |= DNS_MESSAGEFLAG_AA; /* diff --git a/lib/ns/server.c b/lib/ns/server.c new file mode 100644 index 0000000000..4a149ac160 --- /dev/null +++ b/lib/ns/server.c @@ -0,0 +1,257 @@ +/* + * Copyright (C) 2017 Internet Systems Consortium, Inc. ("ISC") + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +/*! \file */ + +#include + +#include +#include + +#include +#include + +#include +#include + +#define SCTX_MAGIC ISC_MAGIC('S','c','t','x') +#define SCTX_VALID(s) ISC_MAGIC_VALID(s, SCTX_MAGIC) + +#define CHECKFATAL(op) \ + do { result = (op); \ + RUNTIME_CHECK(result == ISC_R_SUCCESS); \ + } while (0) \ + +isc_result_t +ns_server_create(isc_mem_t *mctx, isc_entropy_t *entropy, + ns_matchview_t matchingview, ns_server_t **sctxp) +{ + ns_server_t *sctx; + isc_result_t result; + + REQUIRE(sctxp != NULL && *sctxp == NULL); + + sctx = isc_mem_get(mctx, sizeof(*sctx)); + if (sctx == NULL) + return (ISC_R_NOMEMORY); + + memset(sctx, 0, sizeof(*sctx)); + + isc_mem_attach(mctx, &sctx->mctx); + + result = isc_refcount_init(&sctx->references, 1); + if (result != ISC_R_SUCCESS) + goto cleanup; + + CHECKFATAL(isc_quota_init(&sctx->xfroutquota, 10)); + CHECKFATAL(isc_quota_init(&sctx->tcpquota, 10)); + CHECKFATAL(isc_quota_init(&sctx->recursionquota, 100)); + + CHECKFATAL(dns_tkeyctx_create(mctx, entropy, &sctx->tkeyctx)); + + CHECKFATAL(ns_stats_create(mctx, ns_statscounter_max, &sctx->nsstats)); + + CHECKFATAL(dns_rdatatypestats_create(mctx, &sctx->rcvquerystats)); + + CHECKFATAL(dns_opcodestats_create(mctx, &sctx->opcodestats)); + + CHECKFATAL(dns_rcodestats_create(mctx, &sctx->rcodestats)); + + CHECKFATAL(isc_stats_create(mctx, &sctx->udpinstats4, + dns_sizecounter_in_max)); + + CHECKFATAL(isc_stats_create(mctx, &sctx->udpoutstats4, + dns_sizecounter_out_max)); + + CHECKFATAL(isc_stats_create(mctx, &sctx->udpinstats6, + dns_sizecounter_in_max)); + + CHECKFATAL(isc_stats_create(mctx, &sctx->udpoutstats6, + dns_sizecounter_out_max)); + + CHECKFATAL(isc_stats_create(mctx, &sctx->tcpinstats4, + dns_sizecounter_in_max)); + + CHECKFATAL(isc_stats_create(mctx, &sctx->tcpoutstats4, + dns_sizecounter_out_max)); + + CHECKFATAL(isc_stats_create(mctx, &sctx->tcpinstats6, + dns_sizecounter_in_max)); + + CHECKFATAL(isc_stats_create(mctx, &sctx->tcpoutstats6, + dns_sizecounter_out_max)); + + sctx->initialtimo = 300; + sctx->idletimo = 300; + sctx->keepalivetimo = 300; + sctx->advertisedtimo = 300; + + sctx->udpsize = 4096; + sctx->transfer_tcp_message_size = 20480; + + sctx->fuzztype = isc_fuzz_none; + sctx->fuzznotify = NULL; + sctx->gethostname = NULL; + + sctx->matchingview = matchingview; + + ISC_LIST_INIT(sctx->altsecrets); + + sctx->magic = SCTX_MAGIC; + *sctxp = sctx; + + return (ISC_R_SUCCESS); + + cleanup: + isc_mem_putanddetach(&sctx->mctx, sctx, sizeof(*sctx)); + + return (result); +} + +void +ns_server_attach(ns_server_t *src, ns_server_t **dest) { + REQUIRE(SCTX_VALID(src)); + REQUIRE(dest != NULL && *dest == NULL); + + isc_refcount_increment(&src->references, NULL); + + *dest = src; +} + +void +ns_server_detach(ns_server_t **sctxp) { + ns_server_t *sctx; + unsigned int refs; + + REQUIRE(sctxp != NULL); + sctx = *sctxp; + REQUIRE(SCTX_VALID(sctx)); + + isc_refcount_decrement(&sctx->references, &refs); + if (refs == 0) { + ns_altsecret_t *altsecret; + + sctx->magic = 0; + + while ((altsecret = ISC_LIST_HEAD(sctx->altsecrets)) != NULL) { + ISC_LIST_UNLINK(sctx->altsecrets, altsecret, link); + isc_mem_put(sctx->mctx, altsecret, sizeof(*altsecret)); + } + + isc_quota_destroy(&sctx->recursionquota); + isc_quota_destroy(&sctx->tcpquota); + isc_quota_destroy(&sctx->xfroutquota); + + if (sctx->server_id != NULL) + isc_mem_free(sctx->mctx, sctx->server_id); + + if (sctx->blackholeacl != NULL) + dns_acl_detach(&sctx->blackholeacl); + if (sctx->keepresporder != NULL) + dns_acl_detach(&sctx->keepresporder); + if (sctx->tkeyctx != NULL) + dns_tkeyctx_destroy(&sctx->tkeyctx); + + if (sctx->nsstats != NULL) + ns_stats_detach(&sctx->nsstats); + + if (sctx->rcvquerystats != NULL) + dns_stats_detach(&sctx->rcvquerystats); + if (sctx->opcodestats != NULL) + dns_stats_detach(&sctx->opcodestats); + if (sctx->rcodestats != NULL) + dns_stats_detach(&sctx->rcodestats); + + if (sctx->udpinstats4 != NULL) + isc_stats_detach(&sctx->udpinstats4); + if (sctx->tcpinstats4 != NULL) + isc_stats_detach(&sctx->tcpinstats4); + if (sctx->udpoutstats4 != NULL) + isc_stats_detach(&sctx->udpoutstats4); + if (sctx->tcpoutstats4 != NULL) + isc_stats_detach(&sctx->tcpoutstats4); + + if (sctx->udpinstats6 != NULL) + isc_stats_detach(&sctx->udpinstats6); + if (sctx->tcpinstats6 != NULL) + isc_stats_detach(&sctx->tcpinstats6); + if (sctx->udpoutstats6 != NULL) + isc_stats_detach(&sctx->udpoutstats6); + if (sctx->tcpoutstats6 != NULL) + isc_stats_detach(&sctx->tcpoutstats6); + + isc_mem_putanddetach(&sctx->mctx, sctx, sizeof(*sctx)); + } + + *sctxp = NULL; +} + +isc_result_t +ns_server_setserverid(ns_server_t *sctx, const char *serverid) { + REQUIRE(SCTX_VALID(sctx)); + + if (sctx->server_id != NULL) { + isc_mem_free(sctx->mctx, sctx->server_id); + sctx->server_id = NULL; + } + + if (serverid != NULL) { + sctx->server_id = isc_mem_strdup(sctx->mctx, serverid); + if (sctx->server_id == NULL) + return (ISC_R_NOMEMORY); + } + + return (ISC_R_SUCCESS); +} + +void +ns_server_settimeouts(ns_server_t *sctx, unsigned int initial, + unsigned int idle, unsigned int keepalive, + unsigned int advertised) +{ + REQUIRE(SCTX_VALID(sctx)); + + sctx->initialtimo = initial; + sctx->idletimo = idle; + sctx->keepalivetimo = keepalive; + sctx->advertisedtimo = advertised; +} + +void +ns_server_gettimeouts(ns_server_t *sctx, unsigned int *initial, + unsigned int *idle, unsigned int *keepalive, + unsigned int *advertised) +{ + REQUIRE(SCTX_VALID(sctx)); + REQUIRE(initial != NULL && idle != NULL && + keepalive != NULL && advertised != NULL); + + *initial = sctx->initialtimo; + *idle = sctx->idletimo; + *keepalive = sctx->keepalivetimo; + *advertised = sctx->advertisedtimo; +} + +void +ns_server_setoption(ns_server_t *sctx, unsigned int option, + isc_boolean_t value) +{ + REQUIRE(SCTX_VALID(sctx)); + if (value) { + sctx->options |= option; + } else { + sctx->options &= ~option; + } +} + +isc_boolean_t +ns_server_getoption(ns_server_t *sctx, unsigned int option) { + REQUIRE(SCTX_VALID(sctx)); + + return (ISC_TF((sctx->options & option) != 0)); +} diff --git a/bin/named/sortlist.c b/lib/ns/sortlist.c similarity index 69% rename from bin/named/sortlist.c rename to lib/ns/sortlist.c index e59e9a5483..445062f1cf 100644 --- a/bin/named/sortlist.c +++ b/lib/ns/sortlist.c @@ -1,13 +1,11 @@ /* - * Copyright (C) 2000, 2001, 2004-2007, 2016 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2017 Internet Systems Consortium, Inc. ("ISC") * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -/* $Id: sortlist.c,v 1.17 2007/09/14 01:46:05 marka Exp $ */ - /*! \file */ #include @@ -16,15 +14,15 @@ #include #include +#include #include -#include -#include -#include +#include +#include ns_sortlisttype_t -ns_sortlist_setup(dns_acl_t *acl, isc_netaddr_t *clientaddr, - const void **argp) +ns_sortlist_setup(dns_acl_t *acl, dns_aclenv_t *env, + isc_netaddr_t *clientaddr, const void **argp) { unsigned int i; @@ -63,23 +61,26 @@ ns_sortlist_setup(dns_acl_t *acl, isc_netaddr_t *clientaddr, try_elt = e; } - if (dns_aclelement_match(clientaddr, NULL, try_elt, - &ns_g_server->aclenv, - &matched_elt)) { + if (dns_aclelement_match(clientaddr, NULL, try_elt, env, + &matched_elt)) + { if (order_elt != NULL) { if (order_elt->type == - dns_aclelementtype_nestedacl) { + dns_aclelementtype_nestedacl) + { *argp = order_elt->nestedacl; return (NS_SORTLISTTYPE_2ELEMENT); } else if (order_elt->type == dns_aclelementtype_localhost && - ns_g_server->aclenv.localhost != NULL) { - *argp = ns_g_server->aclenv.localhost; + env->localhost != NULL) + { + *argp = env->localhost; return (NS_SORTLISTTYPE_2ELEMENT); } else if (order_elt->type == dns_aclelementtype_localnets && - ns_g_server->aclenv.localnets != NULL) { - *argp = ns_g_server->aclenv.localnets; + env->localnets != NULL) + { + *argp = env->localnets; return (NS_SORTLISTTYPE_2ELEMENT); } else { /* @@ -106,12 +107,12 @@ ns_sortlist_setup(dns_acl_t *acl, isc_netaddr_t *clientaddr, int ns_sortlist_addrorder2(const isc_netaddr_t *addr, const void *arg) { - const dns_acl_t *sortacl = (const dns_acl_t *) arg; + const dns_sortlist_arg_t *sla = (const dns_sortlist_arg_t *) arg; + const dns_aclenv_t *env = sla->env; + const dns_acl_t *sortacl = sla->acl; int match; - (void)dns_acl_match(addr, NULL, sortacl, - &ns_g_server->aclenv, - &match, NULL); + (void)dns_acl_match(addr, NULL, sortacl, env, &match, NULL); if (match > 0) return (match); else if (match < 0) @@ -122,24 +123,25 @@ ns_sortlist_addrorder2(const isc_netaddr_t *addr, const void *arg) { int ns_sortlist_addrorder1(const isc_netaddr_t *addr, const void *arg) { - const dns_aclelement_t *matchelt = (const dns_aclelement_t *) arg; - if (dns_aclelement_match(addr, NULL, matchelt, - &ns_g_server->aclenv, - NULL)) { + const dns_sortlist_arg_t *sla = (const dns_sortlist_arg_t *) arg; + const dns_aclenv_t *env = sla->env; + const dns_aclelement_t *element = sla->element; + + if (dns_aclelement_match(addr, NULL, element, env, NULL)) { return (0); - } else { - return (INT_MAX); } + + return (INT_MAX); } void -ns_sortlist_byaddrsetup(dns_acl_t *sortlist_acl, isc_netaddr_t *client_addr, - dns_addressorderfunc_t *orderp, - const void **argp) +ns_sortlist_byaddrsetup(dns_acl_t *sortlist_acl, dns_aclenv_t *env, + isc_netaddr_t *client_addr, + dns_addressorderfunc_t *orderp, const void **argp) { ns_sortlisttype_t sortlisttype; - sortlisttype = ns_sortlist_setup(sortlist_acl, client_addr, argp); + sortlisttype = ns_sortlist_setup(sortlist_acl, env, client_addr, argp); switch (sortlisttype) { case NS_SORTLISTTYPE_1ELEMENT: diff --git a/lib/ns/stats.c b/lib/ns/stats.c new file mode 100644 index 0000000000..6dbe19959a --- /dev/null +++ b/lib/ns/stats.c @@ -0,0 +1,125 @@ +/* + * Copyright (C) 2017 Internet Systems Consortium, Inc. ("ISC") + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +/*! \file */ + +#include + +#include +#include +#include +#include + +#include + +#define NS_STATS_MAGIC ISC_MAGIC('N', 's', 't', 't') +#define NS_STATS_VALID(x) ISC_MAGIC_VALID(x, NS_STATS_MAGIC) + +struct ns_stats { + /*% Unlocked */ + unsigned int magic; + isc_mem_t *mctx; + isc_mutex_t lock; + isc_stats_t *counters; + + /*% Locked by lock */ + unsigned int references; +}; + +void +ns_stats_attach(ns_stats_t *stats, ns_stats_t **statsp) { + REQUIRE(NS_STATS_VALID(stats)); + REQUIRE(statsp != NULL && *statsp == NULL); + + LOCK(&stats->lock); + stats->references++; + UNLOCK(&stats->lock); + + *statsp = stats; +} + +void +ns_stats_detach(ns_stats_t **statsp) { + ns_stats_t *stats; + + REQUIRE(statsp != NULL && NS_STATS_VALID(*statsp)); + + stats = *statsp; + *statsp = NULL; + + LOCK(&stats->lock); + stats->references--; + UNLOCK(&stats->lock); + + if (stats->references == 0) { + isc_stats_detach(&stats->counters); + DESTROYLOCK(&stats->lock); + isc_mem_putanddetach(&stats->mctx, stats, sizeof(*stats)); + } +} + +isc_result_t +ns_stats_create(isc_mem_t *mctx, int ncounters, ns_stats_t **statsp) { + ns_stats_t *stats; + isc_result_t result; + + REQUIRE(statsp != NULL && *statsp == NULL); + + stats = isc_mem_get(mctx, sizeof(*stats)); + if (stats == NULL) + return (ISC_R_NOMEMORY); + + stats->counters = NULL; + stats->references = 1; + + result = isc_mutex_init(&stats->lock); + if (result != ISC_R_SUCCESS) + goto clean_stats; + + result = isc_stats_create(mctx, &stats->counters, ncounters); + if (result != ISC_R_SUCCESS) + goto clean_mutex; + + stats->magic = NS_STATS_MAGIC; + stats->mctx = NULL; + isc_mem_attach(mctx, &stats->mctx); + *statsp = stats; + + return (ISC_R_SUCCESS); + + clean_mutex: + DESTROYLOCK(&stats->lock); + clean_stats: + isc_mem_put(mctx, stats, sizeof(*stats)); + + return (result); +} + +/*% + * Increment/Decrement methods + */ +void +ns_stats_increment(ns_stats_t *stats, isc_statscounter_t counter) { + REQUIRE(NS_STATS_VALID(stats)); + + isc_stats_increment(stats->counters, counter); +} + +void +ns_stats_decrement(ns_stats_t *stats, isc_statscounter_t counter) { + REQUIRE(NS_STATS_VALID(stats)); + + isc_stats_decrement(stats->counters, counter); +} + +isc_stats_t * +ns_stats_get(ns_stats_t *stats) { + REQUIRE(NS_STATS_VALID(stats)); + + return (stats->counters); +} diff --git a/lib/lwres/tests/Atffile b/lib/ns/tests/Atffile similarity index 100% rename from lib/lwres/tests/Atffile rename to lib/ns/tests/Atffile diff --git a/lib/ns/tests/Makefile.in b/lib/ns/tests/Makefile.in new file mode 100644 index 0000000000..92ffcc323d --- /dev/null +++ b/lib/ns/tests/Makefile.in @@ -0,0 +1,58 @@ +# Copyright (C) 2017 Internet Systems Consortium, Inc. ("ISC") +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +srcdir = @srcdir@ +VPATH = @srcdir@ +top_srcdir = @top_srcdir@ + +# Attempt to disable parallel processing. +.NOTPARALLEL: +.NO_PARALLEL: + +VERSION=@BIND9_VERSION@ + +@BIND9_MAKE_INCLUDES@ + +CINCLUDES = -I. -Iinclude ${NS_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES} \ + @DST_OPENSSL_INC@ +CDEFINES = @CRYPTO@ -DTESTS="\"${top_builddir}/lib/ns/tests/\"" + +ISCLIBS = ../../isc/libisc.@A@ +ISCDEPLIBS = ../../isc/libisc.@A@ +DNSLIBS = ../../dns/libdns.@A@ @DNS_CRYPTO_LIBS@ +DNSDEPLIBS = ../../dns/libdns.@A@ +NSLIBS = ../libns.@A@ +NSDEPLIBS = ../libns.@A@ + +LIBS = @LIBS@ @ATFLIBS@ + +OBJS = nstest.@O@ +SRCS = nstest.c \ + listenlist_test.c \ + notify_test.c + +SUBDIRS = +TARGETS = listenlist_test@EXEEXT@ \ + notify_test@EXEEXT@ + +@BIND9_MAKE_RULES@ + +listenlist_test@EXEEXT@: listenlist_test.@O@ nstest.@O@ ${NSDEPLIBS} ${ISCDEPLIBS} ${DNSDEPLIBS} + ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \ + listenlist_test.@O@ nstest.@O@ ${NSLIBS} ${DNSLIBS} \ + ${ISCLIBS} ${LIBS} + +notify_test@EXEEXT@: notify_test.@O@ nstest.@O@ ${NSDEPLIBS} ${ISCDEPLIBS} ${DNSDEPLIBS} + ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \ + notify_test.@O@ nstest.@O@ ${NSLIBS} ${DNSLIBS} \ + ${ISCLIBS} ${LIBS} + +unit:: + sh ${top_srcdir}/unit/unittest.sh + +clean distclean:: + rm -f ${TARGETS} + rm -f atf.out diff --git a/lib/ns/tests/listenlist_test.c b/lib/ns/tests/listenlist_test.c new file mode 100644 index 0000000000..79a4574b4f --- /dev/null +++ b/lib/ns/tests/listenlist_test.c @@ -0,0 +1,101 @@ +/* + * Copyright (C) 2017 Internet Systems Consortium, Inc. ("ISC") + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +/*! \file */ + +#include + +#include + +#include +#include + +#include +#include + +#include + +#include + +#include "nstest.h" + +/* + * Helper functions + */ + +ATF_TC(ns_listenlist_default); +ATF_TC_HEAD(ns_listenlist_default, tc) { + atf_tc_set_md_var(tc, "descr", "test that ns_listenlist_default works"); +} +ATF_TC_BODY(ns_listenlist_default, tc) { + isc_result_t result; + ns_listenlist_t *list = NULL; + ns_listenelt_t *elt; + int count; + + UNUSED(tc); + + result = ns_test_begin(NULL, ISC_FALSE); + ATF_REQUIRE_EQ(result, ISC_R_SUCCESS); + + result = ns_listenlist_default(mctx, 5300, -1, ISC_FALSE, &list); + ATF_REQUIRE_EQ(result, ISC_R_SUCCESS); + ATF_REQUIRE(list != NULL); + + ATF_CHECK(!ISC_LIST_EMPTY(list->elts)); + + count = 0; + elt = ISC_LIST_HEAD(list->elts); + while (elt != NULL) { + ns_listenelt_t *next = ISC_LIST_NEXT(elt, link); + dns_acl_t *acl = NULL; + + dns_acl_attach(elt->acl, &acl); + ISC_LIST_UNLINK(list->elts, elt, link); + ns_listenelt_destroy(elt); + elt = next; + + ATF_CHECK(dns_acl_isnone(acl)); + dns_acl_detach(&acl); + count++; + } + + ATF_CHECK(ISC_LIST_EMPTY(list->elts)); + ATF_CHECK_EQ(count, 1); + + ns_listenlist_detach(&list); + + result = ns_listenlist_default(mctx, 5300, -1, ISC_TRUE, &list); + ATF_CHECK_EQ(result, ISC_R_SUCCESS); + + ATF_CHECK(!ISC_LIST_EMPTY(list->elts)); + + /* This time just use ns_listenlist_detach() to destroy elements */ + count = 0; + elt = ISC_LIST_HEAD(list->elts); + while (elt != NULL) { + ns_listenelt_t *next = ISC_LIST_NEXT(elt, link); + ATF_CHECK(dns_acl_isany(elt->acl)); + elt = next; + count++; + } + + ATF_CHECK_EQ(count, 1); + + ns_listenlist_detach(&list); + + ns_test_end(); +} + +/* + * Main + */ +ATF_TP_ADD_TCS(tp) { + ATF_TP_ADD_TC(tp, ns_listenlist_default); + return (atf_no_error()); +} diff --git a/lib/ns/tests/notify_test.c b/lib/ns/tests/notify_test.c new file mode 100644 index 0000000000..3852a46825 --- /dev/null +++ b/lib/ns/tests/notify_test.c @@ -0,0 +1,161 @@ +/* + * Copyright (C) 2017 Internet Systems Consortium, Inc. ("ISC") + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +/*! \file */ + +#include + +#include + +#include +#include + +#include +#include +#include + +#include +#include +#include + +#include +#include + +#include "nstest.h" + +static dns_zone_t *zone = NULL; +static dns_view_t *view = NULL; + +/* + * Helper functions + */ +static void +setup_zone(const char *zonename, const char *filename) { + isc_result_t result; + dns_db_t *db = NULL; + + result = ns_test_makezone(zonename, &zone, NULL, ISC_TRUE); + ATF_REQUIRE_EQ(result, ISC_R_SUCCESS); + result = ns_test_setupzonemgr(); + ATF_REQUIRE_EQ(result, ISC_R_SUCCESS); + result = ns_test_managezone(zone); + ATF_REQUIRE_EQ(result, ISC_R_SUCCESS); + view = dns_zone_getview(zone); + ATF_REQUIRE(view->zonetable != NULL); + view->nocookieudp = 512; + + dns_zone_setfile(zone, filename); + result = dns_zone_load(zone); + ATF_REQUIRE(result == ISC_R_SUCCESS); + + /* The zone should now be loaded; test it */ + result = dns_zone_getdb(zone, &db); + ATF_CHECK_EQ(result, ISC_R_SUCCESS); + ATF_CHECK(db != NULL); + if (db != NULL) { + dns_db_detach(&db); + } +} + +static void +cleanup_zone() { + ns_test_releasezone(zone); + ns_test_closezonemgr(); + + dns_zone_detach(&zone); + dns_view_detach(&view); +} + +static void +check_response(isc_buffer_t *buf) { + isc_result_t result; + dns_message_t *message = NULL; + char rcodebuf[20]; + isc_buffer_t b; + + result = dns_message_create(mctx, DNS_MESSAGE_INTENTPARSE, &message); + ATF_REQUIRE_EQ(result, ISC_R_SUCCESS); + + result = dns_message_parse(message, buf, 0); + ATF_REQUIRE_EQ(result, ISC_R_SUCCESS); + + isc_buffer_init(&b, rcodebuf, sizeof(rcodebuf)); + result = dns_rcode_totext(message->rcode, &b); + ATF_REQUIRE_EQ(result, ISC_R_SUCCESS); + + ATF_CHECK_EQ(message->rcode, dns_rcode_noerror); + + dns_message_destroy(&message); +} + +ATF_TC(notify_start); +ATF_TC_HEAD(notify_start, tc) { + atf_tc_set_md_var(tc, "descr", "notify start"); +} +ATF_TC_BODY(notify_start, tc) { + isc_result_t result; + ns_client_t *client = NULL; + dns_message_t *nmsg = NULL; + unsigned char ndata[4096]; + isc_buffer_t nbuf; + size_t nsize; + + UNUSED(tc); + + result = ns_test_begin(NULL, ISC_TRUE); + ATF_REQUIRE_EQ(result, ISC_R_SUCCESS); + + result = ns_test_getclient(NULL, ISC_FALSE, &client); + ATF_REQUIRE_EQ(result, ISC_R_SUCCESS); + + setup_zone("example.com", "testdata/notify/zone1.db"); + + /* + * Create a NOTIFY message by parsing a file in testdata. + * (XXX: use better message mocking method when available.) + */ + + result = ns_test_getdata("testdata/notify/notify1.msg", + ndata, sizeof(ndata), &nsize); + ATF_REQUIRE_EQ(result, ISC_R_SUCCESS); + isc_buffer_init(&nbuf, ndata, nsize); + isc_buffer_add(&nbuf, nsize); + + result = dns_message_create(mctx, DNS_MESSAGE_INTENTPARSE, &nmsg); + ATF_REQUIRE_EQ(result, ISC_R_SUCCESS); + + result = dns_message_parse(nmsg, &nbuf, 0); + ATF_REQUIRE_EQ(result, ISC_R_SUCCESS); + + /* + * Set up client object with this message and test the NOTIFY + * handler. + */ + dns_view_attach(view, &client->view); + client->message = nmsg; + nmsg = NULL; + client->sendcb = check_response; + ns_notify_start(client); + + /* + * Clean up + */ + cleanup_zone(); + + ns_client_detach(&client); + + ns_test_end(); +} + +/* + * Main + */ +ATF_TP_ADD_TCS(tp) { + ATF_TP_ADD_TC(tp, notify_start); + return (atf_no_error()); +} diff --git a/lib/ns/tests/nstest.c b/lib/ns/tests/nstest.c new file mode 100644 index 0000000000..4154d99204 --- /dev/null +++ b/lib/ns/tests/nstest.c @@ -0,0 +1,552 @@ +/* + * Copyright (C) 2017 Internet Systems Consortium, Inc. ("ISC") + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +/*! \file */ + +#include + +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#include "nstest.h" + +isc_mem_t *mctx = NULL; +isc_entropy_t *ectx = NULL; +isc_log_t *lctx = NULL; +isc_taskmgr_t *taskmgr = NULL; +isc_task_t *maintask = NULL; +isc_timermgr_t *timermgr = NULL; +isc_socketmgr_t *socketmgr = NULL; +dns_zonemgr_t *zonemgr = NULL; +dns_dispatchmgr_t *dispatchmgr = NULL; +ns_clientmgr_t *clientmgr = NULL; +ns_interfacemgr_t *interfacemgr = NULL; +ns_server_t *sctx = NULL; +isc_boolean_t app_running = ISC_FALSE; +int ncpus; +isc_boolean_t debug_mem_record = ISC_TRUE; +isc_boolean_t run_managers = ISC_FALSE; + +static isc_boolean_t hash_active = ISC_FALSE, dst_active = ISC_FALSE; + +/* + * Logging categories: this needs to match the list in lib/ns/log.c. + */ +static isc_logcategory_t categories[] = { + { "", 0 }, + { "client", 0 }, + { "network", 0 }, + { "update", 0 }, + { "queries", 0 }, + { "unmatched", 0 }, + { "update-security", 0 }, + { "query-errors", 0 }, + { NULL, 0 } +}; + +static isc_result_t +matchview(isc_netaddr_t *srcaddr, isc_netaddr_t *destaddr, + dns_message_t *message, dns_ecs_t *ecs, + isc_result_t *sigresultp, dns_view_t **viewp) +{ + UNUSED(srcaddr); + UNUSED(destaddr); + UNUSED(message); + UNUSED(ecs); + UNUSED(sigresultp); + UNUSED(viewp); + + return (ISC_R_NOTIMPLEMENTED); +} + +/* + * These need to be shut down from a running task. + */ +isc_boolean_t shutdown_done = ISC_FALSE; +static void +shutdown_managers(isc_task_t *task, isc_event_t *event) { + UNUSED(task); + + if (clientmgr != NULL) { + ns_clientmgr_destroy(&clientmgr); + } + + if (interfacemgr != NULL) { + ns_interfacemgr_shutdown(interfacemgr); + ns_interfacemgr_detach(&interfacemgr); + } + + if (dispatchmgr != NULL) { + dns_dispatchmgr_destroy(&dispatchmgr); + } + + shutdown_done = ISC_TRUE; + run_managers = ISC_FALSE; + + isc_event_free(&event); +} + +static void +cleanup_managers(void) { + if (app_running) + isc_app_finish(); + + shutdown_done = ISC_FALSE; + + if (maintask != NULL) { + isc_task_shutdown(maintask); + isc_task_destroy(&maintask); + } + + while (run_managers && !shutdown_done) { +#ifndef ISC_PLATFORM_USETHREADS + while (isc__taskmgr_ready(taskmgr)) + isc__taskmgr_dispatch(taskmgr); +#else + /* + * There's no straightforward way to determine + * whether all the clients have shut down, so + * we'll just sleep for a bit and hope. + */ + ns_test_nap(500000); +#endif + } + + if (timermgr != NULL) + isc_timermgr_destroy(&timermgr); + if (sctx != NULL) + ns_server_detach(&sctx); + if (socketmgr != NULL) + isc_socketmgr_destroy(&socketmgr); + if (taskmgr != NULL) + isc_taskmgr_destroy(&taskmgr); +} + +static void +scan_interfaces(isc_task_t *task, isc_event_t *event) { + UNUSED(task); + + ns_interfacemgr_scan(interfacemgr, ISC_TRUE); + isc_event_free(&event); +} + +static isc_result_t +create_managers(void) { + isc_result_t result; + ns_listenlist_t *listenon = NULL; + isc_event_t *event = NULL; +#ifdef ISC_PLATFORM_USETHREADS + ncpus = isc_os_ncpus(); +#else + ncpus = 1; +#endif + + CHECK(isc_taskmgr_create(mctx, ncpus, 0, &taskmgr)); + CHECK(isc_task_create(taskmgr, 0, &maintask)); + isc_taskmgr_setexcltask(taskmgr, maintask); + CHECK(isc_task_onshutdown(maintask, shutdown_managers, NULL)); + + CHECK(isc_timermgr_create(mctx, &timermgr)); + + CHECK(isc_socketmgr_create(mctx, &socketmgr)); + + CHECK(ns_server_create(mctx, ectx, matchview, &sctx)); + + CHECK(dns_dispatchmgr_create(mctx, ectx, &dispatchmgr)); + + CHECK(ns_interfacemgr_create(mctx, sctx, taskmgr, timermgr, + socketmgr, dispatchmgr, maintask, + ncpus, NULL, &interfacemgr)); + + CHECK(ns_clientmgr_create(mctx, sctx, taskmgr, timermgr, + &clientmgr)); + + CHECK(ns_listenlist_default(mctx, 5300, -1, ISC_TRUE, &listenon)); + ns_interfacemgr_setlistenon4(interfacemgr, listenon); + ns_listenlist_detach(&listenon); + + event = isc_event_allocate(mctx, maintask, ISC_TASKEVENT_TEST, + scan_interfaces, NULL, + sizeof (isc_event_t)); + isc_task_send(maintask, &event); +#ifndef ISC_PLATFORM_USETHREADS + while (isc__taskmgr_ready(taskmgr)) + isc__taskmgr_dispatch(taskmgr); +#else + /* + * There's no straightforward way to determine + * whether the interfaces have been scanned, + * we'll just sleep for a bit and hope. + */ + ns_test_nap(500000); +#endif + + run_managers = ISC_TRUE; + + return (ISC_R_SUCCESS); + + cleanup: + cleanup_managers(); + return (result); +} + +isc_result_t +ns_test_begin(FILE *logfile, isc_boolean_t start_managers) { + isc_result_t result; + + if (start_managers) + CHECK(isc_app_start()); + if (debug_mem_record) + isc_mem_debugging |= ISC_MEM_DEBUGRECORD; + CHECK(isc_mem_create(0, 0, &mctx)); + CHECK(isc_entropy_create(mctx, &ectx)); + + CHECK(isc_hash_create(mctx, ectx, DNS_NAME_MAXWIRE)); + hash_active = ISC_TRUE; + + CHECK(dst_lib_init(mctx, ectx, ISC_ENTROPY_BLOCKING)); + dst_active = ISC_TRUE; + + if (logfile != NULL) { + isc_logdestination_t destination; + isc_logconfig_t *logconfig = NULL; + + CHECK(isc_log_create(mctx, &lctx, &logconfig)); + isc_log_registercategories(lctx, categories); + isc_log_setcontext(lctx); + dns_log_init(lctx); + dns_log_setcontext(lctx); + + destination.file.stream = logfile; + destination.file.name = NULL; + destination.file.versions = ISC_LOG_ROLLNEVER; + destination.file.maximum_size = 0; + CHECK(isc_log_createchannel(logconfig, "stderr", + ISC_LOG_TOFILEDESC, + ISC_LOG_DYNAMIC, + &destination, 0)); + CHECK(isc_log_usechannel(logconfig, "stderr", NULL, NULL)); + } + + dns_result_register(); + + if (start_managers) + CHECK(create_managers()); + + /* + * atf-run changes us to a /tmp directory, so tests + * that access test data files must first chdir to the proper + * location. + */ + if (chdir(TESTS) == -1) + CHECK(ISC_R_FAILURE); + + return (ISC_R_SUCCESS); + + cleanup: + ns_test_end(); + return (result); +} + +void +ns_test_end(void) { + if (dst_active) { + dst_lib_destroy(); + dst_active = ISC_FALSE; + } + + cleanup_managers(); + + if (hash_active) { + isc_hash_destroy(); + hash_active = ISC_FALSE; + } + + if (ectx != NULL) + isc_entropy_detach(&ectx); + + if (lctx != NULL) + isc_log_destroy(&lctx); + + if (mctx != NULL) + isc_mem_destroy(&mctx); +} + +/* + * Create a view. + */ +isc_result_t +ns_test_makeview(const char *name, dns_view_t **viewp) { + isc_result_t result; + dns_view_t *view = NULL; + + CHECK(dns_view_create(mctx, dns_rdataclass_in, name, &view)); + *viewp = view; + + return (ISC_R_SUCCESS); + + cleanup: + if (view != NULL) + dns_view_detach(&view); + return (result); +} + +/* + * Create a zone with origin 'name', return a pointer to the zone object in + * 'zonep'. If 'view' is set, add the zone to that view; otherwise, create + * a new view for the purpose. + * + * If the created view is going to be needed by the caller subsequently, + * then 'keepview' should be set to true; this will prevent the view + * from being detached. In this case, the caller is responsible for + * detaching the view. + */ +isc_result_t +ns_test_makezone(const char *name, dns_zone_t **zonep, dns_view_t *view, + isc_boolean_t keepview) +{ + isc_result_t result; + dns_zone_t *zone = NULL; + isc_buffer_t buffer; + dns_fixedname_t fixorigin; + dns_name_t *origin; + + if (view == NULL) + CHECK(dns_view_create(mctx, dns_rdataclass_in, "view", &view)); + else if (!keepview) + keepview = ISC_TRUE; + + zone = *zonep; + if (zone == NULL) + CHECK(dns_zone_create(&zone, mctx)); + + isc_buffer_constinit(&buffer, name, strlen(name)); + isc_buffer_add(&buffer, strlen(name)); + dns_fixedname_init(&fixorigin); + origin = dns_fixedname_name(&fixorigin); + CHECK(dns_name_fromtext(origin, &buffer, dns_rootname, 0, NULL)); + CHECK(dns_zone_setorigin(zone, origin)); + dns_zone_setview(zone, view); + dns_zone_settype(zone, dns_zone_master); + dns_zone_setclass(zone, view->rdclass); + dns_view_addzone(view, zone); + + if (!keepview) + dns_view_detach(&view); + + *zonep = zone; + + return (ISC_R_SUCCESS); + + cleanup: + if (zone != NULL) + dns_zone_detach(&zone); + if (view != NULL) + dns_view_detach(&view); + return (result); +} + +isc_result_t +ns_test_setupzonemgr(void) { + isc_result_t result; + REQUIRE(zonemgr == NULL); + + result = dns_zonemgr_create(mctx, taskmgr, timermgr, socketmgr, + &zonemgr); + return (result); +} + +isc_result_t +ns_test_managezone(dns_zone_t *zone) { + isc_result_t result; + REQUIRE(zonemgr != NULL); + + result = dns_zonemgr_setsize(zonemgr, 1); + if (result != ISC_R_SUCCESS) + return (result); + + result = dns_zonemgr_managezone(zonemgr, zone); + return (result); +} + +void +ns_test_releasezone(dns_zone_t *zone) { + REQUIRE(zonemgr != NULL); + dns_zonemgr_releasezone(zonemgr, zone); +} + +void +ns_test_closezonemgr(void) { + REQUIRE(zonemgr != NULL); + + dns_zonemgr_shutdown(zonemgr); + dns_zonemgr_detach(&zonemgr); +} + +isc_result_t +ns_test_getclient(ns_interface_t *ifp0, isc_boolean_t tcp, + ns_client_t **clientp) +{ + isc_result_t result; + ns_interface_t *ifp = ifp0; + + if (ifp == NULL) { + ifp = ns__interfacemgr_getif(interfacemgr); + } + if (ifp == NULL) { + return (ISC_R_FAILURE); + } + + result = ns__clientmgr_getclient(clientmgr, ifp, tcp, clientp); + return (result); +} + +/* + * Sleep for 'usec' microseconds. + */ +void +ns_test_nap(isc_uint32_t usec) { +#ifdef HAVE_NANOSLEEP + struct timespec ts; + + ts.tv_sec = usec / 1000000; + ts.tv_nsec = (usec % 1000000) * 1000; + nanosleep(&ts, NULL); +#elif HAVE_USLEEP + usleep(usec); +#else + /* + * No fractional-second sleep function is available, so we + * round up to the nearest second and sleep instead + */ + sleep((usec / 1000000) + 1); +#endif +} + +isc_result_t +ns_test_loaddb(dns_db_t **db, dns_dbtype_t dbtype, const char *origin, + const char *testfile) +{ + isc_result_t result; + dns_fixedname_t fixed; + dns_name_t *name; + + dns_fixedname_init(&fixed); + name = dns_fixedname_name(&fixed); + + result = dns_name_fromstring(name, origin, 0, NULL); + if (result != ISC_R_SUCCESS) + return(result); + + result = dns_db_create(mctx, "rbt", name, dbtype, dns_rdataclass_in, + 0, NULL, db); + if (result != ISC_R_SUCCESS) + return (result); + + result = dns_db_load(*db, testfile); + return (result); +} + +static int +fromhex(char c) { + if (c >= '0' && c <= '9') + return (c - '0'); + else if (c >= 'a' && c <= 'f') + return (c - 'a' + 10); + else if (c >= 'A' && c <= 'F') + return (c - 'A' + 10); + + printf("bad input format: %02x\n", c); + exit(3); + /* NOTREACHED */ +} + +isc_result_t +ns_test_getdata(const char *file, unsigned char *buf, + size_t bufsiz, size_t *sizep) +{ + isc_result_t result; + unsigned char *bp; + char *rp, *wp; + char s[BUFSIZ]; + size_t len, i; + FILE *f = NULL; + int n; + + result = isc_stdio_open(file, "r", &f); + if (result != ISC_R_SUCCESS) + return (result); + + bp = buf; + while (fgets(s, sizeof(s), f) != NULL) { + rp = s; + wp = s; + len = 0; + while (*rp != '\0') { + if (*rp == '#') + break; + if (*rp != ' ' && *rp != '\t' && + *rp != '\r' && *rp != '\n') { + *wp++ = *rp; + len++; + } + rp++; + } + if (len == 0U) + continue; + if (len % 2 != 0U) + CHECK(ISC_R_UNEXPECTEDEND); + if (len > bufsiz * 2) + CHECK(ISC_R_NOSPACE); + rp = s; + for (i = 0; i < len; i += 2) { + n = fromhex(*rp++); + n *= 16; + n += fromhex(*rp++); + *bp++ = n; + } + } + + + *sizep = bp - buf; + + result = ISC_R_SUCCESS; + + cleanup: + isc_stdio_close(f); + return (result); +} diff --git a/lib/ns/tests/nstest.h b/lib/ns/tests/nstest.h new file mode 100644 index 0000000000..9b7f37cb2a --- /dev/null +++ b/lib/ns/tests/nstest.h @@ -0,0 +1,90 @@ +/* + * Copyright (C) 2017 Internet Systems Consortium, Inc. ("ISC") + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +/*! \file */ + +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#include +#include + +#define CHECK(r) \ + do { \ + result = (r); \ + if (result != ISC_R_SUCCESS) \ + goto cleanup; \ + } while (0) + +extern isc_mem_t *mctx; +extern isc_entropy_t *ectx; +extern isc_log_t *lctx; +extern isc_taskmgr_t *taskmgr; +extern isc_task_t *maintask; +extern isc_timermgr_t *timermgr; +extern isc_socketmgr_t *socketmgr; +extern dns_zonemgr_t *zonemgr; +extern dns_dispatchmgr_t *dispatchmgr; +extern ns_clientmgr_t *clientmgr; +extern ns_interfacemgr_t *interfacemgr; +extern ns_server_t *sctx; +extern isc_boolean_t app_running; +extern int ncpus; +extern isc_boolean_t debug_mem_record; + +isc_result_t +ns_test_begin(FILE *logfile, isc_boolean_t create_managers); + +void +ns_test_end(void); + +isc_result_t +ns_test_makeview(const char *name, dns_view_t **viewp); + +isc_result_t +ns_test_makezone(const char *name, dns_zone_t **zonep, dns_view_t *view, + isc_boolean_t keepview); + +isc_result_t +ns_test_setupzonemgr(void); + +isc_result_t +ns_test_managezone(dns_zone_t *zone); + +void +ns_test_releasezone(dns_zone_t *zone); + +void +ns_test_closezonemgr(void); + +void +ns_test_nap(isc_uint32_t usec); + +isc_result_t +ns_test_loaddb(dns_db_t **db, dns_dbtype_t dbtype, const char *origin, + const char *testfile); + +isc_result_t +ns_test_getdata(const char *file, unsigned char *buf, + size_t bufsiz, size_t *sizep); + +isc_result_t +ns_test_getclient(ns_interface_t *ifp0, isc_boolean_t tcp, + ns_client_t **clientp); diff --git a/lib/ns/tests/testdata/notify/notify1.msg b/lib/ns/tests/testdata/notify/notify1.msg new file mode 100644 index 0000000000..a84193bacb --- /dev/null +++ b/lib/ns/tests/testdata/notify/notify1.msg @@ -0,0 +1,3 @@ +# notify for example.com +10 a6 10 10 00 01 00 00 00 00 00 00 07 65 78 61 +6d 70 6c 65 03 63 6f 6d 00 00 06 00 01 diff --git a/lib/ns/tests/testdata/notify/zone1.db b/lib/ns/tests/testdata/notify/zone1.db new file mode 100644 index 0000000000..a3b4cab9c0 --- /dev/null +++ b/lib/ns/tests/testdata/notify/zone1.db @@ -0,0 +1,21 @@ +; Copyright (C) 2017 Internet Systems Consortium, Inc. ("ISC") +; +; This Source Code Form is subject to the terms of the Mozilla Public +; License, v. 2.0. If a copy of the MPL was not distributed with this +; file, You can obtain one at http://mozilla.org/MPL/2.0/. + +$TTL 1000 +@ in soa localhost. postmaster.localhost. ( + 1993050801 ;serial + 3600 ;refresh + 1800 ;retry + 604800 ;expiration + 3600 ) ;minimum + in ns ns.example.com. + in ns ns2.example.com. + in ns ns3.example.com. +ns in a 10.0.0.1 +ns2 in a 10.0.0.2 +ns3 in a 10.0.0.3 + +a in a 1.2.3.4 diff --git a/bin/named/update.c b/lib/ns/update.c similarity index 98% rename from bin/named/update.c rename to lib/ns/update.c index 0f46d84328..f598204f89 100644 --- a/bin/named/update.c +++ b/lib/ns/update.c @@ -1,13 +1,11 @@ /* - * Copyright (C) 1999-2016 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2017 Internet Systems Consortium, Inc. ("ISC") * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -/* $Id: update.c,v 1.199 2011/12/22 07:32:40 each Exp $ */ - #include #include @@ -43,10 +41,11 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include +#include /*! \file * \brief @@ -118,7 +117,7 @@ } while (0) #define PREREQFAILC(code, msg) \ do { \ - inc_stats(zone, dns_nsstatscounter_updatebadprereq); \ + inc_stats(client, zone, ns_statscounter_updatebadprereq); \ FAILC(code, msg); \ } while (0) @@ -133,7 +132,7 @@ case DNS_R_NXRRSET: \ _what = "unsuccessful"; \ } \ - if (isc_log_wouldlog(ns_g_lctx, LOGLEVEL_PROTOCOL)) { \ + if (isc_log_wouldlog(ns_lctx, LOGLEVEL_PROTOCOL)) { \ char _nbuf[DNS_NAME_FORMATSIZE]; \ dns_name_format(name, _nbuf, sizeof(_nbuf)); \ update_log(client, zone, LOGLEVEL_PROTOCOL, \ @@ -144,7 +143,7 @@ } while (0) #define PREREQFAILN(code, name, msg) \ do { \ - inc_stats(zone, dns_nsstatscounter_updatebadprereq); \ + inc_stats(client, zone, ns_statscounter_updatebadprereq); \ FAILN(code, name, msg); \ } while (0) @@ -159,7 +158,7 @@ case DNS_R_NXRRSET: \ _what = "unsuccessful"; \ } \ - if (isc_log_wouldlog(ns_g_lctx, LOGLEVEL_PROTOCOL)) { \ + if (isc_log_wouldlog(ns_lctx, LOGLEVEL_PROTOCOL)) { \ char _nbuf[DNS_NAME_FORMATSIZE]; \ char _tbuf[DNS_RDATATYPE_FORMATSIZE]; \ dns_name_format(name, _nbuf, sizeof(_nbuf)); \ @@ -173,7 +172,7 @@ } while (0) #define PREREQFAILNT(code, name, type, msg) \ do { \ - inc_stats(zone, dns_nsstatscounter_updatebadprereq); \ + inc_stats(client, zone, ns_statscounter_updatebadprereq); \ FAILNT(code, name, type, msg); \ } while (0) @@ -266,7 +265,7 @@ update_log(ns_client_t *client, dns_zone_t *zone, if (client == NULL || zone == NULL) return; - if (isc_log_wouldlog(ns_g_lctx, level) == ISC_FALSE) + if (isc_log_wouldlog(ns_lctx, level) == ISC_FALSE) return; dns_name_format(dns_zone_getorigin(zone), namebuf, @@ -292,8 +291,8 @@ update_log_cb(void *arg, dns_zone_t *zone, int level, const char *message) { * Increment updated-related statistics counters. */ static inline void -inc_stats(dns_zone_t *zone, isc_statscounter_t counter) { - isc_stats_increment(ns_g_server->nsstats, counter); +inc_stats(ns_client_t *client, dns_zone_t *zone, isc_statscounter_t counter) { + ns_stats_increment(client->sctx->nsstats, counter); if (zone != NULL) { isc_stats_t *zonestats = dns_zone_getrequeststats(zone); @@ -1542,7 +1541,7 @@ respond(ns_client_t *client, isc_result_t result) { return; msg_failure: - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_UPDATE, NS_LOGMODULE_UPDATE, + isc_log_write(ns_lctx, NS_LOGCATEGORY_UPDATE, NS_LOGMODULE_UPDATE, ISC_LOG_ERROR, "could not create update response message: %s", isc_result_totext(msg_result)); @@ -1625,7 +1624,7 @@ ns_update_start(ns_client_t *client, isc_result_t sigresult) { failure: if (result == DNS_R_REFUSED) { INSIST(dns_zone_gettype(zone) == dns_zone_slave); - inc_stats(zone, dns_nsstatscounter_updaterej); + inc_stats(client, zone, ns_statscounter_updaterej); } /* * We failed without having sent an update event to the zone. @@ -2911,7 +2910,7 @@ update_action(isc_task_t *task, isc_event_t *event) { } } - if (isc_log_wouldlog(ns_g_lctx, LOGLEVEL_PROTOCOL)) { + if (isc_log_wouldlog(ns_lctx, LOGLEVEL_PROTOCOL)) { char namestr[DNS_NAME_FORMATSIZE]; char typestr[DNS_RDATATYPE_FORMATSIZE]; char rdstr[2048]; @@ -2980,7 +2979,7 @@ update_action(isc_task_t *task, isc_event_t *event) { } } else if (update_class == dns_rdataclass_any) { if (rdata.type == dns_rdatatype_any) { - if (isc_log_wouldlog(ns_g_lctx, + if (isc_log_wouldlog(ns_lctx, LOGLEVEL_PROTOCOL)) { char namestr[DNS_NAME_FORMATSIZE]; @@ -3010,7 +3009,7 @@ update_action(isc_task_t *task, isc_event_t *event) { "or NS records ignored"); continue; } else { - if (isc_log_wouldlog(ns_g_lctx, + if (isc_log_wouldlog(ns_lctx, LOGLEVEL_PROTOCOL)) { char namestr[DNS_NAME_FORMATSIZE]; @@ -3358,13 +3357,13 @@ updatedone_action(isc_task_t *task, isc_event_t *event) { INSIST(client->nupdates > 0); switch (uev->result) { case ISC_R_SUCCESS: - inc_stats(uev->zone, dns_nsstatscounter_updatedone); + inc_stats(client, uev->zone, ns_statscounter_updatedone); break; case DNS_R_REFUSED: - inc_stats(uev->zone, dns_nsstatscounter_updaterej); + inc_stats(client, uev->zone, ns_statscounter_updaterej); break; default: - inc_stats(uev->zone, dns_nsstatscounter_updatefail); + inc_stats(client, uev->zone, ns_statscounter_updatefail); break; } if (uev->zone != NULL) @@ -3403,12 +3402,12 @@ forward_callback(void *arg, isc_result_t result, dns_message_t *answer) { INSIST(answer == NULL); uev->ev_type = DNS_EVENT_UPDATEDONE; uev->ev_action = forward_fail; - inc_stats(zone, dns_nsstatscounter_updatefwdfail); + inc_stats(client, zone, ns_statscounter_updatefwdfail); } else { uev->ev_type = DNS_EVENT_UPDATEDONE; uev->ev_action = forward_done; uev->answer = answer; - inc_stats(zone, dns_nsstatscounter_updaterespfwd); + inc_stats(client, zone, ns_statscounter_updaterespfwd); } isc_task_send(client->task, ISC_EVENT_PTR(&uev)); dns_zone_detach(&zone); @@ -3442,10 +3441,10 @@ forward_action(isc_task_t *task, isc_event_t *event) { uev->ev_type = DNS_EVENT_UPDATEDONE; uev->ev_action = forward_fail; isc_task_send(client->task, &event); - inc_stats(zone, dns_nsstatscounter_updatefwdfail); + inc_stats(client, zone, ns_statscounter_updatefwdfail); dns_zone_detach(&zone); } else - inc_stats(zone, dns_nsstatscounter_updatereqfwd); + inc_stats(client, zone, ns_statscounter_updatereqfwd); isc_task_detach(&task); } diff --git a/lib/ns/version.c b/lib/ns/version.c new file mode 100644 index 0000000000..bf062335fd --- /dev/null +++ b/lib/ns/version.c @@ -0,0 +1,17 @@ +/* + * Copyright (C) 2017 Internet Systems Consortium, Inc. ("ISC") + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +/*! \file */ + +#include + +const char ns_version[] = VERSION; + +const unsigned int ns_libinterface = LIBINTERFACE; +const unsigned int ns_librevision = LIBREVISION; +const unsigned int ns_libage = LIBAGE; diff --git a/lib/lwres/win32/DLLMain.c b/lib/ns/win32/DLLMain.c similarity index 84% rename from lib/lwres/win32/DLLMain.c rename to lib/ns/win32/DLLMain.c index b51a0a352f..a350f1cba3 100644 --- a/lib/lwres/win32/DLLMain.c +++ b/lib/ns/win32/DLLMain.c @@ -1,12 +1,12 @@ /* - * Copyright (C) 2001, 2004, 2007, 2016 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2017 Internet Systems Consortium, Inc. ("ISC") * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -/* $Id: DLLMain.c,v 1.5 2007/06/18 23:47:51 tbox Exp $ */ +/* $Id: DLLMain.c,v 1.6 2007/06/18 23:47:44 tbox Exp $ */ #include #include @@ -17,8 +17,7 @@ __declspec(dllexport) BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { - switch (fdwReason) - { + switch (fdwReason) { /* * The DLL is loading due to process * initialization or a call to LoadLibrary. diff --git a/lib/ns/win32/libns.def b/lib/ns/win32/libns.def new file mode 100644 index 0000000000..44df6ed6c6 --- /dev/null +++ b/lib/ns/win32/libns.def @@ -0,0 +1,80 @@ +LIBRARY libns + +; Exported Functions +EXPORTS + +ns_client_aclmsg +ns_client_addopt +ns_client_attach +ns_client_checkacl +ns_client_checkaclsilent +ns_client_detach +ns_client_dumprecursing +ns_client_error +ns_client_getsockaddr +ns_client_killoldestquery +ns_client_log +ns_client_logv +ns_client_next +ns_client_qnamereplace +ns_client_recursing +ns_client_replace +ns_client_send +ns_client_sendraw +ns_client_settimeout +ns_client_shuttingdown +ns_client_sourceip +ns_clientmgr_create +ns_clientmgr_createclients +ns_clientmgr_destroy +ns_interface_attach +ns_interface_detach +ns_interface_shutdown +ns_interfacemgr_adjust +ns_interfacemgr_attach +ns_interfacemgr_create +ns_interfacemgr_detach +ns_interfacemgr_dumprecursing +ns_interfacemgr_getaclenv +ns_interfacemgr_islistening +ns_interfacemgr_listeningon +ns_interfacemgr_scan +ns_interfacemgr_setbacklog +ns_interfacemgr_setlistenon4 +ns_interfacemgr_setlistenon6 +ns_interfacemgr_shutdown +ns_lib_init +ns_lib_shutdown +ns_listenelt_create +ns_listenelt_destroy +ns_listenlist_attach +ns_listenlist_create +ns_listenlist_default +ns_listenlist_detach +ns_log_init +ns_log_setcontext +ns_notify_start +ns_query_cancel +ns_query_free +ns_query_init +ns_query_start +ns_server_attach +ns_server_create +ns_server_detach +ns_server_getoption +ns_server_gettimeouts +ns_server_setoption +ns_server_setserverid +ns_server_settimeouts +ns_sortlist_addrorder1 +ns_sortlist_addrorder2 +ns_sortlist_byaddrsetup +ns_sortlist_setup +ns_stats_attach +ns_stats_create +ns_stats_decrement +ns_stats_detach +ns_stats_get +ns_stats_increment +ns_update_start +ns_xfr_start diff --git a/lib/lwres/win32/liblwres.vcxproj.filters.in b/lib/ns/win32/libns.vcxproj.filters similarity index 51% rename from lib/lwres/win32/liblwres.vcxproj.filters.in rename to lib/ns/win32/libns.vcxproj.filters index 990684d1a0..7298efefdf 100644 --- a/lib/lwres/win32/liblwres.vcxproj.filters.in +++ b/lib/ns/win32/libns.vcxproj.filters @@ -1,138 +1,108 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - + + + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + + + + Library Source Files + + + Library Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + \ No newline at end of file diff --git a/lib/lwres/win32/liblwres.vcxproj.in b/lib/ns/win32/libns.vcxproj.in similarity index 64% rename from lib/lwres/win32/liblwres.vcxproj.in rename to lib/ns/win32/libns.vcxproj.in index c7ae18f671..9491921c20 100644 --- a/lib/lwres/win32/liblwres.vcxproj.in +++ b/lib/ns/win32/libns.vcxproj.in @@ -1,4 +1,4 @@ - + @@ -11,9 +11,9 @@ - {EBDB30A3-E8EB-4E1D-915E-06720600A84E} + {82ACD33C-E75F-45B8-BB6D-42643A10D7EE} Win32Proj - liblwres + libns @@ -24,7 +24,6 @@ DynamicLibrary false - true MultiByte @@ -53,8 +52,8 @@ Level3 Disabled - WIN32;USE_MD5;@CRYPTO@_DEBUG;_WINDOWS;_USRDLL;LIBLWRES_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions) - .\;..\..\lwres\win32\include;..\..\..\;include;..\include;..\..\isc\win32;..\..\isc\win32\include;..\..\isc\include;..\..\dns\include;%(AdditionalIncludeDirectories) + WIN32;@CRYPTO@@USE_GSSAPI@_DEBUG;_USRDLL;LIBNS_EXPORTS;%(PreprocessorDefinitions) + .\;..\..\..\;include;..\include;..\..\isc\win32;..\..\isc\win32\include;..\..\isc\include;..\..\..\lib\dns\include;@LIBXML2_INC@@OPENSSL_INC@@GSSAPI_INC@@GEOIP_INC@%(AdditionalIncludeDirectories) true .\$(Configuration)\$(TargetName).pch .\$(Configuration)\ @@ -66,10 +65,11 @@ Console true - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - .\$(Configuration)\$(ProjectName).lib ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) + ..\..\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories) + libisc.lib;libdns.lib;@LIBXML2_LIB@@OPENSSL_LIB@@GSSAPI_LIB@@GEOIP_LIB@ws2_32.lib;%(AdditionalDependencies) $(ProjectName).def + .\$(Configuration)\$(ProjectName).lib @@ -80,15 +80,15 @@ MaxSpeed true @INTRINSIC@ - WIN32;USE_MD5;@CRYPTO@NDEBUG;_WINDOWS;_USRDLL;LIBLWRES_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions) - .\;..\..\lwres\win32\include;..\..\..\;include;..\include;..\..\isc\win32;..\..\isc\win32\include;..\..\isc\include;..\..\dns\include;%(AdditionalIncludeDirectories) + WIN32;@CRYPTO@@USE_GSSAPI@NDEBUG;_USRDLL;LIBNS_EXPORTS;%(PreprocessorDefinitions) + .\;..\..\..\;include;..\include;..\..\isc\win32;..\..\isc\win32\include;..\..\isc\include;..\..\..\lib\dns\include;@LIBXML2_INC@@OPENSSL_INC@@GSSAPI_INC@@GEOIP_INC@%(AdditionalIncludeDirectories) OnlyExplicitInline - false true .\$(Configuration)\$(TargetName).pch .\$(Configuration)\ .\$(Configuration)\ $(OutDir)$(TargetName).pdb + false CompileAsC @@ -96,57 +96,48 @@ false true true - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - Default - .\$(Configuration)\$(ProjectName).lib ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) + ..\..\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories) + libisc.lib;libdns.lib;@LIBXML2_LIB@@OPENSSL_LIB@@GSSAPI_LIB@@GEOIP_LIB@ws2_32.lib;%(AdditionalDependencies) $(ProjectName).def + .\$(Configuration)\$(ProjectName).lib + Default - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/bin/tests/system/win32/lwtest.vcxproj.user b/lib/ns/win32/libns.vcxproj.user similarity index 100% rename from bin/tests/system/win32/lwtest.vcxproj.user rename to lib/ns/win32/libns.vcxproj.user diff --git a/lib/ns/win32/version.c b/lib/ns/win32/version.c new file mode 100644 index 0000000000..998116b845 --- /dev/null +++ b/lib/ns/win32/version.c @@ -0,0 +1,21 @@ +/* + * Copyright (C) 2017 Internet Systems Consortium, Inc. ("ISC") + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +/*! \file */ + +#include + +#include + +LIBNS_EXTERNAL_DATA const char ns_version[] = VERSION; +LIBNS_EXTERNAL_DATA const char ns_major[] = MAJOR; +LIBNS_EXTERNAL_DATA const char ns_mapapi[] = MAPAPI; + +LIBNS_EXTERNAL_DATA const unsigned int ns_libinterface = LIBINTERFACE; +LIBNS_EXTERNAL_DATA const unsigned int ns_librevision = LIBREVISION; +LIBNS_EXTERNAL_DATA const unsigned int ns_libage = LIBAGE; diff --git a/bin/named/xfrout.c b/lib/ns/xfrout.c similarity index 98% rename from bin/named/xfrout.c rename to lib/ns/xfrout.c index 90775ff28a..e2a556f19d 100644 --- a/bin/named/xfrout.c +++ b/lib/ns/xfrout.c @@ -1,13 +1,11 @@ /* - * Copyright (C) 1999-2017 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2017 Internet Systems Consortium, Inc. ("ISC") * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -/* $Id$ */ - #include #include @@ -38,10 +36,11 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include +#include /*! \file * \brief @@ -54,7 +53,7 @@ */ #define XFROUT_COMMON_LOGARGS \ - ns_g_lctx, DNS_LOGCATEGORY_XFER_OUT, NS_LOGMODULE_XFER_OUT + ns_lctx, DNS_LOGCATEGORY_XFER_OUT, NS_LOGMODULE_XFER_OUT #define XFROUT_PROTOCOL_LOGARGS \ XFROUT_COMMON_LOGARGS, ISC_LOG_INFO @@ -104,8 +103,8 @@ /**************************************************************************/ static inline void -inc_stats(dns_zone_t *zone, isc_statscounter_t counter) { - isc_stats_increment(ns_g_server->nsstats, counter); +inc_stats(ns_client_t *client, dns_zone_t *zone, isc_statscounter_t counter) { + ns_stats_increment(client->sctx->nsstats, counter); if (zone != NULL) { isc_stats_t *zonestats = dns_zone_getrequeststats(zone); if (zonestats != NULL) @@ -768,7 +767,7 @@ ns_xfr_start(ns_client_t *client, dns_rdatatype_t reqtype) { /* * Apply quota. */ - result = isc_quota_attach(&ns_g_server->xfroutquota, "a); + result = isc_quota_attach(&client->sctx->xfroutquota, "a); if (result != ISC_R_SUCCESS) { isc_log_write(XFROUT_COMMON_LOGARGS, ISC_LOG_WARNING, "%s request denied: %s", mnemonic, @@ -1108,7 +1107,7 @@ ns_xfr_start(ns_client_t *client, dns_rdatatype_t reqtype) { failure: if (result == DNS_R_REFUSED) - inc_stats(zone, dns_nsstatscounter_xfrrej); + inc_stats(client, zone, ns_statscounter_xfrrej); if (quota != NULL) isc_quota_detach("a); if (current_soa_tuple != NULL) @@ -1422,7 +1421,7 @@ sendstream(xfrout_ctx_t *xfr) { break; } - if (isc_log_wouldlog(ns_g_lctx, XFROUT_RR_LOGLEVEL)) + if (isc_log_wouldlog(ns_lctx, XFROUT_RR_LOGLEVEL)) log_rr(name, rdata, ttl); /* XXX */ result = dns_message_gettempname(msg, &msgname); @@ -1487,7 +1486,7 @@ sendstream(xfrout_ctx_t *xfr) { * here (TCP only). */ if ((isc_buffer_usedlength(&xfr->buf) >= - ns_g_server->transfer_tcp_message_size) && is_tcp) + xfr->client->sctx->transfer_tcp_message_size) && is_tcp) break; } @@ -1623,7 +1622,7 @@ xfrout_senddone(isc_task_t *task, isc_event_t *event) { sendstream(xfr); } else { /* End of zone transfer stream. */ - inc_stats(xfr->zone, dns_nsstatscounter_xfrdone); + inc_stats(xfr->client, xfr->zone, ns_statscounter_xfrdone); xfrout_log(xfr, ISC_LOG_INFO, "%s ended", xfr->mnemonic); ns_client_next(xfr->client, ISC_R_SUCCESS); xfrout_ctx_destroy(&xfr); diff --git a/lib/samples/win32/async.dsp.in b/lib/samples/win32/async.dsp.in deleted file mode 100644 index 35dfb6b42d..0000000000 --- a/lib/samples/win32/async.dsp.in +++ /dev/null @@ -1,103 +0,0 @@ -# Microsoft Developer Studio Project File - Name="async" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103 - -CFG=async - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "async.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "async.mak" CFG="async - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "async - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "async - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "async - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../dns/win32/include" /I "../../dns/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console @MACHINE@ -# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Release/libisc.lib ../../dns/win32/Release/libdns.lib ../../isccfg/win32/Release/libisccfg.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/sample-async.exe" - -!ELSEIF "$(CFG)" == "async - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../dns/win32/include" /I "../../dns/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c -# SUBTRACT CPP /X @COPTY@ -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console /debug @MACHINE@ /pdbtype:sept -# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Debug/libisc.lib ../../dns/win32/Debug/libdns.lib ../../isccfg/win32/Debug/libisccfg.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/sample-async.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "async - @PLATFORM@ Release" -# Name "async - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE="..\sample-async.c" -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/lib/samples/win32/async.dsw b/lib/samples/win32/async.dsw deleted file mode 100644 index 65da1ffee4..0000000000 --- a/lib/samples/win32/async.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "async"=".\async.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/lib/samples/win32/async.mak.in b/lib/samples/win32/async.mak.in deleted file mode 100644 index 13e59c18e4..0000000000 --- a/lib/samples/win32/async.mak.in +++ /dev/null @@ -1,299 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on async.dsp -!IF "$(CFG)" == "" -CFG=async - @PLATFORM@ Debug -!MESSAGE No configuration specified. Defaulting to async - @PLATFORM@ Debug. -!ENDIF - -!IF "$(CFG)" != "async - @PLATFORM@ Release" && "$(CFG)" != "async - @PLATFORM@ Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "async.mak" CFG="async - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "async - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "async - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -!IF "$(CFG)" == "async - @PLATFORM@ 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)" == "async - @PLATFORM@ Release" - -OUTDIR=.\Release -INTDIR=.\Release - -ALL : "..\..\..\Build\Release\sample-async.exe" - - -CLEAN : - -@erase "$(INTDIR)\sample-async.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "..\..\..\Build\Release\sample-async.exe" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../dns/win32/include" /I "../../dns/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\sample-async.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\sample-async.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Release/libisc.lib ../../dns/win32/Release/libdns.lib ../../isccfg/win32/Release/libisccfg.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\sample-async.pdb" @MACHINE@ /out:"../../../Build/Release/sample-async.exe" -LINK32_OBJS= \ - "$(INTDIR)\sample-async.obj" - -"..\..\..\Build\Release\sample-async.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ELSEIF "$(CFG)" == "async - @PLATFORM@ Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -ALL : "..\..\..\Build\Debug\sample-async.exe" "$(OUTDIR)\sample-async.bsc" - - -CLEAN : - -@erase "$(INTDIR)\sample-async.obj" - -@erase "$(INTDIR)\sample-async.sbr" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\sample-async.pdb" - -@erase "$(OUTDIR)\sample-async.bsc" - -@erase "..\..\..\Build\Debug\sample-async.exe" - -@erase "..\..\..\Build\Debug\sample-async.ilk" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../dns/win32/include" /I "../../dns/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\sample-async.bsc" -BSC32_SBRS= \ - "$(INTDIR)\sample-async.sbr" - -"$(OUTDIR)\sample-async.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Debug/libisc.lib ../../dns/win32/Debug/libdns.lib ../../isccfg/win32/Debug/libisccfg.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\sample-async.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/sample-async.exe" /pdbtype:sept -LINK32_OBJS= \ - "$(INTDIR)\sample-async.obj" - -"..\..\..\Build\Debug\sample-async.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ENDIF - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("sample-async.dep") -!INCLUDE "sample-async.dep" -!ELSE -!MESSAGE Warning: cannot find "sample-async.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "async - @PLATFORM@ Release" || "$(CFG)" == "async - @PLATFORM@ Debug" -SOURCE="..\sample-async.c" - -!IF "$(CFG)" == "async - @PLATFORM@ Release" - - -"$(INTDIR)\sample-async.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "async - @PLATFORM@ Debug" - - -"$(INTDIR)\sample-async.obj" "$(INTDIR)\sample-async.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -!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 -1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest" -<< KEEP - -$(_VC_MANIFEST_BASENAME).auto.manifest : - type <<$@ - - - -<< KEEP diff --git a/lib/samples/win32/gai.dsp.in b/lib/samples/win32/gai.dsp.in deleted file mode 100644 index 9282955cb2..0000000000 --- a/lib/samples/win32/gai.dsp.in +++ /dev/null @@ -1,103 +0,0 @@ -# Microsoft Developer Studio Project File - Name="gai" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103 - -CFG=gai - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "gai.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "gai.mak" CFG="gai - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "gai - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "gai - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "gai - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "../../../" @LIBXML2_INC@ /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../dns/win32/include" /I "../../dns/include" /I "../../irs/win32/include" /I "../../irs/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console @MACHINE@ -# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Release/libisc.lib ../../dns/win32/Release/libdns.lib ../../isccfg/win32/Release/libisccfg.lib ../../irs/win32/Release/libirs.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/sample-gai.exe" - -!ELSEIF "$(CFG)" == "gai - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "../../../" @LIBXML2_INC@ /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../dns/win32/include" /I "../../dns/include" /I "../../irs/win32/include" /I "../../irs/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c -# SUBTRACT CPP /X @COPTY@ -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console /debug @MACHINE@ /pdbtype:sept -# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Debug/libisc.lib ../../dns/win32/Debug/libdns.lib ../../isccfg/win32/Debug/libisccfg.lib ../../irs/win32/Debug/libirs.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/sample-gai.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "gai - @PLATFORM@ Release" -# Name "gai - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE="..\sample-gai.c" -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/lib/samples/win32/gai.dsw b/lib/samples/win32/gai.dsw deleted file mode 100644 index 7dfa9c2eac..0000000000 --- a/lib/samples/win32/gai.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "gai"=".\gai.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/lib/samples/win32/gai.mak.in b/lib/samples/win32/gai.mak.in deleted file mode 100644 index 39cd2fbeef..0000000000 --- a/lib/samples/win32/gai.mak.in +++ /dev/null @@ -1,299 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on gai.dsp -!IF "$(CFG)" == "" -CFG=gai - @PLATFORM@ Debug -!MESSAGE No configuration specified. Defaulting to gai - @PLATFORM@ Debug. -!ENDIF - -!IF "$(CFG)" != "gai - @PLATFORM@ Release" && "$(CFG)" != "gai - @PLATFORM@ Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "gai.mak" CFG="gai - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "gai - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "gai - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -!IF "$(CFG)" == "gai - @PLATFORM@ 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)" == "gai - @PLATFORM@ Release" - -OUTDIR=.\Release -INTDIR=.\Release - -ALL : "..\..\..\Build\Release\sample-gai.exe" - - -CLEAN : - -@erase "$(INTDIR)\sample-gai.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "..\..\..\Build\Release\sample-gai.exe" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "../../../" @LIBXML2_INC@ /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../dns/win32/include" /I "../../dns/include" /I "../../irs/win32/include" /I "../../irs/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\sample-gai.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\sample-gai.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Release/libisc.lib ../../dns/win32/Release/libdns.lib ../../isccfg/win32/Release/libisccfg.lib ../../irs/win32/Release/libirs.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\sample-gai.pdb" @MACHINE@ /out:"../../../Build/Release/sample-gai.exe" -LINK32_OBJS= \ - "$(INTDIR)\sample-gai.obj" - -"..\..\..\Build\Release\sample-gai.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ELSEIF "$(CFG)" == "gai - @PLATFORM@ Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -ALL : "..\..\..\Build\Debug\sample-gai.exe" "$(OUTDIR)\sample-gai.bsc" - - -CLEAN : - -@erase "$(INTDIR)\sample-gai.obj" - -@erase "$(INTDIR)\sample-gai.sbr" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\sample-gai.pdb" - -@erase "$(OUTDIR)\sample-gai.bsc" - -@erase "..\..\..\Build\Debug\sample-gai.exe" - -@erase "..\..\..\Build\Debug\sample-gai.ilk" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "../../../" @LIBXML2_INC@ /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../dns/win32/include" /I "../../dns/include" /I "../../irs/win32/include" /I "../../irs/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\sample-gai.bsc" -BSC32_SBRS= \ - "$(INTDIR)\sample-gai.sbr" - -"$(OUTDIR)\sample-gai.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Debug/libisc.lib ../../dns/win32/Debug/libdns.lib ../../isccfg/win32/Debug/libisccfg.lib ../../irs/win32/Debug/libirs.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\sample-gai.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/sample-gai.exe" /pdbtype:sept -LINK32_OBJS= \ - "$(INTDIR)\sample-gai.obj" - -"..\..\..\Build\Debug\sample-gai.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ENDIF - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("sample-gai.dep") -!INCLUDE "sample-gai.dep" -!ELSE -!MESSAGE Warning: cannot find "sample-gai.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "gai - @PLATFORM@ Release" || "$(CFG)" == "gai - @PLATFORM@ Debug" -SOURCE="..\sample-gai.c" - -!IF "$(CFG)" == "gai - @PLATFORM@ Release" - - -"$(INTDIR)\sample-gai.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "gai - @PLATFORM@ Debug" - - -"$(INTDIR)\sample-gai.obj" "$(INTDIR)\sample-gai.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -!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 -1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest" -<< KEEP - -$(_VC_MANIFEST_BASENAME).auto.manifest : - type <<$@ - - - -<< KEEP diff --git a/lib/samples/win32/nsprobe.dsp.in b/lib/samples/win32/nsprobe.dsp.in deleted file mode 100644 index 5161a242a5..0000000000 --- a/lib/samples/win32/nsprobe.dsp.in +++ /dev/null @@ -1,103 +0,0 @@ -# Microsoft Developer Studio Project File - Name="nsprobe" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103 - -CFG=nsprobe - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "nsprobe.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "nsprobe.mak" CFG="nsprobe - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "nsprobe - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "nsprobe - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "nsprobe - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../dns/win32/include" /I "../../dns/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console @MACHINE@ -# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Release/libisc.lib ../../dns/win32/Release/libdns.lib ../../isccfg/win32/Release/libisccfg.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/nsprobe.exe" - -!ELSEIF "$(CFG)" == "nsprobe - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../dns/win32/include" /I "../../dns/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c -# SUBTRACT CPP /X @COPTY@ -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console /debug @MACHINE@ /pdbtype:sept -# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Debug/libisc.lib ../../dns/win32/Debug/libdns.lib ../../isccfg/win32/Debug/libisccfg.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/nsprobe.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "nsprobe - @PLATFORM@ Release" -# Name "nsprobe - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE="..\nsprobe.c" -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/lib/samples/win32/nsprobe.dsw b/lib/samples/win32/nsprobe.dsw deleted file mode 100644 index cef2de1e5f..0000000000 --- a/lib/samples/win32/nsprobe.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "nsprobe"=".\nsprobe.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/lib/samples/win32/nsprobe.mak.in b/lib/samples/win32/nsprobe.mak.in deleted file mode 100644 index 5efcdb0d69..0000000000 --- a/lib/samples/win32/nsprobe.mak.in +++ /dev/null @@ -1,299 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on nsprobe.dsp -!IF "$(CFG)" == "" -CFG=nsprobe - @PLATFORM@ Debug -!MESSAGE No configuration specified. Defaulting to nsprobe - @PLATFORM@ Debug. -!ENDIF - -!IF "$(CFG)" != "nsprobe - @PLATFORM@ Release" && "$(CFG)" != "nsprobe - @PLATFORM@ Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "nsprobe.mak" CFG="nsprobe - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "nsprobe - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "nsprobe - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -!IF "$(CFG)" == "nsprobe - @PLATFORM@ 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)" == "nsprobe - @PLATFORM@ Release" - -OUTDIR=.\Release -INTDIR=.\Release - -ALL : "..\..\..\Build\Release\nsprobe.exe" - - -CLEAN : - -@erase "$(INTDIR)\nsprobe.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "..\..\..\Build\Release\nsprobe.exe" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../dns/win32/include" /I "../../dns/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\nsprobe.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\nsprobe.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Release/libisc.lib ../../dns/win32/Release/libdns.lib ../../isccfg/win32/Release/libisccfg.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\nsprobe.pdb" @MACHINE@ /out:"../../../Build/Release/nsprobe.exe" -LINK32_OBJS= \ - "$(INTDIR)\nsprobe.obj" - -"..\..\..\Build\Release\nsprobe.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ELSEIF "$(CFG)" == "nsprobe - @PLATFORM@ Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -ALL : "..\..\..\Build\Debug\nsprobe.exe" "$(OUTDIR)\nsprobe.bsc" - - -CLEAN : - -@erase "$(INTDIR)\nsprobe.obj" - -@erase "$(INTDIR)\nsprobe.sbr" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\nsprobe.pdb" - -@erase "$(OUTDIR)\nsprobe.bsc" - -@erase "..\..\..\Build\Debug\nsprobe.exe" - -@erase "..\..\..\Build\Debug\nsprobe.ilk" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../dns/win32/include" /I "../../dns/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\nsprobe.bsc" -BSC32_SBRS= \ - "$(INTDIR)\nsprobe.sbr" - -"$(OUTDIR)\nsprobe.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Debug/libisc.lib ../../dns/win32/Debug/libdns.lib ../../isccfg/win32/Debug/libisccfg.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\nsprobe.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/nsprobe.exe" /pdbtype:sept -LINK32_OBJS= \ - "$(INTDIR)\nsprobe.obj" - -"..\..\..\Build\Debug\nsprobe.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ENDIF - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("nsprobe.dep") -!INCLUDE "nsprobe.dep" -!ELSE -!MESSAGE Warning: cannot find "nsprobe.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "nsprobe - @PLATFORM@ Release" || "$(CFG)" == "nsprobe - @PLATFORM@ Debug" -SOURCE="..\nsprobe.c" - -!IF "$(CFG)" == "nsprobe - @PLATFORM@ Release" - - -"$(INTDIR)\nsprobe.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "nsprobe - @PLATFORM@ Debug" - - -"$(INTDIR)\nsprobe.obj" "$(INTDIR)\nsprobe.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -!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 -1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest" -<< KEEP - -$(_VC_MANIFEST_BASENAME).auto.manifest : - type <<$@ - - - -<< KEEP diff --git a/lib/samples/win32/request.dsp.in b/lib/samples/win32/request.dsp.in deleted file mode 100644 index dbdfe836ee..0000000000 --- a/lib/samples/win32/request.dsp.in +++ /dev/null @@ -1,103 +0,0 @@ -# Microsoft Developer Studio Project File - Name="request" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103 - -CFG=request - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "request.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "request.mak" CFG="request - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "request - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "request - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "request - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../dns/win32/include" /I "../../dns/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console @MACHINE@ -# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Release/libisc.lib ../../dns/win32/Release/libdns.lib ../../isccfg/win32/Release/libisccfg.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/sample-request.exe" - -!ELSEIF "$(CFG)" == "request - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../dns/win32/include" /I "../../dns/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c -# SUBTRACT CPP /X @COPTY@ -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console /debug @MACHINE@ /pdbtype:sept -# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Debug/libisc.lib ../../dns/win32/Debug/libdns.lib ../../isccfg/win32/Debug/libisccfg.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/sample-request.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "request - @PLATFORM@ Release" -# Name "request - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE="..\sample-request.c" -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/lib/samples/win32/request.dsw b/lib/samples/win32/request.dsw deleted file mode 100644 index 9528505b83..0000000000 --- a/lib/samples/win32/request.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "request"=".\request.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/lib/samples/win32/request.mak.in b/lib/samples/win32/request.mak.in deleted file mode 100644 index b9681c6484..0000000000 --- a/lib/samples/win32/request.mak.in +++ /dev/null @@ -1,299 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on request.dsp -!IF "$(CFG)" == "" -CFG=request - @PLATFORM@ Debug -!MESSAGE No configuration specified. Defaulting to request - @PLATFORM@ Debug. -!ENDIF - -!IF "$(CFG)" != "request - @PLATFORM@ Release" && "$(CFG)" != "request - @PLATFORM@ Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "request.mak" CFG="request - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "request - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "request - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -!IF "$(CFG)" == "request - @PLATFORM@ 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)" == "request - @PLATFORM@ Release" - -OUTDIR=.\Release -INTDIR=.\Release - -ALL : "..\..\..\Build\Release\sample-request.exe" - - -CLEAN : - -@erase "$(INTDIR)\sample-request.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "..\..\..\Build\Release\sample-request.exe" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../dns/win32/include" /I "../../dns/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\sample-request.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\sample-request.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Release/libisc.lib ../../dns/win32/Release/libdns.lib ../../isccfg/win32/Release/libisccfg.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\sample-request.pdb" @MACHINE@ /out:"../../../Build/Release/sample-request.exe" -LINK32_OBJS= \ - "$(INTDIR)\sample-request.obj" - -"..\..\..\Build\Release\sample-request.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ELSEIF "$(CFG)" == "request - @PLATFORM@ Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -ALL : "..\..\..\Build\Debug\sample-request.exe" "$(OUTDIR)\sample-request.bsc" - - -CLEAN : - -@erase "$(INTDIR)\sample-request.obj" - -@erase "$(INTDIR)\sample-request.sbr" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\sample-request.pdb" - -@erase "$(OUTDIR)\sample-request.bsc" - -@erase "..\..\..\Build\Debug\sample-request.exe" - -@erase "..\..\..\Build\Debug\sample-request.ilk" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../dns/win32/include" /I "../../dns/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\sample-request.bsc" -BSC32_SBRS= \ - "$(INTDIR)\sample-request.sbr" - -"$(OUTDIR)\sample-request.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Debug/libisc.lib ../../dns/win32/Debug/libdns.lib ../../isccfg/win32/Debug/libisccfg.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\sample-request.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/sample-request.exe" /pdbtype:sept -LINK32_OBJS= \ - "$(INTDIR)\sample-request.obj" - -"..\..\..\Build\Debug\sample-request.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ENDIF - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("sample-request.dep") -!INCLUDE "sample-request.dep" -!ELSE -!MESSAGE Warning: cannot find "sample-request.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "request - @PLATFORM@ Release" || "$(CFG)" == "request - @PLATFORM@ Debug" -SOURCE="..\sample-request.c" - -!IF "$(CFG)" == "request - @PLATFORM@ Release" - - -"$(INTDIR)\sample-request.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "request - @PLATFORM@ Debug" - - -"$(INTDIR)\sample-request.obj" "$(INTDIR)\sample-request.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -!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 -1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest" -<< KEEP - -$(_VC_MANIFEST_BASENAME).auto.manifest : - type <<$@ - - - -<< KEEP diff --git a/lib/samples/win32/resolve.dsp.in b/lib/samples/win32/resolve.dsp.in deleted file mode 100644 index e73835d7d4..0000000000 --- a/lib/samples/win32/resolve.dsp.in +++ /dev/null @@ -1,103 +0,0 @@ -# Microsoft Developer Studio Project File - Name="resolve" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103 - -CFG=resolve - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "resolve.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "resolve.mak" CFG="resolve - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "resolve - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "resolve - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "resolve - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../dns/win32/include" /I "../../dns/include" /I "../../irs/win32/include" /I "../../irs/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console @MACHINE@ -# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Release/libisc.lib ../../dns/win32/Release/libdns.lib ../../isccfg/win32/Release/libisccfg.lib ../../irs/win32/Release/libirs.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/resolve.exe" - -!ELSEIF "$(CFG)" == "resolve - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../dns/win32/include" /I "../../dns/include" /I "../../irs/win32/include" /I "../../irs/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c -# SUBTRACT CPP /X @COPTY@ -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console /debug @MACHINE@ /pdbtype:sept -# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Debug/libisc.lib ../../dns/win32/Debug/libdns.lib ../../isccfg/win32/Debug/libisccfg.lib ../../irs/win32/Debug/libirs.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/resolve.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "resolve - @PLATFORM@ Release" -# Name "resolve - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE="..\resolve.c" -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/lib/samples/win32/resolve.dsw b/lib/samples/win32/resolve.dsw deleted file mode 100644 index 222580a662..0000000000 --- a/lib/samples/win32/resolve.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "resolve"=".\resolve.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/lib/samples/win32/resolve.mak.in b/lib/samples/win32/resolve.mak.in deleted file mode 100644 index ae461d1d5f..0000000000 --- a/lib/samples/win32/resolve.mak.in +++ /dev/null @@ -1,299 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on resolve.dsp -!IF "$(CFG)" == "" -CFG=resolve - @PLATFORM@ Debug -!MESSAGE No configuration specified. Defaulting to resolve - @PLATFORM@ Debug. -!ENDIF - -!IF "$(CFG)" != "resolve - @PLATFORM@ Release" && "$(CFG)" != "resolve - @PLATFORM@ Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "resolve.mak" CFG="resolve - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "resolve - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "resolve - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -!IF "$(CFG)" == "resolve - @PLATFORM@ 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)" == "resolve - @PLATFORM@ Release" - -OUTDIR=.\Release -INTDIR=.\Release - -ALL : "..\..\..\Build\Release\resolve.exe" - - -CLEAN : - -@erase "$(INTDIR)\resolve.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "..\..\..\Build\Release\resolve.exe" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../dns/win32/include" /I "../../dns/include" /I "../../irs/win32/include" /I "../../irs/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\resolve.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\resolve.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Release/libisc.lib ../../dns/win32/Release/libdns.lib ../../isccfg/win32/Release/libisccfg.lib ../../irs/win32/Release/libirs.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\resolve.pdb" @MACHINE@ /out:"../../../Build/Release/resolve.exe" -LINK32_OBJS= \ - "$(INTDIR)\resolve.obj" - -"..\..\..\Build\Release\resolve.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ELSEIF "$(CFG)" == "resolve - @PLATFORM@ Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -ALL : "..\..\..\Build\Debug\resolve.exe" "$(OUTDIR)\resolve.bsc" - - -CLEAN : - -@erase "$(INTDIR)\resolve.obj" - -@erase "$(INTDIR)\resolve.sbr" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\resolve.pdb" - -@erase "$(OUTDIR)\resolve.bsc" - -@erase "..\..\..\Build\Debug\resolve.exe" - -@erase "..\..\..\Build\Debug\resolve.ilk" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../dns/win32/include" /I "../../dns/include" /I "../../irs/win32/include" /I "../../irs/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\resolve.bsc" -BSC32_SBRS= \ - "$(INTDIR)\resolve.sbr" - -"$(OUTDIR)\resolve.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Debug/libisc.lib ../../dns/win32/Debug/libdns.lib ../../isccfg/win32/Debug/libisccfg.lib ../../irs/win32/Debug/libirs.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\resolve.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/resolve.exe" /pdbtype:sept -LINK32_OBJS= \ - "$(INTDIR)\resolve.obj" - -"..\..\..\Build\Debug\resolve.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ENDIF - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("resolve.dep") -!INCLUDE "resolve.dep" -!ELSE -!MESSAGE Warning: cannot find "resolve.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "resolve - @PLATFORM@ Release" || "$(CFG)" == "resolve - @PLATFORM@ Debug" -SOURCE="..\resolve.c" - -!IF "$(CFG)" == "resolve - @PLATFORM@ Release" - - -"$(INTDIR)\resolve.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "resolve - @PLATFORM@ Debug" - - -"$(INTDIR)\resolve.obj" "$(INTDIR)\resolve.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -!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 -1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest" -<< KEEP - -$(_VC_MANIFEST_BASENAME).auto.manifest : - type <<$@ - - - -<< KEEP diff --git a/lib/samples/win32/update.dsp.in b/lib/samples/win32/update.dsp.in deleted file mode 100644 index 37be0a9a05..0000000000 --- a/lib/samples/win32/update.dsp.in +++ /dev/null @@ -1,103 +0,0 @@ -# Microsoft Developer Studio Project File - Name="update" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103 - -CFG=update - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "update.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "update.mak" CFG="update - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "update - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "update - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "update - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../dns/win32/include" /I "../../dns/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console @MACHINE@ -# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Release/libisc.lib ../../dns/win32/Release/libdns.lib ../../isccfg/win32/Release/libisccfg.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/sample-update.exe" - -!ELSEIF "$(CFG)" == "update - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../dns/win32/include" /I "../../dns/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c -# SUBTRACT CPP /X @COPTY@ -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 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 /subsystem:console /debug @MACHINE@ /pdbtype:sept -# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Debug/libisc.lib ../../dns/win32/Debug/libdns.lib ../../isccfg/win32/Debug/libisccfg.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/sample-update.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "update - @PLATFORM@ Release" -# Name "update - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE="..\sample-update.c" -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/lib/samples/win32/update.dsw b/lib/samples/win32/update.dsw deleted file mode 100644 index 829e2e8438..0000000000 --- a/lib/samples/win32/update.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "update"=".\update.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/lib/samples/win32/update.mak.in b/lib/samples/win32/update.mak.in deleted file mode 100644 index 38bfecb994..0000000000 --- a/lib/samples/win32/update.mak.in +++ /dev/null @@ -1,299 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on update.dsp -!IF "$(CFG)" == "" -CFG=update - @PLATFORM@ Debug -!MESSAGE No configuration specified. Defaulting to update - @PLATFORM@ Debug. -!ENDIF - -!IF "$(CFG)" != "update - @PLATFORM@ Release" && "$(CFG)" != "update - @PLATFORM@ Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "update.mak" CFG="update - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "update - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "update - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -!IF "$(CFG)" == "update - @PLATFORM@ 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)" == "update - @PLATFORM@ Release" - -OUTDIR=.\Release -INTDIR=.\Release - -ALL : "..\..\..\Build\Release\sample-update.exe" - - -CLEAN : - -@erase "$(INTDIR)\sample-update.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "..\..\..\Build\Release\sample-update.exe" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../dns/win32/include" /I "../../dns/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\sample-update.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\sample-update.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Release/libisc.lib ../../dns/win32/Release/libdns.lib ../../isccfg/win32/Release/libisccfg.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\sample-update.pdb" @MACHINE@ /out:"../../../Build/Release/sample-update.exe" -LINK32_OBJS= \ - "$(INTDIR)\sample-update.obj" - -"..\..\..\Build\Release\sample-update.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ELSEIF "$(CFG)" == "update - @PLATFORM@ Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -ALL : "..\..\..\Build\Debug\sample-update.exe" "$(OUTDIR)\sample-update.bsc" - - -CLEAN : - -@erase "$(INTDIR)\sample-update.obj" - -@erase "$(INTDIR)\sample-update.sbr" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\sample-update.pdb" - -@erase "$(OUTDIR)\sample-update.bsc" - -@erase "..\..\..\Build\Debug\sample-update.exe" - -@erase "..\..\..\Build\Debug\sample-update.ilk" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../dns/win32/include" /I "../../dns/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\sample-update.bsc" -BSC32_SBRS= \ - "$(INTDIR)\sample-update.sbr" - -"$(OUTDIR)\sample-update.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Debug/libisc.lib ../../dns/win32/Debug/libdns.lib ../../isccfg/win32/Debug/libisccfg.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\sample-update.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/sample-update.exe" /pdbtype:sept -LINK32_OBJS= \ - "$(INTDIR)\sample-update.obj" - -"..\..\..\Build\Debug\sample-update.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ENDIF - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("sample-update.dep") -!INCLUDE "sample-update.dep" -!ELSE -!MESSAGE Warning: cannot find "sample-update.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "update - @PLATFORM@ Release" || "$(CFG)" == "update - @PLATFORM@ Debug" -SOURCE="..\sample-update.c" - -!IF "$(CFG)" == "update - @PLATFORM@ Release" - - -"$(INTDIR)\sample-update.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "update - @PLATFORM@ Debug" - - -"$(INTDIR)\sample-update.obj" "$(INTDIR)\sample-update.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -!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 -1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest" -<< KEEP - -$(_VC_MANIFEST_BASENAME).auto.manifest : - type <<$@ - - - -<< KEEP diff --git a/lib/tests/win32/libtests.dsp.in b/lib/tests/win32/libtests.dsp.in deleted file mode 100644 index c638991d14..0000000000 --- a/lib/tests/win32/libtests.dsp.in +++ /dev/null @@ -1,121 +0,0 @@ -# Microsoft Developer Studio Project File - Name="libtests" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Dynamic-Link Library" 0x0102 - -CFG=libtests - @PLATFORM@ Release -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "libtests.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "libtests.mak" CFG="libtests - @PLATFORM@ Release" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "libtests - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Dynamic-Link Library") -!MESSAGE "libtests - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "libtests - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBTESTS_EXPORTS" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 @LIBXML2_INC@ /I "../../../lib/dns/win32/include" /I "./" /I "../../../" /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "WIN32" /D "__STDC__" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBTESTS_EXPORTS" @COPTY@ /FD /c -# SUBTRACT CPP /X -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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@ -# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Release/libisc.lib ../../dns/win32/Release/libdns.lib /nologo /dll @MACHINE@ /out:"../../../Build/Release/libtests.dll" - -!ELSEIF "$(CFG)" == "libtests - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBTESTS_EXPORTS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od @LIBXML2_INC@ /I "./" /I "../../../" /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBTESTS_EXPORTS" /FR @COPTY@ /FD /GZ /c -# SUBTRACT CPP /X -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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@ /pdbtype:sept -# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../isc/win32/debug/libisc.lib ../../dns/win32/debug/libdns.lib /nologo /dll /debug @MACHINE@ /out:"../../../Build/Debug/libtests.dll" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "libtests - @PLATFORM@ Release" -# Name "libtests - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\t_api.c -# End Source File -# Begin Source File - -SOURCE=.\DLLMain.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\include\tests\t_api.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# Begin Source File - -SOURCE=.\libtests.def -# End Source File -# End Target -# End Project diff --git a/lib/tests/win32/libtests.dsw b/lib/tests/win32/libtests.dsw deleted file mode 100644 index c9a15a10b1..0000000000 --- a/lib/tests/win32/libtests.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "libtests"=.\libtests.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/lib/tests/win32/libtests.mak.in b/lib/tests/win32/libtests.mak.in deleted file mode 100644 index 18b17342a8..0000000000 --- a/lib/tests/win32/libtests.mak.in +++ /dev/null @@ -1,378 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on libtests.dsp -!IF "$(CFG)" == "" -CFG=libtests - @PLATFORM@ Release -!MESSAGE No configuration specified. Defaulting to libtests - @PLATFORM@ Release. -!ENDIF - -!IF "$(CFG)" != "libtests - @PLATFORM@ Release" && "$(CFG)" != "libtests - @PLATFORM@ Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "libtests.mak" CFG="libtests - @PLATFORM@ Release" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "libtests - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Dynamic-Link Library") -!MESSAGE "libtests - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Dynamic-Link Library") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "libtests - @PLATFORM@ 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)" == "libtests - @PLATFORM@ Release" - -OUTDIR=.\Release -INTDIR=.\Release - -!IF "$(RECURSE)" == "0" - -ALL : "..\..\..\Build\Release\libtests.dll" - -!ELSE - -ALL : "libisc - @PLATFORM@ Release" "libdns - @PLATFORM@ Release" "..\..\..\Build\Release\libtests.dll" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"libdns - @PLATFORM@ ReleaseCLEAN" "libisc - @PLATFORM@ ReleaseCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\t_api.obj" - -@erase "$(INTDIR)\DLLMain.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(OUTDIR)\libtests.exp" - -@erase "$(OUTDIR)\libtests.lib" - -@erase "..\..\..\Build\Release\libtests.dll" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 @LIBXML2_INC@ /I "../../../lib/dns/win32/include" /I "./" /I "../../../" /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "WIN32" /D "__STDC__" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBTESTS_EXPORTS" /Fp"$(INTDIR)\libtests.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c -MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\libtests.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Release/libisc.lib ../../dns/win32/Release/libdns.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\libtests.pdb" @MACHINE@ /def:".\libtests.def" /out:"../../../Build/Release/libtests.dll" /implib:"$(OUTDIR)\libtests.lib" -DEF_FILE= \ - ".\libtests.def" -LINK32_OBJS= \ - "$(INTDIR)\t_api.obj" \ - "$(INTDIR)\DLLMain.obj" \ - "..\..\dns\win32\Release\libdns.lib" \ - "..\..\isc\win32\Release\libisc.lib" - -"..\..\..\Build\Release\libtests.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_DLL) - -!ELSEIF "$(CFG)" == "libtests - @PLATFORM@ Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : "..\..\..\Build\Debug\libtests.dll" "$(OUTDIR)\libtests.bsc" - -!ELSE - -ALL : "libisc - @PLATFORM@ Debug" "libdns - @PLATFORM@ Debug" "..\..\..\Build\Debug\libtests.dll" "$(OUTDIR)\libtests.bsc" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"libdns - @PLATFORM@ DebugCLEAN" "libisc - @PLATFORM@ DebugCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\t_api.obj" - -@erase "$(INTDIR)\t_api.sbr" - -@erase "$(INTDIR)\DLLMain.obj" - -@erase "$(INTDIR)\DLLMain.sbr" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\libtests.bsc" - -@erase "$(OUTDIR)\libtests.exp" - -@erase "$(OUTDIR)\libtests.lib" - -@erase "$(OUTDIR)\libtests.pdb" - -@erase "..\..\..\Build\Debug\libtests.dll" - -@erase "..\..\..\Build\Debug\libtests.ilk" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od @LIBXML2_INC@ /I "./" /I "../../../" /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBTESTS_EXPORTS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\libtests.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\libtests.bsc" -BSC32_SBRS= \ - "$(INTDIR)\t_api.sbr" \ - "$(INTDIR)\DLLMain.sbr" - -"$(OUTDIR)\libtests.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../isc/win32/debug/libisc.lib ../../dns/win32/debug/libdns.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\libtests.pdb" /debug @MACHINE@ /def:".\libtests.def" /out:"../../../Build/Debug/libtests.dll" /implib:"$(OUTDIR)\libtests.lib" /pdbtype:sept -DEF_FILE= \ - ".\libtests.def" -LINK32_OBJS= \ - "$(INTDIR)\t_api.obj" \ - "$(INTDIR)\DLLMain.obj" \ - "..\..\dns\win32\Debug\libdns.lib" \ - "..\..\isc\win32\Debug\libisc.lib" - -"..\..\..\Build\Debug\libtests.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_DLL) - -!ENDIF - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("libtests.dep") -!INCLUDE "libtests.dep" -!ELSE -!MESSAGE Warning: cannot find "libtests.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "libtests - @PLATFORM@ Release" || "$(CFG)" == "libtests - @PLATFORM@ Debug" -SOURCE=..\t_api.c - -!IF "$(CFG)" == "libtests - @PLATFORM@ Release" - - -"$(INTDIR)\t_api.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "libtests - @PLATFORM@ Debug" - - -"$(INTDIR)\t_api.obj" "$(INTDIR)\t_api.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=.\DLLMain.c - -!IF "$(CFG)" == "libtests - @PLATFORM@ Release" - - -"$(INTDIR)\DLLMain.obj" : $(SOURCE) "$(INTDIR)" - - -!ELSEIF "$(CFG)" == "libtests - @PLATFORM@ Debug" - - -"$(INTDIR)\DLLMain.obj" "$(INTDIR)\DLLMain.sbr" : $(SOURCE) "$(INTDIR)" - - -!ENDIF - -!IF "$(CFG)" == "libtests - @PLATFORM@ Release" - -"libdns - @PLATFORM@ Release" : - cd "..\..\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" - cd "..\..\tests\win32" - -"libdns - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\tests\win32" - -!ELSEIF "$(CFG)" == "libtests - @PLATFORM@ Debug" - -"libdns - @PLATFORM@ Debug" : - cd "..\..\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" - cd "..\..\tests\win32" - -"libdns - @PLATFORM@ DebugCLEAN" : - cd "..\..\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\tests\win32" - -!ENDIF - -!IF "$(CFG)" == "libtests - @PLATFORM@ Release" - -"libisc - @PLATFORM@ Release" : - cd "..\..\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" - cd "..\..\tests\win32" - -"libisc - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\tests\win32" - -!ELSEIF "$(CFG)" == "libtests - @PLATFORM@ Debug" - -"libisc - @PLATFORM@ Debug" : - cd "..\..\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" - cd "..\..\tests\win32" - -"libisc - @PLATFORM@ DebugCLEAN" : - cd "..\..\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\tests\win32" - -!ENDIF - - -!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 -1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest" -<< KEEP - -$(_VC_MANIFEST_BASENAME).auto.manifest : - type <<$@ - - - -<< KEEP diff --git a/lib/win32/bindevt/bindevt.dsp.in b/lib/win32/bindevt/bindevt.dsp.in deleted file mode 100644 index 34cbbd10f2..0000000000 --- a/lib/win32/bindevt/bindevt.dsp.in +++ /dev/null @@ -1,132 +0,0 @@ -# Microsoft Developer Studio Project File - Name="bindevt" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Dynamic-Link Library" 0x0102 - -CFG=bindevt - @PLATFORM@ Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "bindevt.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "bindevt.mak" CFG="bindevt - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "bindevt - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Dynamic-Link Library") -!MESSAGE "bindevt - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "bindevt - @PLATFORM@ Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 1 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BINDEVT_EXPORTS" /Yu"stdafx.h" /FD /c -# ADD CPP /nologo /MT /W3 @COPTX@ @COPTI@ /O2 /I "..\include" /I "..\..\..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BINDEVT_EXPORTS" /FD /c -# SUBTRACT CPP @COPTY@ /Yc /Yu -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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@ -# ADD 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 /pdb:none @MACHINE@ /out:"..\..\..\Build\Release\bindevt.dll" - -!ELSEIF "$(CFG)" == "bindevt - @PLATFORM@ Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 1 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BINDEVT_EXPORTS" /Yu"stdafx.h" /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm @COPTX@ @COPTI@ /Zi /Od /I "..\include" /I "..\..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BINDEVT_EXPORTS" /FR /FD /GZ /c -# SUBTRACT CPP @COPTY@ /Yc /Yu -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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@ /pdbtype:sept -# ADD 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 /pdb:none /debug @MACHINE@ /out:"..\..\..\Build\Debug\bindevt.dll" - -!ENDIF - -# Begin Target - -# Name "bindevt - @PLATFORM@ Release" -# Name "bindevt - @PLATFORM@ Debug" -# Begin Source File - -SOURCE=.\bindevt.c -# End Source File -# Begin Source File - -SOURCE=.\bindevt.mc - -!IF "$(CFG)" == "bindevt - @PLATFORM@ Release" - -# Begin Custom Build -TargetName=bindevt -InputPath=.\bindevt.mc -InputName=bindevt - -"$(TargetName).rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - mc $(InputName).mc - -# End Custom Build - -!ELSEIF "$(CFG)" == "bindevt - @PLATFORM@ Debug" - -# Begin Custom Build -TargetName=bindevt -InputPath=.\bindevt.mc -InputName=bindevt - -"$(TargetName).rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - mc $(InputName).mc - -# End Custom Build - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\bindevt.rc -# End Source File -# End Target -# End Project diff --git a/lib/win32/bindevt/bindevt.dsw b/lib/win32/bindevt/bindevt.dsw deleted file mode 100644 index c9e02a019d..0000000000 --- a/lib/win32/bindevt/bindevt.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "bindevt"=.\bindevt.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/lib/win32/bindevt/bindevt.mak.in b/lib/win32/bindevt/bindevt.mak.in deleted file mode 100644 index b8b503e8a0..0000000000 --- a/lib/win32/bindevt/bindevt.mak.in +++ /dev/null @@ -1,310 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on bindevt.dsp -!IF "$(CFG)" == "" -CFG=bindevt - @PLATFORM@ Debug -!MESSAGE No configuration specified. Defaulting to bindevt - @PLATFORM@ Debug. -!ENDIF - -!IF "$(CFG)" != "bindevt - @PLATFORM@ Release" && "$(CFG)" != "bindevt - @PLATFORM@ Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "bindevt.mak" CFG="bindevt - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "bindevt - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Dynamic-Link Library") -!MESSAGE "bindevt - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Dynamic-Link Library") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "bindevt - @PLATFORM@ 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 - @PLATFORM@ Release" - -OUTDIR=.\Release -INTDIR=.\Release - -ALL : "..\..\..\Build\Release\bindevt.dll" - - -CLEAN : - -@erase "$(INTDIR)\bindevt.obj" - -@erase "$(INTDIR)\bindevt.res" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(OUTDIR)\bindevt.exp" - -@erase "..\..\..\Build\Release\bindevt.dll" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MT /W3 @COPTX@ @COPTI@ /O2 /I "..\include" /I "..\..\..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BINDEVT_EXPORTS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c -MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 -RSC_PROJ=/l 0x409 /fo"$(INTDIR)\bindevt.res" /d "NDEBUG" -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\bindevt.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=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 /pdb:none @MACHINE@ /out:"..\..\..\Build\Release\bindevt.dll" /implib:"$(OUTDIR)\bindevt.lib" -LINK32_OBJS= \ - "$(INTDIR)\bindevt.obj" \ - "$(INTDIR)\bindevt.res" - -"..\..\..\Build\Release\bindevt.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_DLL) - -!ELSEIF "$(CFG)" == "bindevt - @PLATFORM@ Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -ALL : "..\..\..\Build\Debug\bindevt.dll" "$(OUTDIR)\bindevt.bsc" - - -CLEAN : - -@erase "$(INTDIR)\bindevt.obj" - -@erase "$(INTDIR)\bindevt.res" - -@erase "$(INTDIR)\bindevt.sbr" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\bindevt.bsc" - -@erase "$(OUTDIR)\bindevt.exp" - -@erase "..\..\..\Build\Debug\bindevt.dll" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MTd /W3 /Gm @COPTX@ @COPTI@ /Zi /Od /I "..\include" /I "..\..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BINDEVT_EXPORTS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 -RSC_PROJ=/l 0x409 /fo"$(INTDIR)\bindevt.res" /d "_DEBUG" -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\bindevt.bsc" -BSC32_SBRS= \ - "$(INTDIR)\bindevt.sbr" - -"$(OUTDIR)\bindevt.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -LINK32_FLAGS=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 /pdb:none /debug @MACHINE@ /out:"..\..\..\Build\Debug\bindevt.dll" /implib:"$(OUTDIR)\bindevt.lib" -LINK32_OBJS= \ - "$(INTDIR)\bindevt.obj" \ - "$(INTDIR)\bindevt.res" - -"..\..\..\Build\Debug\bindevt.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_DLL) - -!ENDIF - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("bindevt.dep") -!INCLUDE "bindevt.dep" -!ELSE -!MESSAGE Warning: cannot find "bindevt.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "bindevt - @PLATFORM@ Release" || "$(CFG)" == "bindevt - @PLATFORM@ Debug" -SOURCE=.\bindevt.c - -!IF "$(CFG)" == "bindevt - @PLATFORM@ Release" - - -"$(INTDIR)\bindevt.obj" : $(SOURCE) "$(INTDIR)" - - -!ELSEIF "$(CFG)" == "bindevt - @PLATFORM@ Debug" - - -"$(INTDIR)\bindevt.obj" "$(INTDIR)\bindevt.sbr" : $(SOURCE) "$(INTDIR)" - - -!ENDIF - -SOURCE=.\bindevt.mc - -!IF "$(CFG)" == "bindevt - @PLATFORM@ Release" - -TargetName=bindevt -InputPath=.\bindevt.mc -InputName=bindevt - -".\bindevt.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < -1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest" -<< KEEP - -$(_VC_MANIFEST_BASENAME).auto.manifest : - type <<$@ - - - -<< KEEP diff --git a/make/includes.in b/make/includes.in index f41e3cda90..d1ba4bc377 100644 --- a/make/includes.in +++ b/make/includes.in @@ -1,11 +1,9 @@ -# Copyright (C) 1999-2001, 2004, 2005, 2007, 2012, 2014, 2016 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 1999-2001, 2004, 2005, 2007, 2012, 2014, 2016, 2017 Internet Systems Consortium, Inc. ("ISC") # # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -# $Id: includes.in,v 1.21 2007/06/19 23:47:24 tbox Exp $ - # Search for machine-generated header files in the build tree, # and for normal headers in the source tree (${top_srcdir}). # We only need to look in OS-specific subdirectories for the @@ -28,13 +26,12 @@ ISCCFG_INCLUDES = @BIND9_ISCCFG_BUILDINCLUDE@ \ DNS_INCLUDES = @BIND9_DNS_BUILDINCLUDE@ \ -I${top_srcdir}/lib/dns/include +NS_INCLUDES = @BIND9_NS_BUILDINCLUDE@ \ + -I${top_srcdir}/lib/ns/include + IRS_INCLUDES = @BIND9_IRS_BUILDINCLUDE@ \ -I${top_srcdir}/lib/irs/include -LWRES_INCLUDES = @BIND9_LWRES_BUILDINCLUDE@ \ - -I${top_srcdir}/lib/lwres/unix/include \ - -I${top_srcdir}/lib/lwres/include - BIND9_INCLUDES = @BIND9_BIND9_BUILDINCLUDE@ \ -I${top_srcdir}/lib/bind9/include diff --git a/util/check-includes.pl b/util/check-includes.pl index 26872a6134..4667c4a0f4 100644 --- a/util/check-includes.pl +++ b/util/check-includes.pl @@ -1,13 +1,11 @@ #! /usr/bin/perl -ws # -# Copyright (C) 2000, 2001, 2004, 2007, 2012, 2016 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2000, 2001, 2004, 2007, 2012, 2016, 2017 Internet Systems Consortium, Inc. ("ISC") # # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -# $Id$ - # Rudimentary, primarily for use by the developers. # This just evolved with no serious attempt at making it # bulletproof or foolproof. Or pretty even. Probably would @@ -18,13 +16,12 @@ # XXX many warnings should not be made unless the header will be a public file use strict; -use vars qw($debug $isc_includes $dns_includes $lwres_includes +use vars qw($debug $isc_includes $dns_includes $omapi_includes); $isc_includes = "-Ilib/isc/include -Ilib/isc/unix/include " . "-Ilib/isc/pthreads/include"; $dns_includes = "-Ilib/dns/include -Ilib/dns/sec/dst/include"; -$lwres_includes = "-Ilib/lwres/include"; $omapi_includes = "-Ilib/omapi/include"; $0 =~ s%.*/%%; @@ -80,13 +77,12 @@ for (<>) { } my $nocomment = '^(?!\s+/?\*)'; - my $lib = $file =~ /lwres/ ? "lwres" : "isc"; # check use of macros without having included proper header for them. - if (/^(\U$lib\E_LANG_(BEGIN|END)DECLS)$/m && - ! m%^#include <$lib/lang\.h>$%m) { - print "$file has $1 without <$lib/lang.h>\n"; + if (/^(\Uisc\E_LANG_(BEGIN|END)DECLS)$/m && + ! m%^#include $%m) { + print "$file has $1 without \n"; } if (/$nocomment.*ISC_EVENTCLASS_/m && ! m%^#include %m) { @@ -112,7 +108,7 @@ for (<>) { unless $file =~ m%isc/platform.h%; } - if ($file !~ m%isc/magic\.h$% && $lib ne "lwres") { + if ($file !~ m%isc/magic\.h$%) { print "$file has ISC_MAGIC_VALID without \n" if /$nocomment.*ISC_MAGIC_VALID/m && ! m%^#include %m; @@ -126,8 +122,8 @@ for (<>) { } if (/^$nocomment(?!#define)[a-z].*([a-zA-Z0-9]\([^;]*\);)/m && - ! m%^#include <$lib/lang.h>%m) { - print "$file has declarations without <$lib/lang.h>\n"; + ! m%^#include %m) { + print "$file has declarations without \n"; } # @@ -202,15 +198,15 @@ for (<>) { } } - if ($elided eq "<$lib/lang.h>") { - if (! /^\U$lib\E_LANG_BEGINDECLS$/m) { - print "$file includes <$lib/lang.h> but " . - "has no \U$lib\E_LANG_BEGINDECLS\n"; - } elsif (! /^\U$lib\E_LANG_ENDDECLS$/m) { - print "$file has \U$lib\E_LANG_BEGINDECLS but " . - "has no \U$lib\E_LANG_ENDDECLS\n"; + if ($elided eq "") { + if (! /^\Uisc\E_LANG_BEGINDECLS$/m) { + print "$file includes but " . + "has no \Uisc\E_LANG_BEGINDECLS\n"; + } elsif (! /^\Uisc\E_LANG_ENDDECLS$/m) { + print "$file has \Uisc\E_LANG_BEGINDECLS but " . + "has no \Uisc\E_LANG_ENDDECLS\n"; } elsif (! /^$nocomment(?!#define)[a-z].*([a-zA-Z0-9]\()/m) { - print "$file has <$lib/lang.h> apparently not function declarations\n"; + print "$file has apparently not function declarations\n"; } next; } @@ -289,8 +285,6 @@ compile() { $includes = $isc_includes; } elsif ($original =~ m%lib/dns/%) { $includes = "$isc_includes $dns_includes"; - } elsif ($original =~ m%lib/lwres/%) { - $includes = $lwres_includes; } elsif ($original =~ m%lib/omapi/%) { $includes = "$isc_includes $dns_includes $omapi_includes"; } else { diff --git a/util/copyrights b/util/copyrights index d998edd117..1290b56cea 100644 --- a/util/copyrights +++ b/util/copyrights @@ -1,5 +1,5 @@ ./.gitattributes X 2015 -./.gitignore X 2012,2013,2014,2015,2016 +./.gitignore X 2012,2013,2014,2015,2016,2017 ./Atffile X 2011 ./CHANGES X 2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017 ./COPYRIGHT TXT 1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017 @@ -27,20 +27,12 @@ ./bin/check/named-checkzone.c C 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 ./bin/check/named-checkzone.docbook SGML 2000,2001,2002,2004,2005,2006,2007,2009,2010,2011,2012,2013,2014,2015,2016 ./bin/check/named-checkzone.html HTML DOCBOOK -./bin/check/win32/checkconf.dsp.in X 2001,2004,2005,2006,2009,2013,2014,2016 -./bin/check/win32/checkconf.dsw X 2001,2013 -./bin/check/win32/checkconf.mak.in X 2001,2002,2004,2005,2006,2009,2013,2014,2016 ./bin/check/win32/checkconf.vcxproj.filters.in X 2013,2015 ./bin/check/win32/checkconf.vcxproj.in X 2013,2014,2015,2016,2017 ./bin/check/win32/checkconf.vcxproj.user X 2013 -./bin/check/win32/checktool.dsp.in X 2006,2009,2013,2014,2016 -./bin/check/win32/checktool.dsw X 2006 ./bin/check/win32/checktool.vcxproj.filters.in X 2013,2015 ./bin/check/win32/checktool.vcxproj.in X 2013,2014,2015,2016,2017 ./bin/check/win32/checktool.vcxproj.user X 2013 -./bin/check/win32/checkzone.dsp.in X 2001,2002,2004,2005,2006,2009,2013,2014,2016 -./bin/check/win32/checkzone.dsw X 2001,2013 -./bin/check/win32/checkzone.mak.in X 2001,2002,2004,2005,2006,2009,2013,2014,2016 ./bin/check/win32/checkzone.vcxproj.filters.in X 2013,2015 ./bin/check/win32/checkzone.vcxproj.in X 2013,2014,2015,2016,2017 ./bin/check/win32/checkzone.vcxproj.user X 2013 @@ -61,21 +53,13 @@ ./bin/confgen/unix/os.c C 2009,2016 ./bin/confgen/util.c C 2009,2015,2016 ./bin/confgen/util.h C 2009,2016 -./bin/confgen/win32/confgentool.dsp.in X 2009,2013 -./bin/confgen/win32/confgentool.dsw X 2009 ./bin/confgen/win32/confgentool.vcxproj.filters.in X 2013,2015 ./bin/confgen/win32/confgentool.vcxproj.in X 2013,2015,2016,2017 ./bin/confgen/win32/confgentool.vcxproj.user X 2013 -./bin/confgen/win32/ddnsconfgen.dsp.in X 2009,2013 -./bin/confgen/win32/ddnsconfgen.dsw X 2009 -./bin/confgen/win32/ddnsconfgen.mak.in X 2009,2013 ./bin/confgen/win32/ddnsconfgen.vcxproj.filters.in X 2013,2015 ./bin/confgen/win32/ddnsconfgen.vcxproj.in X 2013,2014,2015,2016,2017 ./bin/confgen/win32/ddnsconfgen.vcxproj.user X 2013 ./bin/confgen/win32/os.c C 2009,2016 -./bin/confgen/win32/rndcconfgen.dsp.in X 2001,2009,2013 -./bin/confgen/win32/rndcconfgen.dsw X 2001,2004,2005,2006,2009 -./bin/confgen/win32/rndcconfgen.mak.in X 2001,2004,2005,2006,2009,2013 ./bin/confgen/win32/rndcconfgen.vcxproj.filters.in X 2013,2015 ./bin/confgen/win32/rndcconfgen.vcxproj.in X 2013,2015,2016,2017 ./bin/confgen/win32/rndcconfgen.vcxproj.user X 2013 @@ -85,9 +69,6 @@ ./bin/delv/delv.c C 2014,2015,2016,2017 ./bin/delv/delv.docbook SGML 2014,2015,2016,2017 ./bin/delv/delv.html HTML DOCBOOK -./bin/delv/win32/delv.dsp.in X 2014,2016 -./bin/delv/win32/delv.dsw X 2014 -./bin/delv/win32/delv.mak.in X 2014,2016 ./bin/delv/win32/delv.vcxproj.filters.in X 2014,2015 ./bin/delv/win32/delv.vcxproj.in X 2014,2015,2016,2017 ./bin/delv/win32/delv.vcxproj.user X 2014 @@ -107,26 +88,15 @@ ./bin/dig/nslookup.c C 2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017 ./bin/dig/nslookup.docbook SGML 2004,2005,2006,2007,2010,2013,2014,2015,2016,2017 ./bin/dig/nslookup.html HTML DOCBOOK -./bin/dig/win32/dig.dsp.in X 2001,2002,2004,2005,2006,2009,2013,2014,2016 -./bin/dig/win32/dig.dsw X 2001 -./bin/dig/win32/dig.mak.in X 2001,2002,2004,2005,2006,2009,2013,2014,2016 ./bin/dig/win32/dig.vcxproj.filters.in X 2013,2015 ./bin/dig/win32/dig.vcxproj.in X 2013,2014,2015,2016,2017 ./bin/dig/win32/dig.vcxproj.user X 2013 -./bin/dig/win32/dighost.dsp.in X 2006,2009,2013,2014,2016 -./bin/dig/win32/dighost.dsw X 2006 ./bin/dig/win32/dighost.vcxproj.filters.in X 2013,2015 ./bin/dig/win32/dighost.vcxproj.in X 2013,2014,2015,2016,2017 ./bin/dig/win32/dighost.vcxproj.user X 2013 -./bin/dig/win32/host.dsp.in X 2001,2002,2004,2005,2006,2009,2013,2014,2016 -./bin/dig/win32/host.dsw X 2001 -./bin/dig/win32/host.mak.in X 2001,2002,2004,2005,2006,2009,2013,2014,2016 ./bin/dig/win32/host.vcxproj.filters.in X 2013,2015 ./bin/dig/win32/host.vcxproj.in X 2013,2014,2015,2016,2017 ./bin/dig/win32/host.vcxproj.user X 2013 -./bin/dig/win32/nslookup.dsp.in X 2001,2002,2004,2005,2009,2013,2014,2016 -./bin/dig/win32/nslookup.dsw X 2001 -./bin/dig/win32/nslookup.mak.in X 2001,2002,2004,2005,2006,2009,2013,2014,2016 ./bin/dig/win32/nslookup.vcxproj.filters.in X 2013,2015 ./bin/dig/win32/nslookup.vcxproj.in X 2013,2014,2015,2016,2017 ./bin/dig/win32/nslookup.vcxproj.user X 2013 @@ -166,149 +136,88 @@ ./bin/dnssec/dnssec-verify.html HTML DOCBOOK ./bin/dnssec/dnssectool.c C 2000,2001,2003,2004,2005,2007,2009,2010,2011,2012,2013,2014,2015,2016 ./bin/dnssec/dnssectool.h C 2000,2001,2003,2004,2007,2008,2009,2010,2011,2012,2014,2015,2016,2017 -./bin/dnssec/win32/dnssectool.dsp.in X 2006,2009,2013,2014,2016 -./bin/dnssec/win32/dnssectool.dsw X 2006,2009 ./bin/dnssec/win32/dnssectool.vcxproj.filters.in X 2013,2015 ./bin/dnssec/win32/dnssectool.vcxproj.in X 2013,2014,2015,2016,2017 ./bin/dnssec/win32/dnssectool.vcxproj.user X 2013 -./bin/dnssec/win32/dsfromkey.dsp.in X 2008,2009,2013,2014,2016 -./bin/dnssec/win32/dsfromkey.dsw X 2008 -./bin/dnssec/win32/dsfromkey.mak.in X 2008,2009,2013,2014,2016 ./bin/dnssec/win32/dsfromkey.vcxproj.filters.in X 2013,2015 ./bin/dnssec/win32/dsfromkey.vcxproj.in X 2013,2014,2015,2016,2017 ./bin/dnssec/win32/dsfromkey.vcxproj.user X 2013 -./bin/dnssec/win32/importkey.dsp.in X 2013,2014,2016 -./bin/dnssec/win32/importkey.dsw X 2013 -./bin/dnssec/win32/importkey.mak.in X 2013,2014,2016 ./bin/dnssec/win32/importkey.vcxproj.filters.in X 2013,2015 ./bin/dnssec/win32/importkey.vcxproj.in X 2013,2014,2015,2016,2017 ./bin/dnssec/win32/importkey.vcxproj.user X 2013 -./bin/dnssec/win32/keyfromlabel.dsp.in X 2008,2009,2013,2014,2016 -./bin/dnssec/win32/keyfromlabel.dsw X 2008 -./bin/dnssec/win32/keyfromlabel.mak.in X 2008,2009,2013,2014,2016 ./bin/dnssec/win32/keyfromlabel.vcxproj.filters.in X 2013,2015 ./bin/dnssec/win32/keyfromlabel.vcxproj.in X 2013,2014,2015,2016,2017 ./bin/dnssec/win32/keyfromlabel.vcxproj.user X 2013 -./bin/dnssec/win32/keygen.dsp.in X 2001,2004,2005,2006,2009,2013,2014,2016 -./bin/dnssec/win32/keygen.dsw X 2001 -./bin/dnssec/win32/keygen.mak.in X 2001,2004,2005,2006,2009,2013,2014,2016 ./bin/dnssec/win32/keygen.vcxproj.filters.in X 2013,2015 ./bin/dnssec/win32/keygen.vcxproj.in X 2013,2014,2015,2016,2017 ./bin/dnssec/win32/keygen.vcxproj.user X 2013 -./bin/dnssec/win32/revoke.dsp.in X 2009,2013,2014,2016 -./bin/dnssec/win32/revoke.dsw X 2009 -./bin/dnssec/win32/revoke.mak.in X 2009,2013,2014,2016 ./bin/dnssec/win32/revoke.vcxproj.filters.in X 2013,2015 ./bin/dnssec/win32/revoke.vcxproj.in X 2013,2014,2015,2016,2017 ./bin/dnssec/win32/revoke.vcxproj.user X 2013 -./bin/dnssec/win32/settime.dsp.in X 2009,2013,2014,2016 -./bin/dnssec/win32/settime.dsw X 2009 -./bin/dnssec/win32/settime.mak.in X 2009,2013,2014,2016 ./bin/dnssec/win32/settime.vcxproj.filters.in X 2013,2015 ./bin/dnssec/win32/settime.vcxproj.in X 2013,2014,2015,2016,2017 ./bin/dnssec/win32/settime.vcxproj.user X 2013 -./bin/dnssec/win32/signzone.dsp.in X 2001,2004,2005,2006,2009,2013,2014,2016 -./bin/dnssec/win32/signzone.dsw X 2001 -./bin/dnssec/win32/signzone.mak.in X 2001,2004,2005,2006,2009,2013,2014,2016 ./bin/dnssec/win32/signzone.vcxproj.filters.in X 2013,2015 ./bin/dnssec/win32/signzone.vcxproj.in X 2013,2014,2015,2016,2017 ./bin/dnssec/win32/signzone.vcxproj.user X 2013 -./bin/dnssec/win32/verify.dsp.in X 2013,2014,2016 -./bin/dnssec/win32/verify.dsw X 2013 -./bin/dnssec/win32/verify.mak.in X 2013,2014,2016 ./bin/dnssec/win32/verify.vcxproj.filters.in X 2013,2015 ./bin/dnssec/win32/verify.vcxproj.in X 2013,2014,2015,2016,2017 ./bin/dnssec/win32/verify.vcxproj.user X 2013 -./bin/named/.gitignore X 2012,2014 -./bin/named/Makefile.in MAKE 1998,1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 +./bin/named/.gitignore X 2012,2014,2017 +./bin/named/Makefile.in MAKE 1998,1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017 ./bin/named/bind9.xsl SGML 2006,2007,2008,2009,2012,2013,2014,2015,2016,2017 ./bin/named/bind9.xsl.h X 2007,2008,2009,2011,2012,2013,2014,2015,2016,2017 -./bin/named/builtin.c C 2001,2002,2003,2004,2005,2007,2009,2010,2011,2012,2013,2014,2015,2016 -./bin/named/client.c C 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017 +./bin/named/builtin.c C 2001,2002,2003,2004,2005,2007,2009,2010,2011,2012,2013,2014,2015,2016,2017 ./bin/named/config.c C 2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017 ./bin/named/control.c C 2001,2002,2003,2004,2005,2006,2007,2009,2010,2011,2012,2013,2014,2015,2016,2017 -./bin/named/controlconf.c C 2001,2002,2003,2004,2005,2006,2007,2008,2011,2012,2013,2014,2015,2016 +./bin/named/controlconf.c C 2001,2002,2003,2004,2005,2006,2007,2008,2011,2012,2013,2014,2015,2016,2017 ./bin/named/convertxsl.pl PERL 2006,2007,2008,2012,2014,2016 ./bin/named/fuzz.c C 2016,2017 -./bin/named/geoip.c C 2013,2014,2016 +./bin/named/geoip.c C 2013,2014,2016,2017 ./bin/named/include/.gitignore X 2012,2014 ./bin/named/include/dlz/dlz_dlopen_driver.h C 2011,2016 -./bin/named/include/named/builtin.h C 2001,2004,2005,2007,2016 -./bin/named/include/named/client.h C 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2015,2016,2017 -./bin/named/include/named/config.h C 2001,2002,2004,2005,2006,2007,2009,2013,2016 +./bin/named/include/named/builtin.h C 2001,2004,2005,2007,2016,2017 +./bin/named/include/named/config.h C 2001,2002,2004,2005,2006,2007,2009,2013,2016,2017 ./bin/named/include/named/control.h C 2001,2002,2003,2004,2005,2006,2007,2009,2010,2011,2012,2014,2015,2016,2017 -./bin/named/include/named/fuzz.h C 2016 -./bin/named/include/named/geoip.h C 2013,2016 +./bin/named/include/named/fuzz.h C 2016,2017 +./bin/named/include/named/geoip.h C 2013,2016,2017 ./bin/named/include/named/globals.h C 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017 -./bin/named/include/named/interfacemgr.h C 1999,2000,2001,2002,2004,2005,2007,2011,2013,2014,2016 -./bin/named/include/named/listenlist.h C 2000,2001,2004,2005,2007,2013,2016 -./bin/named/include/named/log.h C 1999,2000,2001,2002,2004,2005,2007,2009,2015,2016 -./bin/named/include/named/logconf.h C 1999,2000,2001,2004,2005,2006,2007,2016 -./bin/named/include/named/lwaddr.h C 2000,2001,2004,2005,2007,2016 -./bin/named/include/named/lwdclient.h C 2000,2001,2004,2005,2007,2009,2015,2016 -./bin/named/include/named/lwresd.h C 2000,2001,2004,2005,2006,2007,2014,2016 -./bin/named/include/named/lwsearch.h C 2000,2001,2004,2005,2007,2016 -./bin/named/include/named/main.h C 1999,2000,2001,2002,2004,2005,2007,2009,2013,2015,2016 -./bin/named/include/named/notify.h C 1999,2000,2001,2004,2005,2007,2009,2016 -./bin/named/include/named/ns_smf_globals.h C 2005,2007,2014,2016 -./bin/named/include/named/query.h C 1999,2000,2001,2002,2004,2005,2007,2010,2011,2013,2014,2015,2016,2017 +./bin/named/include/named/log.h C 1999,2000,2001,2002,2004,2005,2007,2009,2015,2016,2017 +./bin/named/include/named/logconf.h C 1999,2000,2001,2004,2005,2006,2007,2016,2017 +./bin/named/include/named/main.h C 1999,2000,2001,2002,2004,2005,2007,2009,2013,2015,2016,2017 ./bin/named/include/named/seccomp.h C 2014,2016,2017 ./bin/named/include/named/server.h C 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017 -./bin/named/include/named/sortlist.h C 2000,2001,2004,2005,2006,2007,2016 -./bin/named/include/named/statschannel.h C 2008,2016 -./bin/named/include/named/tkeyconf.h C 1999,2000,2001,2004,2005,2006,2007,2016 -./bin/named/include/named/tsigconf.h C 1999,2000,2001,2004,2005,2006,2007,2009,2016 +./bin/named/include/named/smf_globals.h C 2017 +./bin/named/include/named/statschannel.h C 2008,2016,2017 +./bin/named/include/named/tkeyconf.h C 1999,2000,2001,2004,2005,2006,2007,2016,2017 +./bin/named/include/named/tsigconf.h C 1999,2000,2001,2004,2005,2006,2007,2009,2016,2017 ./bin/named/include/named/types.h C 1999,2000,2001,2004,2005,2006,2007,2008,2009,2015,2016,2017 -./bin/named/include/named/update.h C 1999,2000,2001,2004,2005,2007,2016 -./bin/named/include/named/xfrout.h C 1999,2000,2001,2004,2005,2007,2016 -./bin/named/include/named/zoneconf.h C 1999,2000,2001,2002,2004,2005,2006,2007,2010,2011,2015,2016 -./bin/named/interfacemgr.c C 1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2015,2016 -./bin/named/listenlist.c C 2000,2001,2004,2005,2007,2013,2016 -./bin/named/log.c C 1999,2000,2001,2002,2004,2005,2006,2007,2009,2013,2014,2016 +./bin/named/include/named/zoneconf.h C 1999,2000,2001,2002,2004,2005,2006,2007,2010,2011,2015,2016,2017 +./bin/named/log.c C 1999,2000,2001,2002,2004,2005,2006,2007,2009,2013,2014,2016,2017 ./bin/named/logconf.c C 1999,2000,2001,2004,2005,2006,2007,2011,2013,2014,2015,2016,2017 -./bin/named/lwaddr.c C 2000,2001,2004,2005,2007,2008,2014,2016 -./bin/named/lwdclient.c C 2000,2001,2004,2005,2007,2015,2016 -./bin/named/lwderror.c C 2000,2001,2004,2005,2007,2016 -./bin/named/lwdgabn.c C 2000,2001,2004,2005,2006,2007,2009,2016 -./bin/named/lwdgnba.c C 2000,2001,2002,2004,2005,2007,2008,2014,2016 -./bin/named/lwdgrbn.c C 2000,2001,2003,2004,2005,2006,2007,2009,2013,2014,2015,2016 -./bin/named/lwdnoop.c C 2000,2001,2004,2005,2007,2008,2016 -./bin/named/lwresd.8 MAN DOCBOOK -./bin/named/lwresd.c C 2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2012,2013,2014,2015,2016 -./bin/named/lwresd.docbook SGML 2000,2001,2004,2005,2007,2008,2009,2014,2015,2016,2017 -./bin/named/lwresd.html HTML DOCBOOK -./bin/named/lwsearch.c C 2000,2001,2004,2005,2007,2016 -./bin/named/main.c C 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 +./bin/named/main.c C 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017 ./bin/named/named.8 MAN DOCBOOK ./bin/named/named.conf.5 MAN DOCBOOK ./bin/named/named.conf.docbook SGML 2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017 ./bin/named/named.conf.html HTML DOCBOOK ./bin/named/named.docbook SGML 2000,2001,2003,2004,2005,2006,2007,2008,2009,2011,2013,2014,2015,2016,2017 ./bin/named/named.html HTML DOCBOOK -./bin/named/notify.c C 1999,2000,2001,2002,2003,2004,2005,2006,2007,2016 -./bin/named/query.c C 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017 ./bin/named/server.c C 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017 -./bin/named/sortlist.c C 2000,2001,2004,2005,2006,2007,2016 ./bin/named/statschannel.c C 2008,2009,2010,2011,2012,2013,2014,2015,2016,2017 -./bin/named/tkeyconf.c C 1999,2000,2001,2004,2005,2006,2007,2009,2010,2012,2014,2016 -./bin/named/tsigconf.c C 1999,2000,2001,2004,2005,2006,2007,2009,2011,2012,2016 +./bin/named/tkeyconf.c C 1999,2000,2001,2004,2005,2006,2007,2009,2010,2012,2014,2016,2017 +./bin/named/tsigconf.c C 1999,2000,2001,2004,2005,2006,2007,2009,2011,2012,2016,2017 ./bin/named/unix/Makefile.in MAKE 1999,2000,2001,2004,2007,2009,2011,2012,2016 ./bin/named/unix/dlz_dlopen_driver.c C 2011,2012,2013,2014,2016 ./bin/named/unix/include/named/os.h C 1999,2000,2001,2002,2004,2005,2007,2008,2009,2014,2016,2017 ./bin/named/unix/os.c C 1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2013,2014,2015,2016,2017 -./bin/named/update.c C 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 ./bin/named/win32/dlz_dlopen_driver.c C 2011,2012,2013,2014,2016 ./bin/named/win32/include/named/ntservice.h C 1999,2000,2001,2002,2003,2004,2007,2016 ./bin/named/win32/include/named/os.h C 1999,2000,2001,2002,2004,2007,2008,2009,2014,2016,2017 -./bin/named/win32/named.dsp.in X 2001,2004,2005,2008,2009,2010,2011,2013,2014,2015,2016 -./bin/named/win32/named.dsw X 2001 -./bin/named/win32/named.mak.in X 2001,2002,2004,2005,2006,2008,2009,2010,2011,2013,2014,2015,2016 -./bin/named/win32/named.vcxproj.filters.in X 2013,2015,2016 +./bin/named/win32/named.vcxproj.filters.in X 2013,2015,2016,2017 ./bin/named/win32/named.vcxproj.in X 2013,2014,2015,2016,2017 ./bin/named/win32/named.vcxproj.user X 2013 -./bin/named/win32/ntservice.c C 1999,2000,2001,2002,2004,2006,2007,2009,2011,2013,2014,2015,2016 +./bin/named/win32/ntservice.c C 1999,2000,2001,2002,2004,2006,2007,2009,2011,2013,2014,2015,2016,2017 ./bin/named/win32/os.c C 1999,2000,2001,2002,2004,2005,2007,2008,2009,2012,2013,2014,2015,2016,2017 -./bin/named/xfrout.c C 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017 ./bin/named/zoneconf.c C 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017 ./bin/nsupdate/.gitignore X 2012 ./bin/nsupdate/Makefile.in MAKE 2000,2001,2002,2004,2006,2007,2008,2009,2012,2013,2014,2015,2016,2017 @@ -316,9 +225,6 @@ ./bin/nsupdate/nsupdate.c C 2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017 ./bin/nsupdate/nsupdate.docbook SGML 2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2014,2015,2016,2017 ./bin/nsupdate/nsupdate.html HTML DOCBOOK -./bin/nsupdate/win32/nsupdate.dsp.in X 2001,2004,2005,2009,2013,2014,2016 -./bin/nsupdate/win32/nsupdate.dsw X 2001 -./bin/nsupdate/win32/nsupdate.mak.in X 2001,2002,2004,2005,2006,2009,2013,2014,2016 ./bin/nsupdate/win32/nsupdate.vcxproj.filters.in X 2013,2015 ./bin/nsupdate/win32/nsupdate.vcxproj.in X 2013,2014,2015,2016,2017 ./bin/nsupdate/win32/nsupdate.vcxproj.user X 2013 @@ -345,27 +251,15 @@ ./bin/pkcs11/pkcs11-tokens.c C 2014,2015,2016 ./bin/pkcs11/pkcs11-tokens.docbook SGML 2014,2015,2016 ./bin/pkcs11/pkcs11-tokens.html HTML DOCBOOK -./bin/pkcs11/win32/pk11destroy.dsp.in X 2009,2013,2014 -./bin/pkcs11/win32/pk11destroy.dsw X 2009 -./bin/pkcs11/win32/pk11destroy.mak.in X 2009,2013,2014 ./bin/pkcs11/win32/pk11destroy.vcxproj.filters.in X 2013,2014,2015 ./bin/pkcs11/win32/pk11destroy.vcxproj.in X 2013,2014,2015,2016,2017 ./bin/pkcs11/win32/pk11destroy.vcxproj.user X 2013 -./bin/pkcs11/win32/pk11keygen.dsp.in X 2009,2013,2014 -./bin/pkcs11/win32/pk11keygen.dsw X 2009 -./bin/pkcs11/win32/pk11keygen.mak.in X 2009,2013,2014 ./bin/pkcs11/win32/pk11keygen.vcxproj.filters.in X 2013,2014,2015 ./bin/pkcs11/win32/pk11keygen.vcxproj.in X 2013,2014,2015,2016,2017 ./bin/pkcs11/win32/pk11keygen.vcxproj.user X 2013 -./bin/pkcs11/win32/pk11list.dsp.in X 2009,2013,2014 -./bin/pkcs11/win32/pk11list.dsw X 2009 -./bin/pkcs11/win32/pk11list.mak.in X 2009,2013,2014 ./bin/pkcs11/win32/pk11list.vcxproj.filters.in X 2013,2014,2015 ./bin/pkcs11/win32/pk11list.vcxproj.in X 2013,2014,2015,2016,2017 ./bin/pkcs11/win32/pk11list.vcxproj.user X 2013 -./bin/pkcs11/win32/pk11tokens.dsp.in X 2014 -./bin/pkcs11/win32/pk11tokens.dsw X 2014 -./bin/pkcs11/win32/pk11tokens.mak.in X 2014 ./bin/pkcs11/win32/pk11tokens.vcxproj.filters.in X 2014,2015 ./bin/pkcs11/win32/pk11tokens.vcxproj.in X 2014,2015,2016,2017 ./bin/pkcs11/win32/pk11tokens.vcxproj.user X 2014 @@ -423,27 +317,19 @@ ./bin/rndc/rndc.html HTML DOCBOOK ./bin/rndc/util.c C 2000,2001,2004,2005,2007,2015,2016 ./bin/rndc/util.h C 2000,2001,2004,2005,2007,2009,2016 -./bin/rndc/win32/rndc.dsp.in X 2001,2004,2005,2006,2009,2013 -./bin/rndc/win32/rndc.dsw X 2001 -./bin/rndc/win32/rndc.mak.in X 2001,2002,2004,2005,2006,2009,2013 ./bin/rndc/win32/rndc.vcxproj.filters.in X 2013,2015 ./bin/rndc/win32/rndc.vcxproj.in X 2013,2015,2016,2017 ./bin/rndc/win32/rndc.vcxproj.user X 2013 -./bin/rndc/win32/rndcutil.dsp.in X 2006,2013 -./bin/rndc/win32/rndcutil.dsw X 2006 ./bin/rndc/win32/rndcutil.vcxproj.filters.in X 2013,2015 ./bin/rndc/win32/rndcutil.vcxproj.in X 2013,2015,2016,2017 ./bin/rndc/win32/rndcutil.vcxproj.user X 2013 -./bin/tests/.gitignore X 2012,2013 +./bin/tests/.gitignore X 2012,2013,2017 ./bin/tests/Kchild.example.+003+04017.key X 2000,2001 ./bin/tests/Kchild.example.+003+04017.private X 2000,2001 ./bin/tests/Makefile.in MAKE 1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017 ./bin/tests/adb_test.c C 1999,2000,2001,2004,2005,2007,2009,2011,2012,2013,2015,2016 ./bin/tests/atomic/Makefile.in MAKE 2011,2012,2014,2016 ./bin/tests/atomic/t_atomic.c C 2011,2013,2015,2016 -./bin/tests/atomic/win32/t_atomic.dsp.in X 2013 -./bin/tests/atomic/win32/t_atomic.dsw X 2013 -./bin/tests/atomic/win32/t_atomic.mak.in X 2013 ./bin/tests/atomic/win32/t_atomic.vcxproj.filters.in X 2013,2015 ./bin/tests/atomic/win32/t_atomic.vcxproj.in X 2013,2015,2016,2017 ./bin/tests/atomic/win32/t_atomic.vcxproj.user X 2013 @@ -510,9 +396,6 @@ ./bin/tests/db/dns_db_origin_1.data X 1999,2000,2001 ./bin/tests/db/dns_db_origin_data X 1999,2000,2001 ./bin/tests/db/t_db.c C 1999,2000,2001,2004,2005,2007,2009,2011,2012,2013,2015,2016,2017 -./bin/tests/db/win32/t_db.dsp.in X 2013,2016 -./bin/tests/db/win32/t_db.dsw X 2013 -./bin/tests/db/win32/t_db.mak.in X 2013,2016 ./bin/tests/db/win32/t_db.vcxproj.filters.in X 2013,2015 ./bin/tests/db/win32/t_db.vcxproj.in X 2013,2015,2016,2017 ./bin/tests/db/win32/t_db.vcxproj.user X 2013 @@ -553,9 +436,6 @@ ./bin/tests/dst/t2_rsasig.in X 1999,2000,2001,2013 ./bin/tests/dst/t_dst.c C 1999,2000,2001,2004,2005,2007,2008,2009,2011,2012,2013,2014,2016 ./bin/tests/dst/win32/REQUIRE_EXTENDED_DIR X 2013 -./bin/tests/dst/win32/t_dst.dsp.in X 2013 -./bin/tests/dst/win32/t_dst.dsw X 2013 -./bin/tests/dst/win32/t_dst.mak.in X 2013 ./bin/tests/dst/win32/t_dst.vcxproj.filters.in X 2013,2015 ./bin/tests/dst/win32/t_dst.vcxproj.in X 2013,2015,2016,2017 ./bin/tests/dst/win32/t_dst.vcxproj.user X 2013 @@ -563,14 +443,9 @@ ./bin/tests/entropy_test.c C 2000,2001,2004,2005,2007,2015,2016 ./bin/tests/fromhex.pl PERL 2015,2016 ./bin/tests/fsaccess_test.c C 2000,2001,2004,2005,2007,2012,2015,2016 -./bin/tests/gxba_test.c C 2000,2001,2004,2005,2007,2015,2016 -./bin/tests/gxbn_test.c C 2000,2001,2004,2005,2007,2015,2016 ./bin/tests/hash_test.c C 2000,2001,2004,2005,2006,2007,2014,2015,2016 ./bin/tests/hashes/Makefile.in MAKE 2010,2012,2014,2016 ./bin/tests/hashes/t_hashes.c C 2010,2013,2016 -./bin/tests/hashes/win32/t_hashes.dsp.in X 2013,2016 -./bin/tests/hashes/win32/t_hashes.dsw X 2013 -./bin/tests/hashes/win32/t_hashes.mak.in X 2013,2016 ./bin/tests/hashes/win32/t_hashes.vcxproj.filters.in X 2013,2015 ./bin/tests/hashes/win32/t_hashes.vcxproj.in X 2013,2015,2016,2017 ./bin/tests/hashes/win32/t_hashes.vcxproj.user X 2013 @@ -580,8 +455,6 @@ ./bin/tests/lex_test.c C 1998,1999,2000,2001,2004,2005,2007,2015,2016 ./bin/tests/lfsr_test.c C 1999,2000,2001,2004,2005,2007,2015,2016 ./bin/tests/log_test.c C 1999,2000,2001,2004,2007,2011,2014,2015,2016 -./bin/tests/lwres_test.c C 2000,2001,2004,2005,2007,2015,2016 -./bin/tests/lwresconf_test.c C 2000,2001,2004,2007,2015,2016 ./bin/tests/makejournal.c C 2013,2015,2016,2017 ./bin/tests/master/Makefile.in MAKE 1999,2000,2001,2002,2004,2007,2009,2012,2014,2016 ./bin/tests/master/dns_master_load_10_data X 2000,2001 @@ -607,18 +480,12 @@ ./bin/tests/master/master8.data X 2000,2001 ./bin/tests/master/master9.data X 2000,2001 ./bin/tests/master/t_master.c C 1998,1999,2000,2001,2003,2004,2005,2007,2009,2011,2013,2016,2017 -./bin/tests/master/win32/t_master.dsp.in X 2013,2016 -./bin/tests/master/win32/t_master.dsw X 2013 -./bin/tests/master/win32/t_master.mak.in X 2013,2016 ./bin/tests/master/win32/t_master.vcxproj.filters.in X 2013,2015 ./bin/tests/master/win32/t_master.vcxproj.in X 2013,2015,2016,2017 ./bin/tests/master/win32/t_master.vcxproj.user X 2013 ./bin/tests/master_test.c C 1999,2000,2001,2004,2007,2009,2015,2016,2017 ./bin/tests/mem/Makefile.in MAKE 1998,1999,2000,2001,2002,2004,2005,2007,2009,2012,2014,2016 ./bin/tests/mem/t_mem.c C 1999,2000,2001,2004,2007,2009,2013,2016 -./bin/tests/mem/win32/t_mem.dsp.in X 2013 -./bin/tests/mem/win32/t_mem.dsw X 2013 -./bin/tests/mem/win32/t_mem.mak.in X 2013 ./bin/tests/mem/win32/t_mem.vcxproj.filters.in X 2013,2015 ./bin/tests/mem/win32/t_mem.vcxproj.in X 2013,2015,2016,2017 ./bin/tests/mem/win32/t_mem.vcxproj.user X 2013 @@ -650,9 +517,6 @@ ./bin/tests/names/dns_name_towire_1_data X 1999,2000,2001 ./bin/tests/names/dns_name_towire_2_data X 1999,2000,2001 ./bin/tests/names/t_names.c C 1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2015,2016 -./bin/tests/names/win32/t_names.dsp.in X 2013 -./bin/tests/names/win32/t_names.dsw X 2013 -./bin/tests/names/win32/t_names.mak.in X 2013 ./bin/tests/names/win32/t_names.vcxproj.filters.in X 2013,2015 ./bin/tests/names/win32/t_names.vcxproj.in X 2013,2015,2016,2017 ./bin/tests/names/win32/t_names.vcxproj.user X 2013 @@ -716,9 +580,6 @@ ./bin/tests/rbt/dns_rbtnodechain_prev.data X 1999,2000,2001 ./bin/tests/rbt/dns_rbtnodechain_prev_data X 1999,2000,2001 ./bin/tests/rbt/t_rbt.c C 1998,1999,2000,2001,2003,2004,2005,2007,2009,2011,2012,2013,2015,2016 -./bin/tests/rbt/win32/t_rbt.dsp.in X 2013 -./bin/tests/rbt/win32/t_rbt.dsw X 2013 -./bin/tests/rbt/win32/t_rbt.mak.in X 2013 ./bin/tests/rbt/win32/t_rbt.vcxproj.filters.in X 2013,2015 ./bin/tests/rbt/win32/t_rbt.vcxproj.in X 2013,2015,2016,2017 ./bin/tests/rbt/win32/t_rbt.vcxproj.user X 2013 @@ -728,9 +589,6 @@ ./bin/tests/resolv.conf.sample CONF-SH 2000,2001,2004,2007,2012,2016 ./bin/tests/resolver/Makefile.in MAKE 2011,2012,2014,2016 ./bin/tests/resolver/t_resolver.c C 2011,2012,2013,2014,2016 -./bin/tests/resolver/win32/t_resolver.dsp.in X 2013,2016 -./bin/tests/resolver/win32/t_resolver.dsw X 2013 -./bin/tests/resolver/win32/t_resolver.mak.in X 2013,2016 ./bin/tests/resolver/win32/t_resolver.vcxproj.filters.in X 2013,2015 ./bin/tests/resolver/win32/t_resolver.vcxproj.in X 2013,2015,2016,2017 ./bin/tests/resolver/win32/t_resolver.vcxproj.user X 2013 @@ -741,9 +599,6 @@ ./bin/tests/sock_test.c C 1998,1999,2000,2001,2004,2007,2008,2012,2013,2014,2015,2016 ./bin/tests/sockaddr/Makefile.in MAKE 1999,2000,2001,2002,2004,2007,2009,2012,2014,2016 ./bin/tests/sockaddr/t_sockaddr.c C 1999,2000,2001,2004,2007,2013,2016 -./bin/tests/sockaddr/win32/t_sockaddr.dsp.in X 2013 -./bin/tests/sockaddr/win32/t_sockaddr.dsw X 2013 -./bin/tests/sockaddr/win32/t_sockaddr.mak.in X 2013 ./bin/tests/sockaddr/win32/t_sockaddr.vcxproj.filters.in X 2013,2015 ./bin/tests/sockaddr/win32/t_sockaddr.vcxproj.in X 2013,2015,2016,2017 ./bin/tests/sockaddr/win32/t_sockaddr.vcxproj.user X 2013 @@ -755,8 +610,8 @@ ./bin/tests/startperf/smallzone.db ZONE 2011,2016 ./bin/tests/sym_test.c C 1998,1999,2000,2001,2004,2005,2007,2015,2016 ./bin/tests/system/.gitignore X 2012,2016 -./bin/tests/system/Makefile.in MAKE 2000,2001,2004,2007,2008,2010,2011,2012,2013,2014,2015,2016 -./bin/tests/system/README TXT.BRIEF 2000,2001,2004,2010,2011,2013,2015,2016 +./bin/tests/system/Makefile.in MAKE 2000,2001,2004,2007,2008,2010,2011,2012,2013,2014,2015,2016,2017 +./bin/tests/system/README TXT.BRIEF 2000,2001,2004,2010,2011,2013,2015,2016,2017 ./bin/tests/system/acl/clean.sh SH 2008,2012,2014,2015,2016 ./bin/tests/system/acl/ns2/named1.conf CONF-C 2008,2016 ./bin/tests/system/acl/ns2/named2.conf CONF-C 2008,2016 @@ -1115,7 +970,7 @@ ./bin/tests/system/checkzone/zones/warn.inherit.origin.db ZONE 2014,2016 ./bin/tests/system/checkzone/zones/warn.inherited.owner.db ZONE 2014,2016 ./bin/tests/system/clean.sh SH 2015,2016 -./bin/tests/system/cleanall.sh SH 2000,2001,2004,2007,2012,2014,2015,2016 +./bin/tests/system/cleanall.sh SH 2000,2001,2004,2007,2012,2014,2015,2016,2017 ./bin/tests/system/cleanpkcs11.sh SH 2010,2012,2014,2016 ./bin/tests/system/common/controls.conf CONF-C 2000,2001,2004,2007,2013,2016 ./bin/tests/system/common/rndc.conf CONF-C 2000,2001,2004,2007,2013,2016 @@ -1505,7 +1360,7 @@ ./bin/tests/system/emptyzones/ns1/root.hint ZONE 2014,2016 ./bin/tests/system/emptyzones/setup.sh SH 2014,2016 ./bin/tests/system/emptyzones/tests.sh SH 2014,2015,2016 -./bin/tests/system/feature-test.c C 2016 +./bin/tests/system/feature-test.c C 2016,2017 ./bin/tests/system/fetchlimit/ans4/ans.pl PERL 2015,2016 ./bin/tests/system/fetchlimit/clean.sh SH 2015,2016 ./bin/tests/system/fetchlimit/ns1/named.conf CONF-C 2015,2016 @@ -1805,22 +1660,6 @@ ./bin/tests/system/logfileconfig/ns1/root.db ZONE 2011,2016 ./bin/tests/system/logfileconfig/setup.sh SH 2011,2012,2014,2016 ./bin/tests/system/logfileconfig/tests.sh SH 2011,2012,2013,2014,2016,2017 -./bin/tests/system/lwresd/Makefile.in MAKE 2000,2001,2002,2004,2007,2009,2012,2014,2015,2016 -./bin/tests/system/lwresd/clean.sh SH 2008,2012,2013,2014,2015,2016 -./bin/tests/system/lwresd/lwresd1/lwresd.conf CONF-C 2000,2001,2004,2007,2016 -./bin/tests/system/lwresd/lwresd1/nosearch.conf CONF-C 2016 -./bin/tests/system/lwresd/lwresd1/resolv.conf CONF-SH 2000,2001,2004,2007,2012,2016 -./bin/tests/system/lwresd/lwtest.c C 2000,2001,2002,2004,2007,2008,2012,2013,2015,2016 -./bin/tests/system/lwresd/ns1/10.10.10.in-addr.arpa.db ZONE 2000,2001,2004,2007,2016 -./bin/tests/system/lwresd/ns1/e.example1.db X 2008 -./bin/tests/system/lwresd/ns1/example1.db ZONE 2000,2001,2002,2003,2004,2007,2008,2016 -./bin/tests/system/lwresd/ns1/example2.db ZONE 2000,2001,2002,2004,2007,2016 -./bin/tests/system/lwresd/ns1/ip6.arpa.db ZONE 2000,2001,2002,2004,2007,2016 -./bin/tests/system/lwresd/ns1/ip6.int.db ZONE 2000,2001,2002,2004,2007,2016 -./bin/tests/system/lwresd/ns1/named.conf CONF-C 2000,2001,2004,2006,2007,2008,2016 -./bin/tests/system/lwresd/ns1/root.db ZONE 2000,2001,2004,2007,2016 -./bin/tests/system/lwresd/resolv.conf CONF-SH 2000,2001,2004,2007,2012,2016 -./bin/tests/system/lwresd/tests.sh SH 2000,2001,2004,2007,2011,2012,2013,2014,2016 ./bin/tests/system/masterfile/clean.sh SH 2001,2004,2007,2010,2012,2014,2015,2016 ./bin/tests/system/masterfile/knowngood.dig.out X 2001,2004,2012 ./bin/tests/system/masterfile/ns1/include.db ZONE 2001,2004,2007,2012,2016 @@ -2351,7 +2190,7 @@ ./bin/tests/system/statschannel/traffic.expect.4 X 2015 ./bin/tests/system/statschannel/traffic.expect.5 X 2015,2016 ./bin/tests/system/statschannel/traffic.expect.6 X 2015,2016 -./bin/tests/system/stop.pl SH 2001,2004,2005,2006,2007,2012,2016 +./bin/tests/system/stop.pl SH 2001,2004,2005,2006,2007,2012,2016,2017 ./bin/tests/system/stop.sh SH 2000,2001,2004,2007,2012,2016 ./bin/tests/system/stress/clean.sh SH 2000,2001,2004,2007,2012,2014,2016 ./bin/tests/system/stress/ns1/named.conf CONF-C 2000,2001,2004,2007,2016 @@ -2514,45 +2353,21 @@ ./bin/tests/system/wildcard/prereq.sh SH 2014,2016 ./bin/tests/system/wildcard/setup.sh SH 2012,2014,2016,2017 ./bin/tests/system/wildcard/tests.sh SH 2012,2013,2016 -./bin/tests/system/win32/bigkey.dsp.in X 2016 -./bin/tests/system/win32/bigkey.dsw X 2016 -./bin/tests/system/win32/bigkey.mak.in X 2016 ./bin/tests/system/win32/bigkey.vcxproj.filters.in X 2016 ./bin/tests/system/win32/bigkey.vcxproj.in X 2016,2017 ./bin/tests/system/win32/bigkey.vcxproj.user X 2016 -./bin/tests/system/win32/feature-test.dsp.in X 2016 -./bin/tests/system/win32/feature-test.dsw X 2016 -./bin/tests/system/win32/feature-test.mak.in X 2016 ./bin/tests/system/win32/feature-test.vcxproj.filters.in X 2016 ./bin/tests/system/win32/feature-test.vcxproj.in X 2016,2017 ./bin/tests/system/win32/feature-test.vcxproj.user X 2016 -./bin/tests/system/win32/gencheck.dsp.in X 2016 -./bin/tests/system/win32/gencheck.dsw X 2016 -./bin/tests/system/win32/gencheck.mak.in X 2016 ./bin/tests/system/win32/gencheck.vcxproj.filters.in X 2016 ./bin/tests/system/win32/gencheck.vcxproj.in X 2016,2017 ./bin/tests/system/win32/gencheck.vcxproj.user X 2016 -./bin/tests/system/win32/keycreate.dsp.in X 2016 -./bin/tests/system/win32/keycreate.dsw X 2016 -./bin/tests/system/win32/keycreate.mak.in X 2016 ./bin/tests/system/win32/keycreate.vcxproj.filters.in X 2016 ./bin/tests/system/win32/keycreate.vcxproj.in X 2016,2017 ./bin/tests/system/win32/keycreate.vcxproj.user X 2016 -./bin/tests/system/win32/keydelete.dsp.in X 2016 -./bin/tests/system/win32/keydelete.dsw X 2016 -./bin/tests/system/win32/keydelete.mak.in X 2016 ./bin/tests/system/win32/keydelete.vcxproj.filters.in X 2016 ./bin/tests/system/win32/keydelete.vcxproj.in X 2016,2017 ./bin/tests/system/win32/keydelete.vcxproj.user X 2016 -./bin/tests/system/win32/lwtest.dsp.in X 2016 -./bin/tests/system/win32/lwtest.dsw X 2016 -./bin/tests/system/win32/lwtest.mak.in X 2016 -./bin/tests/system/win32/lwtest.vcxproj.filters.in X 2016 -./bin/tests/system/win32/lwtest.vcxproj.in X 2016,2017 -./bin/tests/system/win32/lwtest.vcxproj.user X 2016 -./bin/tests/system/win32/pipequeries.dsp.in X 2016 -./bin/tests/system/win32/pipequeries.dsw X 2016 -./bin/tests/system/win32/pipequeries.mak.in X 2016 ./bin/tests/system/win32/pipequeries.vcxproj.filters.in X 2016 ./bin/tests/system/win32/pipequeries.vcxproj.in X 2016,2017 ./bin/tests/system/win32/pipequeries.vcxproj.user X 2016 @@ -2623,18 +2438,12 @@ ./bin/tests/task_test.c C 1998,1999,2000,2001,2004,2007,2013,2014,2015,2016 ./bin/tests/tasks/Makefile.in MAKE 1998,1999,2000,2001,2002,2004,2007,2009,2012,2014,2016 ./bin/tests/tasks/t_tasks.c C 1998,1999,2000,2001,2004,2005,2007,2009,2011,2013,2014,2015,2016 -./bin/tests/tasks/win32/t_tasks.dsp.in X 2013 -./bin/tests/tasks/win32/t_tasks.dsw X 2013 -./bin/tests/tasks/win32/t_tasks.mak.in X 2013 ./bin/tests/tasks/win32/t_tasks.vcxproj.filters.in X 2013,2015 ./bin/tests/tasks/win32/t_tasks.vcxproj.in X 2013,2015,2016,2017 ./bin/tests/tasks/win32/t_tasks.vcxproj.user X 2013,2015 ./bin/tests/timer_test.c C 1998,1999,2000,2001,2004,2007,2013,2014,2015,2016 ./bin/tests/timers/Makefile.in MAKE 1999,2000,2001,2002,2004,2007,2009,2012,2014,2016 ./bin/tests/timers/t_timers.c C 1999,2000,2001,2004,2007,2008,2009,2011,2013,2016 -./bin/tests/timers/win32/t_timers.dsp.in X 2013 -./bin/tests/timers/win32/t_timers.dsw X 2013 -./bin/tests/timers/win32/t_timers.mak.in X 2013 ./bin/tests/timers/win32/t_timers.vcxproj.filters.in X 2013,2015 ./bin/tests/timers/win32/t_timers.vcxproj.in X 2013,2015,2016,2017 ./bin/tests/timers/win32/t_timers.vcxproj.user X 2013 @@ -2656,11 +2465,11 @@ ./bin/tests/virtual-time/autosign-zsk/ns1/wrap.sh SH 2010,2012,2016 ./bin/tests/virtual-time/autosign-zsk/setup.sh SH 2010,2012,2016 ./bin/tests/virtual-time/autosign-zsk/tests.sh SH 2010,2012,2016 -./bin/tests/virtual-time/cleanall.sh SH 2010,2012,2016 +./bin/tests/virtual-time/cleanall.sh SH 2010,2012,2016,2017 ./bin/tests/virtual-time/common/controls.conf CONF-C 2010,2016 ./bin/tests/virtual-time/common/rndc.conf CONF-C 2010,2016 ./bin/tests/virtual-time/common/root.hint ZONE 2010,2016 -./bin/tests/virtual-time/conf.sh.in SH 2010,2012,2016 +./bin/tests/virtual-time/conf.sh.in SH 2010,2012,2016,2017 ./bin/tests/virtual-time/run.sh SH 2010,2012,2016 ./bin/tests/virtual-time/runall.sh SH 2010,2012,2016 ./bin/tests/virtual-time/setup.sh SH 2010,2012,2016 @@ -2677,51 +2486,27 @@ ./bin/tests/virtual-time/stop.sh SH 2010,2012,2016 ./bin/tests/virtual-time/testsock.pl PERL 2010,2012,2016 ./bin/tests/virtual-time/vtwrapper.c C 2010,2016 -./bin/tests/win32/backtrace_test.dsp.in X 2013 -./bin/tests/win32/backtrace_test.dsw X 2013 -./bin/tests/win32/backtrace_test.mak.in X 2013 ./bin/tests/win32/backtrace_test.vcxproj.filters.in X 2013,2015 ./bin/tests/win32/backtrace_test.vcxproj.in X 2013,2015,2016,2017 ./bin/tests/win32/backtrace_test.vcxproj.user X 2013 -./bin/tests/win32/inter_test.dsp.in X 2013 -./bin/tests/win32/inter_test.dsw X 2013 -./bin/tests/win32/inter_test.mak.in X 2013 ./bin/tests/win32/inter_test.vcxproj.filters.in X 2013,2015 ./bin/tests/win32/inter_test.vcxproj.in X 2013,2015,2016,2017 ./bin/tests/win32/inter_test.vcxproj.user X 2013 -./bin/tests/win32/makejournal.dsp.in X 2016 -./bin/tests/win32/makejournal.dsw X 2016 -./bin/tests/win32/makejournal.mak.in X 2016 ./bin/tests/win32/makejournal.vcxproj.filters.in X 2016 ./bin/tests/win32/makejournal.vcxproj.in X 2016,2017 ./bin/tests/win32/makejournal.vcxproj.user X 2016 -./bin/tests/win32/rwlock_test.dsp.in X 2013 -./bin/tests/win32/rwlock_test.dsw X 2013 -./bin/tests/win32/rwlock_test.mak.in X 2013 ./bin/tests/win32/rwlock_test.vcxproj.filters.in X 2013,2015 ./bin/tests/win32/rwlock_test.vcxproj.in X 2013,2015,2016,2017 ./bin/tests/win32/rwlock_test.vcxproj.user X 2013 -./bin/tests/win32/shutdown_test.dsp.in X 2013 -./bin/tests/win32/shutdown_test.dsw X 2013 -./bin/tests/win32/shutdown_test.mak.in X 2013 ./bin/tests/win32/shutdown_test.vcxproj.filters.in X 2013,2015 ./bin/tests/win32/shutdown_test.vcxproj.in X 2013,2015,2016,2017 ./bin/tests/win32/shutdown_test.vcxproj.user X 2013 -./bin/tests/win32/sock_test.dsp.in X 2013 -./bin/tests/win32/sock_test.dsw X 2013 -./bin/tests/win32/sock_test.mak.in X 2013 ./bin/tests/win32/sock_test.vcxproj.filters.in X 2013,2015 ./bin/tests/win32/sock_test.vcxproj.in X 2013,2015,2016,2017 ./bin/tests/win32/sock_test.vcxproj.user X 2013 -./bin/tests/win32/task_test.dsp.in X 2013 -./bin/tests/win32/task_test.dsw X 2013 -./bin/tests/win32/task_test.mak.in X 2013 ./bin/tests/win32/task_test.vcxproj.filters.in X 2013,2015 ./bin/tests/win32/task_test.vcxproj.in X 2013,2015,2016,2017 ./bin/tests/win32/task_test.vcxproj.user X 2013 -./bin/tests/win32/timer_test.dsp.in X 2013 -./bin/tests/win32/timer_test.dsw X 2013 -./bin/tests/win32/timer_test.mak.in X 2013 ./bin/tests/win32/timer_test.vcxproj.filters.in X 2013,2015 ./bin/tests/win32/timer_test.vcxproj.in X 2013,2015,2016,2017 ./bin/tests/win32/timer_test.vcxproj.user X 2013 @@ -2769,55 +2554,31 @@ ./bin/tools/nsec3hash.c C 2006,2008,2009,2011,2014,2016,2017 ./bin/tools/nsec3hash.docbook SGML 2009,2014,2015,2016,2017 ./bin/tools/nsec3hash.html HTML DOCBOOK -./bin/tools/win32/arpaname.dsp.in X 2009,2013 -./bin/tools/win32/arpaname.dsw X 2009 -./bin/tools/win32/arpaname.mak.in X 2009,2013 ./bin/tools/win32/arpaname.vcxproj.filters.in X 2013,2015 ./bin/tools/win32/arpaname.vcxproj.in X 2013,2015,2016,2017 ./bin/tools/win32/arpaname.vcxproj.user X 2013 -./bin/tools/win32/genrandom.dsp.in X 2009,2013 -./bin/tools/win32/genrandom.dsw X 2009 -./bin/tools/win32/genrandom.mak.in X 2009,2013 ./bin/tools/win32/genrandom.vcxproj.filters.in X 2013,2015 ./bin/tools/win32/genrandom.vcxproj.in X 2013,2015,2016,2017 ./bin/tools/win32/genrandom.vcxproj.user X 2013 -./bin/tools/win32/ischmacfixup.dsp.in X 2010,2013,2014,2016 -./bin/tools/win32/ischmacfixup.dsw X 2010 -./bin/tools/win32/ischmacfixup.mak.in X 2010,2013,2014,2016 ./bin/tools/win32/ischmacfixup.vcxproj.filters.in X 2013,2015 ./bin/tools/win32/ischmacfixup.vcxproj.in X 2013,2014,2015,2016,2017 ./bin/tools/win32/ischmacfixup.vcxproj.user X 2013 -./bin/tools/win32/journalprint.dsp.in X 2009,2013 -./bin/tools/win32/journalprint.dsw X 2009 -./bin/tools/win32/journalprint.mak.in X 2009,2010,2013 ./bin/tools/win32/journalprint.vcxproj.filters.in X 2013,2015 ./bin/tools/win32/journalprint.vcxproj.in X 2013,2015,2016,2017 ./bin/tools/win32/journalprint.vcxproj.user X 2013 -./bin/tools/win32/mdig.dsp.in X 2015,2016 -./bin/tools/win32/mdig.dsw X 2015 -./bin/tools/win32/mdig.mak.in X 2015,2016 ./bin/tools/win32/mdig.vcxproj.filters.in X 2015 ./bin/tools/win32/mdig.vcxproj.in X 2015,2016,2017 ./bin/tools/win32/mdig.vcxproj.user X 2015 -./bin/tools/win32/nsec3hash.dsp.in X 2009,2013,2014,2016 -./bin/tools/win32/nsec3hash.dsw X 2009 -./bin/tools/win32/nsec3hash.mak.in X 2009,2013,2014,2016 ./bin/tools/win32/nsec3hash.vcxproj.filters.in X 2013,2015 ./bin/tools/win32/nsec3hash.vcxproj.in X 2013,2014,2015,2016,2017 ./bin/tools/win32/nsec3hash.vcxproj.user X 2013 -./bin/tools/win32/rrchecker.dsp.in X 2013 -./bin/tools/win32/rrchecker.dsw X 2013 -./bin/tools/win32/rrchecker.mak.in X 2013 ./bin/tools/win32/rrchecker.vcxproj.filters.in X 2013,2015 ./bin/tools/win32/rrchecker.vcxproj.in X 2013,2014,2015,2016,2017 ./bin/tools/win32/rrchecker.vcxproj.user X 2013 ./bin/win32/BINDInstall/AccountInfo.cpp C.PORTION 2001,2002,2004,2007,2009,2013,2016,2017 ./bin/win32/BINDInstall/AccountInfo.h C 2001,2004,2007,2016 ./bin/win32/BINDInstall/BINDInstall.cpp C.PORTION 2001,2004,2007,2009,2016 -./bin/win32/BINDInstall/BINDInstall.dsp.in X 2001,2007,2009,2013,2014 -./bin/win32/BINDInstall/BINDInstall.dsw X 2001 ./bin/win32/BINDInstall/BINDInstall.h C.PORTION 2001,2004,2007,2016 -./bin/win32/BINDInstall/BINDInstall.mak.in X 2001,2006,2007,2009,2013,2014 ./bin/win32/BINDInstall/BINDInstall.rc X 2001,2005,2009,2014 ./bin/win32/BINDInstall/BINDInstall.vcxproj.filters.in X 2013,2015 ./bin/win32/BINDInstall/BINDInstall.vcxproj.in X 2013,2014,2015,2016 @@ -2856,16 +2617,16 @@ ./contrib/dlz/bin/dlzbdb/dlzbdb.c X 2005,2016 ./contrib/dlz/config.dlz.in X 2005,2006,2008,2010,2011,2014,2016 ./contrib/dlz/drivers/.gitignore X 2012 -./contrib/dlz/drivers/dlz_bdb_driver.c X 2005,2008,2010,2011,2012,2016 -./contrib/dlz/drivers/dlz_bdbhpt_driver.c X 2005,2010,2011,2012,2016 +./contrib/dlz/drivers/dlz_bdb_driver.c X 2005,2008,2010,2011,2012,2016,2017 +./contrib/dlz/drivers/dlz_bdbhpt_driver.c X 2005,2010,2011,2012,2016,2017 ./contrib/dlz/drivers/dlz_dlopen_driver.c X 2010,2011 ./contrib/dlz/drivers/dlz_drivers.c X 2005,2010,2011 -./contrib/dlz/drivers/dlz_filesystem_driver.c X 2005,2010,2011,2012,2016 -./contrib/dlz/drivers/dlz_ldap_driver.c X 2005,2010,2011,2012,2016 -./contrib/dlz/drivers/dlz_mysql_driver.c X 2005,2007,2009,2010,2011,2012,2016 -./contrib/dlz/drivers/dlz_odbc_driver.c X 2005,2010,2011,2012,2014,2016 -./contrib/dlz/drivers/dlz_postgres_driver.c X 2005,2007,2010,2011,2012,2014,2016 -./contrib/dlz/drivers/dlz_stub_driver.c X 2005,2010,2011,2012,2016 +./contrib/dlz/drivers/dlz_filesystem_driver.c X 2005,2010,2011,2012,2016,2017 +./contrib/dlz/drivers/dlz_ldap_driver.c X 2005,2010,2011,2012,2016,2017 +./contrib/dlz/drivers/dlz_mysql_driver.c X 2005,2007,2009,2010,2011,2012,2016,2017 +./contrib/dlz/drivers/dlz_odbc_driver.c X 2005,2010,2011,2012,2014,2016,2017 +./contrib/dlz/drivers/dlz_postgres_driver.c X 2005,2007,2010,2011,2012,2014,2016,2017 +./contrib/dlz/drivers/dlz_stub_driver.c X 2005,2010,2011,2012,2016,2017 ./contrib/dlz/drivers/include/dlz/dlz_bdb_driver.h X 2005 ./contrib/dlz/drivers/include/dlz/dlz_bdbhpt_driver.h X 2005 ./contrib/dlz/drivers/include/dlz/dlz_dlopen_driver.h X 2010,2011 @@ -2876,7 +2637,7 @@ ./contrib/dlz/drivers/include/dlz/dlz_odbc_driver.h X 2005 ./contrib/dlz/drivers/include/dlz/dlz_postgres_driver.h X 2005 ./contrib/dlz/drivers/include/dlz/dlz_stub_driver.h X 2005 -./contrib/dlz/drivers/include/dlz/sdlz_helper.h X 2005 +./contrib/dlz/drivers/include/dlz/sdlz_helper.h X 2005,2017 ./contrib/dlz/drivers/rules.in X 2005,2010 ./contrib/dlz/drivers/sdlz_helper.c X 2005,2010,2011,2012,2016 ./contrib/dlz/example/Makefile X 2010,2013 @@ -3439,7 +3200,6 @@ ./doc/arm/man.genrandom.html X 2009,2010,2011,2012,2013,2014,2015,2016,2017 ./doc/arm/man.host.html X 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017 ./doc/arm/man.isc-hmac-fixup.html X 2010,2011,2012,2013,2014,2015,2016,2017 -./doc/arm/man.lwresd.html X 2015,2016,2017 ./doc/arm/man.mdig.html X 2016,2017 ./doc/arm/man.named-checkconf.html X 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017 ./doc/arm/man.named-checkzone.html X 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017 @@ -3478,7 +3238,6 @@ ./doc/design/dscp TXT.BRIEF 2013,2016 ./doc/design/keydone TXT.BRIEF 2011,2016 ./doc/design/logging TXT.BRIEF 1999,2000,2001,2004,2016 -./doc/design/lwres TXT.BRIEF 2000,2001,2004,2016 ./doc/design/ncache TXT.BRIEF 1999,2000,2001,2004,2016 ./doc/design/rdataset TXT.BRIEF 1999,2000,2001,2004,2016 ./doc/design/red-black TXT.BRIEF 1999,2000,2001,2004,2016 @@ -3503,7 +3262,7 @@ ./doc/dev/tests TXT.BRIEF 2000,2001,2004,2016 ./doc/dev/unexpected TXT.BRIEF 1999,2000,2001,2004,2016 ./doc/doxygen/.gitignore X 2012 -./doc/doxygen/Doxyfile.in X 2006 +./doc/doxygen/Doxyfile.in X 2006,2017 ./doc/doxygen/Makefile.in MAKE 2006,2007,2012,2015,2016 ./doc/doxygen/doxygen-input-filter.in PERL 2006,2007,2012,2016 ./doc/doxygen/isc-footer.html HTML 2006,2007,2016 @@ -3518,8 +3277,8 @@ ./doc/misc/migration-4to9 TXT.BRIEF 2001,2004,2016 ./doc/misc/options X 2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017 ./doc/misc/rfc-compliance TXT.BRIEF 2001,2004,2015,2016 -./doc/misc/roadmap TXT.BRIEF 2000,2001,2004,2016 -./doc/misc/sdb TXT.BRIEF 2000,2001,2004,2016 +./doc/misc/roadmap TXT.BRIEF 2000,2001,2004,2016,2017 +./doc/misc/sdb TXT.BRIEF 2000,2001,2004,2016,2017 ./doc/misc/sort-options.pl PERL 2007,2012,2016 ./doc/misc/tcp-fast-open TXT.BRIEF 2016 ./doc/tex/.gitignore X 2015 @@ -3554,12 +3313,12 @@ ./docutil/patch-db2latex-xsltproc-title-bug X 2007 ./install-sh X 1998,1999,2000,2001 ./isc-config.sh.1 MAN DOCBOOK -./isc-config.sh.docbook SGML 2009,2014,2015,2016 +./isc-config.sh.docbook SGML 2009,2014,2015,2016,2017 ./isc-config.sh.html HTML DOCBOOK -./isc-config.sh.in SH 2000,2001,2003,2004,2007,2012,2013,2015,2016 +./isc-config.sh.in SH 2000,2001,2003,2004,2007,2012,2013,2015,2016,2017 ./lib/.gitignore X 2012 -./lib/Atffile X 2011,2014,2016 -./lib/Makefile.in MAKE 1998,1999,2000,2001,2003,2004,2007,2012,2013,2014,2016 +./lib/Atffile X 2011,2014,2016,2017 +./lib/Makefile.in MAKE 1998,1999,2000,2001,2003,2004,2007,2012,2013,2014,2016,2017 ./lib/bind9/Makefile.in MAKE 2001,2004,2007,2009,2012,2014,2015,2016,2017 ./lib/bind9/api X 2001,2006,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017 ./lib/bind9/check.c C 2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017 @@ -3572,9 +3331,6 @@ ./lib/bind9/version.c C 2001,2004,2005,2007,2016 ./lib/bind9/win32/DLLMain.c C 2001,2004,2007,2016 ./lib/bind9/win32/libbind9.def X 2001 -./lib/bind9/win32/libbind9.dsp.in X 2001,2004,2005,2009,2011,2013,2014,2015,2016 -./lib/bind9/win32/libbind9.dsw X 2001 -./lib/bind9/win32/libbind9.mak.in X 2001,2002,2004,2005,2006,2009,2011,2013,2014,2015 ./lib/bind9/win32/libbind9.vcxproj.filters.in X 2013,2015,2016 ./lib/bind9/win32/libbind9.vcxproj.in X 2013,2014,2015,2016,2017 ./lib/bind9/win32/libbind9.vcxproj.user X 2013 @@ -3582,7 +3338,7 @@ ./lib/dns/.gitignore X 2012,2013,2016 ./lib/dns/Atffile X 2011 ./lib/dns/Makefile.in MAKE 1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017 -./lib/dns/acl.c C 1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2011,2013,2014,2016 +./lib/dns/acl.c C 1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2011,2013,2014,2016,2017 ./lib/dns/adb.c C 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017 ./lib/dns/api X 1999,2000,2001,2006,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017 ./lib/dns/badcache.c C 2014,2015,2016 @@ -3626,7 +3382,7 @@ ./lib/dns/hmac_link.c C.NAI 1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 ./lib/dns/include/Makefile.in MAKE 1998,1999,2000,2001,2004,2007,2012,2016 ./lib/dns/include/dns/Makefile.in MAKE 1998,1999,2000,2001,2002,2003,2004,2007,2008,2009,2011,2012,2013,2014,2015,2016,2017 -./lib/dns/include/dns/acl.h C 1999,2000,2001,2002,2004,2005,2006,2007,2009,2011,2013,2014,2016 +./lib/dns/include/dns/acl.h C 1999,2000,2001,2002,2004,2005,2006,2007,2009,2011,2013,2014,2016,2017 ./lib/dns/include/dns/adb.h C 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2011,2013,2014,2015,2016 ./lib/dns/include/dns/badcache.h C 2014,2016 ./lib/dns/include/dns/bit.h C 2000,2001,2004,2005,2006,2007,2016 @@ -3665,7 +3421,7 @@ ./lib/dns/include/dns/keyflags.h C 1999,2000,2001,2004,2005,2006,2007,2016 ./lib/dns/include/dns/keytable.h C 2000,2001,2004,2005,2007,2009,2010,2014,2015,2016 ./lib/dns/include/dns/keyvalues.h C 1999,2000,2001,2003,2004,2005,2006,2007,2008,2009,2010,2012,2016,2017 -./lib/dns/include/dns/lib.h C 1999,2000,2001,2004,2005,2006,2007,2009,2016 +./lib/dns/include/dns/lib.h C 1999,2000,2001,2004,2005,2006,2007,2009,2016,2017 ./lib/dns/include/dns/log.h C 1999,2000,2001,2003,2004,2005,2006,2007,2009,2011,2012,2013,2014,2015,2016,2017 ./lib/dns/include/dns/lookup.h C 2000,2001,2004,2005,2006,2007,2009,2016 ./lib/dns/include/dns/master.h C 1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2016 @@ -3703,7 +3459,7 @@ ./lib/dns/include/dns/secproto.h C 1999,2000,2001,2004,2005,2006,2007,2016 ./lib/dns/include/dns/soa.h C 2000,2001,2004,2005,2006,2007,2009,2016 ./lib/dns/include/dns/ssu.h C 2000,2001,2003,2004,2005,2006,2007,2008,2010,2011,2016 -./lib/dns/include/dns/stats.h C 2000,2001,2004,2005,2006,2007,2008,2009,2012,2014,2015,2016 +./lib/dns/include/dns/stats.h C 2000,2001,2004,2005,2006,2007,2008,2009,2012,2014,2015,2016,2017 ./lib/dns/include/dns/tcpmsg.h C 1999,2000,2001,2004,2005,2006,2007,2015,2016 ./lib/dns/include/dns/time.h C 1999,2000,2001,2004,2005,2006,2007,2012,2016 ./lib/dns/include/dns/timer.h C 2000,2001,2004,2005,2006,2007,2016 @@ -3734,7 +3490,7 @@ ./lib/dns/lib.c C 1999,2000,2001,2004,2005,2007,2009,2013,2014,2015,2016 ./lib/dns/log.c C 1999,2000,2001,2003,2004,2005,2006,2007,2009,2011,2012,2013,2014,2015,2016,2017 ./lib/dns/lookup.c C 2000,2001,2003,2004,2005,2007,2013,2016 -./lib/dns/mapapi X 2013 +./lib/dns/mapapi X 2013,2017 ./lib/dns/master.c C 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2015,2016,2017 ./lib/dns/masterdump.c C 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2015,2016,2017 ./lib/dns/message.c C 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017 @@ -4029,16 +3785,10 @@ ./lib/dns/version.c C 1998,1999,2000,2001,2004,2005,2007,2012,2013,2016 ./lib/dns/view.c C 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017 ./lib/dns/win32/DLLMain.c C 2001,2004,2007,2016 -./lib/dns/win32/gen.dsp.in X 2001,2013 -./lib/dns/win32/gen.dsw X 2001 -./lib/dns/win32/gen.mak.in X 2001,2006,2013 ./lib/dns/win32/gen.vcxproj.filters.in X 2013,2015 ./lib/dns/win32/gen.vcxproj.in X 2013,2015,2016,2017 ./lib/dns/win32/gen.vcxproj.user X 2013 ./lib/dns/win32/libdns.def.in X 2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017 -./lib/dns/win32/libdns.dsp.in X 2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2013,2014,2015,2016,2017 -./lib/dns/win32/libdns.dsw X 2001 -./lib/dns/win32/libdns.mak.in X 2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2013,2014,2015,2016,2017 ./lib/dns/win32/libdns.vcxproj.filters.in X 2013,2014,2015,2016,2017 ./lib/dns/win32/libdns.vcxproj.in X 2013,2014,2015,2016,2017 ./lib/dns/win32/libdns.vcxproj.user X 2013 @@ -4059,12 +3809,12 @@ ./lib/irs/include/irs/Makefile.in MAKE 2009,2012,2014,2016 ./lib/irs/include/irs/context.h C 2009,2016 ./lib/irs/include/irs/dnsconf.h C 2009,2016 -./lib/irs/include/irs/netdb.h.in C 2009,2016 +./lib/irs/include/irs/netdb.h.in C 2009,2016,2017 ./lib/irs/include/irs/platform.h.in C 2009,2016 ./lib/irs/include/irs/resconf.h C 2009,2014,2016 ./lib/irs/include/irs/types.h C 2009,2016 ./lib/irs/include/irs/version.h C 2009,2016 -./lib/irs/resconf.c C 2009,2011,2012,2014,2015,2016 +./lib/irs/resconf.c C 2009,2011,2012,2014,2015,2016,2017 ./lib/irs/tests/Atffile X 2016 ./lib/irs/tests/Makefile.in MAKE 2016,2017 ./lib/irs/tests/resconf_test.c C 2016 @@ -4088,12 +3838,9 @@ ./lib/irs/win32/include/Makefile.in MAKE 2014,2016 ./lib/irs/win32/include/irs/.gitignore X 2014 ./lib/irs/win32/include/irs/Makefile.in MAKE 2014,2016 -./lib/irs/win32/include/irs/netdb.h C 2014,2016 +./lib/irs/win32/include/irs/netdb.h C 2014,2016,2017 ./lib/irs/win32/include/irs/platform.h C 2014,2016 ./lib/irs/win32/libirs.def X 2014 -./lib/irs/win32/libirs.dsp.in X 2014 -./lib/irs/win32/libirs.dsw X 2001,2014 -./lib/irs/win32/libirs.mak.in X 2014 ./lib/irs/win32/libirs.vcxproj.filters.in X 2014,2015,2016 ./lib/irs/win32/libirs.vcxproj.in X 2014,2015,2016,2017 ./lib/irs/win32/libirs.vcxproj.user X 2014 @@ -4154,10 +3901,11 @@ ./lib/isc/include/isc/errno.h C 2016 ./lib/isc/include/isc/error.h C 1998,1999,2000,2001,2004,2005,2006,2007,2009,2016 ./lib/isc/include/isc/event.h C 1998,1999,2000,2001,2002,2004,2005,2006,2007,2014,2016,2017 -./lib/isc/include/isc/eventclass.h C 1998,1999,2000,2001,2004,2005,2007,2016 +./lib/isc/include/isc/eventclass.h C 1998,1999,2000,2001,2004,2005,2007,2016,2017 ./lib/isc/include/isc/file.h C 2000,2001,2004,2005,2006,2007,2009,2011,2012,2014,2015,2016 ./lib/isc/include/isc/formatcheck.h C 2000,2001,2004,2005,2006,2007,2016 ./lib/isc/include/isc/fsaccess.h C 2000,2001,2004,2005,2006,2007,2009,2016 +./lib/isc/include/isc/fuzz.h C 2017 ./lib/isc/include/isc/hash.h C 2003,2004,2005,2006,2007,2009,2013,2014,2015,2016 ./lib/isc/include/isc/heap.h C 1997,1998,1999,2000,2001,2004,2005,2006,2007,2009,2012,2016 ./lib/isc/include/isc/hex.h C 2000,2001,2004,2005,2006,2007,2008,2016 @@ -4166,7 +3914,7 @@ ./lib/isc/include/isc/ht.h C 2016,2017 ./lib/isc/include/isc/httpd.h C 2006,2007,2008,2014,2016 ./lib/isc/include/isc/interfaceiter.h C 1999,2000,2001,2004,2005,2006,2007,2016 -./lib/isc/include/isc/ipv6.h C 1999,2000,2001,2002,2004,2005,2007,2016 +./lib/isc/include/isc/ipv6.h C 1999,2000,2001,2002,2004,2005,2007,2016,2017 ./lib/isc/include/isc/iterated_hash.h C 2008,2014,2016 ./lib/isc/include/isc/json.h C 2013,2015,2016 ./lib/isc/include/isc/lang.h C 1999,2000,2001,2004,2005,2006,2007,2016 @@ -4187,7 +3935,7 @@ ./lib/isc/include/isc/ondestroy.h C 2000,2001,2004,2005,2006,2007,2016 ./lib/isc/include/isc/os.h C 2000,2001,2004,2005,2006,2007,2016 ./lib/isc/include/isc/parseint.h C 2001,2002,2004,2005,2006,2007,2016 -./lib/isc/include/isc/platform.h.in C 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2013,2014,2015,2016 +./lib/isc/include/isc/platform.h.in C 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2013,2014,2015,2016,2017 ./lib/isc/include/isc/pool.h C 2013,2016 ./lib/isc/include/isc/portset.h C 2008,2009,2016 ./lib/isc/include/isc/print.h C 1999,2000,2001,2003,2004,2005,2006,2007,2014,2015,2016 @@ -4214,7 +3962,7 @@ ./lib/isc/include/isc/stdlib.h C 2003,2004,2005,2006,2007,2016 ./lib/isc/include/isc/string.h C 2000,2001,2003,2004,2005,2006,2007,2014,2016 ./lib/isc/include/isc/symtab.h C 1996,1997,1998,1999,2000,2001,2004,2005,2006,2007,2009,2011,2012,2013,2016 -./lib/isc/include/isc/task.h C 1998,1999,2000,2001,2003,2004,2005,2006,2007,2009,2010,2011,2012,2013,2014,2015,2016 +./lib/isc/include/isc/task.h C 1998,1999,2000,2001,2003,2004,2005,2006,2007,2009,2010,2011,2012,2013,2014,2015,2016,2017 ./lib/isc/include/isc/taskpool.h C 1999,2000,2001,2004,2005,2006,2007,2011,2012,2016 ./lib/isc/include/isc/timer.h C 1998,1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2012,2013,2014,2016 ./lib/isc/include/isc/tm.h C 2014,2016 @@ -4312,7 +4060,6 @@ ./lib/isc/strtoul.c C 2003,2004,2005,2007,2014,2016 ./lib/isc/symtab.c C 1996,1997,1998,1999,2000,2001,2004,2005,2007,2011,2012,2013,2016 ./lib/isc/task.c C 1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017 -./lib/isc/task_p.h C 2000,2001,2004,2005,2007,2009,2011,2012,2013,2016 ./lib/isc/taskpool.c C 1999,2000,2001,2004,2005,2007,2011,2012,2013,2016 ./lib/isc/tests/Atffile X 2011 ./lib/isc/tests/Makefile.in MAKE 2011,2012,2013,2014,2015,2016 @@ -4338,14 +4085,14 @@ ./lib/isc/tests/result_test.c C 2015,2016 ./lib/isc/tests/safe_test.c C 2013,2015,2016 ./lib/isc/tests/sockaddr_test.c C 2012,2015,2016,2017 -./lib/isc/tests/socket_test.c C 2011,2012,2013,2014,2015,2016 +./lib/isc/tests/socket_test.c C 2011,2012,2013,2014,2015,2016,2017 ./lib/isc/tests/symtab_test.c C 2011,2012,2013,2016 -./lib/isc/tests/task_test.c C 2011,2012,2016 +./lib/isc/tests/task_test.c C 2011,2012,2016,2017 ./lib/isc/tests/taskpool_test.c C 2011,2012,2016 ./lib/isc/tests/testdata/file/keep X 2014 ./lib/isc/tests/time_test.c C 2014,2015,2016 ./lib/isc/timer.c C 1998,1999,2000,2001,2002,2004,2005,2007,2008,2009,2011,2012,2013,2014,2015,2016,2017 -./lib/isc/timer_p.h C 2000,2001,2004,2005,2007,2009,2016 +./lib/isc/timer_p.h C 2000,2001,2004,2005,2007,2009,2016,2017 ./lib/isc/tm.c C 2014,2016 ./lib/isc/unix/Makefile.in MAKE 1998,1999,2000,2001,2004,2007,2009,2012,2014,2015,2016,2017 ./lib/isc/unix/app.c C 1999,2000,2001,2002,2003,2004,2005,2007,2008,2009,2013,2014,2015,2016,2017 @@ -4412,13 +4159,13 @@ ./lib/isc/win32/include/isc/ipv6.h C 1999,2000,2001,2002,2004,2005,2007,2011,2012,2016 ./lib/isc/win32/include/isc/keyboard.h C 2000,2001,2004,2007,2016 ./lib/isc/win32/include/isc/mutex.h C 1998,1999,2000,2001,2004,2007,2008,2009,2016 -./lib/isc/win32/include/isc/net.h C 1999,2000,2001,2002,2003,2004,2005,2007,2008,2012,2013,2016 +./lib/isc/win32/include/isc/net.h C 1999,2000,2001,2002,2003,2004,2005,2007,2008,2012,2013,2016,2017 ./lib/isc/win32/include/isc/netdb.h C 1999,2000,2001,2004,2007,2016 ./lib/isc/win32/include/isc/ntgroups.h C 2001,2004,2007,2016 -./lib/isc/win32/include/isc/ntpaths.h C 2000,2001,2004,2007,2009,2015,2016 +./lib/isc/win32/include/isc/ntpaths.h C 2000,2001,2004,2007,2009,2015,2016,2017 ./lib/isc/win32/include/isc/offset.h C 2000,2001,2004,2007,2016 ./lib/isc/win32/include/isc/once.h C 1999,2000,2001,2004,2007,2016 -./lib/isc/win32/include/isc/platform.h.in C 2001,2004,2005,2007,2008,2009,2013,2014,2015,2016 +./lib/isc/win32/include/isc/platform.h.in C 2001,2004,2005,2007,2008,2009,2013,2014,2015,2016,2017 ./lib/isc/win32/include/isc/stat.h C 2000,2001,2003,2004,2007,2009,2012,2016 ./lib/isc/win32/include/isc/stdtime.h C 1999,2000,2001,2004,2005,2007,2011,2012,2016 ./lib/isc/win32/include/isc/strerror.h C 2001,2004,2007,2016 @@ -4434,9 +4181,6 @@ ./lib/isc/win32/libgen.h C 2009,2016 ./lib/isc/win32/libisc.def.exclude X 2015 ./lib/isc/win32/libisc.def.in X 2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017 -./lib/isc/win32/libisc.dsp.in X 2001,2002,2003,2004,2005,2006,2007,2008,2009,2013,2014,2015,2016 -./lib/isc/win32/libisc.dsw X 2001 -./lib/isc/win32/libisc.mak.in X 2001,2002,2003,2004,2005,2006,2007,2008,2009,2013,2014,2015,2016 ./lib/isc/win32/libisc.vcxproj.filters.in X 2013,2014,2015,2016 ./lib/isc/win32/libisc.vcxproj.in X 2013,2014,2015,2016,2017 ./lib/isc/win32/libisc.vcxproj.user X 2013 @@ -4444,7 +4188,7 @@ ./lib/isc/win32/net.c C 1999,2000,2001,2002,2003,2004,2005,2007,2008,2009,2011,2012,2013,2014,2015,2016 ./lib/isc/win32/netdb.h C 2000,2001,2004,2006,2007,2009,2013,2016 ./lib/isc/win32/ntgroups.c C 2001,2004,2006,2007,2009,2013,2016 -./lib/isc/win32/ntpaths.c C 2001,2004,2007,2009,2014,2015,2016 +./lib/isc/win32/ntpaths.c C 2001,2004,2007,2009,2014,2015,2016,2017 ./lib/isc/win32/once.c C 1999,2000,2001,2004,2007,2016 ./lib/isc/win32/os.c C 2000,2001,2002,2004,2007,2013,2016 ./lib/isc/win32/pk11_api.c C 2014,2016 @@ -4496,9 +4240,6 @@ ./lib/isccc/version.c C 1998,1999,2000,2001,2004,2005,2007,2016 ./lib/isccc/win32/DLLMain.c C 2001,2004,2007,2016 ./lib/isccc/win32/libisccc.def X 2001,2016 -./lib/isccc/win32/libisccc.dsp.in X 2001,2004,2005,2009,2011,2013,2014,2016 -./lib/isccc/win32/libisccc.dsw X 2001 -./lib/isccc/win32/libisccc.mak.in X 2001,2002,2004,2005,2006,2009,2011,2013,2014 ./lib/isccc/win32/libisccc.vcxproj.filters.in X 2013,2015,2016 ./lib/isccc/win32/libisccc.vcxproj.in X 2013,2014,2015,2016,2017 ./lib/isccc/win32/libisccc.vcxproj.user X 2013 @@ -4526,137 +4267,56 @@ ./lib/isccfg/version.c C 1998,1999,2000,2001,2004,2005,2007,2016 ./lib/isccfg/win32/DLLMain.c C 2001,2004,2007,2016 ./lib/isccfg/win32/libisccfg.def X 2001,2002,2005,2009,2010,2011,2013,2014,2015,2016 -./lib/isccfg/win32/libisccfg.dsp.in X 2001,2002,2004,2005,2009,2011,2013,2014,2016 -./lib/isccfg/win32/libisccfg.dsw X 2001 -./lib/isccfg/win32/libisccfg.mak.in X 2001,2002,2004,2005,2006,2009,2011,2013,2014 ./lib/isccfg/win32/libisccfg.vcxproj.filters.in X 2013,2014,2015,2016 ./lib/isccfg/win32/libisccfg.vcxproj.in X 2013,2014,2015,2016,2017 ./lib/isccfg/win32/libisccfg.vcxproj.user X 2013 ./lib/isccfg/win32/version.c C 1998,1999,2000,2001,2004,2007,2016 -./lib/lwres/Atffile X 2014 -./lib/lwres/Makefile.in MAKE 2000,2001,2004,2005,2007,2012,2014,2015,2016,2017 -./lib/lwres/api X 2000,2001,2006,2008,2009,2010,2011,2012,2013,2014,2015,2017 -./lib/lwres/assert_p.h C 2000,2001,2004,2005,2007,2011,2012,2016 -./lib/lwres/compat.c C 2003,2004,2005,2007,2014,2016 -./lib/lwres/context.c C 2000,2001,2003,2004,2005,2007,2008,2009,2012,2013,2014,2016 -./lib/lwres/context_p.h C 2000,2001,2004,2005,2007,2008,2016 -./lib/lwres/gai_strerror.c C 2000,2001,2004,2005,2006,2007,2014,2016 -./lib/lwres/getaddrinfo.c C.BSDI 1999,2000,2001,2004,2005,2006,2007,2008,2012,2014,2016 -./lib/lwres/gethost.c C 2000,2001,2004,2005,2007,2013,2014,2015,2016 -./lib/lwres/getipnode.c C 1999,2000,2001,2002,2003,2004,2005,2007,2009,2012,2014,2016 -./lib/lwres/getnameinfo.c C.PORTION 1999,2000,2001,2003,2004,2005,2007,2011,2012,2013,2016 -./lib/lwres/getrrset.c C 2000,2001,2002,2003,2004,2005,2007,2012,2014,2016 -./lib/lwres/herror.c C.PORTION 2000,2001,2003,2004,2005,2007,2011,2012,2014,2015,2016 -./lib/lwres/include/Makefile.in MAKE 2000,2001,2004,2007,2012,2016 -./lib/lwres/include/lwres/Makefile.in MAKE 2000,2001,2004,2007,2012,2014,2016 -./lib/lwres/include/lwres/context.h C 2000,2001,2004,2005,2006,2007,2008,2016 -./lib/lwres/include/lwres/int.h C 2000,2001,2004,2005,2006,2007,2016 -./lib/lwres/include/lwres/ipv6.h C 2000,2001,2004,2005,2006,2007,2016 -./lib/lwres/include/lwres/lang.h C 2000,2001,2004,2005,2006,2007,2016 -./lib/lwres/include/lwres/list.h C 1997,1998,1999,2000,2001,2004,2005,2006,2007,2016 -./lib/lwres/include/lwres/lwbuffer.h C 2000,2001,2004,2005,2006,2007,2016 -./lib/lwres/include/lwres/lwpacket.h C 1999,2000,2001,2004,2005,2006,2007,2016 -./lib/lwres/include/lwres/lwres.h C 2000,2001,2004,2005,2006,2007,2014,2016 -./lib/lwres/include/lwres/netdb.h.in C 2000,2001,2004,2005,2007,2009,2014,2016 -./lib/lwres/include/lwres/platform.h.in C 2000,2001,2004,2005,2007,2014,2016 -./lib/lwres/include/lwres/result.h C 2000,2001,2004,2005,2006,2007,2016 -./lib/lwres/include/lwres/stdlib.h C 2003,2004,2005,2006,2007,2014,2016 -./lib/lwres/include/lwres/string.h C 2014,2016 -./lib/lwres/include/lwres/version.h C 2001,2004,2005,2006,2007,2016 -./lib/lwres/lwbuffer.c C 2000,2001,2004,2005,2007,2014,2016 -./lib/lwres/lwconfig.c C 2000,2001,2002,2003,2004,2005,2006,2007,2008,2011,2012,2014,2016 -./lib/lwres/lwinetaton.c C.PORTION 1996,1997,1998,1999,2000,2001,2003,2004,2005,2007,2012,2013,2014,2016 -./lib/lwres/lwinetntop.c C 1996,1997,1998,1999,2000,2001,2003,2004,2005,2007,2016 -./lib/lwres/lwinetpton.c C 1996,1997,1998,1999,2000,2001,2004,2005,2007,2011,2012,2013,2014,2016,2017 -./lib/lwres/lwpacket.c C 2000,2001,2004,2005,2007,2016 -./lib/lwres/lwres_gabn.c C 2000,2001,2004,2005,2007,2013,2015,2016 -./lib/lwres/lwres_gnba.c C 2000,2001,2002,2004,2005,2007,2013,2016 -./lib/lwres/lwres_grbn.c C 2000,2001,2004,2005,2007,2013,2015,2016 -./lib/lwres/lwres_noop.c C 2000,2001,2004,2005,2007,2013,2016 -./lib/lwres/lwresutil.c C 2000,2001,2004,2005,2007,2014,2016 -./lib/lwres/man/Makefile.in MAKE 2001,2004,2007,2012,2015,2016 -./lib/lwres/man/lwres.3 MAN DOCBOOK -./lib/lwres/man/lwres.docbook SGML 2000,2001,2004,2005,2007,2014,2015,2016 -./lib/lwres/man/lwres.html HTML DOCBOOK -./lib/lwres/man/lwres_buffer.3 MAN DOCBOOK -./lib/lwres/man/lwres_buffer.docbook SGML 2000,2001,2004,2005,2007,2014,2015,2016 -./lib/lwres/man/lwres_buffer.html HTML DOCBOOK -./lib/lwres/man/lwres_config.3 MAN DOCBOOK -./lib/lwres/man/lwres_config.docbook SGML 2000,2001,2004,2005,2007,2014,2015,2016 -./lib/lwres/man/lwres_config.html HTML DOCBOOK -./lib/lwres/man/lwres_context.3 MAN DOCBOOK -./lib/lwres/man/lwres_context.docbook SGML 2000,2001,2003,2004,2005,2007,2014,2015,2016 -./lib/lwres/man/lwres_context.html HTML DOCBOOK -./lib/lwres/man/lwres_gabn.3 MAN DOCBOOK -./lib/lwres/man/lwres_gabn.docbook SGML 2000,2001,2004,2005,2007,2014,2015,2016 -./lib/lwres/man/lwres_gabn.html HTML DOCBOOK -./lib/lwres/man/lwres_gai_strerror.3 MAN DOCBOOK -./lib/lwres/man/lwres_gai_strerror.docbook SGML 2000,2001,2004,2005,2007,2014,2015,2016 -./lib/lwres/man/lwres_gai_strerror.html HTML DOCBOOK -./lib/lwres/man/lwres_getaddrinfo.3 MAN DOCBOOK -./lib/lwres/man/lwres_getaddrinfo.docbook SGML 2000,2001,2003,2004,2005,2007,2014,2015,2016 -./lib/lwres/man/lwres_getaddrinfo.html HTML DOCBOOK -./lib/lwres/man/lwres_gethostent.3 MAN DOCBOOK -./lib/lwres/man/lwres_gethostent.docbook SGML 2001,2004,2005,2007,2014,2015,2016 -./lib/lwres/man/lwres_gethostent.html HTML DOCBOOK -./lib/lwres/man/lwres_getipnode.3 MAN DOCBOOK -./lib/lwres/man/lwres_getipnode.docbook SGML 2000,2001,2003,2004,2005,2007,2014,2015,2016 -./lib/lwres/man/lwres_getipnode.html HTML DOCBOOK -./lib/lwres/man/lwres_getnameinfo.3 MAN DOCBOOK -./lib/lwres/man/lwres_getnameinfo.docbook SGML 2000,2001,2004,2005,2007,2014,2015,2016 -./lib/lwres/man/lwres_getnameinfo.html HTML DOCBOOK -./lib/lwres/man/lwres_getrrsetbyname.3 MAN DOCBOOK -./lib/lwres/man/lwres_getrrsetbyname.docbook SGML 2000,2001,2004,2005,2007,2014,2015,2016 -./lib/lwres/man/lwres_getrrsetbyname.html HTML DOCBOOK -./lib/lwres/man/lwres_gnba.3 MAN DOCBOOK -./lib/lwres/man/lwres_gnba.docbook SGML 2000,2001,2004,2005,2007,2014,2015,2016 -./lib/lwres/man/lwres_gnba.html HTML DOCBOOK -./lib/lwres/man/lwres_hstrerror.3 MAN DOCBOOK -./lib/lwres/man/lwres_hstrerror.docbook SGML 2000,2001,2004,2005,2007,2014,2015,2016 -./lib/lwres/man/lwres_hstrerror.html HTML DOCBOOK -./lib/lwres/man/lwres_inetntop.3 MAN DOCBOOK -./lib/lwres/man/lwres_inetntop.docbook SGML 2000,2001,2004,2005,2007,2014,2015,2016 -./lib/lwres/man/lwres_inetntop.html HTML DOCBOOK -./lib/lwres/man/lwres_noop.3 MAN DOCBOOK -./lib/lwres/man/lwres_noop.docbook SGML 2000,2001,2004,2005,2007,2014,2015,2016 -./lib/lwres/man/lwres_noop.html HTML DOCBOOK -./lib/lwres/man/lwres_packet.3 MAN DOCBOOK -./lib/lwres/man/lwres_packet.docbook SGML 2000,2001,2004,2005,2007,2014,2015,2016 -./lib/lwres/man/lwres_packet.html HTML DOCBOOK -./lib/lwres/man/lwres_resutil.3 MAN DOCBOOK -./lib/lwres/man/lwres_resutil.docbook SGML 2000,2001,2004,2005,2007,2014,2015,2016 -./lib/lwres/man/lwres_resutil.html HTML DOCBOOK -./lib/lwres/man/resolver.5 MAN 2000,2001,2004,2007,2016 -./lib/lwres/print.c C 1999,2000,2001,2003,2004,2005,2007,2011,2012,2014,2015,2016,2017 -./lib/lwres/print_p.h C 1999,2000,2001,2003,2004,2007,2010,2016 -./lib/lwres/tests/Atffile X 2014 -./lib/lwres/tests/Makefile.in MAKE 2014,2015,2016 -./lib/lwres/tests/config_test.c C 2014,2016 -./lib/lwres/tests/testdata/link-local.conf X 2014 -./lib/lwres/unix/Makefile.in MAKE 2001,2004,2007,2012,2016 -./lib/lwres/unix/include/Makefile.in MAKE 2001,2004,2007,2012,2016 -./lib/lwres/unix/include/lwres/Makefile.in MAKE 2001,2004,2007,2012,2016 -./lib/lwres/unix/include/lwres/net.h C 2000,2001,2002,2004,2005,2007,2016 -./lib/lwres/version.c C 2000,2001,2004,2005,2007,2016 -./lib/lwres/win32/DLLMain.c C 2001,2004,2007,2016 -./lib/lwres/win32/Makefile.in MAKE 2001,2004,2007,2012,2016 -./lib/lwres/win32/include/Makefile.in MAKE 2001,2004,2007,2012,2016 -./lib/lwres/win32/include/lwres/.gitignore X 2014 -./lib/lwres/win32/include/lwres/Makefile.in MAKE 2001,2004,2007,2012,2016 -./lib/lwres/win32/include/lwres/int.h C 2000,2001,2004,2007,2016 -./lib/lwres/win32/include/lwres/net.h C 2000,2001,2004,2007,2013,2016 -./lib/lwres/win32/include/lwres/netdb.h C 2000,2001,2004,2006,2007,2013,2016 -./lib/lwres/win32/include/lwres/platform.h C 2000,2001,2004,2007,2014,2016 -./lib/lwres/win32/liblwres.def X 2001,2014,2016 -./lib/lwres/win32/liblwres.dsp.in X 2001,2002,2004,2005,2007,2011,2013,2014,2016 -./lib/lwres/win32/liblwres.dsw X 2001 -./lib/lwres/win32/liblwres.mak.in X 2001,2002,2004,2005,2006,2007,2011,2013,2014,2016 -./lib/lwres/win32/liblwres.vcxproj.filters.in X 2013,2014,2015,2016 -./lib/lwres/win32/liblwres.vcxproj.in X 2013,2014,2015,2016,2017 -./lib/lwres/win32/liblwres.vcxproj.user X 2013 -./lib/lwres/win32/lwconfig.c C 2002,2004,2006,2007,2013,2016 -./lib/lwres/win32/socket.c C 2007,2015,2016 -./lib/lwres/win32/version.c C 1998,1999,2000,2001,2004,2007,2016 +./lib/ns/Atffile X 2017 +./lib/ns/Makefile.in MAKE 2017 +./lib/ns/api X 2017 +./lib/ns/client.c C 2017 +./lib/ns/include/Makefile.in MAKE 2017 +./lib/ns/include/ns/Makefile.in MAKE 2017 +./lib/ns/include/ns/client.h C 2017 +./lib/ns/include/ns/interfacemgr.h C 2017 +./lib/ns/include/ns/lib.h C 2017 +./lib/ns/include/ns/listenlist.h C 2017 +./lib/ns/include/ns/log.h C 2017 +./lib/ns/include/ns/notify.h C 2017 +./lib/ns/include/ns/query.h C 2017 +./lib/ns/include/ns/server.h C 2017 +./lib/ns/include/ns/sortlist.h C 2017 +./lib/ns/include/ns/stats.h C 2017 +./lib/ns/include/ns/types.h C 2017 +./lib/ns/include/ns/update.h C 2017 +./lib/ns/include/ns/version.h C 2017 +./lib/ns/include/ns/xfrout.h C 2017 +./lib/ns/interfacemgr.c C 2017 +./lib/ns/lib.c C 2017 +./lib/ns/listenlist.c C 2017 +./lib/ns/log.c C 2017 +./lib/ns/notify.c C 2017 +./lib/ns/query.c C 2017 +./lib/ns/server.c C 2017 +./lib/ns/sortlist.c C 2017 +./lib/ns/stats.c C 2017 +./lib/ns/tests/Atffile X 2017 +./lib/ns/tests/Makefile.in MAKE 2017 +./lib/ns/tests/listenlist_test.c C 2017 +./lib/ns/tests/notify_test.c C 2017 +./lib/ns/tests/nstest.c C 2017 +./lib/ns/tests/nstest.h C 2017 +./lib/ns/tests/testdata/notify/notify1.msg X 2017 +./lib/ns/tests/testdata/notify/zone1.db ZONE 2017 +./lib/ns/update.c C 2017 +./lib/ns/version.c C 2017 +./lib/ns/win32/DLLMain.c C 2017 +./lib/ns/win32/libns.def X 2017 +./lib/ns/win32/libns.vcxproj.filters X 2017 +./lib/ns/win32/libns.vcxproj.in X 2017 +./lib/ns/win32/libns.vcxproj.user X 2017 +./lib/ns/win32/version.c C 2017 +./lib/ns/xfrout.c C 2017 ./lib/samples/.gitignore X 2013,2014 ./lib/samples/Makefile-postinstall.in MAKE 2009,2012,2013,2014,2016 ./lib/samples/Makefile.in MAKE 2009,2012,2013,2014,2015,2016,2017 @@ -4667,39 +4327,21 @@ ./lib/samples/sample-gai.c C 2009,2012,2013,2014,2015,2016 ./lib/samples/sample-request.c C 2009,2012,2013,2014,2015,2016 ./lib/samples/sample-update.c C 2009,2010,2012,2013,2014,2015,2016,2017 -./lib/samples/win32/async.dsp.in X 2014,2016 -./lib/samples/win32/async.dsw X 2014 -./lib/samples/win32/async.mak.in X 2014,2016 ./lib/samples/win32/async.vcxproj.filters.in X 2014,2015 ./lib/samples/win32/async.vcxproj.in X 2014,2015,2016,2017 ./lib/samples/win32/async.vcxproj.user X 2014 -./lib/samples/win32/gai.dsp.in X 2014 -./lib/samples/win32/gai.dsw X 2014 -./lib/samples/win32/gai.mak.in X 2014 ./lib/samples/win32/gai.vcxproj.filters.in X 2014,2015 ./lib/samples/win32/gai.vcxproj.in X 2014,2015,2016,2017 ./lib/samples/win32/gai.vcxproj.user X 2014 -./lib/samples/win32/nsprobe.dsp.in X 2014,2016 -./lib/samples/win32/nsprobe.dsw X 2014 -./lib/samples/win32/nsprobe.mak.in X 2014,2016 ./lib/samples/win32/nsprobe.vcxproj.filters.in X 2014,2015 ./lib/samples/win32/nsprobe.vcxproj.in X 2014,2015,2016,2017 ./lib/samples/win32/nsprobe.vcxproj.user X 2014 -./lib/samples/win32/request.dsp.in X 2014,2016 -./lib/samples/win32/request.dsw X 2014 -./lib/samples/win32/request.mak.in X 2014,2016 ./lib/samples/win32/request.vcxproj.filters.in X 2014,2015 ./lib/samples/win32/request.vcxproj.in X 2014,2015,2016,2017 ./lib/samples/win32/request.vcxproj.user X 2014 -./lib/samples/win32/resolve.dsp.in X 2014,2016 -./lib/samples/win32/resolve.dsw X 2014 -./lib/samples/win32/resolve.mak.in X 2014,2016 ./lib/samples/win32/resolve.vcxproj.filters.in X 2014,2015 ./lib/samples/win32/resolve.vcxproj.in X 2014,2015,2016,2017 ./lib/samples/win32/resolve.vcxproj.user X 2014 -./lib/samples/win32/update.dsp.in X 2014,2016 -./lib/samples/win32/update.dsw X 2014 -./lib/samples/win32/update.mak.in X 2014,2016 ./lib/samples/win32/update.vcxproj.filters.in X 2014,2015 ./lib/samples/win32/update.vcxproj.in X 2014,2015,2016,2017 ./lib/samples/win32/update.vcxproj.user X 2014 @@ -4711,16 +4353,10 @@ ./lib/tests/t_api.c C 1999,2000,2001,2002,2003,2004,2005,2007,2008,2009,2010,2013,2014,2016,2017 ./lib/tests/win32/DLLMain.c C 2013,2016 ./lib/tests/win32/libtests.def X 2013 -./lib/tests/win32/libtests.dsp.in X 2013 -./lib/tests/win32/libtests.dsw X 2013 -./lib/tests/win32/libtests.mak.in X 2013 ./lib/tests/win32/libtests.vcxproj.filters.in X 2013,2015 ./lib/tests/win32/libtests.vcxproj.in X 2013,2015,2016,2017 ./lib/tests/win32/libtests.vcxproj.user X 2013 ./lib/win32/bindevt/bindevt.c C 2000,2001,2004,2007,2016 -./lib/win32/bindevt/bindevt.dsp.in X 2001,2013 -./lib/win32/bindevt/bindevt.dsw X 2001 -./lib/win32/bindevt/bindevt.mak.in X 2001,2006,2013 ./lib/win32/bindevt/bindevt.mc MC 2001,2004,2007,2016 ./lib/win32/bindevt/bindevt.vcxproj.filters.in X 2013,2015 ./lib/win32/bindevt/bindevt.vcxproj.in X 2013,2014,2015,2016 @@ -4733,7 +4369,7 @@ ./ltmain.sh X 1999,2000,2001,2003,2004,2006,2009,2012 ./make/.gitignore X 2012 ./make/Makefile.in MAKE 1998,1999,2000,2001,2004,2007,2012,2016 -./make/includes.in MAKE 1999,2000,2001,2004,2005,2007,2012,2014,2016 +./make/includes.in MAKE 1999,2000,2001,2004,2005,2007,2012,2014,2016,2017 ./make/mkdep.in X 1999,2000,2001,2006,2011,2014 ./make/rules.in MAKE 1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2015,2016,2017 ./mkinstalldirs X 1996 @@ -5056,14 +4692,14 @@ ./util/branchsync.sh SH 2013,2016 ./util/check-categories.sh SH 2015,2016 ./util/check-changes PERL 2002,2004,2007,2012,2016 -./util/check-includes.pl PERL 2000,2001,2004,2007,2012,2016 +./util/check-includes.pl PERL 2000,2001,2004,2007,2012,2016,2017 ./util/check-instincludes.sh SH 2000,2001,2004,2007,2012,2016 ./util/check-pullups.pl PERL 2001,2002,2003,2004,2007,2012,2016 ./util/check-sources.pl PERL 2000,2001,2004,2007,2012,2013,2016 ./util/commit-arm.sh SH 2012,2016 ./util/copyrights X 1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017 ./util/file_year.sh SH 2012,2016 -./util/kit.sh SH 2000,2001,2002,2003,2004,2007,2008,2009,2010,2012,2013,2014,2015,2016 +./util/kit.sh SH 2000,2001,2002,2003,2004,2007,2008,2009,2010,2012,2013,2014,2015,2016,2017 ./util/mandoc2docbook.pl PERL 2001,2004,2007,2012,2016 ./util/mdnbuildtest.sh SH 2000,2001,2004,2007,2012,2016 ./util/memleak.pl PERL 1999,2000,2001,2004,2007,2012,2016 @@ -5083,13 +4719,7 @@ ./version X 1998,1999,2000,2001,2003,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2016,2017 ./win32utils/Configure PERL 2013,2014,2015,2016,2017 ./win32utils/GeoIP.diff X 2013 -./win32utils/bind9.sln.in X 2013,2014,2015,2016 -./win32utils/build.txt TXT.BRIEF 2013,2014,2015,2016 +./win32utils/bind9.sln.in X 2013,2014,2015,2016,2017 +./win32utils/build.txt TXT.BRIEF 2013,2014,2015,2016,2017 ./win32utils/index.html HTML 2006,2007,2008,2012,2013,2014,2015,2016 -./win32utils/legacy/BINDBuild.dsw.in X 2001,2005,2006,2008,2009,2010,2013,2014,2015,2016 -./win32utils/legacy/BuildAll.bat.in BAT 2001,2002,2004,2005,2006,2007,2008,2009,2010,2013,2014,2015,2016 -./win32utils/legacy/BuildPost.bat.in BAT 2005,2006,2013,2014,2016 -./win32utils/legacy/BuildSetup.bat.in BAT 2001,2002,2004,2005,2006,2007,2008,2009,2010,2012,2013,2014,2015,2016 -./win32utils/legacy/makedefs.pl PERL 2001,2004,2007,2009,2012,2013,2014,2016 -./win32utils/legacy/win32-build.txt TXT.BRIEF 2001,2002,2004,2005,2008,2009,2012,2013,2014,2016 ./win32utils/readme1st.txt TXT.BRIEF 2001,2003,2004,2005,2007,2008,2009,2012,2013,2014,2015,2016 diff --git a/util/kit.sh b/util/kit.sh index b0a5e2b896..c55fdafdc6 100644 --- a/util/kit.sh +++ b/util/kit.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2000-2004, 2007-2010, 2012-2016 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2000-2004, 2007-2010, 2012-2017 Internet Systems Consortium, Inc. ("ISC") # # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this @@ -137,8 +137,8 @@ fi # gets accidentally resurrected. rm -rf TODO EXCLUDED conftools doc/design doc/dev doc/draft doc/expired \ - doc/html doc/rfc doc/todo doc/private bin/lwresd doc/man doc/markdown \ - lib/lwres/man/resolver.5 contrib/zkt/doc/rfc5011.txt \ + doc/html doc/rfc doc/todo doc/private doc/man doc/markdown \ + contrib/zkt/doc/rfc5011.txt \ bin/tests/system/relay lib/cfg # Remove everything but mksymtbl.pl and bindkeys.pl from util diff --git a/util/merge_copyrights b/util/merge_copyrights index 585a6010f8..517265570e 100644 --- a/util/merge_copyrights +++ b/util/merge_copyrights @@ -6,8 +6,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -# $Id$ - use strict; my %file_types = (); diff --git a/win32utils/Configure b/win32utils/Configure index b737f9211f..be0f02cbcc 100644 --- a/win32utils/Configure +++ b/win32utils/Configure @@ -23,55 +23,7 @@ my $platformfile = "..\\lib\\isc\\win32\\include\\isc\\platform.h"; my $confshfile = "..\\bin\\tests\\system\\conf.sh"; my $icshfile = "..\\isc-config.sh"; -my @filelist = ("..\\bin\\check\\win32\\checktool.dsp", - "..\\bin\\check\\win32\\checkconf.dsp", - "..\\bin\\check\\win32\\checkconf.mak", - "..\\bin\\check\\win32\\checkzone.dsp", - "..\\bin\\check\\win32\\checkzone.mak", - "..\\bin\\confgen\\win32\\confgentool.dsp", - "..\\bin\\confgen\\win32\\ddnsconfgen.dsp", - "..\\bin\\confgen\\win32\\ddnsconfgen.mak", - "..\\bin\\confgen\\win32\\rndcconfgen.dsp", - "..\\bin\\confgen\\win32\\rndcconfgen.mak", - "..\\bin\\delv\\win32\\delv.dsp", - "..\\bin\\delv\\win32\\delv.mak", - "..\\bin\\dig\\win32\\dig.dsp", - "..\\bin\\dig\\win32\\dig.mak", - "..\\bin\\dig\\win32\\dighost.dsp", - "..\\bin\\dig\\win32\\host.dsp", - "..\\bin\\dig\\win32\\host.mak", - "..\\bin\\dig\\win32\\nslookup.dsp", - "..\\bin\\dig\\win32\\nslookup.mak", - "..\\bin\\dnssec\\win32\\dnssectool.dsp", - "..\\bin\\dnssec\\win32\\dsfromkey.dsp", - "..\\bin\\dnssec\\win32\\dsfromkey.mak", - "..\\bin\\dnssec\\win32\\importkey.dsp", - "..\\bin\\dnssec\\win32\\importkey.mak", - "..\\bin\\dnssec\\win32\\keyfromlabel.dsp", - "..\\bin\\dnssec\\win32\\keyfromlabel.mak", - "..\\bin\\dnssec\\win32\\keygen.dsp", - "..\\bin\\dnssec\\win32\\keygen.mak", - "..\\bin\\dnssec\\win32\\revoke.dsp", - "..\\bin\\dnssec\\win32\\revoke.mak", - "..\\bin\\dnssec\\win32\\settime.dsp", - "..\\bin\\dnssec\\win32\\settime.mak", - "..\\bin\\dnssec\\win32\\signzone.dsp", - "..\\bin\\dnssec\\win32\\signzone.mak", - "..\\bin\\dnssec\\win32\\verify.dsp", - "..\\bin\\dnssec\\win32\\verify.mak", - "..\\bin\\named\\win32\\named.dsp", - "..\\bin\\named\\win32\\named.mak", - "..\\bin\\nsupdate\\win32\\nsupdate.dsp", - "..\\bin\\nsupdate\\win32\\nsupdate.mak", - "..\\bin\\pkcs11\\win32\\pk11destroy.dsp", - "..\\bin\\pkcs11\\win32\\pk11destroy.mak", - "..\\bin\\pkcs11\\win32\\pk11keygen.dsp", - "..\\bin\\pkcs11\\win32\\pk11keygen.mak", - "..\\bin\\pkcs11\\win32\\pk11list.dsp", - "..\\bin\\pkcs11\\win32\\pk11list.mak", - "..\\bin\\pkcs11\\win32\\pk11tokens.dsp", - "..\\bin\\pkcs11\\win32\\pk11tokens.mak", - "..\\bin\\python\\dnssec-checkds.py", +my @filelist = ("..\\bin\\python\\dnssec-checkds.py", "..\\bin\\python\\dnssec-coverage.py", "..\\bin\\python\\dnssec-keymgr.py", "..\\bin\\python\\isc\\__init__.py", @@ -89,130 +41,9 @@ my @filelist = ("..\\bin\\check\\win32\\checktool.dsp", "..\\bin\\python\\isc\\tests\\dnskey_test.py", "..\\bin\\python\\isc\\tests\\policy_test.py", "..\\bin\\python\\isc\\utils.py", - "..\\bin\\rndc\\win32\\rndc.dsp", - "..\\bin\\rndc\\win32\\rndc.mak", - "..\\bin\\rndc\\win32\\rndcutil.dsp", "..\\bin\\tests\\system\\dlz\\prereq.sh", - "..\\bin\\tools\\win32\\arpaname.dsp", - "..\\bin\\tools\\win32\\arpaname.mak", - "..\\bin\\tools\\win32\\genrandom.dsp", - "..\\bin\\tools\\win32\\genrandom.mak", - "..\\bin\\tools\\win32\\ischmacfixup.dsp", - "..\\bin\\tools\\win32\\ischmacfixup.mak", - "..\\bin\\tools\\win32\\journalprint.dsp", - "..\\bin\\tools\\win32\\journalprint.mak", - "..\\bin\\tools\\win32\\mdig.dsp", - "..\\bin\\tools\\win32\\mdig.mak", - "..\\bin\\tools\\win32\\nsec3hash.dsp", - "..\\bin\\tools\\win32\\nsec3hash.mak", - "..\\bin\\tools\\win32\\rrchecker.dsp", - "..\\bin\\tools\\win32\\rrchecker.mak", - "..\\bin\\tests\\atomic\\win32\\t_atomic.dsp", - "..\\bin\\tests\\atomic\\win32\\t_atomic.mak", - "..\\bin\\tests\\db\\win32\\t_db.dsp", - "..\\bin\\tests\\db\\win32\\t_db.mak", - "..\\bin\\tests\\dst\\win32\\t_dst.dsp", - "..\\bin\\tests\\dst\\win32\\t_dst.mak", - "..\\bin\\tests\\master\\win32\\t_master.dsp", - "..\\bin\\tests\\master\\win32\\t_master.mak", - "..\\bin\\tests\\mem\\win32\\t_mem.dsp", - "..\\bin\\tests\\mem\\win32\\t_mem.mak", - "..\\bin\\tests\\hashes\\win32\\t_hashes.dsp", - "..\\bin\\tests\\hashes\\win32\\t_hashes.mak", - "..\\bin\\tests\\names\\win32\\t_names.dsp", - "..\\bin\\tests\\names\\win32\\t_names.mak", - "..\\bin\\tests\\rbt\\win32\\t_rbt.dsp", - "..\\bin\\tests\\rbt\\win32\\t_rbt.mak", - "..\\bin\\tests\\resolver\\win32\\t_resolver.dsp", - "..\\bin\\tests\\resolver\\win32\\t_resolver.mak", - "..\\bin\\tests\\sockaddr\\win32\\t_sockaddr.dsp", - "..\\bin\\tests\\sockaddr\\win32\\t_sockaddr.mak", - "..\\bin\\tests\\tasks\\win32\\t_tasks.dsp", - "..\\bin\\tests\\tasks\\win32\\t_tasks.mak", - "..\\bin\\tests\\timers\\win32\\t_timers.dsp", - "..\\bin\\tests\\timers\\win32\\t_timers.mak", - "..\\bin\\tests\\system\\win32\\bigkey.dsp", - "..\\bin\\tests\\system\\win32\\bigkey.mak", - "..\\bin\\tests\\system\\win32\\feature-test.dsp", - "..\\bin\\tests\\system\\win32\\feature-test.mak", - "..\\bin\\tests\\system\\win32\\gencheck.dsp", - "..\\bin\\tests\\system\\win32\\gencheck.mak", - "..\\bin\\tests\\system\\win32\\keycreate.dsp", - "..\\bin\\tests\\system\\win32\\keycreate.mak", - "..\\bin\\tests\\system\\win32\\keydelete.dsp", - "..\\bin\\tests\\system\\win32\\keydelete.mak", - "..\\bin\\tests\\system\\win32\\lwtest.dsp", - "..\\bin\\tests\\system\\win32\\lwtest.mak", - "..\\bin\\tests\\system\\win32\\pipequeries.dsp", - "..\\bin\\tests\\system\\win32\\pipequeries.mak", - "..\\bin\\tests\\win32\\backtrace_test.dsp", - "..\\bin\\tests\\win32\\backtrace_test.mak", - "..\\bin\\tests\\win32\\inter_test.dsp", - "..\\bin\\tests\\win32\\inter_test.mak", - "..\\bin\\tests\\win32\\makejournal.dsp", - "..\\bin\\tests\\win32\\makejournal.mak", - "..\\bin\\tests\\win32\\rwlock_test.dsp", - "..\\bin\\tests\\win32\\rwlock_test.mak", - "..\\bin\\tests\\win32\\shutdown_test.dsp", - "..\\bin\\tests\\win32\\shutdown_test.mak", - "..\\bin\\tests\\win32\\sock_test.dsp", - "..\\bin\\tests\\win32\\sock_test.mak", - "..\\bin\\tests\\win32\\task_test.dsp", - "..\\bin\\tests\\win32\\task_test.mak", - "..\\bin\\tests\\win32\\timer_test.dsp", - "..\\bin\\tests\\win32\\timer_test.mak", - "..\\bin\\tests\\win32\\inter_test.dsp", - "..\\bin\\tests\\win32\\inter_test.mak", - "..\\bin\\tests\\win32\\rwlock_test.dsp", - "..\\bin\\tests\\win32\\rwlock_test.mak", - "..\\bin\\tests\\win32\\shutdown_test.dsp", - "..\\bin\\tests\\win32\\shutdown_test.mak", - "..\\bin\\tests\\win32\\sock_test.dsp", - "..\\bin\\tests\\win32\\sock_test.mak", - "..\\bin\\tests\\win32\\task_test.dsp", - "..\\bin\\tests\\win32\\task_test.mak", - "..\\bin\\tests\\win32\\timer_test.dsp", - "..\\bin\\tests\\win32\\timer_test.mak", - "..\\bin\\win32\\BINDInstall\\BINDInstall.dsp", - "..\\bin\\win32\\BINDInstall\\BINDInstall.mak", - "..\\lib\\bind9\\win32\\libbind9.dsp", - "..\\lib\\bind9\\win32\\libbind9.mak", - "..\\lib\\dns\\win32\\gen.dsp", - "..\\lib\\dns\\win32\\gen.mak", "..\\lib\\dns\\win32\\libdns.def", - "..\\lib\\dns\\win32\\libdns.dsp", - "..\\lib\\dns\\win32\\libdns.mak", - "..\\lib\\irs\\win32\\libirs.dsp", - "..\\lib\\irs\\win32\\libirs.mak", - "..\\lib\\isc\\win32\\libisc.def", - "..\\lib\\isc\\win32\\libisc.dsp", - "..\\lib\\isc\\win32\\libisc.mak", - "..\\lib\\isccc\\win32\\libisccc.dsp", - "..\\lib\\isccc\\win32\\libisccc.mak", - "..\\lib\\isccfg\\win32\\libisccfg.dsp", - "..\\lib\\isccfg\\win32\\libisccfg.mak", - "..\\lib\\lwres\\win32\\liblwres.dsp", - "..\\lib\\lwres\\win32\\liblwres.mak", - "..\\lib\\samples\\win32\\async.dsp", - "..\\lib\\samples\\win32\\async.mak", - "..\\lib\\samples\\win32\\gai.dsp", - "..\\lib\\samples\\win32\\gai.mak", - "..\\lib\\samples\\win32\\nsprobe.dsp", - "..\\lib\\samples\\win32\\nsprobe.mak", - "..\\lib\\samples\\win32\\request.dsp", - "..\\lib\\samples\\win32\\request.mak", - "..\\lib\\samples\\win32\\resolve.dsp", - "..\\lib\\samples\\win32\\resolve.mak", - "..\\lib\\samples\\win32\\update.dsp", - "..\\lib\\samples\\win32\\update.mak", - "..\\lib\\tests\\win32\\libtests.dsp", - "..\\lib\\tests\\win32\\libtests.mak", - "..\\lib\\win32\\bindevt\\bindevt.dsp", - "..\\lib\\win32\\bindevt\\bindevt.mak", - "legacy\\BINDBuild.dsw", - "legacy\\BuildAll.bat", - "legacy\\BuildPost.bat", - "legacy\\BuildSetup.bat"); + "..\\lib\\isc\\win32\\libisc.def"); my @projectlist = ("..\\bin\\check\\win32\\checkconf.vcxproj", "..\\bin\\check\\win32\\checkconf.vcxproj.filters", @@ -314,8 +145,6 @@ my @projectlist = ("..\\bin\\check\\win32\\checkconf.vcxproj", "..\\bin\\tests\\system\\win32\\keycreate.vcxproj.filters", "..\\bin\\tests\\system\\win32\\keydelete.vcxproj", "..\\bin\\tests\\system\\win32\\keydelete.vcxproj.filters", - "..\\bin\\tests\\system\\win32\\lwtest.vcxproj", - "..\\bin\\tests\\system\\win32\\lwtest.vcxproj.filters", "..\\bin\\tests\\system\\win32\\pipequeries.vcxproj", "..\\bin\\tests\\system\\win32\\pipequeries.vcxproj.filters", "..\\bin\\tests\\tasks\\win32\\t_tasks.vcxproj", @@ -366,8 +195,7 @@ my @projectlist = ("..\\bin\\check\\win32\\checkconf.vcxproj", "..\\lib\\isccc\\win32\\libisccc.vcxproj.filters", "..\\lib\\isccfg\\win32\\libisccfg.vcxproj", "..\\lib\\isccfg\\win32\\libisccfg.vcxproj.filters", - "..\\lib\\lwres\\win32\\liblwres.vcxproj", - "..\\lib\\lwres\\win32\\liblwres.vcxproj.filters", + "..\\lib\\ns\\win32\\libns.vcxproj", "..\\lib\\samples\\win32\\resolve.vcxproj", "..\\lib\\samples\\win32\\resolve.vcxproj.filters", "..\\lib\\samples\\win32\\async.vcxproj", @@ -611,7 +439,6 @@ my @help = ( "\nGeneral Options and Commands:\n", " verbose (options) print messages\n", " help (command) print this help\n", -" legacy (options) process only files for legacy build\n", " win32 (command) configure for Win32 platform\n", " x64 (command) configure for x64 platform\n", " clean (command) clean up generated files\n", @@ -755,10 +582,10 @@ foreach (@ARGV) { } } -# legacy default to win32 +# old legacy mode -if ($legacy_only && ($want_x64 ne "yes")) { - $want_win32 = "yes"; +if ($legacy_only) { + print "legacy mode is obsolete (so ignored)\n"; } if ($want_checkfiles eq "yes") { @@ -1380,8 +1207,8 @@ if ($verbose) { print "_MSC_VER == $msc_ver\n"; } if ($msc_ver < 1600) { - print STDERR "warning: old version of C++ compiler/Visual Studio\n"; - print STDERR "only the legacy (cf legacy\\win32-build.txt) will work\n"; + print STDERR "too old version of C++ compiler/Visual Studio\n"; + exit 1; } # gen single threaded for < VS 2005 @@ -3006,9 +2833,7 @@ sub setupfile { if ($verbose) { print "Setting up $filename\n"; } - if (!$legacy_only) { - binmode(F); - } + binmode(F); foreach $line (@Linesout) { print F $line . "\n"; } @@ -3137,7 +2962,7 @@ sub setupproject { sub makeversion { # List of directories with version files - my @dirlist = ("isc", "dns", "isccc", "isccfg", "lwres", "bind9", "irs"); + my @dirlist = ("isc", "dns", "ns", "isccc", "isccfg", "bind9", "irs"); my %LibMacros = ( "bind9" => "LIBBIND9_EXPORTS", "dns" => "LIBDNS_EXPORTS", @@ -3145,7 +2970,7 @@ sub makeversion { "isc" => "LIBISC_EXPORTS", "isccc" => "LIBISCCC_EXPORTS", "isccfg" => "LIBISCCFG_EXPORTS", - "lwres" => "LIBLWRES_EXPORTS"); + "ns" => "LIBNS_EXPORTS"); my @VersionNames = ("LIBINTERFACE", "LIBREVISION", "LIBAGE"); my $Version; my %ApiVersions; @@ -3342,8 +3167,8 @@ sub makeinstallfile { print LOUT "libisccfg.dll-BCFT\n"; print LOUT "libisccc.dll-BCFT\n"; print LOUT "libdns.dll-BCFT\n"; - print LOUT "liblwres.dll-BCFT\n"; print LOUT "libirs.dll-BCFT\n"; + print LOUT "libns.dll-BCFT\n"; if ($use_openssl eq "yes") { my $v; my $d; @@ -3529,10 +3354,8 @@ if (($want_win32 eq "yes") || ($want_x64 eq "yes")) { setupfile($file); } - if (!$legacy_only) { - foreach $file (@projectlist) { - setupproject($file); - } + foreach $file (@projectlist) { + setupproject($file); } makeversion(); diff --git a/win32utils/bind9.sln.in b/win32utils/bind9.sln.in index 13ae0969f1..44fda88f10 100644 --- a/win32utils/bind9.sln.in +++ b/win32utils/bind9.sln.in @@ -8,9 +8,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BINDInstall", "..\bin\win32 {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} {B556705F-1920-4400-878A-B259D3556047} = {B556705F-1920-4400-878A-B259D3556047} {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} + {82ACD33C-E75F-45B8-BB6D-42643A10D7EE} = {82ACD33C-E75F-45B8-BB6D-42643A10D7EE} {B2DFA58C-6347-478E-81E8-01E06999D4F1} = {B2DFA58C-6347-478E-81E8-01E06999D4F1} {E741C10B-B075-4206-9596-46765B665E03} = {E741C10B-B075-4206-9596-46765B665E03} - {EBDB30A3-E8EB-4E1D-915E-06720600A84E} = {EBDB30A3-E8EB-4E1D-915E-06720600A84E} {A4F29CEB-7644-4A7F-BE9E-02B6A90E4919} = {A4F29CEB-7644-4A7F-BE9E-02B6A90E4919} {0D745CD9-FC3B-49DC-99BE-1E6DF85593F0} = {0D745CD9-FC3B-49DC-99BE-1E6DF85593F0} @IF TESTS @@ -40,13 +40,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BINDInstall", "..\bin\win32 {D171F185-D3C2-4463-9CF3-ED1D0B1D6832} = {D171F185-D3C2-4463-9CF3-ED1D0B1D6832} {03FB7588-C5A7-4572-968F-14F1206BC69C} = {03FB7588-C5A7-4572-968F-14F1206BC69C} {FD653434-F1A8-44A9-85B2-A7468491DA6D} = {FD653434-F1A8-44A9-85B2-A7468491DA6D} - {AB6690A0-055E-458f-BAC5-BF38BCC5834F} = {AB6690A0-055E-458f-BAC5-BF38BCC5834F} + {AB6690A0-055E-458F-BAC5-BF38BCC5834F} = {AB6690A0-055E-458F-BAC5-BF38BCC5834F} {91E60FDA-E48C-4DA0-92A2-97F963348E00} = {91E60FDA-E48C-4DA0-92A2-97F963348E00} {B19042CE-D3D9-469B-BCD2-C3140150939A} = {B19042CE-D3D9-469B-BCD2-C3140150939A} {4EE91023-94C3-48C0-B71C-5333B726C2EE} = {4EE91023-94C3-48C0-B71C-5333B726C2EE} {B4AC7F81-E3DC-43E9-B339-4FA5149FA8F7} = {B4AC7F81-E3DC-43E9-B339-4FA5149FA8F7} {70F2F0DF-665D-4444-A982-AEA31A861A22} = {70F2F0DF-665D-4444-A982-AEA31A861A22} - {98743A7C-6AF8-467f-9911-FA69C451AF2B} = {98743A7C-6AF8-467f-9911-FA69C451AF2B} + {98743A7C-6AF8-467F-9911-FA69C451AF2B} = {98743A7C-6AF8-467F-9911-FA69C451AF2B} {3115091C-8135-481F-9757-F013A26255E0} = {3115091C-8135-481F-9757-F013A26255E0} {C41266C7-E27E-4D60-9815-82D3B32BF82F} = {C41266C7-E27E-4D60-9815-82D3B32BF82F} {2C1F7096-C5B5-48D4-846F-A7ACA454335D} = {2C1F7096-C5B5-48D4-846F-A7ACA454335D} @@ -89,7 +89,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BINDInstall", "..\bin\win32 @IF STESTS {31715139-2C27-47D2-8394-71B71A8AC3D5} = {31715139-2C27-47D2-8394-71B71A8AC3D5} {764DBE24-C8B3-46E8-BE73-196431353A5D} = {764DBE24-C8B3-46E8-BE73-196431353A5D} - {5D7D17B1-18A2-4468-BC26-D9F9800E76D2} = {5D7D17B1-18A2-4468-BC26-D9F9800E76D2} {61F9D673-EB5C-47A5-8907-24E034C75EF8} = {61F9D673-EB5C-47A5-8907-24E034C75EF8} {E1478F40-786C-4738-8E99-E7A71DD98661} = {E1478F40-786C-4738-8E99-E7A71DD98661} {4F9A0F6F-366D-4483-B131-793832840508} = {4F9A0F6F-366D-4483-B131-793832840508} @@ -117,6 +116,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libdns", "..\lib\dns\win32\ {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libns", "..\lib\ns\win32\libns.vcxproj", "{82ACD33C-E75F-45B8-BB6D-42643A10D7EE}" + ProjectSection(ProjectDependencies) = postProject + {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} + {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} + {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} + EndProjectSection +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libisccfg", "..\lib\isccfg\win32\libisccfg.vcxproj", "{B2DFA58C-6347-478E-81E8-01E06999D4F1}" ProjectSection(ProjectDependencies) = postProject {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} @@ -133,12 +139,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbind9", "..\lib\bind9\wi {B2DFA58C-6347-478E-81E8-01E06999D4F1} = {B2DFA58C-6347-478E-81E8-01E06999D4F1} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblwres", "..\lib\lwres\win32\liblwres.vcxproj", "{EBDB30A3-E8EB-4E1D-915E-06720600A84E}" - ProjectSection(ProjectDependencies) = postProject - {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} - {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libirs", "..\lib\irs\win32\libirs.vcxproj", "{A4F29CEB-7644-4A7F-BE9E-02B6A90E4919}" ProjectSection(ProjectDependencies) = postProject {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} @@ -220,9 +220,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "named", "..\bin\named\win32 {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} {B556705F-1920-4400-878A-B259D3556047} = {B556705F-1920-4400-878A-B259D3556047} {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} + {82ACD33C-E75F-45B8-BB6D-42643A10D7EE} = {82ACD33C-E75F-45B8-BB6D-42643A10D7EE} {B2DFA58C-6347-478E-81E8-01E06999D4F1} = {B2DFA58C-6347-478E-81E8-01E06999D4F1} {E741C10B-B075-4206-9596-46765B665E03} = {E741C10B-B075-4206-9596-46765B665E03} - {EBDB30A3-E8EB-4E1D-915E-06720600A84E} = {EBDB30A3-E8EB-4E1D-915E-06720600A84E} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rndcutil", "..\bin\rndc\win32\rndcutil.vcxproj", "{7C8681A1-E3A8-470E-9EEF-16054D111A19}" @@ -250,7 +250,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dighost", "..\bin\dig\win32 {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} {B2DFA58C-6347-478E-81E8-01E06999D4F1} = {B2DFA58C-6347-478E-81E8-01E06999D4F1} {E741C10B-B075-4206-9596-46765B665E03} = {E741C10B-B075-4206-9596-46765B665E03} - {EBDB30A3-E8EB-4E1D-915E-06720600A84E} = {EBDB30A3-E8EB-4E1D-915E-06720600A84E} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dig", "..\bin\dig\win32\dig.vcxproj", "{F938F9B8-D395-4A40-BEC7-0122D289C692}" @@ -260,7 +259,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dig", "..\bin\dig\win32\dig {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} {B2DFA58C-6347-478E-81E8-01E06999D4F1} = {B2DFA58C-6347-478E-81E8-01E06999D4F1} {E741C10B-B075-4206-9596-46765B665E03} = {E741C10B-B075-4206-9596-46765B665E03} - {EBDB30A3-E8EB-4E1D-915E-06720600A84E} = {EBDB30A3-E8EB-4E1D-915E-06720600A84E} {140DE800-E552-43CC-B0C7-A33A92E368CA} = {140DE800-E552-43CC-B0C7-A33A92E368CA} EndProjectSection EndProject @@ -271,7 +269,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "host", "..\bin\dig\win32\ho {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} {B2DFA58C-6347-478E-81E8-01E06999D4F1} = {B2DFA58C-6347-478E-81E8-01E06999D4F1} {E741C10B-B075-4206-9596-46765B665E03} = {E741C10B-B075-4206-9596-46765B665E03} - {EBDB30A3-E8EB-4E1D-915E-06720600A84E} = {EBDB30A3-E8EB-4E1D-915E-06720600A84E} {140DE800-E552-43CC-B0C7-A33A92E368CA} = {140DE800-E552-43CC-B0C7-A33A92E368CA} EndProjectSection EndProject @@ -282,7 +279,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nslookup", "..\bin\dig\win3 {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} {B2DFA58C-6347-478E-81E8-01E06999D4F1} = {B2DFA58C-6347-478E-81E8-01E06999D4F1} {E741C10B-B075-4206-9596-46765B665E03} = {E741C10B-B075-4206-9596-46765B665E03} - {EBDB30A3-E8EB-4E1D-915E-06720600A84E} = {EBDB30A3-E8EB-4E1D-915E-06720600A84E} {140DE800-E552-43CC-B0C7-A33A92E368CA} = {140DE800-E552-43CC-B0C7-A33A92E368CA} EndProjectSection EndProject @@ -358,7 +354,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "verify", "..\bin\dnssec\win {2CB7DC75-023B-4AA3-AF3A-AE5046A4EE70} = {2CB7DC75-023B-4AA3-AF3A-AE5046A4EE70} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "importkey", "..\bin\dnssec\win32\importkey.vcxproj", "{AB6690A0-055E-458f-BAC5-BF38BCC5834F}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "importkey", "..\bin\dnssec\win32\importkey.vcxproj", "{AB6690A0-055E-458F-BAC5-BF38BCC5834F}" ProjectSection(ProjectDependencies) = postProject {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} @@ -398,7 +394,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ischmacfixup", "..\bin\tool {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rrchecker", "..\bin\tools\win32\rrchecker.vcxproj", "{98743A7C-6AF8-467f-9911-FA69C451AF2B}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rrchecker", "..\bin\tools\win32\rrchecker.vcxproj", "{98743A7C-6AF8-467F-9911-FA69C451AF2B}" ProjectSection(ProjectDependencies) = postProject {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} @@ -420,7 +416,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nsupdate", "..\bin\nsupdate {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} {B2DFA58C-6347-478E-81E8-01E06999D4F1} = {B2DFA58C-6347-478E-81E8-01E06999D4F1} {E741C10B-B075-4206-9596-46765B665E03} = {E741C10B-B075-4206-9596-46765B665E03} - {EBDB30A3-E8EB-4E1D-915E-06720600A84E} = {EBDB30A3-E8EB-4E1D-915E-06720600A84E} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "checktool", "..\bin\check\win32\checktool.vcxproj", "{2C1F7096-C5B5-48D4-846F-A7ACA454335D}" @@ -654,13 +649,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gencheck", "..\bin\tests\sy {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lwtest", "..\bin\tests\system\win32\lwtest.vcxproj", "{5D7D17B1-18A2-4468-BC26-D9F9800E76D2}" - ProjectSection(ProjectDependencies) = postProject - {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} - {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} - {EBDB30A3-E8EB-4E1D-915E-06720600A84E} = {EBDB30A3-E8EB-4E1D-915E-06720600A84E} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bigkey", "..\bin\tests\system\win32\bigkey.vcxproj", "{61F9D673-EB5C-47A5-8907-24E034C75EF8}" ProjectSection(ProjectDependencies) = postProject {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} @@ -722,6 +710,10 @@ Global {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@ {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@ {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@ + {82ACD33C-E75F-45B8-BB6D-42643A10D7EE}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@ + {82ACD33C-E75F-45B8-BB6D-42643A10D7EE}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@ + {82ACD33C-E75F-45B8-BB6D-42643A10D7EE}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@ + {82ACD33C-E75F-45B8-BB6D-42643A10D7EE}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@ {B2DFA58C-6347-478E-81E8-01E06999D4F1}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@ {B2DFA58C-6347-478E-81E8-01E06999D4F1}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@ {B2DFA58C-6347-478E-81E8-01E06999D4F1}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@ @@ -730,10 +722,6 @@ Global {E741C10B-B075-4206-9596-46765B665E03}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@ {E741C10B-B075-4206-9596-46765B665E03}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@ {E741C10B-B075-4206-9596-46765B665E03}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@ - {EBDB30A3-E8EB-4E1D-915E-06720600A84E}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@ - {EBDB30A3-E8EB-4E1D-915E-06720600A84E}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@ - {EBDB30A3-E8EB-4E1D-915E-06720600A84E}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@ - {EBDB30A3-E8EB-4E1D-915E-06720600A84E}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@ {A4F29CEB-7644-4A7F-BE9E-02B6A90E4919}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@ {A4F29CEB-7644-4A7F-BE9E-02B6A90E4919}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@ {A4F29CEB-7644-4A7F-BE9E-02B6A90E4919}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@ @@ -838,10 +826,10 @@ Global {FD653434-F1A8-44A9-85B2-A7468491DA6D}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@ {FD653434-F1A8-44A9-85B2-A7468491DA6D}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@ {FD653434-F1A8-44A9-85B2-A7468491DA6D}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@ - {AB6690A0-055E-458f-BAC5-BF38BCC5834F}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@ - {AB6690A0-055E-458f-BAC5-BF38BCC5834F}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@ - {AB6690A0-055E-458f-BAC5-BF38BCC5834F}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@ - {AB6690A0-055E-458f-BAC5-BF38BCC5834F}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@ + {AB6690A0-055E-458F-BAC5-BF38BCC5834F}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@ + {AB6690A0-055E-458F-BAC5-BF38BCC5834F}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@ + {AB6690A0-055E-458F-BAC5-BF38BCC5834F}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@ + {AB6690A0-055E-458F-BAC5-BF38BCC5834F}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@ {91E60FDA-E48C-4DA0-92A2-97F963348E00}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@ {91E60FDA-E48C-4DA0-92A2-97F963348E00}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@ {91E60FDA-E48C-4DA0-92A2-97F963348E00}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@ @@ -862,10 +850,10 @@ Global {70F2F0DF-665D-4444-A982-AEA31A861A22}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@ {70F2F0DF-665D-4444-A982-AEA31A861A22}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@ {70F2F0DF-665D-4444-A982-AEA31A861A22}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@ - {98743A7C-6AF8-467f-9911-FA69C451AF2B}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@ - {98743A7C-6AF8-467f-9911-FA69C451AF2B}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@ - {98743A7C-6AF8-467f-9911-FA69C451AF2B}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@ - {98743A7C-6AF8-467f-9911-FA69C451AF2B}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@ + {98743A7C-6AF8-467F-9911-FA69C451AF2B}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@ + {98743A7C-6AF8-467F-9911-FA69C451AF2B}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@ + {98743A7C-6AF8-467F-9911-FA69C451AF2B}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@ + {98743A7C-6AF8-467F-9911-FA69C451AF2B}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@ {3115091C-8135-481F-9757-F013A26255E0}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@ {3115091C-8135-481F-9757-F013A26255E0}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@ {3115091C-8135-481F-9757-F013A26255E0}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@ @@ -1007,10 +995,6 @@ Global {764DBE24-C8B3-46E8-BE73-196431353A5D}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@ {764DBE24-C8B3-46E8-BE73-196431353A5D}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@ {764DBE24-C8B3-46E8-BE73-196431353A5D}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@ - {5D7D17B1-18A2-4468-BC26-D9F9800E76D2}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@ - {5D7D17B1-18A2-4468-BC26-D9F9800E76D2}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@ - {5D7D17B1-18A2-4468-BC26-D9F9800E76D2}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@ - {5D7D17B1-18A2-4468-BC26-D9F9800E76D2}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@ {61F9D673-EB5C-47A5-8907-24E034C75EF8}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@ {61F9D673-EB5C-47A5-8907-24E034C75EF8}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@ {61F9D673-EB5C-47A5-8907-24E034C75EF8}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@ diff --git a/win32utils/build.txt b/win32utils/build.txt index 084eb2d01a..221d374879 100644 --- a/win32utils/build.txt +++ b/win32utils/build.txt @@ -1,4 +1,4 @@ -Copyright (C) 2013-2016 Internet Systems Consortium, Inc. ("ISC") +Copyright (C) 2013-2017 Internet Systems Consortium, Inc. ("ISC") This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with this @@ -42,8 +42,7 @@ which is included with Visual Studio and can be downloaded from Microsoft. This file must be in place prior to running Configure. 6) BIND is known to run on the following versions of Windows: -Windows XP (with Service Pack 2 or higher), Vista, 7, 8, Server 2003, -Server 2008, Server 2008R2, and Server 2012. +Windows 7, 8, 8.1, 10, Server 2008R2, Server 2012 and newer. Step 1: Download and build OpenSSL @@ -213,20 +212,14 @@ Step 8: Configuring the BIND build Step 9: Building BIND To build using 'nmake' or older versions of Visual Studio (e.g. - VS 2005 or VS 2008), go to the legacy subdirectory: + VS 2005 or VS 2008) is no longer supported. - cd legacy - - and follow the instructions in win32-build.txt. - - Note: Only 32-bit builds are supported in this mode. - - To build using the Visual Studio GUI in VS 2010 or VS 2012: + To build using the Visual Studio GUI in VS 2010 or newer: open the bind9.sln solution file; this will load the project files for all of the BIND 9 libraries and applications. Select "Build->Batch Build", click "Select All", then click "Build". - To build using MSBuild in VS 2010 or VS 2012: call MSBuild on + To build using MSBuild in VS 2010 or newer: call MSBuild on the bind9.sln solution file: msbuild /t:Build /p:Configuration=Release bind9.sln diff --git a/win32utils/legacy/BINDBuild.dsw.in b/win32utils/legacy/BINDBuild.dsw.in deleted file mode 100644 index 0a302c49eb..0000000000 --- a/win32utils/legacy/BINDBuild.dsw.in +++ /dev/null @@ -1,1522 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "BINDInstall"="..\..\bin\win32\BINDInstall\BINDInstall.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "libisc"="..\..\lib\isc\win32\libisc.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "libdns"="..\..\lib\dns\win32\libdns.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libisc - End Project Dependency -}}} - -############################################################################### - -Project: "libisccc"="..\..\lib\isccc\win32\libisccc.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libisc - End Project Dependency -}}} - -############################################################################### - -Project: "libisccfg"="..\..\lib\isccfg\win32\libisccfg.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libisc - End Project Dependency - Begin Project Dependency - Project_Dep_Name libdns - End Project Dependency -}}} - -############################################################################### - -Project: "libbind9"="..\..\lib\bind9\win32\libbind9.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libisc - End Project Dependency - Begin Project Dependency - Project_Dep_Name libdns - End Project Dependency - Begin Project Dependency - Project_Dep_Name libisccc - End Project Dependency - Begin Project Dependency - Project_Dep_Name libisccfg - End Project Dependency -}}} - -############################################################################### - -Project: "liblwres"="..\..\lib\lwres\win32\liblwres.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "libirs"="..\..\lib\irs\win32\libirs.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libisc - End Project Dependency - Begin Project Dependency - Project_Dep_Name libdns - End Project Dependency - Begin Project Dependency - Project_Dep_Name libisccfg - End Project Dependency -}}} - -############################################################################### - -Project: "bindevt"="..\..\lib\win32\bindevt\bindevt.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### -@IF TESTS - -Project: "libtests"="..\..\lib\tests\win32\libtests.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libisc - End Project Dependency - Begin Project Dependency - Project_Dep_Name libdns - End Project Dependency -}}} - -@END TESTS -############################################################################### -@IF SAMPLES - -Project: "resolve"="..\..\lib\samples\win32\resolve.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libisc - End Project Dependency - Begin Project Dependency - Project_Dep_Name libdns - End Project Dependency - Begin Project Dependency - Project_Dep_Name libisccfg - End Project Dependency - Begin Project Dependency - Project_Dep_Name libirs - End Project Dependency -}}} - -############################################################################### - -Project: "async"="..\..\lib\samples\win32\async.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libisc - End Project Dependency - Begin Project Dependency - Project_Dep_Name libdns - End Project Dependency - Begin Project Dependency - Project_Dep_Name libisccfg - End Project Dependency -}}} - -############################################################################### - -Project: "gai"="..\..\lib\samples\win32\gai.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libisc - End Project Dependency - Begin Project Dependency - Project_Dep_Name libdns - End Project Dependency - Begin Project Dependency - Project_Dep_Name libisccfg - End Project Dependency - Begin Project Dependency - Project_Dep_Name libirs - End Project Dependency -}}} - -############################################################################### - -Project: "update"="..\..\lib\samples\win32\update.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libisc - End Project Dependency - Begin Project Dependency - Project_Dep_Name libdns - End Project Dependency - Begin Project Dependency - Project_Dep_Name libisccfg - End Project Dependency -}}} - -############################################################################### - -Project: "request"="..\..\lib\samples\win32\request.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libisc - End Project Dependency - Begin Project Dependency - Project_Dep_Name libdns - End Project Dependency - Begin Project Dependency - Project_Dep_Name libisccfg - End Project Dependency -}}} - -############################################################################### - -Project: "nsprobe"="..\..\lib\samples\win32\nsprobe.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libisc - End Project Dependency - Begin Project Dependency - Project_Dep_Name libdns - End Project Dependency - Begin Project Dependency - Project_Dep_Name libisccfg - End Project Dependency -}}} - -@END SAMPLES -############################################################################### - -Project: "named"="..\..\bin\named\win32\named.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libisc - End Project Dependency - Begin Project Dependency - Project_Dep_Name libdns - End Project Dependency - Begin Project Dependency - Project_Dep_Name libisccc - End Project Dependency - Begin Project Dependency - Project_Dep_Name libisccfg - End Project Dependency - Begin Project Dependency - Project_Dep_Name libbind9 - End Project Dependency - Begin Project Dependency - Project_Dep_Name liblwres - End Project Dependency -}}} - -############################################################################### - -Project: "rndcutil"="..\..\bin\rndc\win32\rndcutil.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "rndc"="..\..\bin\rndc\win32\rndc.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libisc - End Project Dependency - Begin Project Dependency - Project_Dep_Name libdns - End Project Dependency - Begin Project Dependency - Project_Dep_Name libisccc - End Project Dependency - Begin Project Dependency - Project_Dep_Name libisccfg - End Project Dependency - Begin Project Dependency - Project_Dep_Name libbind9 - End Project Dependency - Begin Project Dependency - Project_Dep_Name rndcutil - End Project Dependency -}}} - -############################################################################### - -Project: "delv"="..\..\bin\delv\win32\delv.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libisc - End Project Dependency - Begin Project Dependency - Project_Dep_Name libdns - End Project Dependency - Begin Project Dependency - Project_Dep_Name libisccfg - End Project Dependency - Begin Project Dependency - Project_Dep_Name libirs - End Project Dependency -}}} - -############################################################################### - -Project: "dighost"="..\..\bin\dig\win32\dighost.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "dig"="..\..\bin\dig\win32\dig.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libisc - End Project Dependency - Begin Project Dependency - Project_Dep_Name libdns - End Project Dependency - Begin Project Dependency - Project_Dep_Name libisccc - End Project Dependency - Begin Project Dependency - Project_Dep_Name libisccfg - End Project Dependency - Begin Project Dependency - Project_Dep_Name libbind9 - End Project Dependency - Begin Project Dependency - Project_Dep_Name liblwres - End Project Dependency - Begin Project Dependency - Project_Dep_Name dighost - End Project Dependency -}}} - -############################################################################### - -Project: "host"="..\..\bin\dig\win32\host.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libisc - End Project Dependency - Begin Project Dependency - Project_Dep_Name libdns - End Project Dependency - Begin Project Dependency - Project_Dep_Name libisccc - End Project Dependency - Begin Project Dependency - Project_Dep_Name libisccfg - End Project Dependency - Begin Project Dependency - Project_Dep_Name libbind9 - End Project Dependency - Begin Project Dependency - Project_Dep_Name liblwres - End Project Dependency - Begin Project Dependency - Project_Dep_Name dighost - End Project Dependency -}}} - -############################################################################### - -Project: "nslookup"="..\..\bin\dig\win32\nslookup.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libisc - End Project Dependency - Begin Project Dependency - Project_Dep_Name libdns - End Project Dependency - Begin Project Dependency - Project_Dep_Name libisccc - End Project Dependency - Begin Project Dependency - Project_Dep_Name libisccfg - End Project Dependency - Begin Project Dependency - Project_Dep_Name libbind9 - End Project Dependency - Begin Project Dependency - Project_Dep_Name liblwres - End Project Dependency - Begin Project Dependency - Project_Dep_Name dighost - End Project Dependency -}}} - -############################################################################### - -Project: "dnssectool"="..\..\bin\dnssec\win32\dnssectool.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "keygen"="..\..\bin\dnssec\win32\keygen.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libisc - End Project Dependency - Begin Project Dependency - Project_Dep_Name libdns - End Project Dependency - Begin Project Dependency - Project_Dep_Name dnssectool - End Project Dependency -}}} - -############################################################################### - -Project: "signzone"="..\..\bin\dnssec\win32\signzone.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libisc - End Project Dependency - Begin Project Dependency - Project_Dep_Name libdns - End Project Dependency - Begin Project Dependency - Project_Dep_Name dnssectool - End Project Dependency -}}} - -############################################################################### - -Project: "importkey"="..\..\bin\dnssec\win32\importkey.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libisc - End Project Dependency - Begin Project Dependency - Project_Dep_Name libdns - End Project Dependency - Begin Project Dependency - Project_Dep_Name dnssectool - End Project Dependency -}}} - -############################################################################### - -Project: "keyfromlabel"="..\..\bin\dnssec\win32\keyfromlabel.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libisc - End Project Dependency - Begin Project Dependency - Project_Dep_Name libdns - End Project Dependency - Begin Project Dependency - Project_Dep_Name dnssectool - End Project Dependency -}}} - -############################################################################### - -Project: "dsfromkey"="..\..\bin\dnssec\win32\dsfromkey.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libisc - End Project Dependency - Begin Project Dependency - Project_Dep_Name libdns - End Project Dependency - Begin Project Dependency - Project_Dep_Name dnssectool - End Project Dependency -}}} - -############################################################################### - -Project: "revoke"="..\..\bin\dnssec\win32\revoke.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libisc - End Project Dependency - Begin Project Dependency - Project_Dep_Name libdns - End Project Dependency - Begin Project Dependency - Project_Dep_Name dnssectool - End Project Dependency -}}} - -############################################################################### - -Project: "settime"="..\..\bin\dnssec\win32\settime.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libisc - End Project Dependency - Begin Project Dependency - Project_Dep_Name libdns - End Project Dependency - Begin Project Dependency - Project_Dep_Name dnssectool - End Project Dependency -}}} - -############################################################################### - -Project: "verify"="..\..\bin\dnssec\win32\verify.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libisc - End Project Dependency - Begin Project Dependency - Project_Dep_Name libdns - End Project Dependency - Begin Project Dependency - Project_Dep_Name dnssectool - End Project Dependency -}}} - -############################################################################### - -Project: "arpaname"="..\..\bin\tools\win32\arpaname.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libisc - End Project Dependency -}}} - -############################################################################### - -Project: "journalprint"="..\..\bin\tools\win32\journalprint.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libisc - End Project Dependency - Begin Project Dependency - Project_Dep_Name libdns - End Project Dependency -}}} - -############################################################################### - -Project: "mdig"="..\..\bin\tools\win32\mdig.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libisc - End Project Dependency - Begin Project Dependency - Project_Dep_Name libdns - End Project Dependency - Begin Project Dependency - Project_Dep_Name libbind9 - End Project Dependency -}}} - -############################################################################### - -Project: "nsec3hash"="..\..\bin\tools\win32\nsec3hash.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libisc - End Project Dependency - Begin Project Dependency - Project_Dep_Name libdns - End Project Dependency -}}} - -############################################################################### - -Project: "rrchecker"="..\..\bin\tools\win32\rrchecker.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libisc - End Project Dependency - Begin Project Dependency - Project_Dep_Name libdns - End Project Dependency -}}} - -############################################################################### - -Project: "genrandom"="..\..\bin\tools\win32\genrandom.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libisc - End Project Dependency -}}} - -############################################################################### - -Project: "ischmacfixup"="..\..\bin\tools\win32\ischmacfixup.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libisc - End Project Dependency -}}} - -############################################################################### - -Project: "nsupdate"="..\..\bin\nsupdate\win32\nsupdate.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libisc - End Project Dependency - Begin Project Dependency - Project_Dep_Name libdns - End Project Dependency - Begin Project Dependency - Project_Dep_Name libisccc - End Project Dependency - Begin Project Dependency - Project_Dep_Name libisccfg - End Project Dependency - Begin Project Dependency - Project_Dep_Name libbind9 - End Project Dependency - Begin Project Dependency - Project_Dep_Name liblwres - End Project Dependency -}}} - -############################################################################### - -Project: "checktool"="..\..\bin\check\win32\checktool.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "checkconf"="..\..\bin\check\win32\checkconf.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libisc - End Project Dependency - Begin Project Dependency - Project_Dep_Name libdns - End Project Dependency - Begin Project Dependency - Project_Dep_Name libisccc - End Project Dependency - Begin Project Dependency - Project_Dep_Name libisccfg - End Project Dependency - Begin Project Dependency - Project_Dep_Name libbind9 - End Project Dependency - Begin Project Dependency - Project_Dep_Name checktool - End Project Dependency -}}} - -############################################################################### - -Project: "checkzone"="..\..\bin\check\win32\checkzone.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libisc - End Project Dependency - Begin Project Dependency - Project_Dep_Name libdns - End Project Dependency - Begin Project Dependency - Project_Dep_Name libisccc - End Project Dependency - Begin Project Dependency - Project_Dep_Name libisccfg - End Project Dependency - Begin Project Dependency - Project_Dep_Name checktool - End Project Dependency -}}} - -############################################################################### - -Project: "confgentool"="..\..\bin\confgen\win32\confgentool.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "rndcconfgen"="..\..\bin\confgen\win32\rndcconfgen.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libisc - End Project Dependency - Begin Project Dependency - Project_Dep_Name libdns - End Project Dependency - Begin Project Dependency - Project_Dep_Name libisccc - End Project Dependency - Begin Project Dependency - Project_Dep_Name libisccfg - End Project Dependency - Begin Project Dependency - Project_Dep_Name libbind9 - End Project Dependency - Begin Project Dependency - Project_Dep_Name confgentool - End Project Dependency -}}} - -############################################################################### - -Project: "ddnsconfgen"="..\..\bin\confgen\win32\ddnsconfgen.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libisc - End Project Dependency - Begin Project Dependency - Project_Dep_Name libdns - End Project Dependency - Begin Project Dependency - Project_Dep_Name confgentool - End Project Dependency -}}} - -############################################################################### -@IF PKCS11 - -Project: "pk11keygen"="..\..\bin\pkcs11\win32\pk11keygen.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libisc - End Project Dependency -}}} - -############################################################################### - -Project: "pk11list"="..\..\bin\pkcs11\win32\pk11list.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libisc - End Project Dependency -}}} - -############################################################################### - -Project: "pk11destroy"="..\..\bin\pkcs11\win32\pk11destroy.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libisc - End Project Dependency -}}} - -############################################################################### - -Project: "pk11tokens"="..\..\bin\pkcs11\win32\pk11tokens.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libisc - End Project Dependency -}}} - -@END PKCS11 -############################################################################### -@IF TESTS -@IF ATOMIC -Project: "t_atomic"="..\..\bin\tests\atomic\win32\t_atomic.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libisc - End Project Dependency - Begin Project Dependency - Project_Dep_Name libdns - End Project Dependency - Begin Project Dependency - Project_Dep_Name libtests - End Project Dependency -}}} - -@END ATOMIC -############################################################################### - -Project: "t_db"="..\..\bin\tests\db\win32\t_db.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libisc - End Project Dependency - Begin Project Dependency - Project_Dep_Name libdns - End Project Dependency - Begin Project Dependency - Project_Dep_Name libisccfg - End Project Dependency - Begin Project Dependency - Project_Dep_Name libtests - End Project Dependency -}}} - -############################################################################### -Project: "t_dst"="..\..\bin\tests\dst\win32\t_dst.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libisc - End Project Dependency - Begin Project Dependency - Project_Dep_Name libdns - End Project Dependency - Begin Project Dependency - Project_Dep_Name libtests - End Project Dependency -}}} - -############################################################################### -Project: "t_master"="..\..\bin\tests\master\win32\t_master.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libisc - End Project Dependency - Begin Project Dependency - Project_Dep_Name libdns - End Project Dependency - Begin Project Dependency - Project_Dep_Name libtests - End Project Dependency -}}} - -############################################################################### -Project: "t_mem"="..\..\bin\tests\mem\win32\t_mem.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libisc - End Project Dependency - Begin Project Dependency - Project_Dep_Name libtests - End Project Dependency -}}} - -############################################################################### -Project: "t_hashes"="..\..\bin\tests\hashes\win32\t_hashes.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libisc - End Project Dependency - Begin Project Dependency - Project_Dep_Name libtests - End Project Dependency -}}} - -############################################################################### -Project: "t_names"="..\..\bin\tests\names\win32\t_names.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libisc - End Project Dependency - Begin Project Dependency - Project_Dep_Name libdns - End Project Dependency - Begin Project Dependency - Project_Dep_Name libtests - End Project Dependency -}}} - -############################################################################### -Project: "t_rbt"="..\..\bin\tests\rbt\win32\t_rbt.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libisc - End Project Dependency - Begin Project Dependency - Project_Dep_Name libdns - End Project Dependency - Begin Project Dependency - Project_Dep_Name libtests - End Project Dependency -}}} - -############################################################################### -Project: "t_resolver"="..\..\bin\tests\resolver\win32\t_resolver.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libisc - End Project Dependency - Begin Project Dependency - Project_Dep_Name libdns - End Project Dependency - Begin Project Dependency - Project_Dep_Name libtests - End Project Dependency -}}} - -############################################################################### -Project: "t_sockaddr"="..\..\bin\tests\sockaddr\win32\t_sockaddr.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libisc - End Project Dependency - Begin Project Dependency - Project_Dep_Name libtests - End Project Dependency -}}} - -############################################################################### -Project: "t_tasks"="..\..\bin\tests\tasks\win32\t_tasks.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libisc - End Project Dependency - Begin Project Dependency - Project_Dep_Name libtests - End Project Dependency -}}} - -############################################################################### -Project: "t_timers"="..\..\bin\tests\timers\win32\t_timers.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libisc - End Project Dependency - Begin Project Dependency - Project_Dep_Name libtests - End Project Dependency -}}} - -@END TESTS -############################################################################### -@IF XTESTS - -Project: "backtrace_test"="..\..\bin\tests\win32\backtrace_test.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libisc - End Project Dependency -}}} - -############################################################################### - -Project: "inter_test"="..\..\bin\tests\win32\inter_test.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libisc - End Project Dependency -}}} - -############################################################################### - -Project: "rwlock_test"="..\..\bin\tests\win32\rwlock_test.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libisc - End Project Dependency -}}} - -############################################################################### - -Project: "shutdown_test"="..\..\bin\tests\win32\shutdown_test.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libisc - End Project Dependency -}}} - -############################################################################### - -Project: "sock_test"="..\..\bin\tests\win32\sock_test.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libisc - End Project Dependency -}}} - -############################################################################### - -Project: "task_test"="..\..\bin\tests\win32\task_test.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libisc - End Project Dependency -}}} - -############################################################################### - -Project: "timer_test"="..\..\bin\tests\win32\timer_test.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libisc - End Project Dependency -}}} - -@END XTESTS -############################################################################### -@IF STESTS - -Project: "makejournal"="..\..\bin\tests\win32\makejournal.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libisc - End Project Dependency - Begin Project Dependency - Project_Dep_Name libdns - End Project Dependency -}}} - -############################################################################### - -Project: "gencheck"="..\..\bin\tests\system\win32\gencheck.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libisc - End Project Dependency -}}} - -############################################################################### - -Project: "lwtest"="..\..\bin\tests\system\win32\lwtest.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libisc - End Project Dependency - Begin Project Dependency - Project_Dep_Name liblwres - End Project Dependency -}}} - -############################################################################### - -Project: "bigkey"="..\..\bin\tests\system\win32\bigkey.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libisc - End Project Dependency - Begin Project Dependency - Project_Dep_Name libdns - End Project Dependency -}}} - -############################################################################### - -Project: "pipequeries"="..\..\bin\tests\system\win32\pipequeries.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libisc - End Project Dependency - Begin Project Dependency - Project_Dep_Name libdns - End Project Dependency -}}} - -############################################################################### - -Project: "keycreate"="..\..\bin\tests\system\win32\keycreate.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libisc - End Project Dependency - Begin Project Dependency - Project_Dep_Name libdns - End Project Dependency -}}} - -############################################################################### - -Project: "keydelete"="..\..\bin\tests\system\win32\keydelete.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libisc - End Project Dependency - Begin Project Dependency - Project_Dep_Name libdns - End Project Dependency -}}} - -############################################################################### - -Project: "feature-test"="..\..\bin\tests\system\win32\feature-test.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libisc - End Project Dependency -}}} - -@END STESTS - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/win32utils/legacy/BuildAll.bat.in b/win32utils/legacy/BuildAll.bat.in deleted file mode 100644 index 0bf263b03a..0000000000 --- a/win32utils/legacy/BuildAll.bat.in +++ /dev/null @@ -1,248 +0,0 @@ -echo off -rem -rem Copyright (C) 2001-2002,2004,2016 Internet Systems Consortium, Inc. ("ISC") -rem -rem This Source Code Form is subject to the terms of the Mozilla Public -rem License, v. 2.0. If a copy of the MPL was not distributed with this -rem file, You can obtain one at http://mozilla.org/MPL/2.0/. - -rem BuildAll.bat -rem This script sets up the files necessary ready to build BIND 9 -rem and then builds all of the binaries that make up the installation kit. -rem This requires perl to be installed on the system. - -rem IMPORTANT NOTE: -rem OpenSSL is a prerequisite for building and running this release of -rem BIND 9. You must fetch the OpenSSL sources yourself from -rem http://www.OpenSSL.org/ and compile it yourself. The code must reside -rem at the same level as the bind 9.2.0 source tree and it's top-level -rem directory be named openssl-0.9.6k. This restriction will be lifted in -rem a future release of BIND 9 for Windows NT/2000/XP. - -echo Setting up the BIND files required for the build - -rem Setup the files -call BuildSetup.bat - -echo Build all of the Library files - -cd ..\..\lib - -cd isc\win32 -nmake /nologo -f libisc.mak CFG="libisc - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -cd ..\.. - -cd dns\win32 -nmake /nologo -f libdns.mak CFG="libdns - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -cd ..\.. - -cd isccfg\win32 -nmake /nologo -f libisccfg.mak CFG="libisccfg - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -cd ..\.. - -cd isccc\win32 -nmake /nologo -f libisccc.mak CFG="libisccc - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -cd ..\.. - -cd bind9\win32 -nmake /nologo -f libbind9.mak CFG="libbind9 - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -cd ..\.. - -cd lwres\win32 -nmake /nologo -f liblwres.mak CFG="liblwres - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -cd ..\.. - -cd irs\win32 -nmake /nologo -f libirs.mak CFG="libirs - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -cd ..\.. - -@IF TESTS -cd tests\win32 -nmake /nologo -f libtests.mak CFG="libtests - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -cd ..\.. -@END TESTS - -@IF SAMPLES -cd samples\win32 -nmake /nologo -f resolve.mak CFG="resolve - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -nmake /nologo -f async.mak CFG="async - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -nmake /nologo -f gai.mak CFG="gai - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -nmake /nologo -f update.mak CFG="update - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -nmake /nologo -f request.mak CFG="request - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -nmake /nologo -f nsprobe.mak CFG="nsprobe - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -cd ..\.. -@END SAMPLES - -rem This is the DLL required for the event Viewer - -cd win32\bindevt -nmake /nologo -f bindevt.mak CFG="bindevt - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -cd ..\.. - -cd .. - -echo Now build the apps - -cd bin - -cd named\win32 -nmake /nologo -f named.mak CFG="named - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" - -cd ..\.. - -cd rndc\win32 -nmake /nologo -f rndc.mak CFG="rndc - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" - -cd ..\.. - -cd confgen\win32 -nmake /nologo -f rndcconfgen.mak CFG="rndcconfgen - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -nmake /nologo -f ddnsconfgen.mak CFG="ddnsconfgen - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" - -cd ..\.. - -cd dig\win32 -nmake /nologo -f dig.mak CFG="dig - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -nmake /nologo /nologo -f host.mak CFG="host - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -nmake /nologo -f nslookup.mak CFG="nslookup - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -cd ..\.. - -cd delv\win32 -nmake /nologo -f delv.mak CFG="delv - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -cd ..\.. - -cd nsupdate\win32 -nmake /nologo -f nsupdate.mak CFG="nsupdate - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -cd ..\.. - -cd check\win32 -nmake /nologo -f checkconf.mak CFG="checkconf - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -nmake /nologo -f checkzone.mak CFG="checkzone - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -cd ..\.. - -cd dnssec\win32 -nmake /nologo -f keygen.mak CFG="keygen - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -nmake /nologo -f signzone.mak CFG="signzone - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -nmake /nologo -f dsfromkey.mak CFG="dsfromkey - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -nmake /nologo -f keyfromlabel.mak CFG="keyfromlabel - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -nmake /nologo -f revoke.mak CFG="revoke - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -nmake /nologo -f settime.mak CFG="settime - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -nmake /nologo -f verify.mak CFG="verify - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -nmake /nologo -f importkey.mak CFG="importkey - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -cd ..\.. - -@IF PKCS11 -cd pkcs11\win32 -nmake /nologo -f pk11keygen.mak CFG="pk11keygen - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -nmake /nologo -f pk11list.mak CFG="pk11list - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -nmake /nologo -f pk11destroy.mak CFG="pk11destroy - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -nmake /nologo -f pk11tokens.mak CFG="pk11tokens - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -cd ..\.. -@END PKCS11 - -cd tools\win32 -nmake /nologo -f arpaname.mak CFG="arpaname - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -nmake /nologo -f genrandom.mak CFG="genrandom - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -nmake /nologo -f nsec3hash.mak CFG="nsec3hash - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -nmake /nologo -f journalprint.mak CFG="journalprint - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -nmake /nologo -f ischmacfixup.mak CFG="ischmacfixup - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -nmake /nologo -f rrchecker.mak CFG="rrchecker - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -nmake /nologo -f mdig.mak CFG="mdig - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -cd ..\.. - -@IF TESTS -cd tests -@IF ATOMIC -cd atomic\win32 -nmake /nologo -f t_atomic.mak CFG="t_atomic - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -cd ..\.. -@END ATOMIC - -cd db\win32 -nmake /nologo -f t_db.mak CFG="t_db - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -cd ..\.. - -cd dst\win32 -nmake /nologo -f t_dst.mak CFG="t_dst - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -cd ..\.. - -cd master\win32 -nmake /nologo -f t_master.mak CFG="t_master - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -cd ..\.. - -cd mem\win32 -nmake /nologo -f t_mem.mak CFG="t_mem - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -cd ..\.. - -cd hashes\win32 -nmake /nologo -f t_hashes.mak CFG="t_hashes - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -cd ..\.. - -cd names\win32 -nmake /nologo -f t_names.mak CFG="t_names - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -cd ..\.. - -cd rbt\win32 -nmake /nologo -f t_rbt.mak CFG="t_rbt - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -cd ..\.. - -cd resolver\win32 -nmake /nologo -f t_resolver.mak CFG="t_resolver - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -cd ..\.. - -cd sockaddr\win32 -nmake /nologo -f t_sockaddr.mak CFG="t_sockaddr - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -cd ..\.. - -cd tasks\win32 -nmake /nologo -f t_tasks.mak CFG="t_tasks - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -cd ..\.. - -cd timers\win32 -nmake /nologo -f t_timers.mak CFG="t_timers - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -cd ..\.. - -cd .. -@END TESTS - -@IF XTESTS -cd tests\win32 -nmake /nologo -f backtrace_test.mak CFG="backtrace_test - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -nmake /nologo -f inter_test.mak CFG="inter_test - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -nmake /nologo -f rwlock_test.mak CFG="rwlock_test - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -nmake /nologo -f shutdown_test.mak CFG="shutdown_test - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -nmake /nologo -f sock_test.mak CFG="sock_test - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -nmake /nologo -f task_test.mak CFG="task_test - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -nmake /nologo -f timer_test.mak CFG="timer_test - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -cd ..\.. -@END XTESTS - -@IF STESTS -cd tests\win32 -nmake /nologo -f makejournal.mak CFG="makejournal - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -cd ..\system\win32 -nmake /nologo -f gencheck.mak CFG="gencheck - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -nmake /nologo -f lwtest.mak CFG="lwtest - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -nmake /nologo -f bigkey.mak CFG="bigkey - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -nmake /nologo -f pipequeries.mak CFG="pipequeries - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -nmake /nologo -f keycreate.mak CFG="keycreate - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -nmake /nologo -f keydelete.mak CFG="keydelete - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -nmake /nologo -f feature-test.mak CFG="feature-test - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -cd ..\..\.. -@END STESTS - -rem This is the BIND 9 Installer - -cd win32\BINDInstall -nmake /nologo -f BINDInstall.mak CFG="BINDInstall - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -cd ..\.. - -cd .. - -cd win32utils\legacy - -call BuildPost.bat - -echo Done. - -rem exit here. diff --git a/win32utils/legacy/BuildPost.bat.in b/win32utils/legacy/BuildPost.bat.in deleted file mode 100644 index a775f9f260..0000000000 --- a/win32utils/legacy/BuildPost.bat.in +++ /dev/null @@ -1,52 +0,0 @@ -echo off -rem -rem Copyright (C) 2005,2013,2014 Internet Systems Consortium, Inc. ("ISC") -rem -rem Permission to use, copy, modify, and distribute this software for any -rem purpose with or without fee is hereby granted, provided that the above -rem copyright notice and this permission notice appear in all copies. -rem -rem THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH -rem REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY -rem AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, -rem INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM -rem LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE -rem OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -rem PERFORMANCE OF THIS SOFTWARE. - -rem BuildPost.bat -rem This script does the final stages if BINDBuild.dsw is used. - -echo Copying named-checkzone.exe to named-compilezone.exe - -copy /Y ..\..\Build\Release\named-checkzone.exe ..\..\Build\Release\named-compilezone.exe -if exist ..\..\Build\Debug\named-checkzone.exe copy /Y ..\..\Build\Debug\named-checkzone.exe ..\..\Build\Debug\named-compilezone.exe -if exist ..\..\Build\Debug\named-checkzone.ilk copy /Y ..\..\Build\Debug\named-checkzone.ilk ..\..\Build\Debug\named-compilezone.ilk - -copy /Y ..\..\Build\Release\ddns-confgen.exe ..\..\Build\Release\tsig-keygen.exe -if exist ..\..\Build\Debug\ddns-confgen.exe copy /Y ..\..\Build\Debug\ddns-confgen.exe ..\..\Build\Debug\tsig-keygen.exe -if exist ..\..\Build\Debug\ddns-confgen.ilk copy /Y ..\..\Build\Debug\ddns-confgen.ilk ..\..\Build\Debug\tsig-keygen.ilk - -@IF PYTHON -echo Copying python scripts - -copy /Y ..\..\bin\python\dnssec-checkds.py ..\..\Build\Release\dnssec-checkds.py -copy /Y ..\..\bin\python\dnssec-checkds.py ..\..\Build\Debug\dnssec-checkds.py -copy /Y ..\..\bin\python\dnssec-coverage.py ..\..\Build\Release\dnssec-coverage.py -copy /Y ..\..\bin\python\dnssec-coverage.py ..\..\Build\Debug\dnssec-coverage.py -copy /Y ..\..\bin\python\dnssec-keymgr.py ..\..\Build\Release\dnssec-keymgr.py -copy /Y ..\..\bin\python\dnssec-keymgr.py ..\..\Build\Debug\dnssec-keymgr.py - -echo Build python parser - -cd ..\..\bin\python\isc -@PYTHON@ policy.py parse \dev\nul -set PYTHONPATH=. -@PYTHON@ -m parsetab -cd ..\..\..\win32utils\legacy - -@END PYTHON - -echo Done. - -rem exit here. diff --git a/win32utils/legacy/BuildSetup.bat.in b/win32utils/legacy/BuildSetup.bat.in deleted file mode 100644 index 7b43aa52d2..0000000000 --- a/win32utils/legacy/BuildSetup.bat.in +++ /dev/null @@ -1,185 +0,0 @@ -echo off -rem -rem Copyright (C) 2001-2002,2004,2005,2016 Internet Systems Consortium, Inc. ("ISC") -rem -rem This Source Code Form is subject to the terms of the Mozilla Public -rem License, v. 2.0. If a copy of the MPL was not distributed with this -rem file, You can obtain one at http://mozilla.org/MPL/2.0/. - -rem BuildSetup.bat -rem This script sets up the files necessary ready to build BIND 9. -rem This requires perl to be installed on the system. - -echo Generate header files for lib/dns - -cd ..\..\lib\dns -cd win32 -nmake /nologo /f gen.mak CFG="gen - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" -cd .. -gen -s . -t > include/dns/enumtype.h -gen -s . -c > include/dns/enumclass.h -gen -s . -i -P ./rdata/rdatastructpre.h -S ./rdata/rdatastructsuf.h > include/dns/rdatastruct.h -gen -s . > code.h -cd ..\..\win32utils\legacy - -rem Make sure that the Build directories are there. - -if NOT Exist ..\..\Build mkdir ..\..\Build -if NOT Exist ..\..\Build\Release mkdir ..\..\Build\Release -if NOT Exist ..\..\Build\Debug mkdir ..\..\Build\Debug - -echo Copying the ARM and the Installation Notes. - -copy ..\..\COPYRIGHT ..\..\Build\Release -copy ..\..\COPYRIGHT ..\..\Build\Debug -copy ..\..\README ..\..\Build\Release -copy ..\..\HISTORY ..\..\Build\Release -copy ..\readme1st.txt ..\..\Build\Release -copy ..\index.html ..\..\Build\Release -copy ..\..\doc\arm\*.html ..\..\Build\Release -copy ..\..\doc\arm\notes.pdf ..\..\Build\Release -copy ..\..\doc\arm\Bv9ARM.pdf ..\..\Build\Release -copy ..\..\CHANGES ..\..\Build\Release -if Exist ..\..\CHANGES.SE copy ..\..\CHANGES.SE ..\..\Build\Release -copy ..\..\FAQ ..\..\Build\Release - -echo Copying the standalone manual pages. - -copy ..\..\bin\named\named.html ..\..\Build\Release -copy ..\..\bin\named\named.conf.html ..\..\Build\Release -copy ..\..\bin\named\lwresd.html ..\..\Build\Release -copy ..\..\bin\rndc\*.html ..\..\Build\Release -copy ..\..\bin\confgen\*.html ..\..\Build\Release -copy ..\..\bin\dig\*.html ..\..\Build\Release -copy ..\..\bin\delv\*.html ..\..\Build\Release -copy ..\..\bin\nsupdate\*.html ..\..\Build\Release -copy ..\..\bin\check\*.html ..\..\Build\Release -copy ..\..\bin\dnssec\dnssec-keygen.html ..\..\Build\Release -copy ..\..\bin\dnssec\dnssec-signzone.html ..\..\Build\Release -copy ..\..\bin\dnssec\dnssec-dsfromkey.html ..\..\Build\Release -copy ..\..\bin\dnssec\dnssec-keyfromlabel.html ..\..\Build\Release -copy ..\..\bin\dnssec\dnssec-settime.html ..\..\Build\Release -copy ..\..\bin\dnssec\dnssec-revoke.html ..\..\Build\Release -copy ..\..\bin\dnssec\dnssec-verify.html ..\..\Build\Release -copy ..\..\bin\dnssec\dnssec-importkey.html ..\..\Build\Release -@IF PYTHON -copy ..\..\bin\python\dnssec-checkds.html ..\..\Build\Release -copy ..\..\bin\python\dnssec-coverage.html ..\..\Build\Release -copy ..\..\bin\python\dnssec-keymgr.html ..\..\Build\Release -@END PYTHON -@IF PKCS11 -copy ..\..\bin\pkcs11\pkcs11-keygen.html ..\..\Build\Release -copy ..\..\bin\pkcs11\pkcs11-list.html ..\..\Build\Release -copy ..\..\bin\pkcs11\pkcs11-destroy.html ..\..\Build\Release -copy ..\..\bin\pkcs11\pkcs11-tokens.html ..\..\Build\Release -@END PKCS11 -copy ..\..\bin\tools\arpaname.html ..\..\Build\Release -copy ..\..\bin\tools\genrandom.html ..\..\Build\Release -copy ..\..\bin\tools\isc-hmac-fixup.html ..\..\Build\Release -copy ..\..\bin\tools\mdig.html ..\..\Build\Release -copy ..\..\bin\tools\named-journalprint.html ..\..\Build\Release -copy ..\..\bin\tools\named-rrchecker.html ..\..\Build\Release -copy ..\..\bin\tools\nsec3hash.html ..\..\Build\Release - -echo Copying the migration notes. - -copy ..\..\doc\misc\migration ..\..\Build\Release -copy ..\..\doc\misc\migration-4to9 ..\..\Build\Release - -@IF OPENSSL -echo Copying the OpenSSL DLL and LICENSE. - -copy @OPENSSL_DLL@ ..\..\Build\Release\ -copy @OPENSSL_DLL@ ..\..\Build\Debug\ -copy @OPENSSL_PATH@\LICENSE ..\..\Build\Release\OpenSSL-LICENSE -copy @OPENSSL_PATH@\LICENSE ..\..\Build\Debug\OpenSSL-LICENSE -@END OPENSSL - -@IF LIBXML2 -echo Copying the libxml DLL. - -copy @LIBXML2_DLL@ ..\..\Build\Release\ -copy @LIBXML2_DLL@ ..\..\Build\Debug\ -@END LIBXML2 - -@IF GSSAPI -echo Copying the GSSAPI and KRB5 DLLs. - -copy @GSSAPI_DLL@ ..\..\Build\Release\ -copy @GSSAPI_DLL@ ..\..\Build\Debug\ -copy @KRB5_DLL@ ..\..\Build\Release\ -copy @KRB5_DLL@ ..\..\Build\Debug\ -copy @COMERR_DLL@ ..\..\Build\Release\ -copy @COMERR_DLL@ ..\..\Build\Debug\ -copy @K5SPRT_DLL@ ..\..\Build\Release\ -copy @K5SPRT_DLL@ ..\..\Build\Debug\ -copy @WSHELP_DLL@ ..\..\Build\Release\ -copy @WSHELP_DLL@ ..\..\Build\Debug\ -@END GSSAPI - -@IF GEOIP -echo Copying the GeoIP DLL. - -copy @GEOIP_DLL@ ..\..\Build\Release\ -copy @GEOIP_DLL@ ..\..\Build\Debug\ -@END GEOIP - -@IF IDNKIT -echo Copying the IDN kit DLL. - -copy @IDN_DLL@ ..\..\Build\Release\ -copy @IDN_DLL@ ..\..\Build\Debug\ -copy @ICONV_DLL@ ..\..\Build\Release\ -copy @ICONV_DLL@ ..\..\Build\Debug\ -@END IDNKIT - -@IF ZLIB -echo Copying the zlib DLL. - -copy @ZLIB_DLL@ ..\..\Build\Release\ -copy @ZLIB_DLL@ ..\..\Build\Debug\ -@END ZLIB - -echo Copying the redistributable runtime object. - -rem -rem Use /Y so we always have the current version of the installer. -rem - -copy /Y @VCREDIST_PATH@ ..\..\Build\Release\ -copy /Y @VCREDIST_PATH@ ..\..\Build\Debug\ - -echo Copying install files (flags and file list). - -copy ..\InstallFlags ..\..\Build\Release\ -copy ..\InstallFlags ..\..\Build\Debug\ -copy ..\InstallFiles ..\..\Build\Release\ -copy ..\InstallFiles ..\..\Build\Debug\ - -@IF TESTS -cd ..\..\bin\tests\dst -copy "Kdh.+002+18602.key.in" "Kdh.+002+18602.key" -copy "Kdh.+002+18602.private.in" "Kdh.+002+18602.private" -copy "Kdh.+002+48957.key.in" "Kdh.+002+48957.key" -copy "Kdh.+002+48957.private.in" "Kdh.+002+48957.private" -copy "Ktest.+001+00002.key.in" "Ktest.+001+00002.key" -copy "Ktest.+001+54622.key.in" "Ktest.+001+54622.key" -copy "Ktest.+001+54622.private.in" "Ktest.+001+54622.private" -copy "Ktest.+003+23616.key.in" "Ktest.+003+23616.key" -copy "Ktest.+003+23616.private.in" "Ktest.+003+23616.private" -copy "Ktest.+003+49667.key.in" "Ktest.+003+49667.key" -copy dst_2_data.in dst_2_data -copy t2_data_1.in t2_data_1 -copy t2_data_2.in t2_data_2 -copy t2_dsasig.in t2_dsasig -copy t2_rsasig.in t2_rsasig -cd ..\..\..\win32utils\legacy -@END TESTS - -echo Running Message Compiler - -cd ..\..\lib\win32\bindevt -mc bindevt.mc -cd ..\..\..\win32utils\legacy - -rem Done diff --git a/win32utils/legacy/makedefs.pl b/win32utils/legacy/makedefs.pl deleted file mode 100644 index 7f3e884c8b..0000000000 --- a/win32utils/legacy/makedefs.pl +++ /dev/null @@ -1,162 +0,0 @@ -#!/usr/bin/perl -# -# Copyright (C) 2001, 2004, 2007, 2009, 2012-2014, 2016 Internet Systems Consortium, Inc. ("ISC") -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -# $Id$ - -# makedefs.pl -# This script goes through all of the lib header files and creates a .def file -# for each DLL for Win32. It recurses as necessary through the subdirectories -# -# This program should only be run if it is necessary to regenerate -# the .def files. Normally these files should be updated by hand, adding -# new functions to the end and removing obsolete ones. -# If you do regenerate them you will also need to modify them by hand to -# to pick up those routines not detected by this program (like openlog). -# -# Search String: ^(([_a-z0-9])*( ))*prefix_[_a-z0-9]+_[a-z0-9]+( )*\( -# List of directories - -@prefixlist = ("isc", "isccfg", "dns", "isccc", "bind9", "lwres", "irs"); -@iscdirlist = ("isc/include/isc","isc/win32/include/isc","isc/include/pk11", - "isc/include/pkcs11","isc/win32/include/pkcs11"); -@iscprefixlist = ("isc", "pk11", "pkcs"); - -@isccfgdirlist = ("isccfg/include/isccfg"); -@isccfgprefixlist = ("cfg"); - -@iscccdirlist = ("isccc/include/isccc"); -@iscccprefixlist = ("isccc"); - -@dnsdirlist = ("dns/include/dns","dns/include/dst"); -@dnsprefixlist = ("dns", "dst"); - -@lwresdirlist = ("lwres/include/lwres","lwres/win32/include/lwres"); -@lwresprefixlist = ("lwres"); - -@bind9dirlist = ("bind9/include/bind9"); -@bind9prefixlist = ("bind9"); - -@irsdirlist = ("irs/include/irs","irs/win32/include/irs"); -@irsprefixlist = ("irs"); - -# Run the changes for each directory in the directory list - -$ind = 0; -createoutfile($iscprefixlist[0]); -foreach $dir (@iscdirlist) { - createdeffile($dir, $iscprefixlist[$ind]); - $ind++; -} -close OUTDEFFILE; - -$ind = 0; -createoutfile($isccfgprefixlist[0]); -foreach $dir (@isccfgdirlist) { - createdeffile($dir, $isccfgprefixlist[$ind]); - $ind++; -} -close OUTDEFFILE; - -$ind = 0; -createoutfile($dnsprefixlist[0]); -foreach $dir (@dnsdirlist) { - createdeffile($dir, $dnsprefixlist[$ind]); - $ind++; -} -close OUTDEFFILE; - -$ind = 0; -createoutfile($iscccprefixlist[0]); -foreach $dir (@iscccdirlist) { - createdeffile($dir, $iscccprefixlist[$ind]); - $ind++; -} -close OUTDEFFILE; - -$ind = 0; -createoutfile($lwresprefixlist[0]); -foreach $dir (@lwresdirlist) { - createdeffile($dir, $lwresprefixlist[$ind]); - $ind++; -} -close OUTDEFFILE; - -$ind = 0; -createoutfile($bind9prefixlist[0]); -foreach $dir (@bind9dirlist) { - createdeffile($dir, $bind9prefixlist[$ind]); - $ind++; -} -close OUTDEFFILE; - -$ind = 0; -createoutfile($irsprefixlist[0]); -foreach $dir (@irsdirlist) { - createdeffile($dir, $irsprefixlist[$ind]); - $ind++; -} -close OUTDEFFILE; - -exit; - -# -# Subroutines -# -sub createdeffile { - $xdir = $_[0]; - - # - # Get the List of files in the directory to be processed. - # - #^(([_a-z0-9])*( ))*prefix_[_a-z]+_[a-z]+( )*\( - $prefix = $_[1]; - $pattern = "\^\(\(\[\_a\-z0\-9\]\)\*\( \)\)\*\(\\*\( \)\+\)\*$prefix"; - $pattern = "$pattern\_\[\_a\-z0\-9\]\+_\[a\-z0\-9\]\+\( \)\*\\\("; - - opendir(DIR,$xdir) || die "No Directory: $!"; - @files = grep(/\.h$/i, readdir(DIR)); - closedir(DIR); - - foreach $filename (sort @files) { - # - # Open the file and locate the pattern. - # - open (HFILE, "$xdir/$filename") || - die "Can't open file $filename : $!"; - - while () { - if(/$pattern/) { - $func = $&; - chop($func); - $space = rindex($func, " ") + 1; - if($space >= 0) { - # strip out return values - $func = substr($func, $space, 100); - } - print OUTDEFFILE "$func\n"; - } - } - # Set up the Patterns - close(HFILE); - } -} - -# This is the routine that applies the changes - -# output the result to the platform specific directory. -sub createoutfile { - $outfile = "lib$_[0].def"; - - open (OUTDEFFILE, ">$outfile") - || die "Can't open output file $outfile: $!"; - print OUTDEFFILE "LIBRARY lib$_[0]\n"; - print OUTDEFFILE "\n"; - print OUTDEFFILE "; Exported Functions\n"; - print OUTDEFFILE "EXPORTS\n"; - print OUTDEFFILE "\n"; -} diff --git a/win32utils/legacy/win32-build.txt b/win32utils/legacy/win32-build.txt deleted file mode 100644 index 2c27c242be..0000000000 --- a/win32utils/legacy/win32-build.txt +++ /dev/null @@ -1,105 +0,0 @@ -Copyright (C) 2001, 2002, 2004, 2005, 2008, 2009, 2012-2014, 2016 Internet Systems Consortium, Inc. ("ISC") - -This Source Code Form is subject to the terms of the Mozilla Public -License, v. 2.0. If a copy of the MPL was not distributed with this -file, You can obtain one at http://mozilla.org/MPL/2.0/. - - *LEGACY* BIND 9.10 for Win32 Source Build Instructions. 04-Feb-2014 - -Building BIND 9.10 on Windows using legacy compilers (up to Visual -Studio 2008) has the following prerequisites: - -1) Perl, 2) Visual C++ redistributable object, 3) OpenSSL, and -optionally 4) LibXML2, 5) LibGeoIP, and 6) Readline. -See ..\build.txt for more details on these prerequisites. - -If you want to build using Visual C++ 6.0, you'll need some extra -files that are to be found in the Platform SDK (which you will need -to install), namely: - -iphlpapi.h -iptypes.h -ipexport.h -iphlpapi.lib - -You'll also need an updated Iprtrmib.h - using the VC++6.0 one will -get you some compilation errors. You can just overwrite the old one if -you're not using it for any purposes, and maybe keep a backup of it. - -You can copy the header files under VC98\INCLUDE and the library file -under VC98\LIB. I think you can also put them in a separate directory -and add it to the include search list, but I don't know if that can be -made persistent. - -For building on VC++ 7.0 or more recent, no extra files are required. - -The instructions assume a Visual C++ 6.0 compiler with Visual Studio -and Visual Studio Service Pack 3 or later. It may build and work with -earlier versions but it has not been tested. The binaries may be built -and run on any of the following platforms: NT 4.0 Workstation (SP3 or -later), NT 4.0 Server (SP3 or later), Windows 2000 Professional (SP1 -or later), Windows 2000 Server or any kind (SP1 or later), Windows XP, -Windows 2003 Server, Windows Vista, Windows 2008 Server, Windows 7, -Windows 2008 R2 Server, Windows 8, Windows 2012 Server (untested), and -further (untested as not yet available). It will NOT build or run on -Windows 95, Windows 98, etc., or Windows RT platforms. - -BUILDING BIND - -From the command prompt cd to the win32utils\legacy directory under -the BIND9 root: - - cd bind-9.10.0\win32utils\legacy - -If you wish to use nmake from VC++ 6.0 or more recent, run -the BuildAll.bat file: - - BuildAll - -This will do the following: -1) Build the gen application in the lib/dns directory. -2) Run the gen application and build the required lib/dns header - files. -3) Create the Build/Release subdirectory under the root of the BIND - source tree which will hold the binaries being built. -4) Build the libraries, named, application tools like dig, rndc - dnssec tools, installer, checkconf and checkzones programs, - BIND 9 Installer. -5) Copies the release notes and the OpenSSL DLL to the BUILD/Release - directory. -6) Copies the BIND 9 ARM HTML files and the application HTML files - to the Build\Release area. - -If you wish to use the Visual Studio GUI for building, you can just -run the BuildSetup.bat file: - - BuildSetup - -This will create or find and copy into place several files which are -necessary for the build to proceed. It also locates and copies into place -the DLLs for OpenSSL and libxml2. - -Use BINDBuild.dsw (also located in the win32utils\legacy directory) to -open the workspace for all of the BIND9 libraries and applications. If -needed Visual Studio will update the workspace (aka solution) and -project files. Note it is known to give slightly incorrect files on VS -2010 or more recent, for instance BINDInstall is not compiled to use -DLLs. Finally select "Build->Batch Build", click "Select All", then -click "Build". - -After the build has completed, run the BuildPost.bat file: - - BuildPost - -...which does post-build processing. - -Installation is accomplished by running the BINDInstall program. All -DLL's are copied to the Program Files area and all applications -(including BINDInstall which may be necessary for uninstalling BIND 9) -to the bin directory. If BIND 8 has previously been installed on the -system it must be uninstalled first by running it's own BINDInstall -program. The BIND 9 installer does not yet do this. - -All bugs found, whether in the process of building the application or -running BIND or the tools should be reported to the bind9 bugs email -account at bind9-bugs@isc.org.