[SCM] Samba Shared Repository - branch master updated
Björn Jacke
bjacke at samba.org
Thu Oct 31 02:19:03 UTC 2019
The branch, master has been updated
via c714c996017 docs-xml/manpages/pam_winbind.conf.5.xml: typo fixes
via 4b198163d03 docs-xml/manpages/pam_winbind.8.xml: typo fixes
via 81df8aa7bea docs-xml/Samba-Developers-Guide/unix-smb.xml: typo fixes
via a456c2bb02a ctdb/utils/smnotify/smnotify.c: typo fixes
via 1e73161bdd7 ctdb/utils/scsi_io/scsi_io.c: typo fixes
via f3754b64876 ctdb/server/ctdb_daemon.c: typo fixes
via 5d2a257c2e4 ctdb/server/ctdb_client.c: typo fixes
via 7722bd80fcd ctdb/server/ctdb_call.c: typo fixes
via 9fa37484c30 ctdb/include/ctdb_private.h: typo fixes
via 493705dc274 ctdb/ib/ibwrapper_test.c: typo fixes
via 540325d3cb4 ctdb/ib/ibw_ctdb.c: typo fixes
via b9d7b85afdf ctdb/doc/readonlyrecords.txt: typo fixes
via cb867b29c9c ctdb/doc/ctdb.1.xml: typo fixes
via 93859b3394d ctdb/doc/ctdb-tunables.7.xml: typo fixes
via 37398acca58 ctdb/doc/ctdb-statistics.7.xml: typo fixes
via 1b51b444874 ctdb/common/srvid.h: typo fixes
via c71a1df18aa ctdb/client/client.h: typo fixes
via 522697331fc buildtools/wafsamba/wscript: typo fixes
via e6cd8884256 buildtools/wafsamba/samba_install.py: typo fixes
via e781db805e5 source4/scripting/bin/samba_upgradeprovision: typo fixes
via 9092120b0db source4/rpc_server/lsa/lsa_lookup.c: typo fixes
via b4e0c0d38f5 source4/libcli/libcli.h: typo fixes
via 7f41f137426 source4/libcli/clireadwrite.c: typo fixes
via 60fcfa506db source4/dsdb/schema/schema_description.c: typo fixes
via 1ca79e64d8c source3/winbindd/winbindd_util.c: typo fixes
via 616f9d04660 source3/utils/net_rpc.c: typo fixes
via 65d0ea76904 source3/smbd/reply.c: typo fixes
via b61e3233273 source3/registry/reg_parse.h: typo fixes
via 9f4e97a4d5d source3/registry/reg_import.h: typo fixes
via c7ceca8451f source3/registry/reg_format.h: typo fixes
via 07b506c213a source3/modules/vfs_virusfilter.c: typo fixes
via 12e71a745ae source3/modules/vfs_recycle.c: typo fixes
via 08ffb9388ec python/samba/upgradehelpers.py: typo fixes
via c259190db2d python/samba/netcmd/gpo.py: typo fixes
via 6e91c52bbb9 python/samba/dbchecker.py: typo fixes
via 5915a40b25c librpc/ndr/ndr_compression.c: typo fixes
via b0deb6799c8 libgpo/gpo_filesync.c: typo fixes
via 96c7653ee77 lib/tdb/docs/tracing.txt: typo fixes
via ba1887d3742 lib/replace/xattr.c: typo fixes
via c93f06b12d0 examples/VFS/skel_transparent.c: typo fixes
via c2794780ad0 dynconfig/wscript: typo fixes
from 2b060f93502 s3:smbclient added ABI signature file
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit c714c996017b4167e9a7424e1aecd4437deeed22
Author: Björn Jacke <bj at sernet.de>
Date: Sat Oct 26 02:41:09 2019 +0200
docs-xml/manpages/pam_winbind.conf.5.xml: typo fixes
Signed-off-by: Bjoern Jacke <bjacke at samba.org>
Reviewed-by: Martin Schwenke <martin at meltin.net>
Autobuild-User(master): Björn Jacke <bjacke at samba.org>
Autobuild-Date(master): Thu Oct 31 02:18:12 UTC 2019 on sn-devel-184
commit 4b198163d03e97790a3c242f25bbd9949ab0aba1
Author: Björn Jacke <bj at sernet.de>
Date: Sat Oct 26 02:41:09 2019 +0200
docs-xml/manpages/pam_winbind.8.xml: typo fixes
Signed-off-by: Bjoern Jacke <bjacke at samba.org>
Reviewed-by: Martin Schwenke <martin at meltin.net>
commit 81df8aa7bea88f90d7ad18b00788fec8d2744a91
Author: Björn Jacke <bj at sernet.de>
Date: Sat Oct 26 02:41:09 2019 +0200
docs-xml/Samba-Developers-Guide/unix-smb.xml: typo fixes
Signed-off-by: Bjoern Jacke <bjacke at samba.org>
Reviewed-by: Martin Schwenke <martin at meltin.net>
commit a456c2bb02af56ab3d966d673421aab976e632ad
Author: Björn Jacke <bj at sernet.de>
Date: Sat Oct 26 02:41:09 2019 +0200
ctdb/utils/smnotify/smnotify.c: typo fixes
Signed-off-by: Bjoern Jacke <bjacke at samba.org>
Reviewed-by: Martin Schwenke <martin at meltin.net>
commit 1e73161bdd791fe97053dc2faa85b28e7ef55327
Author: Björn Jacke <bj at sernet.de>
Date: Sat Oct 26 02:41:09 2019 +0200
ctdb/utils/scsi_io/scsi_io.c: typo fixes
Signed-off-by: Bjoern Jacke <bjacke at samba.org>
Reviewed-by: Martin Schwenke <martin at meltin.net>
commit f3754b64876e7d0c073d86bb6d2e29425d9e8d31
Author: Björn Jacke <bj at sernet.de>
Date: Sat Oct 26 02:41:09 2019 +0200
ctdb/server/ctdb_daemon.c: typo fixes
Signed-off-by: Bjoern Jacke <bjacke at samba.org>
Reviewed-by: Martin Schwenke <martin at meltin.net>
commit 5d2a257c2e4a929bb70e4e2a2f31ed243c2efa51
Author: Björn Jacke <bj at sernet.de>
Date: Sat Oct 26 02:41:08 2019 +0200
ctdb/server/ctdb_client.c: typo fixes
Signed-off-by: Bjoern Jacke <bjacke at samba.org>
Reviewed-by: Martin Schwenke <martin at meltin.net>
commit 7722bd80fcde69d13b25a1b120fd3f9ecf6dd7dd
Author: Björn Jacke <bj at sernet.de>
Date: Sat Oct 26 02:41:08 2019 +0200
ctdb/server/ctdb_call.c: typo fixes
Signed-off-by: Bjoern Jacke <bjacke at samba.org>
Reviewed-by: Martin Schwenke <martin at meltin.net>
commit 9fa37484c30b83bc36b1607a82c76a77fe639b71
Author: Björn Jacke <bj at sernet.de>
Date: Sat Oct 26 02:41:08 2019 +0200
ctdb/include/ctdb_private.h: typo fixes
Signed-off-by: Bjoern Jacke <bjacke at samba.org>
Reviewed-by: Martin Schwenke <martin at meltin.net>
commit 493705dc2746ee64a4e2cf1dc290009185853db2
Author: Björn Jacke <bj at sernet.de>
Date: Sat Oct 26 02:41:08 2019 +0200
ctdb/ib/ibwrapper_test.c: typo fixes
Signed-off-by: Bjoern Jacke <bjacke at samba.org>
Reviewed-by: Martin Schwenke <martin at meltin.net>
commit 540325d3cb4eee1964fc59a63d51289552293902
Author: Björn Jacke <bj at sernet.de>
Date: Sat Oct 26 02:41:08 2019 +0200
ctdb/ib/ibw_ctdb.c: typo fixes
Signed-off-by: Bjoern Jacke <bjacke at samba.org>
Reviewed-by: Martin Schwenke <martin at meltin.net>
commit b9d7b85afdf96b6ca443861700b9a22c6145dc6d
Author: Björn Jacke <bj at sernet.de>
Date: Sat Oct 26 02:41:08 2019 +0200
ctdb/doc/readonlyrecords.txt: typo fixes
Signed-off-by: Bjoern Jacke <bjacke at samba.org>
Reviewed-by: Martin Schwenke <martin at meltin.net>
commit cb867b29c9ca2ef7ea7c9f80228f60b32329dd6f
Author: Björn Jacke <bj at sernet.de>
Date: Sat Oct 26 02:41:08 2019 +0200
ctdb/doc/ctdb.1.xml: typo fixes
Signed-off-by: Bjoern Jacke <bjacke at samba.org>
Reviewed-by: Martin Schwenke <martin at meltin.net>
commit 93859b3394d87f1521f757111eb8e55633c8cde3
Author: Björn Jacke <bj at sernet.de>
Date: Sat Oct 26 02:41:08 2019 +0200
ctdb/doc/ctdb-tunables.7.xml: typo fixes
Signed-off-by: Bjoern Jacke <bjacke at samba.org>
Reviewed-by: Martin Schwenke <martin at meltin.net>
commit 37398acca58ac9d224aa5d841197b378e1d26e68
Author: Björn Jacke <bj at sernet.de>
Date: Sat Oct 26 02:41:08 2019 +0200
ctdb/doc/ctdb-statistics.7.xml: typo fixes
Signed-off-by: Bjoern Jacke <bjacke at samba.org>
Reviewed-by: Martin Schwenke <martin at meltin.net>
commit 1b51b444874bc254fbe7b865fab7e416f898e46a
Author: Björn Jacke <bj at sernet.de>
Date: Sat Oct 26 02:41:08 2019 +0200
ctdb/common/srvid.h: typo fixes
Signed-off-by: Bjoern Jacke <bjacke at samba.org>
Reviewed-by: Martin Schwenke <martin at meltin.net>
commit c71a1df18aa1b38c194e6b200b81ac44f6d6770f
Author: Björn Jacke <bj at sernet.de>
Date: Sat Oct 26 02:41:08 2019 +0200
ctdb/client/client.h: typo fixes
Signed-off-by: Bjoern Jacke <bjacke at samba.org>
Reviewed-by: Martin Schwenke <martin at meltin.net>
commit 522697331fc143bb04cc5136d60178533ae61afc
Author: Björn Jacke <bj at sernet.de>
Date: Sat Oct 26 02:41:08 2019 +0200
buildtools/wafsamba/wscript: typo fixes
Signed-off-by: Bjoern Jacke <bjacke at samba.org>
Reviewed-by: Martin Schwenke <martin at meltin.net>
commit e6cd8884256e5f433b16b4132ed825054af867e5
Author: Björn Jacke <bj at sernet.de>
Date: Sat Oct 26 02:41:08 2019 +0200
buildtools/wafsamba/samba_install.py: typo fixes
Signed-off-by: Bjoern Jacke <bjacke at samba.org>
Reviewed-by: Martin Schwenke <martin at meltin.net>
commit e781db805e53959150c8a385ac60d55f601dde71
Author: Björn Jacke <bj at sernet.de>
Date: Sat Oct 26 02:41:10 2019 +0200
source4/scripting/bin/samba_upgradeprovision: typo fixes
Signed-off-by: Bjoern Jacke <bjacke at samba.org>
Reviewed-by: Martin Schwenke <martin at meltin.net>
commit 9092120b0dbcd45149975a11f32073d3877da406
Author: Björn Jacke <bj at sernet.de>
Date: Sat Oct 26 02:41:09 2019 +0200
source4/rpc_server/lsa/lsa_lookup.c: typo fixes
Signed-off-by: Bjoern Jacke <bjacke at samba.org>
Reviewed-by: Martin Schwenke <martin at meltin.net>
commit b4e0c0d38f501f5b477ac384b900fb2651a44e4d
Author: Björn Jacke <bj at sernet.de>
Date: Sat Oct 26 02:41:09 2019 +0200
source4/libcli/libcli.h: typo fixes
Signed-off-by: Bjoern Jacke <bjacke at samba.org>
Reviewed-by: Martin Schwenke <martin at meltin.net>
commit 7f41f1374264f854a3c7fc74d10a6a691e2f5f64
Author: Björn Jacke <bj at sernet.de>
Date: Sat Oct 26 02:41:09 2019 +0200
source4/libcli/clireadwrite.c: typo fixes
Signed-off-by: Bjoern Jacke <bjacke at samba.org>
Reviewed-by: Martin Schwenke <martin at meltin.net>
commit 60fcfa506db3d66b7f51ce1c25b55cb62100c763
Author: Björn Jacke <bj at sernet.de>
Date: Sat Oct 26 02:41:09 2019 +0200
source4/dsdb/schema/schema_description.c: typo fixes
Signed-off-by: Bjoern Jacke <bjacke at samba.org>
Reviewed-by: Martin Schwenke <martin at meltin.net>
commit 1ca79e64d8c28edcb3c9bdea3470e5a7eb8003ea
Author: Björn Jacke <bj at sernet.de>
Date: Sat Oct 26 02:41:09 2019 +0200
source3/winbindd/winbindd_util.c: typo fixes
Signed-off-by: Bjoern Jacke <bjacke at samba.org>
Reviewed-by: Martin Schwenke <martin at meltin.net>
commit 616f9d04660f14c9ccb2dab01442c56e377aa37e
Author: Björn Jacke <bj at sernet.de>
Date: Sat Oct 26 02:41:09 2019 +0200
source3/utils/net_rpc.c: typo fixes
Signed-off-by: Bjoern Jacke <bjacke at samba.org>
Reviewed-by: Martin Schwenke <martin at meltin.net>
commit 65d0ea769043637a91cb3b1c6ab9b18ff5e48060
Author: Björn Jacke <bj at sernet.de>
Date: Sat Oct 26 02:41:09 2019 +0200
source3/smbd/reply.c: typo fixes
Signed-off-by: Bjoern Jacke <bjacke at samba.org>
Reviewed-by: Martin Schwenke <martin at meltin.net>
commit b61e3233273411d693da0e516e4da09423ca92db
Author: Björn Jacke <bj at sernet.de>
Date: Sat Oct 26 02:41:09 2019 +0200
source3/registry/reg_parse.h: typo fixes
Signed-off-by: Bjoern Jacke <bjacke at samba.org>
Reviewed-by: Martin Schwenke <martin at meltin.net>
commit 9f4e97a4d5d044e5be29b503254684197ca244ee
Author: Björn Jacke <bj at sernet.de>
Date: Sat Oct 26 02:41:09 2019 +0200
source3/registry/reg_import.h: typo fixes
Signed-off-by: Bjoern Jacke <bjacke at samba.org>
Reviewed-by: Martin Schwenke <martin at meltin.net>
commit c7ceca8451f0ff7f4b0650084faed0614332b86e
Author: Björn Jacke <bj at sernet.de>
Date: Sat Oct 26 02:41:09 2019 +0200
source3/registry/reg_format.h: typo fixes
Signed-off-by: Bjoern Jacke <bjacke at samba.org>
Reviewed-by: Martin Schwenke <martin at meltin.net>
commit 07b506c213a965c900b8002766350ebb38e3c9e4
Author: Björn Jacke <bj at sernet.de>
Date: Sat Oct 26 02:41:09 2019 +0200
source3/modules/vfs_virusfilter.c: typo fixes
Signed-off-by: Bjoern Jacke <bjacke at samba.org>
Reviewed-by: Martin Schwenke <martin at meltin.net>
commit 12e71a745aedf6906b54dd03ff9d9a18c9d6b523
Author: Björn Jacke <bj at sernet.de>
Date: Sat Oct 26 02:41:09 2019 +0200
source3/modules/vfs_recycle.c: typo fixes
Signed-off-by: Bjoern Jacke <bjacke at samba.org>
Reviewed-by: Martin Schwenke <martin at meltin.net>
commit 08ffb9388ec39514a24ca87391ffe715db68db88
Author: Björn Jacke <bj at sernet.de>
Date: Sat Oct 26 02:41:09 2019 +0200
python/samba/upgradehelpers.py: typo fixes
Signed-off-by: Bjoern Jacke <bjacke at samba.org>
Reviewed-by: Martin Schwenke <martin at meltin.net>
commit c259190db2d232a9db6d25d7cdbca649a56bd26f
Author: Björn Jacke <bj at sernet.de>
Date: Sat Oct 26 02:41:09 2019 +0200
python/samba/netcmd/gpo.py: typo fixes
Signed-off-by: Bjoern Jacke <bjacke at samba.org>
Reviewed-by: Martin Schwenke <martin at meltin.net>
commit 6e91c52bbb9a5fe0a4057e15cd52ab56ff6682b6
Author: Björn Jacke <bj at sernet.de>
Date: Sat Oct 26 02:41:09 2019 +0200
python/samba/dbchecker.py: typo fixes
Signed-off-by: Bjoern Jacke <bjacke at samba.org>
Reviewed-by: Martin Schwenke <martin at meltin.net>
commit 5915a40b25cebf7a480b51543cae93021fb091de
Author: Björn Jacke <bj at sernet.de>
Date: Sat Oct 26 02:41:09 2019 +0200
librpc/ndr/ndr_compression.c: typo fixes
Signed-off-by: Bjoern Jacke <bjacke at samba.org>
Reviewed-by: Martin Schwenke <martin at meltin.net>
commit b0deb6799c8d40f7c4c8824e11d37594d52e7bd5
Author: Björn Jacke <bj at sernet.de>
Date: Sat Oct 26 02:41:09 2019 +0200
libgpo/gpo_filesync.c: typo fixes
Signed-off-by: Bjoern Jacke <bjacke at samba.org>
Reviewed-by: Martin Schwenke <martin at meltin.net>
commit 96c7653ee774eb6f0c08a0cbb473f4c4a42a526e
Author: Björn Jacke <bj at sernet.de>
Date: Sat Oct 26 02:41:09 2019 +0200
lib/tdb/docs/tracing.txt: typo fixes
Signed-off-by: Bjoern Jacke <bjacke at samba.org>
Reviewed-by: Martin Schwenke <martin at meltin.net>
commit ba1887d37422f39bd36d0ab17dd1ef8efa56cb63
Author: Björn Jacke <bj at sernet.de>
Date: Sat Oct 26 02:41:09 2019 +0200
lib/replace/xattr.c: typo fixes
Signed-off-by: Bjoern Jacke <bjacke at samba.org>
Reviewed-by: Martin Schwenke <martin at meltin.net>
commit c93f06b12d07783104ea833e463f7fd94c0ccb0f
Author: Björn Jacke <bj at sernet.de>
Date: Sat Oct 26 02:41:09 2019 +0200
examples/VFS/skel_transparent.c: typo fixes
Signed-off-by: Bjoern Jacke <bjacke at samba.org>
Reviewed-by: Martin Schwenke <martin at meltin.net>
commit c2794780ad09b0fa9d63e4ad31a8ae3c67fa453d
Author: Björn Jacke <bj at sernet.de>
Date: Sat Oct 26 02:41:09 2019 +0200
dynconfig/wscript: typo fixes
Signed-off-by: Bjoern Jacke <bjacke at samba.org>
Reviewed-by: Martin Schwenke <martin at meltin.net>
-----------------------------------------------------------------------
Summary of changes:
buildtools/wafsamba/samba_install.py | 6 ++--
buildtools/wafsamba/wscript | 2 +-
ctdb/client/client.h | 2 +-
ctdb/common/srvid.h | 2 +-
ctdb/doc/ctdb-statistics.7.xml | 2 +-
ctdb/doc/ctdb-tunables.7.xml | 12 +++----
ctdb/doc/ctdb.1.xml | 4 +--
ctdb/doc/readonlyrecords.txt | 6 ++--
ctdb/ib/ibw_ctdb.c | 2 +-
ctdb/ib/ibwrapper_test.c | 2 +-
ctdb/include/ctdb_private.h | 2 +-
ctdb/server/ctdb_call.c | 6 ++--
ctdb/server/ctdb_client.c | 6 ++--
ctdb/server/ctdb_daemon.c | 8 ++---
ctdb/utils/scsi_io/scsi_io.c | 20 +++++------
ctdb/utils/smnotify/smnotify.c | 10 +++---
docs-xml/Samba-Developers-Guide/unix-smb.xml | 2 +-
docs-xml/manpages/pam_winbind.8.xml | 2 +-
docs-xml/manpages/pam_winbind.conf.5.xml | 2 +-
dynconfig/wscript | 10 +++---
examples/VFS/skel_transparent.c | 2 +-
lib/replace/xattr.c | 16 ++++-----
lib/tdb/docs/tracing.txt | 2 +-
libgpo/gpo_filesync.c | 2 +-
librpc/ndr/ndr_compression.c | 14 ++++----
python/samba/dbchecker.py | 8 ++---
python/samba/netcmd/gpo.py | 1 +
python/samba/upgradehelpers.py | 2 +-
source3/modules/vfs_recycle.c | 2 +-
source3/modules/vfs_virusfilter.c | 2 +-
source3/registry/reg_format.h | 2 +-
source3/registry/reg_import.h | 16 ++++-----
source3/registry/reg_parse.h | 8 ++---
source3/smbd/reply.c | 6 ++--
source3/utils/net_rpc.c | 2 +-
source3/winbindd/winbindd_util.c | 6 ++--
source4/dsdb/schema/schema_description.c | 54 ++++++++++++++--------------
source4/libcli/clireadwrite.c | 2 +-
source4/libcli/libcli.h | 2 +-
source4/rpc_server/lsa/lsa_lookup.c | 8 ++---
source4/scripting/bin/samba_upgradeprovision | 10 +++---
41 files changed, 138 insertions(+), 137 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/samba_install.py b/buildtools/wafsamba/samba_install.py
index 07b01d6ac4b..2957e16c3da 100644
--- a/buildtools/wafsamba/samba_install.py
+++ b/buildtools/wafsamba/samba_install.py
@@ -12,7 +12,7 @@ from samba_utils import LIB_PATH, MODE_755, install_rpath, build_rpath
@after('apply_core')
@before('apply_link', 'apply_obj_vars')
def install_binary(self):
- '''install a binary, taking account of the different rpath varients'''
+ '''install a binary, taking account of the different rpath variants'''
bld = self.bld
# get the ldflags we will use for install and build
@@ -54,7 +54,7 @@ def install_binary(self):
@after('apply_core')
@before('apply_link', 'apply_obj_vars')
def install_library(self):
- '''install a library, taking account of the different rpath varients'''
+ '''install a library, taking account of the different rpath variants'''
if getattr(self, 'done_install_library', False):
return
@@ -156,7 +156,7 @@ def install_library(self):
@after('apply_implib')
@before('apply_vnum')
def apply_soname(self):
- '''install a library, taking account of the different rpath varients'''
+ '''install a library, taking account of the different rpath variants'''
if self.env.SONAME_ST and getattr(self, 'soname', ''):
self.env.append_value('LINKFLAGS', self.env.SONAME_ST % self.soname)
diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript
index 28d81ebd602..8d0a89a0ee3 100644
--- a/buildtools/wafsamba/wscript
+++ b/buildtools/wafsamba/wscript
@@ -92,7 +92,7 @@ def options(opt):
gr = opt.option_group('developer options')
gr.add_option('-C',
- help='enable configure cacheing',
+ help='enable configure caching',
action='store_true', dest='enable_configure_cache')
gr.add_option('--enable-auto-reconfigure',
help='enable automatic reconfigure on build',
diff --git a/ctdb/client/client.h b/ctdb/client/client.h
index 0df76a66e46..88ee5768d76 100644
--- a/ctdb/client/client.h
+++ b/ctdb/client/client.h
@@ -184,7 +184,7 @@ void ctdb_client_wait(struct tevent_context *ev, bool *done);
* @param[in] ev Tevent context
* @param[in] done Boolean flag to indicate when to stop waiting
* @param[in] timeout How long to wait
- * @return 0 on succes, ETIMEDOUT on timeout, and errno on failure
+ * @return 0 on success, ETIMEDOUT on timeout, and errno on failure
*/
int ctdb_client_wait_timeout(struct tevent_context *ev, bool *done,
struct timeval timeout);
diff --git a/ctdb/common/srvid.h b/ctdb/common/srvid.h
index 702724ff93a..c0c2b30952d 100644
--- a/ctdb/common/srvid.h
+++ b/ctdb/common/srvid.h
@@ -29,7 +29,7 @@
* @brief Database of message handlers based on srvid
*
* CTDB can be used to send messages between clients across nodes using
- * CTDB_REQ_MESSAGE. Clients register for mesages based on srvid. CTDB itself
+ * CTDB_REQ_MESSAGE. Clients register for messages based on srvid. CTDB itself
* uses a small set of srvid messages. A large range (2^56) of srvid messages
* is reserved for Samba.
*/
diff --git a/ctdb/doc/ctdb-statistics.7.xml b/ctdb/doc/ctdb-statistics.7.xml
index 4b152423f3c..387852d5498 100644
--- a/ctdb/doc/ctdb-statistics.7.xml
+++ b/ctdb/doc/ctdb-statistics.7.xml
@@ -378,7 +378,7 @@ Statistics collected since : (000 01:49:20) Fri Sep 12 11:43:12 2014
<refsect2>
<title>pending_calls</title>
<para>
- Number of req_call messages which are currenly being processed.
+ Number of req_call messages which are currently being processed.
This number indicates the number of record migrations in flight.
</para>
</refsect2>
diff --git a/ctdb/doc/ctdb-tunables.7.xml b/ctdb/doc/ctdb-tunables.7.xml
index 289b1d7324b..c9ff6abd1e8 100644
--- a/ctdb/doc/ctdb-tunables.7.xml
+++ b/ctdb/doc/ctdb-tunables.7.xml
@@ -366,7 +366,7 @@ MonitorInterval=20
take longer than this value, in milliseconds, to complete.
These operations include "process a record request from client",
"take a record or database lock", "update a persistent database
- record" and "vaccum a database".
+ record" and "vacuum a database".
</para>
</refsect2>
@@ -480,7 +480,7 @@ MonitorInterval=20
<title>RecdFailCount</title>
<para>Default: 10</para>
<para>
- If the recovery daemon has failed to ping the main dameon for
+ If the recovery daemon has failed to ping the main daemon for
this many consecutive intervals, the main daemon will consider
the recovery daemon as hung and will try to restart it to recover.
</para>
@@ -490,8 +490,8 @@ MonitorInterval=20
<title>RecdPingTimeout</title>
<para>Default: 60</para>
<para>
- If the main dameon has not heard a "ping" from the recovery dameon
- for this many seconds, the main dameon will log a message that
+ If the main daemon has not heard a "ping" from the recovery daemon
+ for this many seconds, the main daemon will log a message that
the recovery daemon is potentially hung. This also increments a
counter which is checked against <varname>RecdFailCount</varname>
for detection of hung recovery daemon.
@@ -503,7 +503,7 @@ MonitorInterval=20
<para>Default: 1000</para>
<para>
When using a reclock file for split brain prevention, if set
- to non-zero this tunable will make the recovery dameon log a
+ to non-zero this tunable will make the recovery daemon log a
message if the fcntl() call to lock/testlock the recovery file
takes longer than this number of milliseconds.
</para>
@@ -525,7 +525,7 @@ MonitorInterval=20
This is the default setting for timeouts for controls when sent
from the recovery daemon. We allow longer control timeouts from
the recovery daemon than from normal use since the recovery
- dameon often use controls that can take a lot longer than normal
+ daemon often use controls that can take a lot longer than normal
controls.
</para>
</refsect2>
diff --git a/ctdb/doc/ctdb.1.xml b/ctdb/doc/ctdb.1.xml
index e355752d1db..a204583b62c 100644
--- a/ctdb/doc/ctdb.1.xml
+++ b/ctdb/doc/ctdb.1.xml
@@ -198,7 +198,7 @@
<varlistentry><term>--usage</term>
<listitem>
<para>
- Print useage information to the screen.
+ Print usage information to the screen.
</para>
</listitem>
</varlistentry>
@@ -1359,7 +1359,7 @@ DB Statistics: locking.tdb
If a PERSISTENT database is not in a healthy state the database
is flagged as UNHEALTHY. If there's at least one completely
healthy node running in the cluster, it's possible that the
- content is restored by a recovery run automaticly. Otherwise an
+ content is restored by a recovery run automatically. Otherwise an
administrator needs to analyze the problem.
</para>
<para>
diff --git a/ctdb/doc/readonlyrecords.txt b/ctdb/doc/readonlyrecords.txt
index 5374a855ddf..cc6d7ee269d 100644
--- a/ctdb/doc/readonlyrecords.txt
+++ b/ctdb/doc/readonlyrecords.txt
@@ -97,7 +97,7 @@ Once the child process has finished revoking all delegations it will set the fla
REVOKE_COMPLETE for this record to signal to the main daemon that the record has been
successfully revoked.
At this stage the child process will also trigger an event in the main daemon that
-revoke is complete and that the main dameon should start re-processing all deferred
+revoke is complete and that the main daemon should start re-processing all deferred
requests.
@@ -272,7 +272,7 @@ HAVE_DELEGATIONS flag for the record and then proceeds to perform the migration
When receiving a ctdb_call without the flag we want all delegations to be revoked,
so we must take care that the delegations are revoked unconditionally before we even
-check if we are already the DMASTER (in which case thie ctdb_call would normally just
+check if we are already the DMASTER (in which case the ctdb_call would normally just
be no-op (*B below))
@@ -333,7 +333,7 @@ Non-readonly locking daemons must be able to interoperate with readonly locking
Non-readonly enabled daemons fetching records from Readonly enabled daemons:
Non-readonly enabled daemons do not know, and never set the WANT_READONLY flag so these daemons will always request a full migration for a full fetch-lock for all records. Thus a request from a non-readonly enabled daemon will always cause any existing delegations to be immediately revoked. Access will work but performance may be harmed since there will be a lot of revoking of delegations.
-Readonly enabled dameons fetching records with WANT_READONLY from non-readonly enabled daemons:
+Readonly enabled daemons fetching records with WANT_READONLY from non-readonly enabled daemons:
Non-readonly enabled daemons ingore the WANT_READONLY flag and never return delegations. They always return a full record migration.
Full record migration is allowed by the protocol, even if the originator only requests the 'hint' WANT_READONLY,
so this access also interoperates between daemons with different capabilities.
diff --git a/ctdb/ib/ibw_ctdb.c b/ctdb/ib/ibw_ctdb.c
index 458646faae0..b5537c8a7e5 100644
--- a/ctdb/ib/ibw_ctdb.c
+++ b/ctdb/ib/ibw_ctdb.c
@@ -44,7 +44,7 @@ int ctdb_ibw_get_address(struct ctdb_context *ctdb,
if (inet_pton(AF_INET, address, addr) <= 0) {
struct hostent *he = gethostbyname(address);
if (he == NULL || he->h_length > sizeof(*addr)) {
- ctdb_set_error(ctdb, "invalid nework address '%s'\n",
+ ctdb_set_error(ctdb, "invalid network address '%s'\n",
address);
return -1;
}
diff --git a/ctdb/ib/ibwrapper_test.c b/ctdb/ib/ibwrapper_test.c
index bc88dad051c..5eb3209b68c 100644
--- a/ctdb/ib/ibwrapper_test.c
+++ b/ctdb/ib/ibwrapper_test.c
@@ -467,7 +467,7 @@ static int ibwtest_get_address(const char *address, struct in_addr *addr)
if (inet_pton(AF_INET, address, addr) <= 0) {
struct hostent *he = gethostbyname(address);
if (he == NULL || he->h_length > sizeof(*addr)) {
- DEBUG(DEBUG_ERR, ("invalid nework address '%s'\n", address));
+ DEBUG(DEBUG_ERR, ("invalid network address '%s'\n", address));
return -1;
}
memcpy(addr, he->h_addr, he->h_length);
diff --git a/ctdb/include/ctdb_private.h b/ctdb/include/ctdb_private.h
index 4f36c9a44a5..47c339a36d6 100644
--- a/ctdb/include/ctdb_private.h
+++ b/ctdb/include/ctdb_private.h
@@ -87,7 +87,7 @@ struct ctdb_node {
if the node becomes disconnected */
struct daemon_control_state *pending_controls;
- /* used by the recovery dameon to track when a node should be banned */
+ /* used by the recovery daemon to track when a node should be banned */
struct ctdb_banning_state *ban_state;
};
diff --git a/ctdb/server/ctdb_call.c b/ctdb/server/ctdb_call.c
index 9e1c51bf57d..f8bf2d8d41e 100644
--- a/ctdb/server/ctdb_call.c
+++ b/ctdb/server/ctdb_call.c
@@ -65,7 +65,7 @@ struct ctdb_sticky_record {
}
/*
- a varient of input packet that can be used in lock requeue
+ a variant of input packet that can be used in lock requeue
*/
static void ctdb_call_input_pkt(void *p, struct ctdb_req_header *hdr)
{
@@ -484,7 +484,7 @@ static void *insert_ddq_callback(void *parm, void *data)
}
/**
- * This function is used to reigster a key in database that needs to be updated.
+ * This function is used to register a key in database that needs to be updated.
* Any requests for that key should get deferred till this is completed.
*/
static int dmaster_defer_setup(struct ctdb_db_context *ctdb_db,
@@ -508,7 +508,7 @@ static int dmaster_defer_setup(struct ctdb_db_context *ctdb_db,
return 0;
}
- /* Recovery ocurred - get rid of old queue. All the deferred
+ /* Recovery occurred - get rid of old queue. All the deferred
* requests will be resent anyway from ctdb_call_resend_db.
*/
talloc_free(ddq);
diff --git a/ctdb/server/ctdb_client.c b/ctdb/server/ctdb_client.c
index dc7836abb2e..0da847c401b 100644
--- a/ctdb/server/ctdb_client.c
+++ b/ctdb/server/ctdb_client.c
@@ -642,7 +642,7 @@ static void ctdb_client_reply_control(struct ctdb_context *ctdb,
}
/* state->outdata now uses resources from c so we don't want c
- to just dissappear from under us while state is still alive
+ to just disappear from under us while state is still alive
*/
talloc_steal(state, c);
@@ -848,7 +848,7 @@ int ctdb_control(struct ctdb_context *ctdb, uint32_t destnode, uint64_t srvid,
timeout, errormsg);
/* FIXME: Error conditions in ctdb_control_send return NULL without
- * setting errormsg. So, there is no way to distinguish between sucess
+ * setting errormsg. So, there is no way to distinguish between success
* and failure when CTDB_CTRL_FLAG_NOREPLY is set */
if (flags & CTDB_CTRL_FLAG_NOREPLY) {
if (status != NULL) {
@@ -1603,7 +1603,7 @@ uint32_t ctdb_get_pnn(struct ctdb_context *ctdb)
/*
callback for the async helpers used when sending the same control
- to multiple nodes in parallell.
+ to multiple nodes in parallel.
*/
static void async_callback(struct ctdb_client_control_state *state)
{
diff --git a/ctdb/server/ctdb_daemon.c b/ctdb/server/ctdb_daemon.c
index c0553a18c14..d9a6bf6d741 100644
--- a/ctdb/server/ctdb_daemon.c
+++ b/ctdb/server/ctdb_daemon.c
@@ -573,15 +573,15 @@ static void reprocess_deferred_call(struct tevent_context *ev,
fetch-lock has finished.
at this stage, immediately start reprocessing the queued up deferred
calls so they get reprocessed immediately (and since we are dmaster at
- this stage, trigger the waiting smbd processes to pick up and aquire the
+ this stage, trigger the waiting smbd processes to pick up and acquire the
record right away.
*/
static int deferred_fetch_queue_destructor(struct ctdb_deferred_fetch_queue *dfq)
{
- /* need to reprocess the packets from the queue explicitely instead of
- just using a normal destructor since we want, need, to
- call the clients in the same oder as the requests queued up
+ /* need to reprocess the packets from the queue explicitly instead of
+ just using a normal destructor since we need to
+ call the clients in the same order as the requests queued up
*/
while (dfq->deferred_calls != NULL) {
struct ctdb_client *client;
diff --git a/ctdb/utils/scsi_io/scsi_io.c b/ctdb/utils/scsi_io/scsi_io.c
index 1a4fe0ef699..c5588603a07 100644
--- a/ctdb/utils/scsi_io/scsi_io.c
+++ b/ctdb/utils/scsi_io/scsi_io.c
@@ -417,7 +417,7 @@ int scsi_persistent_reserve_in_read_keys(int fd)
cdb[8]=data_size&0xff;
- printf("PRESISTENT RESERVE IN: READ KEYS\n");
+ printf("PERSISTENT RESERVE IN: READ KEYS\n");
res=scsi_io(fd, cdb, sizeof(cdb), SG_DXFER_FROM_DEV, data, &data_size, sense, &sense_len);
if(res){
@@ -477,7 +477,7 @@ int scsi_persistent_reserve_in_read_reservation(int fd)
cdb[8]=data_size&0xff;
- printf("PRESISTENT RESERVE IN: READ RESERVATION\n");
+ printf("PERSISTENT RESERVE IN: READ RESERVATION\n");
res=scsi_io(fd, cdb, sizeof(cdb), SG_DXFER_FROM_DEV, data, &data_size, sense, &sense_len);
if(res){
@@ -537,7 +537,7 @@ int scsi_persistent_reserve_in_report_capabilities(int fd)
cdb[8]=data_size&0xff;
- printf("PRESISTENT RESERVE IN: REPORT CAPABILITIES\n");
+ printf("PERSISTENT RESERVE IN: REPORT CAPABILITIES\n");
res=scsi_io(fd, cdb, sizeof(cdb), SG_DXFER_FROM_DEV, data, &data_size, sense, &sense_len);
if(res){
@@ -572,7 +572,7 @@ int scsi_persistent_reserve_in_report_capabilities(int fd)
/* Persistent Reservation Type Mask */
type_mask=data[4];
type_mask<<=8;type_mask|=data[5];
- printf("Presistent Reservation Type Mask:0x%04x\n", type_mask);
+ printf("Persistent Reservation Type Mask:0x%04x\n", type_mask);
printf("WR_EX_AR:%d EX_AC_RO:%d WR_EX_RO:%d EX_AC:%d WR_EX:%d EX_AC_AR:%d\n",
!!(data[4]&0x80),
!!(data[4]&0x40),
@@ -602,7 +602,7 @@ int scsi_persistent_reserve_in_read_full_status(int fd)
cdb[8]=data_size&0xff;
- printf("PRESISTENT RESERVE IN: READ FULL STATUS\n");
+ printf("PERSISTENT RESERVE IN: READ FULL STATUS\n");
res=scsi_io(fd, cdb, sizeof(cdb), SG_DXFER_FROM_DEV, data, &data_size, sense, &sense_len);
if(res){
@@ -694,7 +694,7 @@ int scsi_persistent_reserve_out_clear(int fd)
/* Spec_ip_ti=0 all_tg_pt=1 aptpl=0 */
data[20]=0x04;
- printf("PRESISTENT RESERVE IN: CLEAR\n");
+ printf("PERSISTENT RESERVE IN: CLEAR\n");
res=scsi_io(fd, cdb, sizeof(cdb), SG_DXFER_TO_DEV, data, &data_size, sense, &sense_len);
if(res){
@@ -771,7 +771,7 @@ int scsi_persistent_reserve_out_reserve(int fd)
/* Spec_ip_ti=0 all_tg_pt=1 aptpl=0 */
data[20]=0x04;
- printf("PRESISTENT RESERVE IN: RESERVE\n");
+ printf("PERSISTENT RESERVE IN: RESERVE\n");
res=scsi_io(fd, cdb, sizeof(cdb), SG_DXFER_TO_DEV, data, &data_size, sense, &sense_len);
if(res){
@@ -854,7 +854,7 @@ int scsi_persistent_reserve_out_preempt(int fd)
/* Spec_ip_ti=0 all_tg_pt=1 aptpl=0 */
data[20]=0x04;
- printf("PRESISTENT RESERVE IN: RESERVE\n");
+ printf("PERSISTENT RESERVE IN: RESERVE\n");
res=scsi_io(fd, cdb, sizeof(cdb), SG_DXFER_TO_DEV, data, &data_size, sense, &sense_len);
if(res){
@@ -930,7 +930,7 @@ int scsi_persistent_reserve_out_register_and_ignore_existing_key(int fd)
/* Spec_ip_ti=0 all_tg_pt=1 aptpl=0 */
data[20]=0x04;
- printf("PRESISTENT RESERVE IN: REGISTER AND IGNORE EXISTING KEY\n");
+ printf("PERSISTENT RESERVE IN: REGISTER AND IGNORE EXISTING KEY\n");
res=scsi_io(fd, cdb, sizeof(cdb), SG_DXFER_TO_DEV, data, &data_size, sense, &sense_len);
if(res){
@@ -1006,7 +1006,7 @@ int scsi_persistent_reserve_out_unregister_key(int fd)
/* Spec_ip_ti=0 all_tg_pt=1 aptpl=0 */
data[20]=0x04;
- printf("PRESISTENT RESERVE IN: UNREGISTER KEY\n");
+ printf("PERSISTENT RESERVE IN: UNREGISTER KEY\n");
res=scsi_io(fd, cdb, sizeof(cdb), SG_DXFER_TO_DEV, data, &data_size, sense, &sense_len);
if(res){
diff --git a/ctdb/utils/smnotify/smnotify.c b/ctdb/utils/smnotify/smnotify.c
index 43ca7f37c6f..5907bd6e8d6 100644
--- a/ctdb/utils/smnotify/smnotify.c
+++ b/ctdb/utils/smnotify/smnotify.c
@@ -34,7 +34,7 @@ static int stateval = 0;
static int clientport = 0;
static int sendport = 0;
-static void useage(void)
+static void usage(void)
{
exit(0);
}
@@ -95,22 +95,22 @@ int main(int argc, const char *argv[])
if (client == NULL) {
printf("ERROR: client not specified\n");
- useage();
+ usage();
}
if (ip == NULL) {
printf("ERROR: ip not specified\n");
- useage();
+ usage();
}
if (server == NULL) {
printf("ERROR: server not specified\n");
- useage();
+ usage();
}
if (stateval == 0) {
printf("ERROR: stateval not specified\n");
- useage();
+ usage();
}
diff --git a/docs-xml/Samba-Developers-Guide/unix-smb.xml b/docs-xml/Samba-Developers-Guide/unix-smb.xml
index 53d41b7d6b8..6b0db27cda2 100644
--- a/docs-xml/Samba-Developers-Guide/unix-smb.xml
+++ b/docs-xml/Samba-Developers-Guide/unix-smb.xml
@@ -310,7 +310,7 @@ renamed the SMB protocol CIFS (Common Internet File System) and have
published new specifications. These are far superior to the old
X/Open documents but there are still undocumented calls and features.
This specification is actively being worked on by a CIFS developers
-mailing list hosted by Microsft.
+mailing list hosted by Microsoft.
</para>
</sect1>
</chapter>
diff --git a/docs-xml/manpages/pam_winbind.8.xml b/docs-xml/manpages/pam_winbind.8.xml
index b8af5b54c58..97dc5733d64 100644
--- a/docs-xml/manpages/pam_winbind.8.xml
+++ b/docs-xml/manpages/pam_winbind.8.xml
@@ -141,7 +141,7 @@
skew), winbindd will fallback to samlogon authentication over
MSRPC. When this parameter is used in conjunction with
<parameter>winbind refresh tickets</parameter>, winbind will
- keep your Ticket Granting Ticket (TGT) uptodate by refreshing
+ keep your Ticket Granting Ticket (TGT) up-to-date by refreshing
it whenever necessary.
</para></listitem>
diff --git a/docs-xml/manpages/pam_winbind.conf.5.xml b/docs-xml/manpages/pam_winbind.conf.5.xml
index 2751231a08c..1c48f1bc428 100644
--- a/docs-xml/manpages/pam_winbind.conf.5.xml
+++ b/docs-xml/manpages/pam_winbind.conf.5.xml
@@ -98,7 +98,7 @@
skew), winbindd will fallback to samlogon authentication over
MSRPC. When this parameter is used in conjunction with
<parameter>winbind refresh tickets</parameter>, winbind will
- keep your Ticket Granting Ticket (TGT) uptodate by refreshing
+ keep your Ticket Granting Ticket (TGT) up-to-date by refreshing
it whenever necessary. Defaults to "no".
</para></listitem>
diff --git a/dynconfig/wscript b/dynconfig/wscript
index 5a0ce6d956a..440ecd7f1b4 100644
--- a/dynconfig/wscript
+++ b/dynconfig/wscript
@@ -66,12 +66,12 @@ class SambaIndentedHelpFormatter (optparse.IndentedHelpFormatter):
# 'OPTION' - the configure option to overwrite the default (optional)
# 'HELPTEXT' - the help text of the configure option (optional)
#
-# 'OVERWRITE' - The option referrs to itself and was already from
+# 'OVERWRITE' - The option refers to itself and was already from
# the basic GNU options from the gnu_dirs tool.
# We may overwrite the related path. (Default: False)
#
-# 'DELAY' - The option referrs to other options in the dynconfig list.
-# We delay the intialization into a later stage. This
--
Samba Shared Repository
More information about the samba-cvs
mailing list