Merge pull request #204 from jonathangray/spelling

wcawijngaards · web-flow · commit b506659fa5bf · 2022-01-03T16:50:21.000+01:00
correct some spelling mistakes
diff --git a/dbaccess.c b/dbaccess.c
@@ -491,7 +491,7 @@ namedb_open (const char* filename, struct nsd_options* opt)
 #endif /* HAVE_MMAP */
 }
 
-/** the the file mtime stat (or nonexist or error) */
+/** get the file mtime stat (or nonexist or error) */
 int
 file_get_mtime(const char* file, struct timespec* mtime, int* nonexist)
 {
diff --git a/doc/REQUIREMENTS b/doc/REQUIREMENTS
@@ -411,7 +411,7 @@ C 4.1 Actions based on QTYPE of incoming Query.
 	      else 
 
 	        we are in an opt-in part of the zone and we should
-	        include the the NSEC RR of the last secured RR in the
+	        include the NSEC RR of the last secured RR in the
 	        zone and the corresponding RRSIG(NSEC) into the authority
 	        section of the answer.
 
@@ -495,7 +495,7 @@ C 4.1 Actions based on QTYPE of incoming Query.
   Note that on a QNAME match the NS records are not copied into the AUTH
   section (This is a requirement from step 4 'matching down the cache'
   from rfc1034 4.3.2).  This is a requirement only for caching
-  servers. BIND8 will copy the the NS in the Auth section for
+  servers. BIND8 will copy the NS in the Auth section for
   authoritative server too.
 
 
diff --git a/lookup3.c b/lookup3.c
@@ -872,7 +872,7 @@ void driver2()
     {
       for (j=0; j<8; ++j)   /*------------------------ for each input bit, */
       {
-	for (m=1; m<8; ++m) /*------------ for serveral possible initvals, */
+	for (m=1; m<8; ++m) /*------------ for several possible initvals, */
 	{
 	  for (l=0; l<HASHSTATE; ++l)
 	    e[l]=f[l]=g[l]=h[l]=x[l]=y[l]=~((uint32_t)0);
diff --git a/nsd.conf.5.in b/nsd.conf.5.in
@@ -298,7 +298,7 @@ negotiation between server and client.
 .TP
 .B outgoing\-tcp\-mss:\fR <number>
 Maximum segment size (MSS) of TCP socket for outgoing XFR request
-to other namesevers. Value lower than
+to other nameservers. Value lower than
 common MSS on Ethernet (1220 for example) will
 address path MTU problem.
 Note that not all platform supports socket option to set MSS (TCP_MAXSEG).
@@ -493,7 +493,7 @@ With the value 0 the rate is unlimited.
 .\" rrlend
 .TP
 .B answer\-cookie:\fR <yes or no>
-Enable to answer to requests containig DNS Cookies as specified in RFC7873.
+Enable to answer to requests containing DNS Cookies as specified in RFC7873.
 Default is no.
 .TP
 .B cookie\-secret:\fR <128 bit hex string>
diff --git a/nsd.conf.sample.in b/nsd.conf.sample.in
@@ -378,7 +378,7 @@ remote-control:
 	#request-xfr: 192.0.2.2 the_tsig_key_name
 	#request-xfr: 192.0.2.2 the_tsig_key_name the_tls_auth_name
 	# Attention: You cannot use UDP and AXFR together. AXFR is always over
-	# TCP. If you use UDP, we higly recommend you to deploy TSIG.
+	# TCP. If you use UDP, we highly recommend you to deploy TSIG.
 	# Allow AXFR fallback if the master does not support IXFR. Default
 	# is yes.
 	#allow-axfr-fallback: yes
diff --git a/rrl.h b/rrl.h
@@ -51,7 +51,7 @@ void rrl_mmap_init(int numch, size_t numbuck, size_t lm, size_t wlm, size_t sm,
  */
 void rrl_init(size_t ch);
 
-/** deinit (for this child server processs) */
+/** deinit (for this child server process) */
 void rrl_deinit(size_t ch);
 
 /** deinit mmaps for n children */
diff --git a/server.c b/server.c
@@ -367,7 +367,7 @@ static void report_tcp_fastopen_config() {
 	}
 	if (!(tcp_fastopen_value & TCP_FASTOPEN_SERVER_BIT_MASK)) {
 		log_msg(LOG_WARNING, "Error: TCP Fast Open support is available and configured in NSD by default.\n");
-		log_msg(LOG_WARNING, "However the kernel paramenters are not configured to support TCP_FASTOPEN in server mode.\n");
+		log_msg(LOG_WARNING, "However the kernel parameters are not configured to support TCP_FASTOPEN in server mode.\n");
 		log_msg(LOG_WARNING, "To enable TFO use the command:");
 		log_msg(LOG_WARNING, "  'sudo sysctl -w net.ipv4.tcp_fastopen=2' for pure server mode or\n");
 		log_msg(LOG_WARNING, "  'sudo sysctl -w net.ipv4.tcp_fastopen=3' for both client and server mode\n");
diff --git a/udb.c b/udb.c
@@ -1149,7 +1149,7 @@ grow_extra_check(udb_alloc* alloc, uint64_t ge)
 	return ge;
 }
 
-/** see if free space is enogh to warrant shrink (while file is open) */
+/** see if free space is enough to warrant shrink (while file is open) */
 static int
 enough_free(udb_alloc* alloc)
 {
diff --git a/udb.h b/udb.h
@@ -198,7 +198,7 @@ struct udb_base {
 	udb_ptr** ram_hash;
 	/** size of the current udb_ptr hashtable array */
 	size_t ram_size;
-	/** mask for the curren udb_ptr hashtable lookups */
+	/** mask for the current udb_ptr hashtable lookups */
 	int ram_mask;
 	/** number of ptrs in ram, used to decide when to grow */
 	size_t ram_num;
diff --git a/xfrd.h b/xfrd.h
@@ -364,7 +364,7 @@ void xfrd_deactivate_zone(xfrd_zone_type* z);
 /*
  * Make a new request to next master server.
  * uses next_master if set (and a fresh set of rounds).
- * otherwised, starts new round of requests if none started already.
+ * otherwise, starts new round of requests if none started already.
  * starts next round of requests if at last master.
  * if too many rounds of requests, sets timer for next retry.
  */

Original file line number	Diff line number	Diff line change
`@@ -491,7 +491,7 @@ namedb_open (const char* filename, struct nsd_options* opt)`
`491`	`491`	`#endif /* HAVE_MMAP */`
`492`	`492`	`}`
`493`	`493`
`494`		`-/** the the file mtime stat (or nonexist or error) */`
	`494`	`+/** get the file mtime stat (or nonexist or error) */`
`495`	`495`	`int`
`496`	`496`	`file_get_mtime(const char* file, struct timespec* mtime, int* nonexist)`
`497`	`497`	`{`
Original file line number	Diff line number	Diff line change
`@@ -872,7 +872,7 @@ void driver2()`
`872`	`872`	`{`
`873`	`873`	`for (j=0; j<8; ++j) /------------------------ for each input bit, /`
`874`	`874`	`{`
`875`		`- for (m=1; m<8; ++m) /------------ for serveral possible initvals, /`
	`875`	`+ for (m=1; m<8; ++m) /------------ for several possible initvals, /`
`876`	`876`	`{`
`877`	`877`	`for (l=0; l<HASHSTATE; ++l)`
`878`	`878`	`e[l]=f[l]=g[l]=h[l]=x[l]=y[l]=~((uint32_t)0);`
Original file line number	Diff line number	Diff line change
`@@ -367,7 +367,7 @@ static void report_tcp_fastopen_config() {`
`367`	`367`	`}`
`368`	`368`	`if (!(tcp_fastopen_value & TCP_FASTOPEN_SERVER_BIT_MASK)) {`
`369`	`369`	`log_msg(LOG_WARNING, "Error: TCP Fast Open support is available and configured in NSD by default.\n");`
`370`		`- log_msg(LOG_WARNING, "However the kernel paramenters are not configured to support TCP_FASTOPEN in server mode.\n");`
	`370`	`+ log_msg(LOG_WARNING, "However the kernel parameters are not configured to support TCP_FASTOPEN in server mode.\n");`
`371`	`371`	`log_msg(LOG_WARNING, "To enable TFO use the command:");`
`372`	`372`	`log_msg(LOG_WARNING, " 'sudo sysctl -w net.ipv4.tcp_fastopen=2' for pure server mode or\n");`
`373`	`373`	`log_msg(LOG_WARNING, " 'sudo sysctl -w net.ipv4.tcp_fastopen=3' for both client and server mode\n");`
Original file line number	Diff line number	Diff line change
`@@ -1149,7 +1149,7 @@ grow_extra_check(udb_alloc* alloc, uint64_t ge)`
`1149`	`1149`	`return ge;`
`1150`	`1150`	`}`
`1151`	`1151`
`1152`		`-/** see if free space is enogh to warrant shrink (while file is open) */`
	`1152`	`+/** see if free space is enough to warrant shrink (while file is open) */`
`1153`	`1153`	`static int`
`1154`	`1154`	`enough_free(udb_alloc* alloc)`
`1155`	`1155`	`{`