diff options
| author | Josh Soref <jsoref@gmail.com> | 2017-02-06 16:14:04 +0000 |
|---|---|---|
| committer | Simon Kelley <simon@thekelleys.org.uk> | 2017-02-06 16:14:04 +0000 |
| commit | 730c6745f020c80e5f630907f423987323f747ae (patch) | |
| tree | 18a37b8546844f314db0d7bb566a3aae887efe6b | |
| parent | d42d4706bbcce3b5a40ad778a5a356a997db6b34 (diff) | |
| download | dnsmasq-730c6745f020c80e5f630907f423987323f747ae.tar.gz | |
Comprehensive spelling/typo fixes.
Thanks to Josh Soref for generating these fixes.
47 files changed, 214 insertions, 214 deletions
@@ -104,10 +104,10 @@ version 2.76 Add --script-arp and two new functions for the dhcp-script. These are "arp" and "arp-old" which announce the arrival and - removal of entries in the ARP or nieghbour tables. + removal of entries in the ARP or neighbour tables. Extend --add-mac to allow a new encoding of the MAC address - as base64, by configurting --add-mac=base64 + as base64, by configuring --add-mac=base64 Add --add-cpe-id option. @@ -155,7 +155,7 @@ version 2.76 Fix PXE booting for UEFI architectures. Modify PXE boot sequence in this case to force the client to talk to dnsmasq over port 4011. This makes PXE and especially proxy-DHCP PXE - work with these archictectures. + work with these architectures. Workaround problems with UEFI PXE clients. There exist in the wild PXE clients which have problems with PXE @@ -256,7 +256,7 @@ version 2.73 good idea, but I've been persuaded that there are sometimes reasons to do it. (Step forward, GFW). To avoid misuse, there's a hard limit on the TTL - floor of one hour. Thansk to RinSatsuki for the patch. + floor of one hour. Thanks to RinSatsuki for the patch. Cope with multiple interfaces with the same link-local address. (IPv6 addresses are scoped, so this is allowed.) @@ -346,7 +346,7 @@ version 2.72 Add ra-advrouter mode, for RFC-3775 mobile IPv6 support. Add support for "ipsets" in *BSD, using pf. Thanks to - Sven Falempim for the patch. + Sven Falempin for the patch. Fix race condition which could lock up dnsmasq when an interface goes down and up rapidly. Thanks to Conrad @@ -358,7 +358,7 @@ version 2.72 Fix failure to build against Nettle-3.0. Thanks to Steven Barth for spotting this and finding the fix. - When assigning existing DHCP leases to intefaces by comparing + When assigning existing DHCP leases to interfaces by comparing networks, handle the case that two or more interfaces have the same network part, but different prefix lengths (favour the longer prefix length.) Thanks to Lung-Pin Chang for the @@ -415,7 +415,7 @@ version 2.70 version 2.69 Implement dynamic interface discovery on *BSD. This allows - the contructor: syntax to be used in dhcp-range for DHCPv6 + the constructor: syntax to be used in dhcp-range for DHCPv6 on the BSD platform. Thanks to Matthias Andree for valuable research on how to implement this. @@ -553,11 +553,11 @@ version 2.68 names as well as address literals. This makes it possible to configure authoritative DNS when local address ranges are dynamic and works much better than the previous - work-around which exempted contructed DHCP ranges from the + work-around which exempted constructed DHCP ranges from the IP address filtering. As a consequence, that work-around is removed. Under certain circumstances, this change wil break existing configuration: if you're relying on the - contructed-range exception, you need to change --auth-zone + constructed-range exception, you need to change --auth-zone to specify the same interface as is used to construct your DHCP ranges, probably with a trailing "/6" like this: --auth-zone=example.com,eth0/6 to limit the addresses to @@ -716,7 +716,7 @@ version 2.67 Fix problem in DHCPv6 vendorclass/userclass matching code. Thanks to Tanguy Bouzeloc for the patch. - Update Spanish transalation. Thanks to Vicente Soriano. + Update Spanish translation. Thanks to Vicente Soriano. Add --ra-param option. Thanks to Vladislav Grishenko for inspiration on this. @@ -733,7 +733,7 @@ version 2.67 suggestion. Avoid treating a --dhcp-host which has an IPv6 address - as eligable for use with DHCPv4 on the grounds that it has + as eligible for use with DHCPv4 on the grounds that it has no address, and vice-versa. Thanks to Yury Konovalov for spotting the problem. @@ -774,7 +774,7 @@ version 2.66 the local DNS server if dnsmasq is configured to not act as DNS server, or it's configured to a non-standard port. - Add DNSMASQ_CIRCUIT_ID, DNSMASQ_SUBCRIBER_ID, + Add DNSMASQ_CIRCUIT_ID, DNSMASQ_SUBSCRIBER_ID, DNSMASQ_REMOTE_ID variables to the environment of the lease-change script (and the corresponding Lua). These hold information inserted into the DHCP request by a DHCP relay @@ -817,7 +817,7 @@ version 2.65 Fix failure to build with DHCP support excluded. Thanks to Gustavo Zacarias for the patch. - Fix nasty regression in 2.64 which completely broke cacheing. + Fix nasty regression in 2.64 which completely broke caching. version 2.64 @@ -828,7 +828,7 @@ version 2.64 Finesse the check for /etc/hosts names which conflict with DHCP names. Previously a name/address pair in /etc/hosts which didn't match the name/address of a DHCP lease would - generate a warning. Now that only happesn if there is not + generate a warning. Now that only happens if there is not also a match. This allows multiple addresses for a name in /etc/hosts with one of them assigned via DHCP. @@ -838,7 +838,7 @@ version 2.64 Don't report spurious netlink errors, regression in 2.63. Thanks to Vladislav Grishenko for the patch. - Flag DHCP or DHCPv6 in starup logging. Thanks to + Flag DHCP or DHCPv6 in startup logging. Thanks to Vladislav Grishenko for the patch. Add SetServersEx method in DBus interface. Thanks to Dan @@ -847,14 +847,14 @@ version 2.64 Add SetDomainServers method in DBus interface. Thanks to Roy Marples for the patch. - Fix build with later Lua libraries. Thansk to Cristian + Fix build with later Lua libraries. Thanks to Cristian Rodriguez for the patch. Add --max-cache-ttl option. Thanks to Dennis Kaarsemaker for the patch. Fix breakage of --host-record parsing, resulting in - infinte loop at startup. Regression in 2.63. Thanks to + infinite loop at startup. Regression in 2.63. Thanks to Haim Gelfenbeyn for spotting this. Set SO_REUSEADDRESS and SO_V6ONLY options on the DHCPv6 @@ -929,7 +929,7 @@ version 2.63 Allow "w" (for week) as multiplier in lease times, as well as seconds, minutes, hours and days. Álvaro Gámez Machado - spotted the ommission. + spotted the omission. Update French translation. Thanks to Gildas Le Nadan. @@ -981,7 +981,7 @@ version 2.61 Add --dhcp-duid to allow DUID-EN uids to be used. - Explicity send DHCPv6 replies to the correct port, instead + Explicitly send DHCPv6 replies to the correct port, instead of relying on clients to send requests with the correct source address, since at least one client in the wild gets this wrong. Thanks to Conrad Kostecki for help tracking @@ -999,7 +999,7 @@ version 2.61 Invoke the DHCP script with action "tftp" when a TFTP file transfer completes. The size of the file, address to which it was sent and complete pathname are supplied. Note that - version 2.60 introduced some script incompatibilties + version 2.60 introduced some script incompatibilities associated with DHCPv6, and this is a further change. To be safe, scripts should ignore unknown actions, and if not IPv6-aware, should exit if the environment @@ -1029,14 +1029,14 @@ version 2.61 Add a new DHCP lease time keyword, "deprecated" for --dhcp-range. This is only valid for IPv6, and sets the - preffered lease time for both DHCP and RA to zero. The + preferred lease time for both DHCP and RA to zero. The effect is that clients can continue to use the address for existing connections, but new connections will use other addresses, if they exist. This makes hitless renumbering at least possible. Fix bug in address6_available() which caused DHCPv6 lease - aquisition to fail if more than one dhcp-range in use. + acquisition to fail if more than one dhcp-range in use. Provide RDNSS and DNSSL data in router advertisements, using the settings provided for DHCP options @@ -1046,7 +1046,7 @@ version 2.61 SamLT for work on this. Don't cache data from non-recursive nameservers, since it - may erroneously look like a valid CNAME to a non-exitant + may erroneously look like a valid CNAME to a non-existent name. Thanks to Ben Winslow for finding this. Call SO_BINDTODEVICE on the DHCP socket(s) when doing DHCP @@ -1058,7 +1058,7 @@ version 2.61 Updated French translation. Thanks to Gildas Le Nadan. - Give correct from-cache answers to explict CNAME queries. + Give correct from-cache answers to explicit CNAME queries. Thanks to Rob Zwissler for spotting this. Add --tftp-lowercase option. Thanks to Oliver Rath for the @@ -1326,8 +1326,8 @@ version 2.56 the DHCP subsystem. Thanks to Olaf Westrik for the patch. Omit timestamps from logs when a) logging to stderr and - b) --keep-in-forground is set. The logging facility on the - other end of stderr can be assumned to supply them. Thanks + b) --keep-in-foreground is set. The logging facility on the + other end of stderr can be assumed to supply them. Thanks to John Hallam for the patch. Don't complain about strings longer than 255 characters in @@ -1340,7 +1340,7 @@ version 2.56 script. Thanks to Ferenc Wagner for finding the problem. Only log that a file has been sent by TFTP after the - transfer has completed succesfully. + transfer has completed successfully. A good suggestion from Ferenc Wagner: extend the --domain option to allow this sort of thing: @@ -1349,7 +1349,7 @@ version 2.56 --local=/thekelleys.org.uk/ --local=/0.168.192.in-addr.arpa/ - Tighten up syntax checking of hex contants in the config + Tighten up syntax checking of hex constants in the config file. Thanks to Fred Damen for spotting this. Add dnsmasq logo/icon, contributed by Justin Swift. Many @@ -1387,11 +1387,11 @@ version 2.56 an 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 sematics if the + override this behaviour by defining the semantics if the same domain appears in both --server and --address. In that case, the --address has priority for the address family in which is appears, but the --server has priority - of the address family which doesn't appear in --adddress + of the address family which doesn't appear in --address So: --address=/google.com/1.2.3.4 --server=/google.com/# @@ -1491,7 +1491,7 @@ version 2.53 to be added to dnsmasq configuration which then supplies DHCP and DNS services to that interface, without affecting what services are supplied to other interfaces and - irrespective of the existance or lack of + irrespective of the existence or lack of interface=<interface> lines elsewhere in the dnsmasq configuration. The idea is that such a line can be added automatically by libvirt @@ -1867,7 +1867,7 @@ version 2.47 Updated config.h to use the same location for the lease file on NetBSD as the other *BSD variants. Also allow - LEASEFILE and CONFFILE symbols to be overriden in CFLAGS. + LEASEFILE and CONFFILE symbols to be overridden in CFLAGS. Handle duplicate address detection on IPv6 more intelligently. In IPv6, an interface can have an address diff --git a/CHANGELOG.archive b/CHANGELOG.archive index c9973cc..859ab18 100644 --- a/CHANGELOG.archive +++ b/CHANGELOG.archive @@ -56,7 +56,7 @@ release 0.95 Major rewrite: remove calls to gethostbyname() and talk any more memory after start-up. The NAT-like forwarding was inspired by a suggestion from Eli Chen <eli@routefree.com> -release 0.96 Fixed embarrasing thinko in cache linked-list code. +release 0.96 Fixed embarrassing thinko in cache linked-list code. release 0.98 Some enhancements and bug-fixes. Thanks to "Denis Carre" <denis.carre@laposte.net> and Martin @@ -88,7 +88,7 @@ release 0.991 Added -b flag: when set causes dnsmasq to always answer Fixed a bug which stopped dnsmasq working on a box with two or more interfaces with the same IP address. - Fixed cacheing of CNAMEs. Previously, a CNAME which pointed + Fixed caching of CNAMEs. Previously, a CNAME which pointed to a name with many A records would not have all the addresses returned when being answered from the cache. @@ -191,7 +191,7 @@ release 1.1 Added --user argument to allow user to change to release 1.2 Added IPv6 DNS record support. AAAA records are cached and read from /etc/hosts. Reverse-lookups in the - ip6.int and ip6.arpa domains are suppored. Dnsmasq can + ip6.int and ip6.arpa domains are supported. Dnsmasq can talk to upstream servers via IPv6 if it finds IP6 addresses in /etc/resolv.conf and it offers DNS service automatically if IPv6 support is present in the kernel. @@ -214,7 +214,7 @@ release 1.3 Some versions of the Linux kernel return EINVAL rather starting, rather than after the first query - principle of least surprise applies here. -release 1.4 Fix a bug with DHPC lease parsing which broke in +release 1.4 Fix a bug with DHCP lease parsing which broke in non-UTC timezones. Thanks to Mark Wormgoor for spotting and diagnosing this. Fixed versions in the .spec files this time. Fixed bug in Suse startup @@ -258,7 +258,7 @@ release 1.7 Fix a problem with cache not clearing properly on receipt of SIGHUP. Bug spotted by Sat Deshpande. In group-id changing code: - 1) Drop supplimentary groups. + 1) Drop supplementary groups. 2) Change gid before dropping root (patch from Soewono Effendi.) 3) Change group to "dip" if it exists, to allow access to /etc/ppp/resolv.conf (suggestion from Jorg Sommer.) @@ -297,7 +297,7 @@ release 1.9 Fixes to rpm .spec files. required. The difference is not really visible with bloated libcs like glibc, but should dramatically reduce memory requirements when linked against ulibc for use on - embeded routers, and that's the point really. Thanks to + embedded routers, and that's the point really. Thanks to Matthew Natalier for prompting this. Changed debug mode (-d) so that all logging appears on @@ -324,7 +324,7 @@ release 1.10 Log warnings if resolv.conf or dhcp.leases are not Fixed wrong address printing in error message about no interface with address. - Updated docs and split installation instuctions into setup.html. + Updated docs and split installation instructions into setup.html. Fix bug in CNAME chasing code: One CNAME pointing to many A records would lose A records after the @@ -346,7 +346,7 @@ release 1.10 Log warnings if resolv.conf or dhcp.leases are not Added -S option to directly specify upstream servers and added ability to direct queries for specific domains to - specfic servers. Suggested by Jens Vonderheide. + specific servers. Suggested by Jens Vonderheide. Upgraded random ID generation - patch from Rob Funk. @@ -386,13 +386,13 @@ release 1.11 Actually implement the -R flag promised in the 1.10 man page. names in /etc/hosts -suggestion from Phil Harman. Always return a zero time-to-live for names derived from - DHCP which stops anthing else caching these + DHCP which stops anything else caching these names. Previously the TTL was derived from the lease time but that is incorrect since a lease can be given up early: dnsmasq would know this but anything with the name cached with long TTL would not be updated. - Extended HAVE_IPV6 config flag to allow compliation on + Extended HAVE_IPV6 config flag to allow compilation on old systems which don't have modern library routines like inet_ntop(). Thanks to Phil Harman for the patch. @@ -471,7 +471,7 @@ release 1.14 Fixed man page description of -b option which confused /etc/resolv.conf. (Thanks to Klaas Teschauer) - Check that recieved queries have only rfc1035-legal characters + Check that received queries have only rfc1035-legal characters in them. This check is mainly to avoid bad strings being sent to syslog. @@ -549,7 +549,7 @@ release 1.16 Allow "/" characters in domain names - this fixes release 1.17 Fixed crash with DHCP hostnames > 40 characters. - Fixed name-comparision routines to not depend on Locale, + Fixed name-comparison routines to not depend on Locale, in theory this versions since 1.15 could lock up or give wrong results when run with locale != 'C'. @@ -574,7 +574,7 @@ release 1.18 Added round-robin DNS for names which have more than one forwarded because -D is in effect, return NXDOMAIN not an empty reply. - Add code to return the software version in repsonse to the + Add code to return the software version in response to the correct magic query in the same way as BIND. Use "dig version.bind chaos txt" to make the query. @@ -635,7 +635,7 @@ release 2.0 dynamic allocation. Allow dhcp-host options for the same host with different - IP adresses where the correct one will be selected for + IP addresses where the correct one will be selected for the network the host appears on. Fix parsing of --dhcp-option to allow more than one @@ -674,7 +674,7 @@ release 2.1 Fix unaligned access warnings on BSD/Alpha. - Allow empty DHCP options, like so: dhpc-option=44 + Allow empty DHCP options, like so: dhcp-option=44 Allow single-byte DHCP options like so: dhcp-option=20,1 @@ -745,7 +745,7 @@ release 2.3 around a bug in the DHCP client in HP Jetdirect printers. Thanks to Marko Stolle for finding this problem. - Return DHCP T1 and T2 times, with "fuzz" to desychronise lease + Return DHCP T1 and T2 times, with "fuzz" to desynchronise lease renewals, as specified in the RFC. Ensure that the END option is always present in DHCP @@ -838,7 +838,7 @@ release 2.4 by Chad Skeeters. Fixed bug in /etc/ethers parsing code triggered by tab - characters. Qudos to Dag Wieers for hepling to nail that + characters. Kudos to Dag Wieers for helping to nail that one. Added "bind-interfaces" option correctly. @@ -997,7 +997,7 @@ release 2.8 Add checks against DHCP clients which return zero-length hostnames. This avoids the potential lease-loss problems - reffered to above. Also, if a client sends a hostname when + referred to above. Also, if a client sends a hostname when it creates a lease but subsequently sends no or a zero-length hostname whilst renewing, continue to use the existing hostname, don't wipe it out. @@ -1027,7 +1027,7 @@ release 2.9 unqualified domains introduced in version 2.8 Allow fallback to "bind-interfaces" at runtime: Some - verions of *BSD seem to have enough stuff in the header + versions of *BSD seem to have enough stuff in the header files to build but no kernel support. Also now log if "bind-interfaces" is forced on. @@ -1049,7 +1049,7 @@ release 2.9 first name found is now returned for reverse lookups, rather than all of them. - Add back fatal errors when nonexistant + Add back fatal errors when nonexistent interfaces or interface addresses are given but only in "bind-interfaces" mode. Principle of least surprise applies. @@ -1193,7 +1193,7 @@ version 2.14 version 2.15 Fixed NXDOMAIN/NODATA confusion for locally known - names. We now return a NODATA reponse for names which are + names. We now return a NODATA response for names which are locally known. Now a query for (eg AAAA or MX) for a name with an IPv4 address in /etc/hosts which fails upstream will generate a NODATA response. Note that the query @@ -1314,7 +1314,7 @@ version 2.19 Thanks to Richard Atterer for the bug report. Check for under-length option fields in DHCP packets, a - zero length client-id, in particluar, could seriously + zero length client-id, in particular, could seriously confuse dnsmasq 'till now. Thanks to Will Murname for help with that. @@ -1389,7 +1389,7 @@ version 2.21 recursive queries. Fix DHCP address allocation problem when netid tags are in - use. Thanks to Will Murnane for the bug report and + use. Thanks to Will Murname for the bug report and subsequent testing. Add an additional data section to the reply for MX and SRV @@ -1505,7 +1505,7 @@ version 2.23 from dnsmasq --version. Thanks to Dirk Schenkewitz for the suggestion. - Fix pathalogical behaviour when a broken client keeps sending + Fix pathological behaviour when a broken client keeps sending DHCPDISCOVER messages repeatedly and fast. Because dealing with each of these takes a few seconds, (because of the ping) then a queue of DHCP packets could build up. Now, the results of a ping @@ -1593,7 +1593,7 @@ version 2.24 than one dhcp-range is available. Thanks to Sorin Panca for help chasing this down. - Added more explict error mesages to the hosts file and + Added more explicit error messages to the hosts file and ethers file reading code. Markus Kaiserswerth suffered to make this happen. @@ -1617,7 +1617,7 @@ version 2.25 Fixed Suse spec file - thanks to Steven Springl. - Fixed DHCP bug when two distict subnets are on the same + Fixed DHCP bug when two distinct subnets are on the same physical interface. Thanks to Pawel Zawora for finding this and suggesting the fix. @@ -1761,7 +1761,7 @@ version 2.28 Eric House and Eric Spakman for help in chasing this down. Tolerate configuration screwups which lead to the DHCP - server attemping to allocate its own address to a + server attempting to allocate its own address to a client; eg setting the whole subnet range as a DHCP range. Addresses in use by the server are now excluded from use by clients. @@ -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 an MAC address. Tweaked TFTP file-open code to make it behave sensibly @@ -2307,7 +2307,7 @@ version 2.40 Continue to use unqualified hostnames provided by DHCP clients, even if the domain part is illegal. (The domain is ignored, and an error logged.) Previously in this - situation, the whole name whould have been + situation, the whole name would have been rejected. Thanks to Jima for the patch. Handle EINTR returns from wait() correctly and reap @@ -2319,7 +2319,7 @@ version 2.40 leases file and passed to the lease-change script. Suggestion from Ben Voigt. - Re-run the lease chamge script with an "old" event for + Re-run the lease change script with an "old" event for each lease when dnsmasq receives a SIGHUP. Added more useful exit codes, including passing on a @@ -2417,7 +2417,7 @@ version 2.41 Changed behavior of DHCP server to always return total length of a new lease in DHCPOFFER, even if an existing lease exists. (It used to return the time remaining on the lease - whne one existed.) This fixes problems with the Sony Ericsson + when one existed.) This fixes problems with the Sony Ericsson K610i phone. Thanks to Hakon Stordahl for finding and fixing this. @@ -2476,7 +2476,7 @@ version 2.42 Fix OS detection logic to cope with GNU/FreeBSD. - Fix unitialised variable in DBus code - thanks to Roy + Fix uninitialised variable in DBus code - thanks to Roy Marples. Fix network enumeration code to work on later NetBSD - @@ -59,7 +59,7 @@ A: Yes, there is explicit support for *BSD and MacOS X and Solaris. Q: My company's nameserver knows about some names which aren't in the public DNS. Even though I put it first in /etc/resolv.conf, it - dosen't work: dnsmasq seems not to use the nameservers in the order + doesn't work: dnsmasq seems not to use the nameservers in the order given. What am I doing wrong? A: By default, dnsmasq treats all the nameservers it knows about as @@ -144,13 +144,13 @@ Q: Who are Verisign, what do they have to do with the bogus-nxdomain option in dnsmasq and why should I wory about it? A: [note: this was written in September 2003, things may well change.] - Versign run the .com and .net top-level-domains. They have just + Verisign run the .com and .net top-level-domains. They have just changed the configuration of their servers so that unknown .com and .net domains, instead of returning an error code NXDOMAIN, (no such - domain) return the address of a host at Versign which runs a web + domain) return the address of a host at Verisign which runs a web server showing a search page. Most right-thinking people regard this new behaviour as broken :-). You can test to see if you are - suffering Versign brokeness by run a command like + suffering Verisign brokenness by run a command like host jlsdajkdalld.com @@ -180,7 +180,7 @@ A: There are a couple of configuration gotchas which have been whilst the ISC one works. The first thing to check is the broadcast address set for the - ethernet interface. This is normally the adddress on the connected + ethernet interface. This is normally the address on the connected network with all ones in the host part. For instance if the address of the ethernet interface is 192.168.55.7 and the netmask is 255.255.255.0 then the broadcast address should be @@ -205,7 +205,7 @@ A: By default, none of the DHCP clients send the host-name when asking send with the "hostname" keyword in /etc/network/interfaces. (See "man interfaces" for details.) That doesn't work for dhclient, were you have to add something like "send host-name daisy" to - /etc/dhclient.conf [Update: the lastest dhcpcd packages _do_ send + /etc/dhclient.conf [Update: the latest dhcpcd packages _do_ send the hostname by default. Q: I'm network booting my machines, and trying to give them static @@ -240,7 +240,7 @@ Q: What are these strange "bind-interface" and "bind-dynamic" options? A: Dnsmasq from v2.63 can operate in one of three different "networking modes". This is unfortunate as it requires users configuring dnsmasq - to take into account some rather bizzare contraints and select the + to take into account some rather bizarre constraints and select the mode which best fits the requirements of a particular installation. The origin of these are deficiencies in the Unix networking model and APIs and each mode has different advantages and @@ -252,10 +252,10 @@ A: Dnsmasq from v2.63 can operate in one of three different "networking The three modes are "wildcard", "bind-interfaces" and "bind-dynamic". In "wildcard" mode, dnsmasq binds the wildcard IP address (0.0.0.0 or - ::). This allows it to recieve all the packets sent to the server on + ::). This allows it to receive all the packets sent to the server on the relevant port. Access control (--interface, --except-interface, --listen-address, etc) is implemented by dnsmasq: it queries the - kernel to determine the interface on which a packet was recieved and + kernel to determine the interface on which a packet was received and the address to which it was sent, and applies the configured rules. Wildcard mode is the default if neither of the other modes are specified. @@ -276,7 +276,7 @@ A: Dnsmasq from v2.63 can operate in one of three different "networking The mode chosen has four different effects: co-existence with other servers, semantics of --interface access control, effect of new interfaces, and legality of --interface specifications for - non-existent inferfaces. We will deal with these in order. + non-existent interfaces. We will deal with these in order. A dnsmasq instance running in wildcard mode precludes a machine from running a second instance of dnsmasq or any other DNS, TFTP or DHCP @@ -313,7 +313,7 @@ Q: Can I get email notification when a new version of dnsmasq is released? A: Yes, new releases of dnsmasq are always announced through - freshmeat.net, and they allow you to subcribe to email alerts when + freshmeat.net, and they allow you to subscribe to email alerts when new versions of particular projects are released. New releases are also announced in the dnsmasq-discuss mailing list, subscribe at http://lists.thekelleys.org.uk/mailman/listinfo/dnsmasq-discuss @@ -354,7 +354,7 @@ Addendum: involve setting client-IDs. It's possible to put more than one MAC address in a --dhcp-host configuration. This tells dnsmasq that it should use the specified IP for any of the specified MAC addresses, - and furthermore it gives dnsmasq permission to sumarily abandon a + and furthermore it gives dnsmasq permission to summarily abandon a lease to one of the MAC addresses if another one comes along. Note that this will work fine only as longer as only one interface is up at any time. There is no way for dnsmasq to enforce this @@ -488,7 +488,7 @@ Q: DHCP doesn't work with windows 7 but everything else is fine. A: There seems to be a problem if Windows 7 doesn't get a value for DHCP option 252 in DHCP packets it gets from the server. The - symtoms have beeen variously reported as continual DHCPINFORM + symptoms have been variously reported as continual DHCPINFORM requests in an attempt to get an option-252, or even ignoring DHCP offers completely (and failing to get an IP address) if there is no option-252 supplied. DHCP option 252 is for WPAD, WWW Proxy @@ -123,7 +123,7 @@ merge : echo -n msgmerge $(PO)/$$f && $(MSGMERGE) --no-wrap -U $(PO)/$$f $(BUILDDIR)/dnsmasq.pot; \ done -# Cannonicalise .po file. +# Canonicalise .po file. %.po : @cd $(BUILDDIR) && $(MAKE) -f $(top)/Makefile dnsmasq.pot mv $(PO)/$*.po $(PO)/$*.po.orig && $(MSGMERGE) --no-wrap $(PO)/$*.po.orig $(BUILDDIR)/dnsmasq.pot >$(PO)/$*.po; @@ -142,7 +142,7 @@ bloatcheck : $(BUILDDIR)/dnsmasq_baseline mostly_clean all $(top)/bld/bloat-o-meter dnsmasq_baseline dnsmasq; \ size dnsmasq_baseline dnsmasq -# rules below are targets in recusive makes with cwd=$(BUILDDIR) +# rules below are targets in recursive makes with cwd=$(BUILDDIR) $(copts_conf): $(hdrs) @rm -f *.o .copts_* diff --git a/contrib/MacOSX-launchd/launchd-README.txt b/contrib/MacOSX-launchd/launchd-README.txt index 4783221..cf245ff 100644 --- a/contrib/MacOSX-launchd/launchd-README.txt +++ b/contrib/MacOSX-launchd/launchd-README.txt @@ -22,7 +22,7 @@ sudo chmod 644 /Library/LaunchDaemons/uk.org.thekelleys.dnsmasq.plist Optionally, edit your dnsmasq configuration file to your liking. -To start the launchd job, which starts dnsmaq, reboot or use the command: +To start the launchd job, which starts dnsmasq, reboot or use the command: sudo launchctl load /Library/LaunchDaemons/uk.org.thekelleys.dnsmasq.plist To stop the launchd job, which stops dnsmasq, use the command: diff --git a/contrib/Suse/README.susefirewall b/contrib/Suse/README.susefirewall index 2f19ca6..0b94108 100644 --- a/contrib/Suse/README.susefirewall +++ b/contrib/Suse/README.susefirewall @@ -1,9 +1,9 @@ This is a patch against SuSEfirewall2-3.1-206 (SuSE 9.x and older) -It fixes the depancy from the dns daemon name 'named' +It fixes the dependency from the dns daemon name 'named' After appending the patch, the SuSEfirewall is again able to autodetect the dnsmasq named service. This is a very old bug in the SuSEfirewall script. -The SuSE people think the name of the dns server will allways 'named' +The SuSE people think the name of the dns server will always 'named' --- /sbin/SuSEfirewall2.orig 2004-01-23 13:30:09.000000000 +0100 diff --git a/contrib/conntrack/README b/contrib/conntrack/README index c0d17aa..e883447 100644 --- a/contrib/conntrack/README +++ b/contrib/conntrack/README @@ -13,10 +13,10 @@ connection comes out of the other side. However, sometimes, we want to maintain that relationship through the proxy and continue the connection mark on packets upstream of our proxy -DNSMasq includes such a feature enabled by the --conntrack +Dnsmasq includes such a feature enabled by the --conntrack option. This allows, for example, using iptables to mark traffic from a particular IP, and that mark to be persisted to requests made *by* -DNSMasq. Such a feature could be useful for bandwidth accounting, +Dnsmasq. Such a feature could be useful for bandwidth accounting, captive portals and the like. Note a similar feature has been implemented in Squid 2.2 @@ -40,7 +40,7 @@ on IP address. 3) Saves the firewall mark back to the connection mark (which will persist it across related packets) 4) is applied to the OUTPUT table, which is where we first see packets -generated locally. DNSMasq will have already copied the firewall mark +generated locally. Dnsmasq will have already copied the firewall mark from the request, across to the new packet, and so all that remains is for iptables to copy it to the connection mark so it's persisted across packets. diff --git a/contrib/lease-access/lease.access.patch b/contrib/lease-access/lease.access.patch index ad76e25..911ee7e 100644 --- a/contrib/lease-access/lease.access.patch +++ b/contrib/lease-access/lease.access.patch @@ -55,7 +55,7 @@ Index: src/dnsmasq.c } @@ -434,7 +433,7 @@ - /* lose the setuid and setgid capbilities */ + /* lose the setuid and setgid capabilities */ if (capset(hdr, data) == -1) { - send_event(err_pipe[1], EVENT_CAP_ERR, errno); diff --git a/contrib/lease-tools/dhcp_lease_time.c b/contrib/lease-tools/dhcp_lease_time.c index b438ef7..fc00ff1 100644 --- a/contrib/lease-tools/dhcp_lease_time.c +++ b/contrib/lease-tools/dhcp_lease_time.c @@ -168,7 +168,7 @@ int main(int argc, char **argv) *(p++) = 1; *(p++) = DHCPINFORM; - /* Explicity request the lease time, it won't be sent otherwise: + /* Explicitly request the lease time, it won't be sent otherwise: this is a dnsmasq extension, not standard. */ *(p++) = OPTION_REQUESTED_OPTIONS; *(p++) = 1; diff --git a/contrib/lease-tools/dhcp_release.c b/contrib/lease-tools/dhcp_release.c index a51f04b..201fcd3 100644 --- a/contrib/lease-tools/dhcp_release.c +++ b/contrib/lease-tools/dhcp_release.c @@ -117,7 +117,7 @@ static ssize_t netlink_recv(int fd) msg.msg_flags = 0; while ((rc = recvmsg(fd, &msg, MSG_PEEK)) == -1 && errno == EINTR); - /* 2.2.x doesn't suport MSG_PEEK at all, returning EOPNOTSUPP, so we just grab a + /* 2.2.x doesn't support MSG_PEEK at all, returning EOPNOTSUPP, so we just grab a big buffer and pray in that case. */ if (rc == -1 && errno == EOPNOTSUPP) { diff --git a/contrib/lease-tools/dhcp_release6.c b/contrib/lease-tools/dhcp_release6.c index 00ff115..1eee873 100644 --- a/contrib/lease-tools/dhcp_release6.c +++ b/contrib/lease-tools/dhcp_release6.c @@ -1,7 +1,7 @@ /* dhcp_release6 --iface <interface> --client-id <client-id> --server-id server-id --iaid <iaid> --ip <IP> [--dry-run] [--help] - MUST be run as root - will fail othewise + MUST be run as root - will fail otherwise */ /* Send a DHCPRELEASE message to IPv6 multicast address via the specified interface @@ -22,7 +22,7 @@ IP is an IPv6 adress to release - If --dry-run is specified, dhcp_release6 just prints hexadecimal represantation of + If --dry-run is specified, dhcp_release6 just prints hexadecimal representation of packet to send to stdout and exits. If --help is specified, dhcp_release6 print usage information to stdout and exits diff --git a/contrib/port-forward/portforward b/contrib/port-forward/portforward index 1a97c3a..21fdca1 100644 --- a/contrib/port-forward/portforward +++ b/contrib/port-forward/portforward @@ -3,7 +3,7 @@ # first column of this file, then a DNAT port-forward will be set up # to the address which has just been allocated by DHCP . The second field # is port number(s). If there is only one, then the port-forward goes to -# the same port on the DHCP-client, if there are two seperated with a +# the same port on the DHCP-client, if there are two separated with a # colon, then the second number is the port to which the connection # is forwarded on the DHCP-client. By default, forwarding is set up # for TCP, but it can done for UDP instead by prefixing the port to "u". diff --git a/contrib/reverse-dns/README b/contrib/reverse-dns/README index 2ec4df1..9fd4efb 100644 --- a/contrib/reverse-dns/README +++ b/contrib/reverse-dns/README @@ -1,6 +1,6 @@ The script reads stdin and replaces all IP addresses with names before
outputting it again. IPs from private networks are reverse looked up
-via dns. Other IP adresses are searched for in the dnsmasq query log.
+via dns. Other IP addresses are searched for in the dnsmasq query log.
This gives names (CNAMEs if I understand DNS correctly) that are closer
to the name the client originally asked for then the names obtained by
reverse lookup. Just run
diff --git a/contrib/reverse-dns/reverse_replace.sh b/contrib/reverse-dns/reverse_replace.sh index 5b4aebd..c6401fb 100644 --- a/contrib/reverse-dns/reverse_replace.sh +++ b/contrib/reverse-dns/reverse_replace.sh @@ -5,10 +5,10 @@ # Parses stdin for IP4 addresses and replaces them # with names retrieved by parsing the dnsmasq log. # This currently only gives CNAMEs. But these -# usually tell ou more than the mones from reverse +# usually tell you more than the ones from reverse # lookups. # -# This has been tested on debian and asuswrt. Plese +# This has been tested on debian and asuswrt. Please # report successful tests on other platforms. # # Author: Joachim Zobel <jz-2014@heute-morgen.de> diff --git a/contrib/try-all-ns/README-2.47 b/contrib/try-all-ns/README-2.47 index 3ebec65..bfe4ec7 100644 --- a/contrib/try-all-ns/README-2.47 +++ b/contrib/try-all-ns/README-2.47 @@ -2,7 +2,7 @@ A remake of patch Bob Carroll had posted to dnsmasq, now compatible with version 2.47. Hopefully he doesn't mind (sending a copy of this mail to him too). -Maybe the patch in question is not acceptible +Maybe the patch in question is not acceptable as it doesn't add new switch, rather it binds itself to "strict-order". What it does is: if you have strict-order in the diff --git a/contrib/webmin/README b/contrib/webmin/README index 8a8f937..2278871 100644 --- a/contrib/webmin/README +++ b/contrib/webmin/README @@ -1,5 +1,5 @@ -This is the README for the DNSmasq webmin module. +This is the README for the Dnsmasq webmin module. Problems: @@ -48,7 +48,7 @@ wade through the config file and man pages again. If you modify it, or add a language file, and you have a spare moment, please e-mail me - I won't be upset at all if you fix my poor coding! -(rather the opposite - I'd be pleased someone found it usefull) +(rather the opposite - I'd be pleased someone found it useful) Cheers, Neil Fisher <neil@magnecor.com.au> diff --git a/contrib/wrt/README b/contrib/wrt/README index 862046f..981db9f 100644 --- a/contrib/wrt/README +++ b/contrib/wrt/README @@ -4,7 +4,7 @@ reboot, then it will eventually be restored as hosts renew their leases. Until a host renews (which may take hours/days) it will not exist in the DNS if dnsmasq's DDNS function is in use. -*WRT systems remount all non-volatile fileystems read-only after boot, +*WRT systems remount all non-volatile filesystems read-only after boot, so the normal leasefile will not work. They do, however have NV storage, accessed with the nvram command: @@ -62,7 +62,7 @@ about 100 bytes, so restricting the number of leases to 50 will limit use to half that. (The default limit in the distributed source is 150) Any UI script which reads the dnsmasq leasefile will have to be -ammended, probably by changing it to read the output of +amended, probably by changing it to read the output of `lease_update init` instead. diff --git a/debian/changelog b/debian/changelog index cc721bd..14dbf44 100644 --- a/debian/changelog +++ b/debian/changelog @@ -62,7 +62,7 @@ dnsmasq (2.76-1) unstable; urgency=low * New upstream. (closes: #798586) * Use /run/dnsmasq directly, rather than relying on link from /var/run to avoid problems before /var is mounted. (closes: #800351) - * Test for the existance of /usr/share/doc/dnsmasq rather then + * Test for the existence of /usr/share/doc/dnsmasq rather then /etc/dnsmasq.d/README in the daemon startup script. (closes: #819856) * Add --help to manpage and mention dhcp6 in summary. (closes: #821226) @@ -104,7 +104,7 @@ dnsmasq (2.72-3) unstable; urgency=medium work without it. (Closes: #769486, #776530) - debian/init: when called with systemd-exec argument, let dnsmasq go into the background, so Type=forking can detect when it is ready - * Remove line containing only whitespace in debian/contol. + * Remove line containing only whitespace in debian/control. (closes: #777571) -- Simon Kelley <simon@thekelleys.org.uk> Wed, 11 Feb 2015 21:56:12 +0000 @@ -716,7 +716,7 @@ dnsmasq (2.26-1) unstable; urgency=high dnsmasq (2.25-1) unstable; urgency=low * Remove bashisms in postinst and prerm scripts. - * Remove misconcieved dependency on locales. + * Remove misconceived dependency on locales. * Depend on adduser. -- Simon Kelley <simon@thekelleys.org.uk> Thu, 01 Dec 2005 21:02:12 +0000 @@ -738,7 +738,7 @@ dnsmasq (2.23-1) unstable; urgency=low * Add support for DNSMASQ_EXCEPT in /etc/defaults/dnsmasq. putting "lo" in this also disables resolvconf support. * No longer delete pre-existing /etc/init.d symlinks. The - change in default runlevels which neccesitated this + change in default runlevels which necessitated this is now ancient history and anyway the startup script now behaves when called twice. (closes: #312111) * Tightened config-file parser. (closes: #317030) @@ -923,7 +923,7 @@ dnsmasq (2.6-3) unstable; urgency=low * Removed reload command from start script and moved force-reload to be equivalent to restart. This is needed to be policy compliant - since SIHGUP doesn't cause dnsmasq to reload its configuration file, + since SIGHUP doesn't cause dnsmasq to reload its configuration file, only the /etc/hosts, /etc/resolv.conf etc. (closes: #244208) -- Simon Kelley <simon@thekelleys.org.uk> Sun, 18 Apr 2004 14:40:51 +0000 @@ -1013,8 +1013,8 @@ dnsmasq (2.0-1) unstable; urgency=low * New upstream: This removes the ability to read the the leases file of ISC DHCP and replaces it with a built-in DHCP server. Apologies in advance for breaking backwards - compatibilty, but this replaces a bit of a hack (the ISC stuff) - with a nicely engineered and much more apropriate solution. + compatibility, but this replaces a bit of a hack (the ISC stuff) + with a nicely engineered and much more appropriate solution. Wearing my upstream-maintainer hat, I want to lose the hack now, rather than have to support it into Sarge. * New upstream closes some bugs since they become @@ -1040,7 +1040,7 @@ dnsmasq (1.18-1) unstable; urgency=low * New upstream which does round-robin. (closes: #215460) * Removed conflicts with other dns servers since it is now possible to control exactly where dnsmasq listens on multi-homed - hosts, making co-existance with another nameserver + hosts, making co-existence with another nameserver a viable proposition. (closes #176163) * New upstream allows _ in hostnames and check for illegal names in /etc/hosts. (closes: #218842) @@ -1126,13 +1126,13 @@ dnsmasq (1.11-2) unstable; urgency=low dnsmasq (1.11-1) unstable; urgency=low - * New uptream. + * New upstream. -- Simon Kelley <simon@thekelleys.org.uk> Tues, 12 Jan 2003 22:25:17 -0100 dnsmasq (1.10-1) unstable; urgency=low - * New uptream. + * New upstream. * Force service to stop in postinst before restarting. I don't understand the circumstances under which it would still be running at this point, but this is the correct fix anyway. (closes: #169718) @@ -1144,7 +1144,7 @@ dnsmasq (1.10-1) unstable; urgency=low dnsmasq (1.9-1) unstable; urgency=low - * New uptream. + * New upstream. -- Simon Kelley <simon@thekelleys.org.uk> Mon, 23 Sept 2002 21:35:07 -0100 diff --git a/debian/systemd.service b/debian/systemd.service index 7a045f6..a28b806 100644 --- a/debian/systemd.service +++ b/debian/systemd.service @@ -18,7 +18,7 @@ ExecStartPre=/usr/sbin/dnsmasq --test ExecStart=/etc/init.d/dnsmasq systemd-exec # The systemd-*-resolvconf functions configure (and deconfigure) -# resolvconf to work with the dnsmasq DNS server. They're called liek +# resolvconf to work with the dnsmasq DNS server. They're called like # this to get correct error handling (ie don't start-resolvconf if the # dnsmasq daemon fails to start. ExecStartPost=/etc/init.d/dnsmasq systemd-start-resolvconf diff --git a/dnsmasq.conf.example b/dnsmasq.conf.example index 590f217..790eaf5 100644 --- a/dnsmasq.conf.example +++ b/dnsmasq.conf.example @@ -189,7 +189,7 @@ # add names to the DNS for the IPv6 address of SLAAC-configured dual-stack # hosts. Use the DHCPv4 lease to derive the name, network segment and # MAC address and assume that the host will also have an -# IPv6 address calculated using the SLAAC alogrithm. +# IPv6 address calculated using the SLAAC algorithm. #dhcp-range=1234::, ra-names # Do Router Advertisements, BUT NOT DHCP for this subnet. @@ -210,7 +210,7 @@ #dhcp-range=1234::, ra-stateless, ra-names # Do router advertisements for all subnets where we're doing DHCPv6 -# Unless overriden by ra-stateless, ra-names, et al, the router +# Unless overridden by ra-stateless, ra-names, et al, the router # advertisements will have the M and O bits set, so that the clients # get addresses and configuration from DHCPv6, and the A bit reset, so the # clients don't use SLAAC addresses. @@ -251,7 +251,7 @@ # the IP address 192.168.0.60 #dhcp-host=id:01:02:02:04,192.168.0.60 -# Always give the Infiniband interface with hardware address +# Always give the InfiniBand interface with hardware address # 80:00:00:48:fe:80:00:00:00:00:00:00:f4:52:14:03:00:28:05:81 the # ip address 192.168.0.61. The client id is derived from the prefix # ff:00:00:00:00:00:02:00:00:02:c9:00 and the last 8 pairs of @@ -288,7 +288,7 @@ # Give a fixed IPv6 address and name to client with # DUID 00:01:00:01:16:d2:83:fc:92:d4:19:e2:d8:b2 # Note the MAC addresses CANNOT be used to identify DHCPv6 clients. -# Note also the they [] around the IPv6 address are obilgatory. +# Note also the they [] around the IPv6 address are obligatory. #dhcp-host=id:00:01:00:01:16:d2:83:fc:92:d4:19:e2:d8:b2, fred, [1234::5] # Ignore any clients which are not specified in dhcp-host lines @@ -525,7 +525,7 @@ # (using /etc/hosts) then that name can be specified as the # tftp_servername (the third option to dhcp-boot) and in that # case dnsmasq resolves this name and returns the resultant IP -# addresses in round robin fasion. This facility can be used to +# addresses in round robin fashion. This facility can be used to # load balance the tftp load among a set of servers. #dhcp-boot=/var/ftpd/pxelinux.0,boothost,tftp_server_name @@ -18,7 +18,7 @@ Linux distributions and the ports systems of FreeBSD, OpenBSD and NetBSD. Dnsmas <P> The DNS subsystem provides a local DNS server for the network, with forwarding of all query types to upstream recursive DNS servers and -cacheing of common record types (A, AAAA, CNAME and PTR, also DNSKEY and DS when DNSSEC is enabled). +caching of common record types (A, AAAA, CNAME and PTR, also DNSKEY and DS when DNSSEC is enabled). <DIR> <LI>Local DNS names can be defined by reading /etc/hosts, by importing names from the DHCP subsystem, or by configuration of a wide range of useful record types.</LI> <LI>Upstream servers can be configured in a variety of convenient ways, including dynamic configuration as these change on moving upstream network. diff --git a/man/dnsmasq.8 b/man/dnsmasq.8 index 08799a2..82f7965 100644 --- a/man/dnsmasq.8 +++ b/man/dnsmasq.8 @@ -30,7 +30,7 @@ DHCPv4 server, and in addition, it includes router advertisements and a neat feature which allows nameing for clients which use DHCPv4 and stateless autoconfiguration only for IPv6 configuration. There is support for doing address allocation (both DHCPv6 and RA) from subnets which are dynamically delegated via DHCPv6 prefix delegation. .PP -Dnsmasq is coded with small embedded systems in mind. It aims for the smallest possible memory footprint compatible with the supported functions, and allows uneeded functions to be omitted from the compiled binary. +Dnsmasq is coded with small embedded systems in mind. It aims for the smallest possible memory footprint compatible with the supported functions, and allows unneeded functions to be omitted from the compiled binary. .SH OPTIONS Note that in general missing parameters are allowed and switch off functions, for instance "--pid-file" disables writing a PID file. On @@ -232,7 +232,7 @@ or .B --listen-address configuration, indeed .B --auth-server -will overide these and provide a different DNS service on the +will override these and provide a different DNS service on the specified interface. The <domain> is the "glue record". It should resolve in the global DNS to a A and/or AAAA record which points to the address dnsmasq is listening on. When an interface is specified, @@ -434,7 +434,7 @@ address using a # character. More than one -S flag is allowed, with repeated domain or ipaddr parts as required. -More specific domains take precendence over less specific domains, so: +More specific domains take precedence over less specific domains, so: .B --server=/google.com/1.2.3.4 .B --server=/www.google.com/2.3.4.5 will send queries for *.google.com to 1.2.3.4, except *www.google.com, @@ -700,7 +700,7 @@ permitted to reduce the cache size below the default when DNSSEC is enabled. The nameservers upstream of dnsmasq must be DNSSEC-capable, ie capable of returning DNSSEC records with data. If they are not, then dnsmasq will not be able to determine the trusted status of -answers. In the default mode, this menas that all replies will be +answers. In the default mode, this means that all replies will be marked as untrusted. If .B --dnssec-check-unsigned is set and the upstream servers don't support DNSSEC, then DNS service will be entirely broken. @@ -839,7 +839,7 @@ For IPv6, the parameters are slightly different: instead of netmask and broadcast address, there is an optional prefix length which must be equal to or larger then the prefix length on the local interface. If not given, this defaults to 64. Unlike the IPv4 case, the prefix length is not -automatically derived from the interface configuration. The mimimum +automatically derived from the interface configuration. The minimum size of the prefix length is 64. IPv6 (only) supports another type of range. In this, the start address and optional end address contain only the network part (ie ::1) and they are followed by @@ -1064,7 +1064,7 @@ This is equivalent to dhcp-hostsfile, except for the following. The path MUST be directory, and not an individual file. Changed or new files within the directory are read automatically, without the need to send SIGHUP. If a file is deleted for changed after it has been read by dnsmasq, then the -host record it contained will remain until dnsmasq recieves a SIGHUP, or +host record it contained will remain until dnsmasq receives a SIGHUP, or is restarted; ie host records are only added dynamically. .TP .B --dhcp-optsdir=<path> @@ -1656,7 +1656,7 @@ and functions are called only when enabled with .B --script-arp and have a table which holds the tags -.B mac_addres +.B mac_address and .B client_address. .TP @@ -1766,7 +1766,7 @@ subnets with the mode keywords described in RFC6106 DNS parameters are included in the advertisements. By default, the relevant link-local address of the machine running dnsmasq is sent as recursive DNS server. If provided, the DHCPv6 options dns-server and -domain-search are used for the DNS server (RDNSS) and the domain serach list (DNSSL). +domain-search are used for the DNS server (RDNSS) and the domain search list (DNSSL). .TP .B --ra-param=<interface>,[high|low],[[<ra-interval>],<router lifetime>] Set non-default values for router advertisements sent via an @@ -1787,7 +1787,7 @@ Enable the TFTP server function. This is deliberately limited to that needed to net-boot a client. Only reading is allowed; the tsize and blksize extensions are supported (tsize is only supported in octet mode). Without an argument, the TFTP service is provided to the same set of interfaces as DHCP service. -If the list of interfaces is provided, that defines which interfaces recieve TFTP service. +If the list of interfaces is provided, that defines which interfaces receive TFTP service. .TP .B --tftp-root=<directory>[,<interface>] Look for files to transfer using TFTP relative to the given @@ -1875,7 +1875,7 @@ A special case of .B --conf-file which differs in two respects. Firstly, only --server and --rev-server are allowed in the configuration file included. Secondly, the file is re-read and the configuration -therein is updated when dnsmasq recieves SIGHUP. +therein is updated when dnsmasq receives SIGHUP. .SH CONFIG FILE At startup, dnsmasq reads .I /etc/dnsmasq.conf, @@ -2229,7 +2229,7 @@ provided the address falls into one of the subnets specified in the .PP Addresses of DHCP leases, provided the address falls into one of the subnets specified in the .B --auth-zone. -(If contructed DHCP ranges are is use, which depend on the address dynamically +(If constructed DHCP ranges are is use, which depend on the address dynamically assigned to an interface, then the form of .B --auth-zone which defines subnets by the dynamic address of an interface should @@ -78,7 +78,7 @@ by modifying MODIFY_RESOLV_CONF_DYNAMICALLY="no" in <TT>/etc/sysconfig/network/c <h3>Automatic DNS server configuration with DHCP.</h3> -You need to get your DHCP client to write the addresse(s) of the DNS +You need to get your DHCP client to write the address(es) of the DNS servers to a file other than <TT>/etc/resolv.conf</TT>. For dhcpcd, the <TT>dhcpcd.exe</TT> script gets run with the addresses of the nameserver(s) in the shell variable <TT>$DNS</TT>. The following bit of shell script @@ -86,8 +86,8 @@ uses that to write a file suitable for dnsmasq. <PRE> echo -n >|/etc/dhcpc/resolv.conf -dnsservs=${DNS//,/ } -for serv in $dnsservs; do +dnsservers=${DNS//,/ } +for serv in $dnsservers; do echo "nameserver $serv" >>/etc/dhcpc/resolv.conf done @@ -186,7 +186,7 @@ more than one nameserver just include as many <H2>Local domains.</H2> Sometimes people have local domains which they do not want forwarded -to upstream servers. This is accomodated by using server options +to upstream servers. This is accommodated by using server options without the server IP address. To make things clearer <TT>local</TT> is a synonym for <TT>server</TT>. For example the option <TT>local=/localnet/</TT> ensures that any domain name query which ends in @@ -864,7 +864,7 @@ size_t answer_auth(struct dns_header *header, char *limit, size_t qlen, time_t n header->hb4 &= ~HB4_RA; } - /* authoritive */ + /* authoritative */ if (auth) header->hb3 |= HB3_AA; @@ -105,7 +105,7 @@ int arp_enumerate(void *parm, int (*callback)()) int iface_enumerate(int family, void *parm, int (*callback)()) { struct ifaddrs *head, *addrs; - int errsav, fd = -1, ret = 0; + int errsave, fd = -1, ret = 0; if (family == AF_UNSPEC) #if defined(HAVE_BSD_NETWORK) && !defined(__APPLE__) @@ -237,11 +237,11 @@ int iface_enumerate(int family, void *parm, int (*callback)()) ret = 1; err: - errsav = errno; + errsave = errno; freeifaddrs(head); if (fd != -1) close(fd); - errno = errsav; + errno = errsave; return ret; } diff --git a/src/config.h b/src/config.h index cd4636d..be9cf05 100644 --- a/src/config.h +++ b/src/config.h @@ -21,7 +21,7 @@ #define TCP_BACKLOG 32 /* kernel backlog limit for TCP connections */ #define EDNS_PKTSZ 4096 /* default max EDNS.0 UDP packet from RFC5625 */ #define SAFE_PKTSZ 1280 /* "go anywhere" UDP packet size */ -#define KEYBLOCK_LEN 40 /* choose to mininise fragmentation when storing DNSSEC keys */ +#define KEYBLOCK_LEN 40 /* choose to minimise fragmentation when storing DNSSEC keys */ #define DNSSEC_WORK 50 /* Max number of queries to validate one question */ #define TIMEOUT 10 /* drop UDP queries after TIMEOUT seconds */ #define FORWARD_TEST 50 /* try all servers every 50 queries */ @@ -99,7 +99,7 @@ HAVE_IDN *-i18n makefile targets, even if HAVE_IDN is not explicitly set. HAVE_CONNTRACK - define this to include code which propogates conntrack marks from + define this to include code which propagates conntrack marks from incoming DNS queries to the corresponding upstream queries. This adds a build-dependency on libnetfilter_conntrack, but the resulting binary will still run happily on a kernel without conntrack support. @@ -131,7 +131,7 @@ NO_SCRIPT NO_LARGEFILE NO_AUTH NO_INOTIFY - these are avilable to explictly disable compile time options which would + these are avilable to explicitly disable compile time options which would otherwise be enabled automatically (HAVE_IPV6, >2Gb file sizes) or which are enabled by default in the distributed source tree. Building dnsmasq with something like "make COPTS=-DNO_SCRIPT" will do the trick. @@ -232,7 +232,7 @@ HAVE_SOCKADDR_SA_LEN defined if struct sockaddr has sa_len field (*BSD) */ -/* Must preceed __linux__ since uClinux defines __linux__ too. */ +/* Must precede __linux__ since uClinux defines __linux__ too. */ #if defined(__uClinux__) #define HAVE_LINUX_NETWORK #define HAVE_GETOPT_LONG @@ -270,7 +270,7 @@ HAVE_SOCKADDR_SA_LEN defined(__DragonFly__) || \ defined(__FreeBSD_kernel__) #define HAVE_BSD_NETWORK -/* Later verions of FreeBSD have getopt_long() */ +/* Later versions of FreeBSD have getopt_long() */ #if defined(optional_argument) && defined(required_argument) # define HAVE_GETOPT_LONG #endif @@ -368,7 +368,7 @@ HAVE_SOCKADDR_SA_LEN #endif /* Define a string indicating which options are in use. - DNSMASQP_COMPILE_OPTS is only defined in dnsmasq.c */ + DNSMASQ_COMPILE_OPTS is only defined in dnsmasq.c */ #ifdef DNSMASQ_COMPILE_OPTS @@ -67,9 +67,9 @@ static int make_fd(int port) setsockopt(fd, SOL_SOCKET, SO_BROADCAST, &oneopt, sizeof(oneopt)) == -1) die(_("failed to set options on DHCP socket: %s"), NULL, EC_BADNET); - /* When bind-interfaces is set, there might be more than one dnmsasq + /* When bind-interfaces is set, there might be more than one dnsmasq instance binding port 67. That's OK if they serve different networks. - Need to set REUSEADDR|REUSEPORT to make this posible. + Need to set REUSEADDR|REUSEPORT to make this possible. Handle the case that REUSEPORT is defined, but the kernel doesn't support it. This handles the introduction of REUSEPORT on Linux. */ if (option_bool(OPT_NOWILD) || option_bool(OPT_CLEVERBIND)) @@ -596,7 +596,7 @@ struct dhcp_context *narrow_context(struct dhcp_context *context, { /* We start of with a set of possible contexts, all on the current physical interface. These are chained on ->current. - Here we have an address, and return the actual context correponding to that + Here we have an address, and return the actual context corresponding to that address. Note that none may fit, if the address came a dhcp-host and is outside any dhcp-range. In that case we return a static range if possible, or failing that, any context on the correct subnet. (If there's more than one, this is a dodgy diff --git a/src/dhcp6.c b/src/dhcp6.c index 56eb0da..3e35ac7 100644 --- a/src/dhcp6.c +++ b/src/dhcp6.c @@ -51,9 +51,9 @@ void dhcp6_init(void) !set_ipv6pktinfo(fd)) die (_("cannot create DHCPv6 socket: %s"), NULL, EC_BADNET); - /* When bind-interfaces is set, there might be more than one dnmsasq + /* When bind-interfaces is set, there might be more than one dnsmasq instance binding port 547. That's OK if they serve different networks. - Need to set REUSEADDR|REUSEPORT to make this posible. + Need to set REUSEADDR|REUSEPORT to make this possible. Handle the case that REUSEPORT is defined, but the kernel doesn't support it. This handles the introduction of REUSEPORT on Linux. */ if (option_bool(OPT_NOWILD) || option_bool(OPT_CLEVERBIND)) @@ -252,7 +252,7 @@ void dhcp6_packet(time_t now) void get_client_mac(struct in6_addr *client, int iface, unsigned char *mac, unsigned int *maclenp, unsigned int *mactypep, time_t now) { - /* Recieving a packet from a host does not populate the neighbour + /* Receiving a packet from a host does not populate the neighbour cache, so we send a neighbour discovery request if we can't find the sender. Repeat a few times in case of packet loss. */ @@ -344,7 +344,7 @@ static int complete_context6(struct in6_addr *local, int prefix, { struct dhcp_context *tmp, **up; - /* use interface values only for contructed contexts */ + /* use interface values only for constructed contexts */ if (!(context->flags & CONTEXT_CONSTRUCTED)) preferred = valid = 0xffffffff; else if (flags & IFACE_DEPRECATED) @@ -672,7 +672,7 @@ static int construct_worker(struct in6_addr *local, int prefix, /* address went, now it's back */ log_context(AF_INET6, context); /* fast RAs for a while */ - ra_start_unsolicted(param->now, context); + ra_start_unsolicited(param->now, context); param->newone = 1; /* Add address to name again */ if (context->flags & CONTEXT_RA_NAME) @@ -695,7 +695,7 @@ static int construct_worker(struct in6_addr *local, int prefix, context->next = daemon->dhcp6; daemon->dhcp6 = context; - ra_start_unsolicted(param->now, context); + ra_start_unsolicited(param->now, context); /* we created a new one, need to call lease_update_file to get periodic functions called */ param->newone = 1; @@ -743,7 +743,7 @@ void dhcp_construct_contexts(time_t now) /* maximum time is 2 hours, from RFC */ if (context->saved_valid > 7200) /* 2 hours */ context->saved_valid = 7200; - ra_start_unsolicted(now, context); + ra_start_unsolicited(now, context); param.newone = 1; /* include deletion */ if (context->flags & CONTEXT_RA_NAME) diff --git a/src/dnsmasq.c b/src/dnsmasq.c index 1fd4e4f..456b0e8 100644 --- a/src/dnsmasq.c +++ b/src/dnsmasq.c @@ -202,12 +202,12 @@ int main (int argc, char **argv) #ifdef HAVE_SOLARIS_NETWORK if (daemon->max_logs != 0) - die(_("asychronous logging is not available under Solaris"), NULL, EC_BADCONF); + die(_("asynchronous logging is not available under Solaris"), NULL, EC_BADCONF); #endif #ifdef __ANDROID__ if (daemon->max_logs != 0) - die(_("asychronous logging is not available under Android"), NULL, EC_BADCONF); + die(_("asynchronous logging is not available under Android"), NULL, EC_BADCONF); #endif #ifndef HAVE_AUTH @@ -514,7 +514,7 @@ int main (int argc, char **argv) extent that an attacker running as the unprivileged user could replace the pidfile with a symlink, and have the target of that symlink overwritten as root next time dnsmasq starts. - The folowing code first deletes any existing file, and then opens it with the O_EXCL flag, + The following code first deletes any existing file, and then opens it with the O_EXCL flag, ensuring that the open() fails should there be any existing file (because the unlink() failed, or an attacker exploited the race between unlink() and open()). This ensures that no symlink attack can succeed. @@ -583,7 +583,7 @@ int main (int argc, char **argv) int bad_capabilities = 0; gid_t dummy; - /* remove all supplimentary groups */ + /* remove all supplementary groups */ if (gp && (setgroups(0, &dummy) == -1 || setgid(gp->gr_gid) == -1)) @@ -655,7 +655,7 @@ int main (int argc, char **argv) (1 << CAP_NET_ADMIN) | (1 << CAP_NET_RAW); data->inheritable = 0; - /* lose the setuid and setgid capbilities */ + /* lose the setuid and setgid capabilities */ if (capset(hdr, data) == -1) { send_event(err_pipe[1], EVENT_CAP_ERR, errno, NULL); @@ -818,7 +818,7 @@ int main (int argc, char **argv) my_syslog(MS_DHCP | LOG_INFO, _("DHCP, sockets bound exclusively to interface %s"), bound_device); # endif - /* after dhcp_contruct_contexts */ + /* after dhcp_construct_contexts */ if (daemon->dhcp || daemon->doing_dhcp6) lease_find_interfaces(now); #endif @@ -1680,7 +1680,7 @@ static void check_dns_listeners(time_t now) } #ifndef NO_FORK - /* Arrange for SIGALARM after CHILD_LIFETIME seconds to + /* Arrange for SIGALRM after CHILD_LIFETIME seconds to terminate the process. */ if (!option_bool(OPT_DEBUG)) alarm(CHILD_LIFETIME); diff --git a/src/dnsmasq.h b/src/dnsmasq.h index 4dffe1b..5be5f50 100644 --- a/src/dnsmasq.h +++ b/src/dnsmasq.h @@ -125,7 +125,7 @@ typedef unsigned long long u64; #if defined(HAVE_LINUX_NETWORK) #include <linux/capability.h> /* There doesn't seem to be a universally-available - userpace header for these. */ + userspace header for these. */ extern int capset(cap_user_header_t header, cap_user_data_t data); extern int capget(cap_user_header_t header, cap_user_data_t data); #define LINUX_CAPABILITY_VERSION_1 0x19980330 @@ -789,7 +789,7 @@ struct pxe_service { #define MATCH_REMOTE 4 #define MATCH_SUBSCRIBER 5 -/* vendorclass, userclass, remote-id or cicuit-id */ +/* vendorclass, userclass, remote-id or circuit-id */ struct dhcp_vendor { int len, match_type; unsigned int enterprise; @@ -1493,7 +1493,7 @@ void put_opt6_string(char *s); void ra_init(time_t now); void icmp6_packet(time_t now); time_t periodic_ra(time_t now); -void ra_start_unsolicted(time_t now, struct dhcp_context *context); +void ra_start_unsolicited(time_t now, struct dhcp_context *context); #endif /* slaac.c */ diff --git a/src/dnssec.c b/src/dnssec.c index 64358fa..90d8a4d 100644 --- a/src/dnssec.c +++ b/src/dnssec.c @@ -358,7 +358,7 @@ static int verify(struct blockdata *key_data, unsigned int key_len, unsigned cha character. In theory, if all the characters in a name were /000 or '.' or NAME_ESCAPE then all would have to be escaped, so the presentation format would be twice as long as the spec (1024). - The buffers are all delcared as 2049 (allowing for the trailing zero) + The buffers are all declared as 2049 (allowing for the trailing zero) for this reason. */ static int to_wire(char *name) @@ -670,7 +670,7 @@ static void sort_rrset(struct dns_header *header, size_t plen, u16 *rr_desc, int static unsigned char **rrset = NULL, **sigs = NULL; -/* Get pointers to RRset menbers and signature(s) for same. +/* Get pointers to RRset members and signature(s) for same. Check signatures, and return keyname associated in keyname. */ static int explore_rrset(struct dns_header *header, size_t plen, int class, int type, char *name, char *keyname, int *sigcnt, int *rrcnt) @@ -1467,7 +1467,7 @@ static int prove_non_existence_nsec(struct dns_header *header, size_t plen, unsi if (offset < p[1] && (p[offset+2] & mask) != 0) return 0; - break; /* finshed checking */ + break; /* finished checking */ } rdlen -= p[1]; @@ -1625,7 +1625,7 @@ static int check_nsec3_coverage(struct dns_header *header, size_t plen, int dige if (offset < p[1] && (p[offset+2] & mask) != 0) return 0; - break; /* finshed checking */ + break; /* finished checking */ } rdlen -= p[1]; @@ -1910,7 +1910,7 @@ static int zone_status(char *name, int class, char *keyname, time_t now) if (!(crecp = cache_find_by_name(NULL, keyname, now, F_DS))) return STAT_NEED_DS; - /* F_DNSSECOK misused in DS cache records to non-existance of NS record. + /* F_DNSSECOK misused in DS cache records to non-existence of NS record. F_NEG && !F_DNSSECOK implies that we've proved there's no DS record here, but that's because there's no NS record either, ie this isn't the start of a zone. We only prove that the DNS tree below a node is unsigned when @@ -2128,7 +2128,7 @@ int dnssec_validate_reply(time_t now, struct dns_header *header, size_t plen, ch /* An attacker replay a wildcard answer with a different answer and overlay a genuine RR. To prove this hasn't happened, the answer must prove that - the gennuine record doesn't exist. Check that here. + the genuine record doesn't exist. Check that here. Note that we may not yet have validated the NSEC/NSEC3 RRsets. That's not a problem since if the RRsets later fail we'll return BOGUS then. */ diff --git a/src/forward.c b/src/forward.c index 9b464d3..70371f0 100644 --- a/src/forward.c +++ b/src/forward.c @@ -1038,7 +1038,7 @@ void reply_query(int fd, int family, time_t now) if (!forward->dependent) break; - /* validated subsdiary query, (and cached result) + /* validated subsidiary query, (and cached result) pop that and return to the previous query we were working on. */ struct frec *prev = forward->dependent; free_frec(forward); @@ -1326,7 +1326,7 @@ void receive_query(struct listener *listen, time_t now) { struct irec *iface; - /* get the netmask of the interface whch has the address we were sent to. + /* get the netmask of the interface which has the address we were sent to. This is no neccessarily the interface we arrived on. */ for (iface = daemon->interfaces; iface; iface = iface->next) @@ -1448,7 +1448,7 @@ void receive_query(struct listener *listen, time_t now) } #ifdef HAVE_DNSSEC -/* Recurse up the key heirarchy */ +/* Recurse up the key hierarchy */ static int tcp_key_recurse(time_t now, int status, struct dns_header *header, size_t n, int class, char *name, char *keyname, struct server *server, int have_mark, unsigned int mark, int *keycount) @@ -1587,7 +1587,7 @@ static int tcp_key_recurse(time_t now, int status, struct dns_header *header, si /* The daemon forks before calling this: it should deal with one connection, - blocking as neccessary, and then return. Note, need to be a bit careful + blocking as necessary, and then return. Note, need to be a bit careful about resources for debug mode, when the fork is suppressed: that's done by the caller. */ unsigned char *tcp_request(int confd, time_t now, @@ -1799,7 +1799,7 @@ unsigned char *tcp_request(int confd, time_t now, unsigned int crc = questions_crc(header, (unsigned int)size, daemon->namebuff); #endif /* Loop round available servers until we succeed in connecting to one. - Note that this code subtley ensures that consecutive queries on this connection + Note that this code subtly ensures that consecutive queries on this connection which can go to the same server, do so. */ while (1) { diff --git a/src/helper.c b/src/helper.c index 34a1c8f..2b8164b 100644 --- a/src/helper.c +++ b/src/helper.c @@ -18,7 +18,7 @@ #ifdef HAVE_SCRIPT -/* This file has code to fork a helper process which recieves data via a pipe +/* This file has code to fork a helper process which receives data via a pipe shared with the main process and which is responsible for calling a script when DHCP leases change. diff --git a/src/inotify.c b/src/inotify.c index 603ce9d..083f7d3 100644 --- a/src/inotify.c +++ b/src/inotify.c @@ -260,7 +260,7 @@ int inotify_check(time_t now) #ifdef HAVE_DHCP if (daemon->dhcp || daemon->doing_dhcp6) { - /* Propogate the consequences of loading a new dhcp-host */ + /* Propagate the consequences of loading a new dhcp-host */ dhcp_update_configs(daemon->dhcp_conf); lease_update_from_configs(); lease_update_file(now); @@ -273,7 +273,7 @@ int inotify_check(time_t now) { if (option_read_dynfile(path, AH_DHCP_HST)) { - /* Propogate the consequences of loading a new dhcp-host */ + /* Propagate the consequences of loading a new dhcp-host */ dhcp_update_configs(daemon->dhcp_conf); lease_update_from_configs(); lease_update_file(now); diff --git a/src/lease.c b/src/lease.c index ca62cc5..fc6cbe9 100644 --- a/src/lease.c +++ b/src/lease.c @@ -70,7 +70,7 @@ void lease_init(time_t now) Check various buffers are big enough for the code below */ #if (DHCP_BUFF_SZ < 255) || (MAXDNAME < 64) || (PACKETSZ+MAXDNAME+RRFIXEDSZ < 764) -# error Buffer size breakage in leasfile parsing. +# error Buffer size breakage in leasefile parsing. #endif if (leasestream) @@ -100,7 +100,7 @@ void lease_init(time_t now) (lease = lease4_allocate(addr.addr.addr4))) { hw_len = parse_hex(daemon->dhcp_buff2, (unsigned char *)daemon->dhcp_buff2, DHCP_CHADDR_MAX, NULL, &hw_type); - /* For backwards compatibility, no explict MAC address type means ether. */ + /* For backwards compatibility, no explicit MAC address type means ether. */ if (hw_type == 0 && hw_len != 0) hw_type = ARPHRD_ETHER; @@ -413,7 +413,7 @@ void lease_ping_reply(struct in6_addr *sender, unsigned char *packet, char *inte void lease_update_slaac(time_t now) { - /* Called when we contruct a new RA-names context, to add putative + /* Called when we construct a new RA-names context, to add putative new SLAAC addresses to existing leases. */ struct dhcp_lease *lease; @@ -783,7 +783,7 @@ void lease_set_expires(struct dhcp_lease *lease, unsigned int len, time_t now) { exp = now + (time_t)len; /* Check for 2038 overflow. Make the lease - inifinite in that case, as the least disruptive + infinite in that case, as the least disruptive thing we can do. */ if (difftime(exp, now) <= 0.0) exp = 0; @@ -1117,7 +1117,7 @@ int do_script_run(time_t now) } #ifdef HAVE_SCRIPT -/* delim == -1 -> delim = 0, but embeded 0s, creating extra records, are OK. */ +/* delim == -1 -> delim = 0, but embedded 0s, creating extra records, are OK. */ void lease_add_extradata(struct dhcp_lease *lease, unsigned char *data, unsigned int len, int delim) { unsigned int i; @@ -1125,7 +1125,7 @@ void lease_add_extradata(struct dhcp_lease *lease, unsigned char *data, unsigned if (delim == -1) delim = 0; else - /* check for embeded NULLs */ + /* check for embedded NULLs */ for (i = 0; i < len; i++) if (data[i] == 0) { @@ -154,7 +154,7 @@ static void log_write(void) while (entries) { - /* The data in the payoad is written with a terminating zero character + /* The data in the payload is written with a terminating zero character and the length reflects this. For a stream connection we need to send the zero as a record terminator, but this isn't done for a datagram connection, so treat the length as one less than reality @@ -436,7 +436,7 @@ void check_log_writer(int force) void flush_log(void) { /* write until queue empty, but don't loop forever if there's - no connection to the syslog in existance */ + no connection to the syslog in existence */ while (log_fd != -1) { struct timespec waiter; diff --git a/src/network.c b/src/network.c index 6169827..770558a 100644 --- a/src/network.c +++ b/src/network.c @@ -178,7 +178,7 @@ int iface_check(int family, struct all_addr *addr, char *name, int *auth) } -/* Fix for problem that the kernel sometimes reports the loopback inerface as the +/* Fix for problem that the kernel sometimes reports the loopback interface as the arrival interface when a packet originates locally, even when sent to address of an interface other than the loopback. Accept packet if it arrived via a loopback interface, even when we're not accepting packets that way, as long as the destination @@ -644,7 +644,7 @@ int enumerate_interfaces(int reset) /* Garbage-collect listeners listening on addresses that no longer exist. Does nothing when not binding interfaces or for listeners on localhost, since the ->iface field is NULL. Note that this needs the protections - against re-entrancy, hence it's here. It also means there's a possibility, + against reentrancy, hence it's here. It also means there's a possibility, in OPT_CLEVERBIND mode, that at listener will just disappear after a call to enumerate_interfaces, this is checked OK on all calls. */ struct listener *l, *tmp, **up; @@ -699,7 +699,7 @@ static int make_sock(union mysockaddr *addr, int type, int dienow) if ((fd = socket(family, type, 0)) == -1) { - int port, errsav; + int port, errsave; char *s; /* No error if the kernel just doesn't support this IP flavour */ @@ -709,7 +709,7 @@ static int make_sock(union mysockaddr *addr, int type, int dienow) return -1; err: - errsav = errno; + errsave = errno; port = prettyprint_addr(addr, daemon->addrbuff); if (!option_bool(OPT_NOWILD) && !option_bool(OPT_CLEVERBIND)) sprintf(daemon->addrbuff, "port %d", port); @@ -718,7 +718,7 @@ static int make_sock(union mysockaddr *addr, int type, int dienow) if (fd != -1) close (fd); - errno = errsav; + errno = errsave; if (dienow) { diff --git a/src/option.c b/src/option.c index 9bad827..4a5ef5f 100644 --- a/src/option.c +++ b/src/option.c @@ -422,7 +422,7 @@ static struct { { LOPT_SCRIPTUSR, ARG_ONE, "<username>", gettext_noop("Run lease-change scripts as this user."), NULL }, { LOPT_SCRIPT_ARP, OPT_SCRIPT_ARP, NULL, gettext_noop("Call dhcp-script with changes to local ARP table."), NULL }, { '7', ARG_DUP, "<path>", gettext_noop("Read configuration from all the files in this directory."), NULL }, - { '8', ARG_ONE, "<facilty>|<file>", gettext_noop("Log to this syslog facility or file. (defaults to DAEMON)"), NULL }, + { '8', ARG_ONE, "<facility>|<file>", gettext_noop("Log to this syslog facility or file. (defaults to DAEMON)"), NULL }, { '9', OPT_LEASE_RO, NULL, gettext_noop("Do not use leasefile."), NULL }, { '0', ARG_ONE, "<integer>", gettext_noop("Maximum number of concurrent DNS queries. (defaults to %s)"), "!" }, { LOPT_RELOAD, OPT_RELOAD, NULL, gettext_noop("Clear DNS cache when reloading %s."), RESOLVFILE }, @@ -433,7 +433,7 @@ static struct { { LOPT_APREF, OPT_TFTP_APREF, NULL, gettext_noop("Add client IP address to tftp-root."), NULL }, { LOPT_SECURE, OPT_TFTP_SECURE, NULL, gettext_noop("Allow access only to files owned by the user running dnsmasq."), NULL }, { LOPT_TFTP_NO_FAIL, OPT_TFTP_NO_FAIL, NULL, gettext_noop("Do not terminate the service if TFTP directories are inaccessible."), NULL }, - { LOPT_TFTP_MAX, ARG_ONE, "<integer>", gettext_noop("Maximum number of conncurrent TFTP transfers (defaults to %s)."), "#" }, + { LOPT_TFTP_MAX, ARG_ONE, "<integer>", gettext_noop("Maximum number of concurrent TFTP transfers (defaults to %s)."), "#" }, { LOPT_TFTP_MTU, ARG_ONE, "<integer>", gettext_noop("Maximum MTU to use for TFTP transfers."), NULL }, { LOPT_NOBLOCK, OPT_TFTP_NOBLOCK, NULL, gettext_noop("Disable the TFTP blocksize extension."), NULL }, { LOPT_TFTP_LC, OPT_TFTP_LC, NULL, gettext_noop("Convert TFTP filenames to lowercase"), NULL }, @@ -472,7 +472,7 @@ static struct { { LOPT_AUTHSERV, ARG_ONE, "<NS>,<interface>", gettext_noop("Export local names to global DNS"), NULL }, { LOPT_AUTHZONE, ARG_DUP, "<domain>,[<subnet>...]", gettext_noop("Domain to export to global DNS"), NULL }, { LOPT_AUTHTTL, ARG_ONE, "<integer>", gettext_noop("Set TTL for authoritative replies"), NULL }, - { LOPT_AUTHSOA, ARG_ONE, "<serial>[,...]", gettext_noop("Set authoritive zone information"), NULL }, + { LOPT_AUTHSOA, ARG_ONE, "<serial>[,...]", gettext_noop("Set authoritative zone information"), NULL }, { LOPT_AUTHSFS, ARG_DUP, "<NS>[,<NS>...]", gettext_noop("Secondary authoritative nameservers for forward domains"), NULL }, { LOPT_AUTHPEER, ARG_DUP, "<ipaddr>[,<ipaddr>...]", gettext_noop("Peers which are allowed to do zone transfer"), NULL }, { LOPT_IPSET, ARG_DUP, "/<domain>[/<domain>...]/<ipset>...", gettext_noop("Specify ipsets to which matching domains should be added"), NULL }, @@ -497,7 +497,7 @@ static struct { { 0, 0, NULL, NULL, NULL } }; -/* We hide metacharaters in quoted strings by mapping them into the ASCII control +/* We hide metacharacters in quoted strings by mapping them into the ASCII control character space. Note that the \0, \t \b \r \033 and \n characters are carefully placed in the following sequence so that they map to themselves: it is therefore possible to call unhide_metas repeatedly on string without breaking things. diff --git a/src/outpacket.c b/src/outpacket.c index 2caacd9..270d1a3 100644 --- a/src/outpacket.c +++ b/src/outpacket.c @@ -31,7 +31,7 @@ void end_opt6(int container) void reset_counter(void) { - /* Clear out buffer when starting from begining */ + /* Clear out buffer when starting from beginning */ if (daemon->outpacket.iov_base) memset(daemon->outpacket.iov_base, 0, daemon->outpacket.iov_len); @@ -82,7 +82,7 @@ void ra_init(time_t now) /* ensure this is around even if we're not doing DHCPv6 */ expand_buf(&daemon->outpacket, sizeof(struct dhcp_packet)); - /* See if we're guessing SLAAC addresses, if so we need to recieve ping replies */ + /* See if we're guessing SLAAC addresses, if so we need to receive ping replies */ for (context = daemon->dhcp6; context; context = context->next) if ((context->flags & CONTEXT_RA_NAME)) break; @@ -112,10 +112,10 @@ void ra_init(time_t now) daemon->icmp6fd = fd; if (daemon->doing_ra) - ra_start_unsolicted(now, NULL); + ra_start_unsolicited(now, NULL); } -void ra_start_unsolicted(time_t now, struct dhcp_context *context) +void ra_start_unsolicited(time_t now, struct dhcp_context *context) { /* init timers so that we do ra's for some/all soon. some ra_times will end up zeroed if it's not appropriate to advertise those contexts. @@ -400,7 +400,7 @@ static void send_ra_alias(time_t now, int iface, char *iface_name, struct in6_ad } #ifdef HAVE_LINUX_NETWORK - /* Note that IPv6 MTU is not necessarilly the same as the IPv4 MTU + /* Note that IPv6 MTU is not neccessarily the same as the IPv4 MTU available from SIOCGIFMTU */ sprintf(daemon->namebuff, "/proc/sys/net/ipv6/conf/%s/mtu", iface_name); if ((f = fopen(daemon->namebuff, "r"))) @@ -780,7 +780,7 @@ time_t periodic_ra(time_t now) associated with it, because it's for a subnet we dont have an interface on. Probably we're doing DHCP on a remote subnet via a relay. Zero the timer, since we won't - ever be able to send ra's and satistfy it. */ + ever be able to send ra's and satisfy it. */ context->ra_time = 0; if (param.iface != 0 && diff --git a/src/rfc1035.c b/src/rfc1035.c index a8daf12..c007dca 100644 --- a/src/rfc1035.c +++ b/src/rfc1035.c @@ -176,7 +176,7 @@ int in_arpa_name_2_addr(char *namein, struct all_addr *addrp) if (hostname_isequal(lastchunk, "arpa") && hostname_isequal(penchunk, "in-addr")) { /* IP v4 */ - /* address arives as a name of the form + /* address arrives as a name of the form www.xxx.yyy.zzz.in-addr.arpa some of the low order address octets might be missing and should be set to zero. */ @@ -206,7 +206,7 @@ int in_arpa_name_2_addr(char *namein, struct all_addr *addrp) Address arrives as 0.1.2.3.4.5.6.7.8.9.a.b.c.d.e.f.ip6.[int|arpa] or \[xfedcba9876543210fedcba9876543210/128].ip6.[int|arpa] - Note that most of these the various reprentations are obsolete and + Note that most of these the various representations are obsolete and left-over from the many DNS-for-IPv6 wars. We support all the formats that we can since there is no reason not to. */ @@ -336,7 +336,7 @@ unsigned char *skip_section(unsigned char *ansp, int count, struct dns_header *h } /* CRC the question section. This is used to safely detect query - retransmision and to detect answers to questions we didn't ask, which + retransmission and to detect answers to questions we didn't ask, which might be poisoning attacks. Note that we decode the name rather than CRC the raw bytes, since replies might be compressed differently. We ignore case in the names for the same reason. Return all-ones @@ -1576,7 +1576,7 @@ size_t answer_request(struct dns_header *header, char *limit, size_t qlen, { int localise = 0; - /* See if a putative address is on the network from which we recieved + /* See if a putative address is on the network from which we received the query, is so we'll filter other answers. */ if (local_addr.s_addr != 0 && option_bool(OPT_LOCALISE) && flag == F_IPV4) { @@ -1852,7 +1852,7 @@ size_t answer_request(struct dns_header *header, char *limit, size_t qlen, /* set RA flag */ header->hb4 |= HB4_RA; - /* authoritive - only hosts and DHCP derived names. */ + /* authoritative - only hosts and DHCP derived names. */ if (auth) header->hb3 |= HB3_AA; diff --git a/src/rfc2131.c b/src/rfc2131.c index 491c3ca..978c8dc 100644 --- a/src/rfc2131.c +++ b/src/rfc2131.c @@ -365,7 +365,7 @@ size_t dhcp_reply(struct dhcp_context *context, char *iface_name, int int_index, /* dhcp-match. If we have hex-and-wildcards, look for a left-anchored match. Otherwise assume the option is an array, and look for a matching element. - If no data given, existance of the option is enough. This code handles + If no data given, existence of the option is enough. This code handles rfc3925 V-I classes too. */ for (o = daemon->dhcp_match; o; o = o->next) { diff --git a/src/rfc3315.c b/src/rfc3315.c index 568b0c8..836222d 100644 --- a/src/rfc3315.c +++ b/src/rfc3315.c @@ -118,7 +118,7 @@ static int dhcp6_maybe_relay(struct state *state, void *inbuff, size_t sz, void *opt; struct dhcp_vendor *vendor; - /* if not an encaplsulated relayed message, just do the stuff */ + /* if not an encapsulated relayed message, just do the stuff */ if (msg_type != DHCP6RELAYFORW) { /* if link_address != NULL if points to the link address field of the @@ -262,7 +262,7 @@ static int dhcp6_no_relay(struct state *state, int msg_type, void *inbuff, size_ state->hostname_auth = 0; state->hostname = NULL; state->client_hostname = NULL; - state->fqdn_flags = 0x01; /* default to send if we recieve no FQDN option */ + state->fqdn_flags = 0x01; /* default to send if we receive no FQDN option */ #ifdef OPTION6_PREFIX_CLASS state->send_prefix_class = NULL; #endif @@ -381,7 +381,7 @@ static int dhcp6_no_relay(struct state *state, int msg_type, void *inbuff, size_ /* dhcp-match. If we have hex-and-wildcards, look for a left-anchored match. Otherwise assume the option is an array, and look for a matching element. - If no data given, existance of the option is enough. This code handles + If no data given, existence of the option is enough. This code handles V-I opts too. */ for (opt_cfg = daemon->dhcp_match6; opt_cfg; opt_cfg = opt_cfg->next) { @@ -1273,7 +1273,7 @@ static int dhcp6_no_relay(struct state *state, int msg_type, void *inbuff, size_ } - /* We must anwser with 'success' in global section anyway */ + /* We must answer with 'success' in global section anyway */ o1 = new_opt6(OPTION6_STATUS_CODE); put_opt6_short(DHCP6SUCCESS); put_opt6_string(_("success")); @@ -1387,7 +1387,7 @@ static struct dhcp_netid *add_options(struct state *state, int do_refresh) unsigned int lease_time = 0xffffffff; /* Find the smallest lease tie of all contexts, - subjext to the RFC-4242 stipulation that this must not + subject to the RFC-4242 stipulation that this must not be less than 600. */ for (c = state->context; c; c = c->next) if (c->lease_time < lease_time) diff --git a/src/rrfilter.c b/src/rrfilter.c index a784522..d8da27e 100644 --- a/src/rrfilter.c +++ b/src/rrfilter.c @@ -173,7 +173,7 @@ size_t rrfilter(struct dns_header *header, size_t plen, int mode) GETSHORT(qclass, p); /* First pass, find pointers to start and end of all the records we wish to elide: - records added for DNSSEC, unless explicity queried for */ + records added for DNSSEC, unless explicitly queried for */ for (rr_found = 0, chop_ns = 0, chop_an = 0, chop_ar = 0, i = 0; i < ntohs(header->ancount) + ntohs(header->nscount) + ntohs(header->arcount); i++) diff --git a/src/slaac.c b/src/slaac.c index 7ecf127..1d079f1 100644 --- a/src/slaac.c +++ b/src/slaac.c @@ -94,7 +94,7 @@ void slaac_add_addrs(struct dhcp_lease *lease, time_t now, int force) slaac->backoff = 1; slaac->addr = addr; /* Do RA's to prod it */ - ra_start_unsolicted(now, context); + ra_start_unsolicited(now, context); } if (slaac) @@ -470,7 +470,7 @@ static struct tftp_file *check_tftp_fileperm(ssize_t *len, char *prefix) else if (option_bool(OPT_TFTP_SECURE) && uid != statbuf.st_uid) goto perm; - /* If we're doing many tranfers from the same file, only + /* If we're doing many transfers from the same file, only open it once this saves lots of file descriptors when mass-booting a big cluster, for instance. Be conservative and only share when inode and name match @@ -373,7 +373,7 @@ int is_same_net6(struct in6_addr *a, struct in6_addr *b, int prefixlen) return 0; } -/* return least signigicant 64 bits if IPv6 address */ +/* return least significant 64 bits if IPv6 address */ u64 addr6part(struct in6_addr *addr) { int i; |