summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Lamb <chris@chris-lamb.co.uk>2017-02-18 08:59:36 +1300
committerGarming Sam <garming@samba.org>2017-02-22 08:26:23 +0100
commitbca0d8ee673b86d374840591002229783c06128d (patch)
treed7fc71ba26010ac33877bc1bdc7d234103048b35
parentdb3dd6fb5fd4869beedc2bb65570ef36e93f4ad9 (diff)
downloadsamba-bca0d8ee673b86d374840591002229783c06128d.tar.gz
Correct "defered" typos.
Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk> Reviewed-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Garming Sam <garming@catalyst.net.nz>
-rw-r--r--source3/smbd/open.c2
-rw-r--r--source4/rpc_server/dcerpc_server.c4
-rwxr-xr-xsource4/scripting/bin/samba_upgradeprovision2
3 files changed, 4 insertions, 4 deletions
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 37c630b7e5a..7bd1086bfec 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -1480,7 +1480,7 @@ static bool delay_for_oplock(files_struct *fsp,
/*
* we'll decide about SMB2_LEASE_READ later.
*
- * Maybe the break will be defered
+ * Maybe the break will be deferred
*/
break_to &= ~SMB2_LEASE_HANDLE;
}
diff --git a/source4/rpc_server/dcerpc_server.c b/source4/rpc_server/dcerpc_server.c
index d77d52d7b89..f7ec2106b98 100644
--- a/source4/rpc_server/dcerpc_server.c
+++ b/source4/rpc_server/dcerpc_server.c
@@ -2174,11 +2174,11 @@ static void dcesrv_terminate_connection(struct dcesrv_connection *dce_conn, cons
return;
}
- DEBUG(3,("dcesrv: terminating connection due to '%s' defered due to pending calls\n",
+ DEBUG(3,("dcesrv: terminating connection due to '%s' deferred due to pending calls\n",
reason));
dce_conn->terminate = talloc_strdup(dce_conn, reason);
if (dce_conn->terminate == NULL) {
- dce_conn->terminate = "dcesrv: defered terminating connection - no memory";
+ dce_conn->terminate = "dcesrv: deferred terminating connection - no memory";
}
DLIST_ADD_END(dce_ctx->broken_connections, dce_conn);
}
diff --git a/source4/scripting/bin/samba_upgradeprovision b/source4/scripting/bin/samba_upgradeprovision
index ccfc578281f..99e97b7f28f 100755
--- a/source4/scripting/bin/samba_upgradeprovision
+++ b/source4/scripting/bin/samba_upgradeprovision
@@ -1504,7 +1504,7 @@ def sync_calculated_attributes(samdb, names):
# The object is reappended at the end of the list to be created later
# (and preferably after all the needed object have been created)
# The function keeps on looping on the list of object to be created until
-# it's empty or that the number of defered creation is equal to the number
+# it's empty or that the number of deferred creation is equal to the number
# of object that still needs to be created.
# The function add_missing_object will first check if the object can be created.