Merge pull request #102 from jsoref/spelling

Spelling fixes

SECURITY.md

@@ -46,7 +46,7 @@ do two things:
 
 #### ENABLING BASH COMMAND SUBSTITUTION ####
 
-To enable support for arguments containing bash command substitions, 
+To enable support for arguments containing bash command substitutions, 
 you must do two things:
 
    1.  Enable arguments as described above

include/acl.h

@@ -53,7 +53,7 @@ struct dns_acl {
         struct dns_acl *next;
 };
 
-/* Poiters to head ACL structs */
+/* Pointers to head ACL structs */
 static struct ip_acl *ip_acl_head, *ip_acl_prev;
 static struct dns_acl *dns_acl_head, *dns_acl_prev;
 

macros/README.md

@@ -34,8 +34,8 @@ used in subsequent macros.
 > Output Variables : dist_type, dist_ver
 
 This macro detects the distribution type. For Linux, this would be rh
-(for Red Hat and derivitives), suse (OpenSUSE, SLES, derivitives), gentoo
-(Gentoo and derivitives), debian (Debian and derivitives), and so on.
+(for Red Hat and derivatives), suse (OpenSUSE, SLES, derivatives), gentoo
+(Gentoo and derivatives), debian (Debian and derivatives), and so on.
 For BSD, this would be openbsd, netbsd, freebsd, dragonfly, etc. It can
 also be aix, solaris, osx, and so on for Unix operating systems.
 
@@ -94,7 +94,7 @@ on a simple program to make sure a compile and link will work correctly.
 ## Usage
 
 This repo is intended to be used as a git subtree, so changes will
-automatically propogate, and still be reasonably easy to use.
+automatically propagate, and still be reasonably easy to use.
 
 * First, Create, checkout, clone, or branch your project. If you do an
 `ls -AF` it might look something like this:
@@ -129,7 +129,7 @@ master.
 
 * To get the latest version of `autoconf-macros` into your parent project:
 
-           git subtgree pull --squash --prefix=macros autoconf-macros master
+           git subtree pull --squash --prefix=macros autoconf-macros master
 
 
 

nrpe.spec.in

@@ -32,7 +32,7 @@
 # rpm -ba|--rebuild --define 'nsport 5666'
 %{?port:%define nsport %{port}}
 
-# Macro that print mesages to syslog at package (un)install time
+# Macro that print messages to syslog at package (un)install time
 %define nnmmsg logger -t %{name}/rpm
 
 Summary: Host/service/network monitoring agent for Nagios

sample-config/nrpe.cfg.in

@@ -38,7 +38,7 @@ pid_file=@piddir@/nrpe.pid
 
 # PORT NUMBER
 # Port number we should wait for connections on.
-# NOTE: This must be a non-priviledged port (i.e. > 1024).
+# NOTE: This must be a non-privileged port (i.e. > 1024).
 # NOTE: This option is ignored if NRPE is running under either inetd or xinetd
 
 server_port=@nrpe_port@
@@ -115,7 +115,7 @@ dont_blame_nrpe=0
 
 
 
-# BASH COMMAND SUBTITUTION
+# BASH COMMAND SUBSTITUTION
 # This option determines whether or not the NRPE daemon will allow clients
 # to specify arguments that contain bash command substitutions of the form
 # $(...).  This option only works if the daemon was configured with both
@@ -141,7 +141,7 @@ allow_bash_command_substitution=0
 # *** THIS EXAMPLE MAY POSE A POTENTIAL SECURITY RISK, SO USE WITH CAUTION! ***
 # Usage scenario:
 # Execute restricted commmands using sudo.  For this to work, you need to add
-# the nagios user to your /etc/sudoers.  An example entry for alllowing
+# the nagios user to your /etc/sudoers.  An example entry for allowing
 # execution of the plugins from might be:
 #
 # nagios          ALL=(ALL) NOPASSWD: /usr/lib/nagios/plugins/

src/acl.c

@@ -49,7 +49,7 @@
 
 extern int debug;
 
-/* This function checks if a char argumnet from valid char range.
+/* This function checks if a char argument from valid char range.
  * Valid range is: ASCII only, a number or a letter, a space, a dot, a slash, a dash, a comma.
  *
  * Returns:
@@ -228,7 +228,7 @@ int add_ipv4_to_acl(char *ipv4) {
                 return 0;
         }
 
-        /* Conver ip and mask to unsigned long */
+        /* Convert ip and mask to unsigned long */
         ip = htonl((data[0] << 24) + (data[1] << 16) + (data[2] << 8) + data[3]);
         mask =  htonl(-1 << (32 - data[4]));
 
@@ -479,7 +479,7 @@ int add_domain_to_acl(char *domain) {
         }
 }
 
-/* Checks connectiong host in ACL
+/* Checks connection host in ACL
  *
  * Returns:
  * 1 - on success

src/check_nrpe.c

@@ -98,7 +98,7 @@ void set_timeout_state (char *state);
 int parse_timeout_string (char *timeout_str);
 void usage(int result);
 void setup_ssl();
-void set_sig_hadlers();
+void set_sig_handlers();
 int connect_to_remote();
 int send_request();
 int read_response();
@@ -135,7 +135,7 @@ int main(int argc, char **argv)
 
 	generate_crc32_table();		/* generate the CRC 32 table */
 	setup_ssl();				/* Do all the SSL/TLS set up */
-	set_sig_hadlers();			/* initialize alarm signal handling */
+	set_sig_handlers();			/* initialize alarm signal handling */
 	result = connect_to_remote();	/* Make the connection */
 	if (result != STATE_OK) {
 		alarm(0);
@@ -155,7 +155,7 @@ int main(int argc, char **argv)
 
 		/* Rerun the setup */
 		setup_ssl();
-		set_sig_hadlers();
+		set_sig_handlers();
 		result = connect_to_remote();	/* Connect */
 		if (result != STATE_OK) {
 			alarm(0);
@@ -596,22 +596,22 @@ void set_timeout_state (char *state) {
 
 int parse_timeout_string (char *timeout_str)
 {
-	char *seperated_str;
+	char *separated_str;
 	char *timeout_val = NULL;
 	char *timeout_sta = NULL;
 
 	if (strstr(timeout_str, ":") == NULL)
 		timeout_val = timeout_str;
 	else if (strncmp(timeout_str, ":", 1) == 0) {
-		seperated_str = strtok(timeout_str, ":");
-		if (seperated_str != NULL)
-			timeout_sta = seperated_str;
+		separated_str = strtok(timeout_str, ":");
+		if (separated_str != NULL)
+			timeout_sta = separated_str;
 	} else {
-		seperated_str = strtok(timeout_str, ":");
-		timeout_val = seperated_str;
-		seperated_str = strtok(NULL, ":");
-		if (seperated_str != NULL) {
-			timeout_sta = seperated_str;
+		separated_str = strtok(timeout_str, ":");
+		timeout_val = separated_str;
+		separated_str = strtok(NULL, ":");
+		if (separated_str != NULL) {
+			timeout_sta = separated_str;
 		}
 	}
 
@@ -870,7 +870,7 @@ void setup_ssl()
 #endif
 }
 
-void set_sig_hadlers()
+void set_sig_handlers()
 {
 #ifdef HAVE_SIGACTION
 	struct sigaction sig_action;
@@ -1110,7 +1110,7 @@ int read_response()
 	int rc, result;
 
 	alarm(0);
-	set_sig_hadlers();
+	set_sig_handlers();
 
 #ifdef HAVE_SSL
 	rc = read_packet(sd, ssl, &v2_receive_packet, &v3_receive_packet);

src/nrpe.c

@@ -1271,7 +1271,7 @@ void setup_wait_conn(void)
 				   "Warning: Daemon is configured to accept command arguments with bash command substitutions!");
 		else
 			syslog(LOG_NOTICE,
-				   "Warning: Daemon is configured to accept command arguments with bash command substitutions, but is not configured to accept command argements from clients. Enable command arguments if you wish to allow command arguments with bash command substitutions.");
+				   "Warning: Daemon is configured to accept command arguments with bash command substitutions, but is not configured to accept command arguments from clients. Enable command arguments if you wish to allow command arguments with bash command substitutions.");
 	}
 # endif
 #endif

src/snprintf.c

@@ -77,7 +77,7 @@
  * Fix incorrect zpadlen handling in fmtfp.
  * Thanks to Ollie Oldham <ollie.oldham@metro-optix.com> for spotting it.
  * few mods to make it easier to compile the tests.
- * addedd the "Ollie" test to the floating point ones.
+ * added the "Ollie" test to the floating point ones.
  *
  * Martin Pool (mbp@samba.org) April 2003
  *    Remove NO_CONFIG_H so that the test case can be built within a source
@@ -847,7 +847,7 @@ static void fmtint(char *buffer, size_t *currlen, size_t maxlen,
 		spadlen = 0;
 	}
 	if (flags & DP_F_MINUS) 
-		spadlen = -spadlen; /* Left Justifty */
+		spadlen = -spadlen; /* Left Justify */
 
 #ifdef DEBUG_SNPRINTF
 	printf("zpad: %d, spad: %d, min: %d, max: %d, place: %d\n",
@@ -1055,7 +1055,7 @@ static void fmtfp (char *buffer, size_t *currlen, size_t maxlen,
 	if (padlen < 0) 
 		padlen = 0;
 	if (flags & DP_F_MINUS) 
-		padlen = -padlen; /* Left Justifty */
+		padlen = -padlen; /* Left Justify */
 	
 	if ((flags & DP_F_ZERO) && (padlen > 0)) {
 		if (signvalue) {