Commit 1e9f7a42 authored by Tinderbox User's avatar Tinderbox User
Browse files

update copyright notice

parent cd594861
......@@ -600,7 +600,7 @@ dns_zone_setalsonotifywithkeys(dns_zone_t *zone, const isc_sockaddr_t *notify,
dns_name_t **keynames, isc_uint32_t count);
isc_result_t
dns_zone_setalsonotifydscpkeys(dns_zone_t *zone, const isc_sockaddr_t *notify,
const isc_dscp_t *dscps, dns_name_t **keynames,
const isc_dscp_t *dscps, dns_name_t **keynames,
isc_uint32_t count);
/*%<
* Set the list of additional servers to be notified when
......
......@@ -923,7 +923,7 @@ dns_request_createvia4(dns_requestmgr_t *requestmgr, dns_message_t *message,
isc_sockaddr_t *srcaddr, isc_sockaddr_t *destaddr,
isc_dscp_t dscp, unsigned int options,
dns_tsigkey_t *key, unsigned int timeout,
unsigned int udptimeout, unsigned int udpretries,
unsigned int udptimeout, unsigned int udpretries,
isc_task_t *task, isc_taskaction_t action, void *arg,
dns_request_t **requestp)
{
......
......@@ -252,7 +252,7 @@ struct dns_zone {
dns_notifytype_t notifytype;
isc_sockaddr_t *notify;
dns_name_t **notifykeynames;
isc_dscp_t *notifydscp;
isc_dscp_t *notifydscp;
unsigned int notifycnt;
isc_sockaddr_t notifyfrom;
isc_task_t *task;
......@@ -520,7 +520,7 @@ struct dns_notify {
dns_name_t ns;
isc_sockaddr_t dst;
dns_tsigkey_t *key;
isc_dscp_t dscp;
isc_dscp_t dscp;
ISC_LINK(dns_notify_t) link;
};
......@@ -885,7 +885,7 @@ dns_zone_create(dns_zone_t **zonep, isc_mem_t *mctx) {
zone->curmaster = 0;
zone->notify = NULL;
zone->notifykeynames = NULL;
zone->notifydscp = NULL;
zone->notifydscp = NULL;
zone->notifytype = dns_notifytype_yes;
zone->notifycnt = 0;
zone->task = NULL;
......@@ -5025,8 +5025,8 @@ clear_addresskeylist(isc_sockaddr_t **addrsp, isc_dscp_t **dscpsp,
if (addrs != NULL)
isc_mem_put(mctx, addrs, count * sizeof(isc_sockaddr_t));
if (dscps != NULL)
isc_mem_put(mctx, dscps, count * sizeof(isc_dscp_t));
if (dscps != NULL)
isc_mem_put(mctx, dscps, count * sizeof(isc_dscp_t));
if (keynames != NULL) {
unsigned int i;
......@@ -11280,7 +11280,7 @@ ns_query(dns_zone_t *zone, dns_rdataset_t *soardataset, dns_stub_t *stub) {
int timeout;
isc_boolean_t have_xfrsource = ISC_FALSE, have_xfrdscp = ISC_FALSE;
isc_boolean_t reqnsid;
isc_uint16_t udpsize = SEND_BUFFER_SIZE;
isc_uint16_t udpsize = SEND_BUFFER_SIZE;
isc_dscp_t dscp = -1;
REQUIRE(DNS_ZONE_VALID(zone));
......@@ -14094,12 +14094,12 @@ sendtomaster(dns_forward_t *forward) {
goto unlock;
}
result = dns_request_createraw4(forward->zone->view->requestmgr,
forward->msgbuf,
forward->msgbuf,
&src, &forward->addr, dscp,
DNS_REQUESTOPT_TCP, 15 /* XXX */,
DNS_REQUESTOPT_TCP, 15 /* XXX */,
0, 0, forward->zone->task,
forward_callback, forward,
&forward->request);
forward_callback, forward,
&forward->request);
if (result == ISC_R_SUCCESS) {
if (!ISC_LINK_LINKED(forward, link))
ISC_LIST_APPEND(forward->zone->forwards, forward, link);
......
......@@ -1495,7 +1495,7 @@ build_msghdr_send(isc__socket_t *sock, isc_socketevent_t *dev,
int dscp = (dev->dscp << 2) & 0xff;
#ifdef IP_TOS
if (sock->pf == AF_INET &&
if (sock->pf == AF_INET &&
((isc_net_probedscp() & ISC_NET_DSCPPKTV4) != 0))
{
cmsgp = (struct cmsghdr *)(sock->sendcmsgbuf +
......@@ -1527,7 +1527,7 @@ build_msghdr_send(isc__socket_t *sock, isc_socketevent_t *dev,
}
#endif
#ifdef IPPROTO_IPV6
if (sock->pf == AF_INET6 &&
if (sock->pf == AF_INET6 &&
((isc_net_probedscp() & ISC_NET_DSCPPKTV6) != 0))
{
cmsgp = (struct cmsghdr *)(sock->sendcmsgbuf +
......
......@@ -3901,7 +3901,7 @@ isc__socket_socketevent(isc_mem_t *mctx, void *sender,
isc_eventtype_t eventtype, isc_taskaction_t action,
const void *arg)
{
return (allocate_socketevent(mctx, sender, eventtype, action, arg));
return (allocate_socketevent(mctx, sender, eventtype, action, arg));
}
#ifdef HAVE_LIBXML2
......
......@@ -310,7 +310,7 @@ cfg_obj_getdscp(const cfg_obj_t *obj);
* socket address.
*
* Requires:
* \li 'obj' points to a valid configuration object of a
* \li 'obj' points to a valid configuration object of a
* socket address type.
*
* Returns:
......
......@@ -2058,7 +2058,7 @@ parse_keyvalue(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) {
static isc_result_t
parse_optional_keyvalue(cfg_parser_t *pctx, const cfg_type_t *type,
cfg_obj_t **ret)
cfg_obj_t **ret)
{
return (parse_maybe_optional_keyvalue(pctx, type, ISC_TRUE, ret));
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment