mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-04 16:45:24 +00:00
Code Issues Releases Wiki Activity

[master] merge several interdependent fixes

Browse Source 
3760.   [bug]           Improve SIT with native PKCS#11 and on Windows.
			[RT #35433]

3759.   [port]          Enable delve on Windows. [RT #35441]

3758.   [port]          Enable export library APIs on windows. [RT #35382]
This commit is contained in:
Evan Hunt
2014-02-26 19:00:05 -08:00
parent 95c3a5e116
commit 98922b2b2b
109 changed files with 7208 additions and 529 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
lib/samples/sample-update.c
View File

@@ -18,6 +18,7 @@
#include <config.h>
#ifndef WIN32
#include <sys/types.h>
#include <sys/socket.h>
@@ -25,14 +26,17 @@
#include <arpa/inet.h>
#include <netdb.h>
#include <unistd.h>
#endif
#include <ctype.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <netdb.h>
#include <isc/buffer.h>
#include <isc/commandline.h>
#include <isc/lex.h>
#include <isc/lib.h>
#include <isc/mem.h>
@@ -101,7 +105,7 @@ main(int argc, char *argv[]) {
isc_boolean_t isdelete;
isc_buffer_t b, *buf;
dns_fixedname_t zname0, pname0, uname0;
size_t namelen;
unsigned int namelen;
dns_name_t *zname = NULL, *uname, *pname;
dns_rdataset_t *rdataset;
dns_rdatalist_t *rdatalist;
@@ -109,30 +113,30 @@ main(int argc, char *argv[]) {
dns_namelist_t updatelist, prereqlist, *prereqlistp = NULL;
isc_mem_t *umctx = NULL;
while ((ch = getopt(argc, argv, "a:k:p:r:z:")) != -1) {
while ((ch = isc_commandline_parse(argc, argv, "a:k:p:r:z:")) != EOF) {
switch (ch) {
case 'k':
keyfilename = optarg;
keyfilename = isc_commandline_argument;
break;
case 'a':
auth_server = optarg;
auth_server = isc_commandline_argument;
break;
case 'p':
prereqstr = optarg;
prereqstr = isc_commandline_argument;
break;
case 'r':
recursive_server = optarg;
recursive_server = isc_commandline_argument;
break;
case 'z':
zonenamestr = optarg;
zonenamestr = isc_commandline_argument;
break;
default:
usage();
}
}
argc -= optind;
argv += optind;
argc -= isc_commandline_index;
argv += isc_commandline_index;
if (argc < 2)
usage();
@@ -191,7 +195,7 @@ main(int argc, char *argv[]) {
INSIST(res->ai_addrlen <= sizeof(sa_auth.type));
memmove(&sa_auth.type, res->ai_addr, res->ai_addrlen);
freeaddrinfo(res);
sa_auth.length = res->ai_addrlen;
sa_auth.length = (unsigned int)res->ai_addrlen;
ISC_LINK_INIT(&sa_auth, link);
ISC_LIST_APPEND(auth_servers, &sa_auth, link);
@@ -213,7 +217,7 @@ main(int argc, char *argv[]) {
INSIST(res->ai_addrlen <= sizeof(sa_recursive.type));
memmove(&sa_recursive.type, res->ai_addr, res->ai_addrlen);
freeaddrinfo(res);
sa_recursive.length = res->ai_addrlen;
sa_recursive.length = (unsigned int)res->ai_addrlen;
ISC_LINK_INIT(&sa_recursive, link);
ISC_LIST_INIT(rec_servers);
ISC_LIST_APPEND(rec_servers, &sa_recursive, link);