Skip to content

Commit

Permalink
Merge branch 'devel/spelling' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
wtoorop committed Jun 14, 2021
2 parents a881fba + 5820518 commit 97019eb
Show file tree
Hide file tree
Showing 85 changed files with 219 additions and 206 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,6 @@ script:
make -j 2
make install
else
# Default case for mosts tests
# Default case for most tests
./test/test_ci.sh
fi
23 changes: 12 additions & 11 deletions Changelog
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
1.7.2 2020-??-??
1.7.2 2021-??-??
* bugfix #38: Print "line" before line number when printing
zone parse errors. Thanks Petr Špaček.
* bugfix: Revert unused variables in ldns-config removal patch.
Expand All @@ -25,6 +25,7 @@
* bugfix #119: Let example tools read longer RR's than
LDNS_MAX_LINELEN
* Add SVCPARAMS to python ldns_rdf_type2str function.
* PR #134 Miscellaneous spelling fixes. Thanks jsoref!

1.7.1 2019-07-26
* bugfix: Manage verification paths for OpenSSL >= 1.1.0
Expand Down Expand Up @@ -295,7 +296,7 @@
in sync.
* Let ldns_pkt_push_rr now return false on (memory) errors.
* Make buffer_export comply to documentation and fix buffer2str
* Various improvements and fixes of pyldns from Katel Slany
* Various improvements and fixes of pyldns from Karel Slany
now documented in their own Changelog.
* bugfix: Make ldns_resolver_pop_nameserver clear the array when
there was only one.
Expand Down Expand Up @@ -334,7 +335,7 @@
* bugfix #433: Allocate rdf using ldns_rdf_new in ldns_dname_label
* bugfix #432: Use LDNS_MALLOC & LDNS_FREE i.s.o. malloc & free
* bugfix #431: Added error message for LDNS_STATUS_INVALID_B32_EXT
* bugfix #427: Explicitely link ssl with the programs that use it.
* bugfix #427: Explicitly link ssl with the programs that use it.
* Fix reading \DDD: Error on values that are outside range (>255).
* bugfix #429: fix doxyparse.pl fails on NetBSD because specified
path to perl.
Expand Down Expand Up @@ -398,7 +399,7 @@
* Update of libdns.vim (thanks Miek Gieben)
* Added the ldnsx Python module to our contrib section, which adds even
more pythonisticism to the usage of ldns with Python. (Many thanks
to Christpher Olah and Paul Wouters)
to Christopher Olah and Paul Wouters)
The ldnsx module is automatically installed when --with-pyldns is
used with configuring, but may explicitly be excluded with the
--without-pyldnsx option to configure.
Expand Down Expand Up @@ -426,7 +427,7 @@
* bugfix #380: Minimizing effect of discrepancies in sizeof(bool) at
build time and when used.
* bugfix #383: Fix detection of empty nonterminals of multiple labels.
* Fixed the ommission of rrsets in nsec(3)s and rrsigs to all occluded
* Fixed the omission of rrsets in nsec(3)s and rrsigs to all occluded
names (in stead of just the ones that contain glue only) and all
occluded records on the delegation points (in stead of just the glue).
* Clarify the operation of ldns_dnssec_mark_glue and the usage of
Expand Down Expand Up @@ -716,7 +717,7 @@
from Shane Kerr, bug id 188)
* zone.c memory leaks on error and allocation checks fixed (patch
from Shane Kerr, bug id 189)
* ldns-zplit output and error messages fixed (patch from Shane Kerr,
* ldns-zsplit output and error messages fixed (patch from Shane Kerr,
bug id 190)
* Fixed potential buffer overflow in ldns_str2rdf_dname
* Signing code no longer signs delegation NS rrsets
Expand Down Expand Up @@ -745,7 +746,7 @@
* DLV RR type added
* TCP fallback system has been improved
* HMAC-SHA256 TSIG support has been added.
* TTLS are now correcly set in NSEC(3) records when signing zones
* TTLS are now correctly set in NSEC(3) records when signing zones

EXAMPLE TOOLS:
* New example: ldns-revoke to revoke DNSKEYs according to RFC5011
Expand Down Expand Up @@ -820,7 +821,7 @@
28 Nov 2007 1.2.2:
* Added support for HMAC-MD5 keys in generator
* Added a new example tool (written by Ondrej Sury): ldns-compare-zones
* ldns-keygen now checks key sizes for rfc conformancy
* ldns-keygen now checks key sizes for rfc conformance
* ldns-signzone outputs SSL error if present
* Fixed manpages (thanks to Ondrej Sury)
* Fixed Makefile for -j <x>
Expand Down Expand Up @@ -910,7 +911,7 @@
* ldns-dpa was added to the examples - this is the Dns Packet
Analyzer tool.
* ldnsd - as very, very simple nameserver impl.
* ldns-zsplit - split zones for parrallel signing
* ldns-zsplit - split zones for parallel signing
* ldns-zcat - cat split zones back together
* ldns-keyfetcher - Fetches DNSKEY records with a few (non-strong,
non-DNSSEC) anti-spoofing techniques.
Expand All @@ -929,7 +930,7 @@
API:
Changed:
* renamed ldns/dns.h to ldns/ldns.h
* ldns_rr_new_frm_str() is extented with an extra variable which
* ldns_rr_new_frm_str() is extended with an extra variable which
in common use may be NULL. This trickles through to:
o ldns_rr_new_frm_fp
o ldns_rr_new_frm_fp_l
Expand Down Expand Up @@ -1003,7 +1004,7 @@
13 Jun 2005: 0.65: ldns-team
* Repository is online at:
http://www.nlnetlabs.nl/ldns/svn/
* Apply reference copying throuhgout ldns, except in 2
* Apply reference copying throughout ldns, except in 2
places in the ldns_resolver structure (._domain and
._nameservers)
* Usual array of bugfixes
Expand Down
2 changes: 1 addition & 1 deletion Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ install: install-h install-lib install-pc @INSTALL_CONFIG@ install-manpages $(py

uninstall: uninstall-manpages @UNINSTALL_CONFIG@ uninstall-h uninstall-lib uninstall-pc $(pyldns_uninst) $(pyldnsx_uninst) @UNINSTALL_P5_DNS_LDNS@ @UNINSTALL_DRILL@ @UNINSTALL_EXAMPLES@

destclean: uninstall
distclean: uninstall

install-config:
$(INSTALL) -d $(DESTDIR)$(bindir)
Expand Down
2 changes: 1 addition & 1 deletion README-Travis.md
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ If you are working from a developer machine you probably already have the necess

The fourth step builds OpenSSL. OpenSSL is built for iOS using the scripts `contrib/ios/install_openssl.sh`. The script downloads, configures and installs the latest release version of the OpenSSL libraries. OpenSSL is configured with `--prefix="$IOS_PREFIX"` so the headers are placed in `$IOS_PREFIX/include` directory, and the libraries are placed in the `$IOS_PREFIX/lib` directory.

`IOS_PREFIX` is the value `$HOME/$IOS_SDK-$IOS_CPU`. The scheme handles both iOS SDKs and cpu architectures so the pair recieves a unique installation directory. The libraries will be installed in `$HOME/iPhoneOS-armv7s`, `$HOME/iPhoneOS-arm64`, `$HOME/iPhoneSimulator-i386`, etc. For Autotools projects, the appropriate `PKG_CONFIG_PATH` is exported.
`IOS_PREFIX` is the value `$HOME/$IOS_SDK-$IOS_CPU`. The scheme handles both iOS SDKs and cpu architectures so the pair receives a unique installation directory. The libraries will be installed in `$HOME/iPhoneOS-armv7s`, `$HOME/iPhoneOS-arm64`, `$HOME/iPhoneSimulator-i386`, etc. For Autotools projects, the appropriate `PKG_CONFIG_PATH` is exported.

`PKG_CONFIG_PATH` is an important variable. It is the userland equivalent to sysroot, and allows Autotools to find non-system headers and libraries for an architecture. Typical `PKG_CONFIG_PATH` are `$HOME/iPhoneOS-armv7s/lib/pkgconfig` and `$HOME/iPhoneOS-arm64/lib/pkgconfig`.

Expand Down
4 changes: 2 additions & 2 deletions acx_nlnetlabs.m4
Original file line number Diff line number Diff line change
Expand Up @@ -525,12 +525,12 @@ AC_DEFUN([AC_PROG_OBJC], [:])
AC_DEFUN([AC_PROG_OBJCCPP], [:])
AC_DEFUN([AC_LIBTOOL_CXX], [:])
AC_DEFUN([AC_LIBTOOL_F77], [:])
# always use ./libtool unless override from commandline (libtool=mylibtool)
# always use ./libtool unless override from command line (libtool=mylibtool)
if test -z "$libtool"; then
libtool="./libtool"
fi
AC_SUBST(libtool)
# avoid libtool max commandline length test on systems that fork slowly.
# avoid libtool max command line length test on systems that fork slowly.
AC_CANONICAL_HOST
if echo "$host_os" | grep "sunos4" >/dev/null; then
lt_cv_sys_max_cmd_len=32750;
Expand Down
4 changes: 2 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ case "$enable_sha2" in
;;
esac

# check wether gost also works
# check whether gost also works
AC_DEFUN([AC_CHECK_GOST_WORKS],
[AC_REQUIRE([AC_PROG_CC])
AC_MSG_CHECKING([if GOST works])
Expand Down Expand Up @@ -497,7 +497,7 @@ case "$enable_gost" in
AC_CHECK_FUNC(EVP_PKEY_set_type_str, [],[AC_MSG_ERROR([OpenSSL >= 1.0.0 is needed for GOST support or rerun with --disable-gost])])
AC_CHECK_FUNC(EC_KEY_new, [], [AC_MSG_ERROR([No ECC functions found in OpenSSL: please upgrade OpenSSL or rerun with --disable-gost])])
AC_CHECK_GOST_WORKS
AC_ARG_ENABLE(gost-anyway, AC_HELP_STRING([--enable-gost-anyway], [Enable GOST even whithout a GOST engine installed]))
AC_ARG_ENABLE(gost-anyway, AC_HELP_STRING([--enable-gost-anyway], [Enable GOST even without a GOST engine installed]))
if test "$ac_cv_c_gost_works" != "no" -o "$enable_gost_anyway" = "yes"; then
if test "$ac_cv_c_gost_works" = "no"; then
AC_MSG_RESULT([no, but compiling with GOST support anyway])
Expand Down
2 changes: 1 addition & 1 deletion contrib/android/install_tools.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ sudo apt-get -qq update
sudo apt-get -qq install --no-install-recommends curl wget tar zip unzip patch perl openjdk-8-jdk autoconf automake libtool pkg-config

# Android builds run config.guess early to determine BUILD and HOST. We need to add config.guess
# and config.sub now. Later, bootstrap_ldns.sh will handle the complete bootrap of LDNS.
# and config.sub now. Later, bootstrap_ldns.sh will handle the complete bootstrap of LDNS.

echo "Adding config.guess"
if ! wget -q -O config.guess 'https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD'; then
Expand Down
4 changes: 2 additions & 2 deletions contrib/ldnsx/README
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
LDNSX: Easy DNS (including DNSSEC) via ldns.

ldns is a great library. It is a powerfull tool for
ldns is a great library. It is a powerful tool for
working with DNS. python-ldns it is a straight up clone of the C
interface, howver that is not a very good interface for python. Its
interface, however that is not a very good interface for python. Its
documentation is incomplete and some functions don't work as
described. And some objects don't have a full python API.

Expand Down
16 changes: 8 additions & 8 deletions contrib/ldnsx/ldnsx.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

""" Easy DNS (including DNSSEC) via ldns.
ldns is a great library. It is a powerfull tool for
ldns is a great library. It is a powerful tool for
working with DNS. python-ldns it is a straight up clone of the C
interface, howver that is not a very good interface for python. Its
interface, however that is not a very good interface for python. Its
documentation is incomplete and some functions don't work as
described. And some objects don't have a full python API.
Expand Down Expand Up @@ -204,7 +204,7 @@ def __init__(self, ns = None, dnssec = False, tcp = False, port = 53):
defaults to settings from /etc/resolv.conf
* dnssec -- should the resolver try and use dnssec or not?
* tcp -- should the resolver use TCP
'auto' is a depricated work around for old ldns problems
'auto' is a deprecated work around for old ldns problems
* port -- the port to use, must be the same for all nameservers
"""
Expand Down Expand Up @@ -238,7 +238,7 @@ def query(self, name, rr_type, rr_class="IN", flags=["RD"], tries = 3):
* rr_type -- the record type to query for
* rr_class -- the class to query for, defaults to IN (Internet)
* flags -- the flags to send the query with
* tries -- the number of times to attempt to acheive query in case of packet loss, etc
* tries -- the number of times to attempt to achieve query in case of packet loss, etc
**Examples**
Expand Down Expand Up @@ -284,7 +284,7 @@ def query(self, name, rr_type, rr_class="IN", flags=["RD"], tries = 3):
If the version of ldnsx you are using is old, it is possible that there could be new rr_types that
we don't recognise mnemonic for. You can still use the number XXX or the string "TYPEXXX". To
determine what rr_type menmonics we support, please refer to resolver.supported_rr_types()
determine what rr_type mnemonics we support, please refer to resolver.supported_rr_types()
"""
# Determine rr_type int
Expand Down Expand Up @@ -320,7 +320,7 @@ def query(self, name, rr_type, rr_class="IN", flags=["RD"], tries = 3):
pkt = self._ldns_resolver.query(name, _rr_type, _rr_class, _flags)
except KeyboardInterrupt: #Since so much time is spent waiting on ldns, this is very common place for Ctr-C to fall
raise
except: #Since the ldns exceptiion is not very descriptive...
except: #Since the ldns exception is not very descriptive...
raise Exception("ldns backend ran into problems. Likely, the name you were querying for, %s, was invalid." % name)
#Deal with failed queries
if not pkt:
Expand Down Expand Up @@ -497,7 +497,7 @@ def rcode(self):
Example returned value: "NOERROR"
possilbe rcodes (via ldns): "FORMERR", "MASK", "NOERROR",
possible rcodes (via ldns): "FORMERR", "MASK", "NOERROR",
"NOTAUTH", "NOTIMPL", "NOTZONE", "NXDOMAIN",
"NXRSET", "REFUSED", "SERVFAIL", "SHIFT",
"YXDOMAIN", "YXRRSET"
Expand Down Expand Up @@ -823,7 +823,7 @@ def alg(self):
return -1

def protocol(self):
""" Returns proticol of the DNSKEY"""
""" Returns protocol of the DNSKEY"""
t = self.rr_type()
if t == "DNSKEY":
return int(self[5])
Expand Down
4 changes: 2 additions & 2 deletions contrib/ldnsx/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ Welcome to ldnsx's documentation!

LDNSX: Easy DNS (including DNSSEC) via ldns.

ldns is a great library. It is a powerfull tool for
ldns is a great library. It is a powerful tool for
working with DNS. python-ldns it is a straight up clone of the C
interface, howver that is not a very good interface for python. Its
interface, however that is not a very good interface for python. Its
documentation is incomplete and some functions don't work as
described. And some objects don't have a full python API.

Expand Down
2 changes: 1 addition & 1 deletion contrib/python/Changelog
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Added ldns_rdf.data_as_bytearray(). The method returns a bytearray object
containing rdf data.
* Changed the behaviour of ldns_resolver.trusted_key() in order to prevent
memory corrupotion and leaks.
memory corruption and leaks.
* Fixed memory leaks when destroying ldns_resolver.
* Removed ldns_pkt.section_count(), ldns_resolver.set_searchlist_count()
because it is marked static in the library.
Expand Down
2 changes: 1 addition & 1 deletion contrib/python/docs/source/examples/example1.rst
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ In the third step we tell the resolver to query for our domain, type MX, of clas
pkt = resolver.query(dname, ldns.LDNS_RR_TYPE_MX, ldns.LDNS_RR_CLASS_IN, ldns.LDNS_RD)

The function should return a packet if everything goes well and this packet will contain resource records we asked for.
Note that there exists a simplier way. Instead of using a dname variable, we can use a string which will be automatically converted.
Note that there exists a simpler way. Instead of using a dname variable, we can use a string which will be automatically converted.
::

pkt = resolver.query("fit.vutbr.cz", ldns.LDNS_RR_TYPE_MX, ldns.LDNS_RR_CLASS_IN, ldns.LDNS_RD)
Expand Down
6 changes: 3 additions & 3 deletions contrib/python/docs/source/examples/example8.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ In order to be able sign a zone file, you have to generate a key-pair using ``ld

Signing consists of three steps

1. In the first step, the content of a zone file is readed and parsed. This can be done using :class:`ldns.ldns_zone` class.
1. In the first step, the content of a zone file is read and parsed. This can be done using :class:`ldns.ldns_zone` class.

2. In the second step, the private and public key is readed and public key is inserted into zone (as DNSKEY).
2. In the second step, the private and public key is read and public key is inserted into zone (as DNSKEY).

3. In the last step, the DNSSEC zone instace is created and all the RRs from zone file are copied here. Then, all the records are signed using :meth:`ldns.ldns_zone.sign` method. If the signing was successfull, the content of DNSSEC zone is written to a file.
3. In the last step, the DNSSEC zone instance is created and all the RRs from zone file are copied here. Then, all the records are signed using :meth:`ldns.ldns_zone.sign` method. If the signing was successful, the content of DNSSEC zone is written to a file.
2 changes: 1 addition & 1 deletion contrib/python/examples/test_buffer.py
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ def set_error():

#if not error_detected:
if True:
mehod_name = "ldns_buffer.flip()"
method_name = "ldns_buffer.flip()"
buf.printf("abcdef")
try:
buf.flip()
Expand Down
2 changes: 1 addition & 1 deletion contrib/python/examples/test_dname.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def set_error():
except:
set_error()
#
# Error when printing a dname wich was created fron an empty string.
# Error when printing a dname wich was created from an empty string.
# Must find out why.
#
try:
Expand Down
2 changes: 1 addition & 1 deletion contrib/python/ldns_buffer.i
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,7 @@
:param amount: Amount to use.
:type amount: positive integer
:throws TypeError: When `amount` of non-integer type.
:return: (bool) hether this failed or succeeded.
:return: (bool) Whether this failed or succeeded.
"""
return _ldns.ldns_buffer_reserve(self, amount)
#parameters: ldns_buffer *, size_t,
Expand Down
4 changes: 2 additions & 2 deletions contrib/python/ldns_dname.i
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
/* ========================================================================= */

/*
* Not here (with the exception of functions defined in this C code sction),
* Not here (with the exception of functions defined in this C code section),
* must be set in ldns_rdf.i.
*/

Expand All @@ -46,7 +46,7 @@
/* ========================================================================= */

/*
* Not here (with the exception of functions defined in this C code sction),
* Not here (with the exception of functions defined in this C code section),
* must be set in ldns_rdf.i.
*/

Expand Down
2 changes: 1 addition & 1 deletion contrib/python/ldns_dnssec.i
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@

@staticmethod
def new_frm_rr(raiseException=True):
"""Create a new instace of dnssec name for the given RR.
"""Create a new instance of dnssec name for the given RR.
:returns: (ldns_dnssec_name) instance
"""
Expand Down
4 changes: 2 additions & 2 deletions contrib/python/ldns_key.i
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ This class can contains all types of keys that are used in DNSSEC. Mostly used t
def expiration(self):
"""return the key's expiration date
:returns: (uint32_t) the experiration date
:returns: (uint32_t) the expiration date
"""
return _ldns.ldns_key_expiration(self)
#parameters: const ldns_key *,
Expand Down Expand Up @@ -514,7 +514,7 @@ void _ldns_key_list_free (ldns_key_list* k) {
"""Set the keylist's key count to count.
:param count:
the cuont
the count
"""
_ldns.ldns_key_list_set_key_count(self,count)
#parameters: ldns_key_list *,size_t,
Expand Down
4 changes: 2 additions & 2 deletions contrib/python/ldns_packet.i
Original file line number Diff line number Diff line change
Expand Up @@ -736,7 +736,7 @@ This simple example instances a resolver in order to resolve NS for nic.cz."
"""
Return the packet's edns data.
:return: (:class:`ldns_rdf`) The ensd data.
:return: (:class:`ldns_rdf`) The edns data.
"""
return _ldns._ldns_pkt_edns_data(self)
#parameters: const ldns_pkt *,
Expand Down Expand Up @@ -1346,7 +1346,7 @@ This simple example instances a resolver in order to resolve NS for nic.cz."

def set_rcode(self, c):
"""
Set the packet's respons code.
Set the packet's response code.
:param c: The rcode.
:type c: uint8_t
Expand Down

0 comments on commit 97019eb

Please sign in to comment.