From: Mathieu Parent <math.parent@gmail.com>
Date: Thu, 29 Aug 2019 19:54:14 +0000 (+0200)
Subject: Spelling fixes s/overriden/overridden/
X-Git-Tag: tevent-0.10.1~80
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a03bafbcd5b835aa248c01b4150750f8e50f43a9;p=thirdparty%2Fsamba.git

Spelling fixes s/overriden/overridden/

Signed-off-by: Mathieu Parent <math.parent@gmail.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
---

diff --git a/docs-xml/smbdotconf/security/lanmanauth.xml b/docs-xml/smbdotconf/security/lanmanauth.xml
index 97f2fb04dcb..964c3602aa1 100644
--- a/docs-xml/smbdotconf/security/lanmanauth.xml
+++ b/docs-xml/smbdotconf/security/lanmanauth.xml
@@ -30,7 +30,7 @@
     network.  See the <command moreinfo="none">client lanman
     auth</command> to disable this for Samba's clients (such as smbclient)</para>
 
-    <para>This parameter is overriden by <parameter moreinfo="none">ntlm
+    <para>This parameter is overridden by <parameter moreinfo="none">ntlm
     auth</parameter>, so unless that it is also set to
     <constant>ntlmv1-permitted</constant> or <constant>yes</constant>,
     then only NTLMv2 logins will be permited and no LM hash will be
diff --git a/python/samba/netcmd/domain.py b/python/samba/netcmd/domain.py
index 542461bc9f7..9d44d6d5ea4 100644
--- a/python/samba/netcmd/domain.py
+++ b/python/samba/netcmd/domain.py
@@ -4113,7 +4113,7 @@ class cmd_domain_schema_upgrade(Command):
         from samba.ms_schema_markdown import read_ms_markdown
         from samba.schema import Schema
 
-        updates_allowed_overriden = False
+        updates_allowed_overridden = False
         sambaopts = kwargs.get("sambaopts")
         credopts = kwargs.get("credopts")
         lp = sambaopts.get_loadparm()
@@ -4131,7 +4131,7 @@ class cmd_domain_schema_upgrade(Command):
         if lp.get("dsdb:schema update allowed") is None:
             lp.set("dsdb:schema update allowed", "yes")
             print("Temporarily overriding 'dsdb:schema update allowed' setting")
-            updates_allowed_overriden = True
+            updates_allowed_overridden = True
 
         own_dn = ldb.Dn(samdb, samdb.get_dsServiceName())
         master = get_fsmo_roleowner(samdb, str(samdb.get_schema_basedn()),
@@ -4220,7 +4220,7 @@ class cmd_domain_schema_upgrade(Command):
             samdb.transaction_cancel()
             error_encountered = True
 
-        if updates_allowed_overriden:
+        if updates_allowed_overridden:
             lp.set("dsdb:schema update allowed", "no")
 
         if temp_folder:
@@ -4257,7 +4257,7 @@ class cmd_domain_functional_prep(Command):
     ]
 
     def run(self, **kwargs):
-        updates_allowed_overriden = False
+        updates_allowed_overridden = False
         sambaopts = kwargs.get("sambaopts")
         credopts = kwargs.get("credopts")
         lp = sambaopts.get_loadparm()
@@ -4273,7 +4273,7 @@ class cmd_domain_functional_prep(Command):
         if lp.get("dsdb:schema update allowed") is None:
             lp.set("dsdb:schema update allowed", "yes")
             print("Temporarily overriding 'dsdb:schema update allowed' setting")
-            updates_allowed_overriden = True
+            updates_allowed_overridden = True
 
         if forest_prep is None and domain_prep is None:
             forest_prep = True
@@ -4329,7 +4329,7 @@ class cmd_domain_functional_prep(Command):
                 samdb.transaction_cancel()
                 error_encountered = True
 
-        if updates_allowed_overriden:
+        if updates_allowed_overridden:
             lp.set("dsdb:schema update allowed", "no")
 
         if error_encountered:
diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
index b52d5163066..c92a7a6f337 100644
--- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
+++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
@@ -1676,7 +1676,7 @@ static int replmd_update_rpmd_element(struct ldb_context *ldb,
 	md1->local_usn                 = *seq_num;
 
 	if (is_forced_rodc) {
-		/* Force version to 0 to be overriden later via replication */
+		/* Force version to 0 to be overridden later via replication */
 		md1->version = 0;
 	}