From faaf306a631f8307f7e63cec9fdd0ee6492b6eb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 14 Jan 2018 17:32:52 +0000 Subject: [PATCH] Spelling fixes. --- CHANGELOG | 4 ++-- CHANGELOG.archive | 6 +++--- FAQ | 6 +++--- contrib/mactable/macscript | 2 +- debian/changelog | 2 +- dnsmasq.conf.example | 2 +- man/dnsmasq.8 | 10 +++++----- setup.html | 2 +- src/dnssec.c | 2 +- src/forward.c | 2 +- src/inotify.c | 2 +- src/radv.c | 2 +- src/rfc2131.c | 2 +- src/rfc3315.c | 4 ++-- src/rrfilter.c | 4 ++-- 15 files changed, 26 insertions(+), 26 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 7d7a2b7..e97d237 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -7,7 +7,7 @@ version 2.79 Thanks to Beniamino Galvani for the patch. Always return a SERVFAIL answer to DNS queries without the - recusion desired bit set, UNLESS acting as a authoritative + recursion desired bit set, UNLESS acting as an authoritative DNS server. This avoids a potential route to cache snooping. Add support for Ed25519 signatures in DNSSEC validation. @@ -1548,7 +1548,7 @@ version 2.56 By default, setting an IPv4 address for a domain but not an IPv6 address causes dnsmasq to return - an NODATA reply for IPv6 (or vice-versa). So + a NODATA reply for IPv6 (or vice-versa). So --address=/google.com/1.2.3.4 stops IPv6 queries for *google.com from being forwarded. Make it possible to override this behaviour by defining the semantics if the diff --git a/CHANGELOG.archive b/CHANGELOG.archive index f4362ca..c74c5e3 100644 --- a/CHANGELOG.archive +++ b/CHANGELOG.archive @@ -1010,7 +1010,7 @@ release 2.9 but to the address of another interface were ignored unless the loopback interface was explicitly configured. 2) on OpenBSD failure to configure one interface now - causes a fatal error on startup rather than an huge + causes a fatal error on startup rather than a huge stream of log messages. Thanks to Erik Jan Tromp for finding that bug. @@ -2067,7 +2067,7 @@ version 2.36 kernel. Thanks to Philip Wall for the bug report. Added --dhcp-bridge option, but only to the FreeBSD - build. This fixes an oddity with a a particular bridged + build. This fixes an oddity with a particular bridged network configuration on FreeBSD. Thanks to Luigi Rizzo for the patch. @@ -2273,7 +2273,7 @@ version 2.40 this. Use client-id as hash-seed for DHCP address allocation - with Firewire and InfiniBand, as these don't supply an MAC + with Firewire and InfiniBand, as these don't supply a MAC address. Tweaked TFTP file-open code to make it behave sensibly diff --git a/FAQ b/FAQ index 567ad2c..fa22833 100644 --- a/FAQ +++ b/FAQ @@ -9,7 +9,7 @@ A: The high ports that dnsmasq opens are for replies from the upstream from port 53 the replies would be _to_ port 53 and get blocked. This is not a security hole since dnsmasq will only accept replies to that - port: queries are dropped. The replies must be to oustanding queries + port: queries are dropped. The replies must be to outstanding queries which dnsmasq has forwarded, otherwise they are dropped too. Addendum: dnsmasq now has the option "query-port" (-Q), which allows @@ -297,7 +297,7 @@ A: Dnsmasq from v2.63 can operate in one of three different "networking by dnsmasq when in --bind-interfaces mode. In wildcard or bind-dynamic mode, such interfaces are handled normally. - A --interface specification for a non-existent interface is a fatal + An --interface specification for a non-existent interface is a fatal error at start-up when in --bind-interfaces mode, by just generates a warning in wildcard or bind-dynamic mode. @@ -320,7 +320,7 @@ A: Yes, new releases of dnsmasq are always announced through Q: What does the dhcp-authoritative option do? -A: The DHCP spec says that when a DHCP server recieves a renewal request +A: The DHCP spec says that when a DHCP server receives a renewal request from a client it has no knowledge of, it should just ignore it. This is because it's supported to have more than one DHCP server on a network, and another DHCP server may be dealing with the client. diff --git a/contrib/mactable/macscript b/contrib/mactable/macscript index 44a4477..9712d09 100755 --- a/contrib/mactable/macscript +++ b/contrib/mactable/macscript @@ -3,7 +3,7 @@ STATUS_FILE="/tmp/dnsmasq-ip-mac.status" # Script for dnsmasq lease-change hook. -# Maintains the above file with a IP address/MAC address pairs, +# Maintains the above file with an IP address/MAC address pairs, # one lease per line. Works with IPv4 and IPv6 leases, file is # atomically updated, so no races for users of the data. diff --git a/debian/changelog b/debian/changelog index f969b4c..22dd661 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,7 +27,7 @@ dnsmasq (2.77-1) unstable; urgency=low includes port=0 to disable DNS. * Handle gratuitous format change in /usr/share/dns/root.ds (closes: #858506) (closes: #860064) - * Add lsb-base dependancy. + * Add lsb-base dependency. -- Simon Kelley Tue, 11 Apr 2017 14:19:20 +0000 diff --git a/dnsmasq.conf.example b/dnsmasq.conf.example index 1ccca0c..b39b9c3 100644 --- a/dnsmasq.conf.example +++ b/dnsmasq.conf.example @@ -90,7 +90,7 @@ # server=10.1.2.3@eth1 # and this sets the source (ie local) address used to talk to -# 10.1.2.3 to 192.168.1.1 port 55 (there must be a interface with that +# 10.1.2.3 to 192.168.1.1 port 55 (there must be an interface with that # IP on the machine, obviously). # server=10.1.2.3@192.168.1.1#55 diff --git a/man/dnsmasq.8 b/man/dnsmasq.8 index ea4c895..a2d5743 100644 --- a/man/dnsmasq.8 +++ b/man/dnsmasq.8 @@ -241,7 +241,7 @@ configuration, indeed .B --auth-server will override these and provide a different DNS service on the specified interface. The is the "glue record". It should -resolve in the global DNS to a A and/or AAAA record which points to +resolve in the global DNS to an A and/or AAAA record which points to the address dnsmasq is listening on. When an interface is specified, it may be qualified with "/4" or "/6" to specify only the IPv4 or IPv6 addresses associated with the interface. @@ -464,7 +464,7 @@ is a synonym for .B server to make configuration files clearer in this case. -IPv6 addresses may include a %interface scope-id, eg +IPv6 addresses may include an %interface scope-id, eg fe80::202:a412:4512:7bbf%eth0. The optional string after the @ character tells dnsmasq how to set the source of @@ -597,7 +597,7 @@ hosts files), from DHCP, from --interface-name or from another .B --cname. If the target does not satisfy this criteria, the whole cname is ignored. The cname must be unique, but it -is permissable to have more than one cname pointing to the same target. Indeed +is permissible to have more than one cname pointing to the same target. Indeed it's possible to declare multiple cnames to a target in a single line, like so: .B --cname=cname1,cname2,target @@ -655,7 +655,7 @@ given for --add-subnet applies to --add-mac too. An alternative encoding of the MAC, as base64, is enabled by adding the "base64" parameter and a human-readable encoding of hex-and-colons is enabled by added the "text" parameter. .TP .B --add-cpe-id= -Add a arbitrary identifying string to o DNS queries which are +Add an arbitrary identifying string to o DNS queries which are forwarded upstream. .TP .B --add-subnet[[=[/]][,[/]]] @@ -739,7 +739,7 @@ time typically requires use of NTP and therefore DNS, but validating DNS require removes the time-window checks (but not other DNSSEC validation.) only until the dnsmasq process receives SIGHUP. The intention is that dnsmasq should be started with this flag when the platform determines that reliable time is not currently available. As soon as reliable time is established, a SIGHUP should be sent to dnsmasq, which enables time checking, and purges the cache of DNS records -which have not been throughly checked. +which have not been thoroughly checked. .TP .B --dnssec-timestamp= Enables an alternative way of checking the validity of the system time for DNSSEC (see --dnssec-no-timecheck). In this case, the diff --git a/setup.html b/setup.html index fe831f6..fb80dab 100644 --- a/setup.html +++ b/setup.html @@ -125,7 +125,7 @@ address of its ethernet card. For the former to work, a machine needs to know it requests a DHCP lease. For dhcpcd, the -h option specifies this. The names may be anything as far as DHCP is concerned, but dnsmasq adds some limitations. By default the names must no have a domain part, ie -they must just be a alphanumeric name, without any dots. This is a +they must just be alphanumeric names, without any dots. This is a security feature to stop a machine on your network telling DHCP that its name is "www.microsoft.com" and thereby grabbing traffic which shouldn't go to it. A domain part is only allowed by dnsmasq in DHCP machine names diff --git a/src/dnssec.c b/src/dnssec.c index 81eaa9e..eb6c11c 100644 --- a/src/dnssec.c +++ b/src/dnssec.c @@ -1789,7 +1789,7 @@ int dnssec_validate_reply(time_t now, struct dns_header *header, size_t plen, ch if (!explore_rrset(header, plen, class1, type1, name, keyname, &sigcnt, &rrcnt)) return STAT_BOGUS; - /* No signatures for RRset. We can be configured to assume this is OK and return a INSECURE result. */ + /* No signatures for RRset. We can be configured to assume this is OK and return an INSECURE result. */ if (sigcnt == 0) { if (check_unsigned) diff --git a/src/forward.c b/src/forward.c index 57e7e4b..71bc495 100644 --- a/src/forward.c +++ b/src/forward.c @@ -851,7 +851,7 @@ void reply_query(int fd, int family, time_t now) } /* We tried resending to this server with a smaller maximum size and got an answer. - Make that permanent. To avoid reduxing the packet size for an single dropped packet, + Make that permanent. To avoid reduxing the packet size for a single dropped packet, only do this when we get a truncated answer, or one larger than the safe size. */ if (server && (forward->flags & FREC_TEST_PKTSZ) && ((header->hb3 & HB3_TC) || n >= SAFE_PKTSZ)) diff --git a/src/inotify.c b/src/inotify.c index e9fc6c1..eda1d56 100644 --- a/src/inotify.c +++ b/src/inotify.c @@ -20,7 +20,7 @@ #include #include /* For MAXSYMLINKS */ -/* the strategy is to set a inotify on the directories containing +/* the strategy is to set an inotify on the directories containing resolv files, for any files in the directory which are close-write or moved into the directory. diff --git a/src/radv.c b/src/radv.c index 96eac93..4f31457 100644 --- a/src/radv.c +++ b/src/radv.c @@ -407,7 +407,7 @@ static void send_ra_alias(time_t now, int iface, char *iface_name, struct in6_ad if (ra_param) mtu = ra_param->mtu; #ifdef HAVE_LINUX_NETWORK - /* Note that IPv6 MTU is not neccessarily the same as the IPv4 MTU + /* Note that IPv6 MTU is not necessarily the same as the IPv4 MTU available from SIOCGIFMTU */ if (mtu == 0) { diff --git a/src/rfc2131.c b/src/rfc2131.c index 29ec010..c08a8ab 100644 --- a/src/rfc2131.c +++ b/src/rfc2131.c @@ -2284,7 +2284,7 @@ static void do_options(struct dhcp_context *context, /* See if we can send the boot stuff as options. To do this we need a requested option list, BOOTP and very old DHCP clients won't have this, we also - provide an manual option to disable it. + provide a manual option to disable it. Some PXE ROMs have bugs (surprise!) and need zero-terminated names, so we always send those. */ if ((boot = find_boot(tagif))) diff --git a/src/rfc3315.c b/src/rfc3315.c index 029c51a..c3c1c95 100644 --- a/src/rfc3315.c +++ b/src/rfc3315.c @@ -882,7 +882,7 @@ static int dhcp6_no_relay(struct state *state, int msg_type, void *inbuff, size_ if (!ia_option) { - /* If we get a request with a IA_*A without addresses, treat it exactly like + /* If we get a request with an IA_*A without addresses, treat it exactly like a SOLICT with rapid commit set. */ save_counter(start); goto request_no_address; @@ -1625,7 +1625,7 @@ static void end_ia(int t1cntr, unsigned int min_time, int do_fuzz) { if (t1cntr != 0) { - /* go back an fill in fields in IA_NA option */ + /* go back and fill in fields in IA_NA option */ int sav = save_counter(t1cntr); unsigned int t1, t2, fuzz = 0; diff --git a/src/rrfilter.c b/src/rrfilter.c index 3c5535f..f5b9c61 100644 --- a/src/rrfilter.c +++ b/src/rrfilter.c @@ -14,7 +14,7 @@ along with this program. If not, see . */ -/* Code to safely remove RRs from an DNS answer */ +/* Code to safely remove RRs from a DNS answer */ #include "dnsmasq.h" @@ -247,7 +247,7 @@ size_t rrfilter(struct dns_header *header, size_t plen, int mode) check_rrs(p, header, plen, 1, rrs, rr_found); - /* Fouth pass, elide records */ + /* Fourth pass, elide records */ for (p = rrs[0], i = 1; i < rr_found; i += 2) { unsigned char *start = rrs[i];