[SCM] Samba Shared Repository - branch master updated

[Jelmer Vernooij]

The branch, master has been updated
       via  e0cddcd Typo: s/preceeded/preceded/
       via  986e539 Typo: Commiting -> Committing
      from  5521cf0 Typo: speciefied -> specified.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit e0cddcd5c44a22a36a156079f8546d3b8e7ee0c1
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Mar 30 04:01:06 2014 +0200

    Typo: s/preceeded/preceded/
    
    Caught by lintian, the Debian package linter :)
    
    Change-Id: Ia7162ea8c2b1845155345526b66d71ae64f15227
    Reviewed-on: https://gerrit.samba.org/216
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    
    Autobuild-User(master): Jelmer Vernooij <jelmer at samba.org>
    Autobuild-Date(master): Mon Apr 14 03:51:15 CEST 2014 on sn-devel-104

commit 986e53967a84f8bcabfc333198159ef7ebe9efe0
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Mar 30 04:02:39 2014 +0200

    Typo: Commiting -> Committing
    
    Signed-Off-By: Jelmer Vernooij <jelmer at samba.org>
    Change-Id: I9d71706ce6d6782da72a26fa37e33fe5b527788e
    Reviewed-on: https://gerrit.samba.org/217
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 libcli/auth/ntlm_check.c           |    6 +++---
 python/samba/upgrade.py            |    6 +++---
 source3/utils/net_registry_check.c |    2 +-
 source4/utils/oLschema2ldif.c      |    2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/libcli/auth/ntlm_check.c b/libcli/auth/ntlm_check.c
index dc70957..7f91b52 100644
--- a/libcli/auth/ntlm_check.c
+++ b/libcli/auth/ntlm_check.c
@@ -485,7 +485,7 @@ NTSTATUS ntlm_password_check(TALLOC_CTX *mem_ctx,
 				 client_domain,
 				 &tmp_sess_key)) {
 		if (nt_response->length > 24) {
-			/* If NTLMv2 authentication has preceeded us
+			/* If NTLMv2 authentication has preceded us
 			 * (even if it failed), then use the session
 			 * key from that.  See the RPC-SAMLOGON
 			 * torture test */
@@ -514,7 +514,7 @@ NTSTATUS ntlm_password_check(TALLOC_CTX *mem_ctx,
 				 upper_client_domain,
 				 &tmp_sess_key)) {
 		if (nt_response->length > 24) {
-			/* If NTLMv2 authentication has preceeded us
+			/* If NTLMv2 authentication has preceded us
 			 * (even if it failed), then use the session
 			 * key from that.  See the RPC-SAMLOGON
 			 * torture test */
@@ -542,7 +542,7 @@ NTSTATUS ntlm_password_check(TALLOC_CTX *mem_ctx,
 				 "",
 				 &tmp_sess_key)) {
 		if (nt_response->length > 24) {
-			/* If NTLMv2 authentication has preceeded us
+			/* If NTLMv2 authentication has preceded us
 			 * (even if it failed), then use the session
 			 * key from that.  See the RPC-SAMLOGON
 			 * torture test */
diff --git a/python/samba/upgrade.py b/python/samba/upgrade.py
index c06454a..7eca5b6 100644
--- a/python/samba/upgrade.py
+++ b/python/samba/upgrade.py
@@ -777,7 +777,7 @@ Please fix this account before attempting to upgrade again
         result.samdb.transaction_cancel()
         raise
 
-    logger.info("Commiting 'add groups' transaction to disk")
+    logger.info("Committing 'add groups' transaction to disk")
     result.samdb.transaction_commit()
 
     logger.info("Adding users")
@@ -811,7 +811,7 @@ Please fix this account before attempting to upgrade again
         result.samdb.transaction_cancel()
         raise
 
-    logger.info("Commiting 'add users' transaction to disk")
+    logger.info("Committing 'add users' transaction to disk")
     result.samdb.transaction_commit()
 
     logger.info("Adding users to groups")
@@ -828,7 +828,7 @@ Please fix this account before attempting to upgrade again
         result.samdb.transaction_cancel()
         raise
 
-    logger.info("Commiting 'add users to groups' transaction to disk")
+    logger.info("Committing 'add users to groups' transaction to disk")
     result.samdb.transaction_commit()
 
     # Set password for administrator
diff --git a/source3/utils/net_registry_check.c b/source3/utils/net_registry_check.c
index d57c2aa..de79f3e 100644
--- a/source3/utils/net_registry_check.c
+++ b/source3/utils/net_registry_check.c
@@ -378,7 +378,7 @@ static void check_ctx_transaction_stop(struct check_ctx *ctx, bool ok) {
 		return;
 	}
 	if (!ctx->opt.test && ok) {
-		d_printf("Commiting changes\n");
+		d_printf("Committing changes\n");
 		if (dbwrap_transaction_commit(ctx->odb) != 0) {
 			DEBUG(0, ("transaction_commit failed\n"));
 		}
diff --git a/source4/utils/oLschema2ldif.c b/source4/utils/oLschema2ldif.c
index 88dba01..108c2c8 100644
--- a/source4/utils/oLschema2ldif.c
+++ b/source4/utils/oLschema2ldif.c
@@ -563,7 +563,7 @@ static struct schema_conv process_file(FILE *in, FILE *out)
 					break;
 				}
 				if (ret2 == 2) {
-					fprintf(stderr, "Invalid entry %s, closing braces needs to be preceeded by a space\n", entry);
+					fprintf(stderr, "Invalid entry %s, closing braces need to be preceded by a space\n", entry);
 					ret.failures++;
 					break;
 				}


-- 
Samba Shared Repository