From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Wed, 29 Mar 2017 17:44:55 +0000 (-0700)
Subject: ITS#8587 - Fix typos
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2c84446240091026a460a652f44f505842cf0318;p=openldap

ITS#8587 - Fix typos
---

diff --git a/contrib/ldapc++/Makefile.in b/contrib/ldapc++/Makefile.in
index 216ffdf0b0..2999041b81 100644
--- a/contrib/ldapc++/Makefile.in
+++ b/contrib/ldapc++/Makefile.in
@@ -306,7 +306,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/contrib/slapd-modules/nssov/nss-pam-ldapd/nslcd.h b/contrib/slapd-modules/nssov/nss-pam-ldapd/nslcd.h
index c9857d695b..9884733900 100644
--- a/contrib/slapd-modules/nssov/nss-pam-ldapd/nslcd.h
+++ b/contrib/slapd-modules/nssov/nss-pam-ldapd/nslcd.h
@@ -100,7 +100,7 @@
      STRING       group password
      INT32        group id
      STRINGLIST   members (usernames) of the group
-     (not that the BYMEMER call returns an emtpy members list) */
+     (not that the BYMEMER call returns an empty members list) */
 #define NSLCD_ACTION_GROUP_BYNAME      0x00040001
 #define NSLCD_ACTION_GROUP_BYGID       0x00040002
 #define NSLCD_ACTION_GROUP_BYMEMBER    0x00040006
diff --git a/servers/slapd/controls.c b/servers/slapd/controls.c
index 8ed1003af5..960a7f7ea4 100644
--- a/servers/slapd/controls.c
+++ b/servers/slapd/controls.c
@@ -843,7 +843,7 @@ get_ctrls2(
 
 		} else if( c->ldctl_oid == NULL ) {
 			Debug( LDAP_DEBUG_TRACE,
-				"get_ctrls: conn %lu got emtpy OID.\n",
+				"get_ctrls: conn %lu got empty OID.\n",
 				op->o_connid, 0, 0 );
 
 			slap_free_ctrls( op, op->o_ctrls );
diff --git a/tests/scripts/test058-syncrepl-asymmetric b/tests/scripts/test058-syncrepl-asymmetric
index 2e26f77139..d8eaa3cdc6 100755
--- a/tests/scripts/test058-syncrepl-asymmetric
+++ b/tests/scripts/test058-syncrepl-asymmetric
@@ -2027,7 +2027,7 @@ echo "Checking contextCSN after modify of second backend on site2 master..."
 # starts with an empty database.  Start site2 master first, then site2
 # search and finally central master so that the site2 search's syncrepl
 # connection has been set up when site2 master receives the database:
-echo "Stopping central master and site2 servers to test start with emtpy db..."
+echo "Stopping central master and site2 servers to test start with empty db..."
 kill -HUP  $SMC_PID $SM2_PID $SS2_PID
 for pid in $SMC_PID $SM2_PID $SS2_PID; do wait $pid ; done
 KILLPIDS=`echo "$KILLPIDS " | sed -e "s/ $SMC_PID / /"`;