[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Fri Nov 6 12:44:04 UTC 2015
The branch, master has been updated
via c315fce Fix various spelling errors
via f3033a1 build:wafsamba: Remove the print_commands code from the build scripts
via 7c5a92a build:wafsamba: Include the print_commands.py tool from upstream
via 963ccff build:wafsamba: Remove samba_utils.runonce
via 1f4f081 build:wafsamba: Remove the unnecessary intltool module dependency
via 9731979 build:wafsamba: Moved samba_before_apply_obj_vars to samba_utils
via 40a2deb build:wafsamba: Removed unnecessary and misleading variables
from bae51eb Fix up some aesthetics ... ie, align things as they were intended.
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit c315fce17ef11a23c24fc92b7475ac3a3ac55032
Author: Mathieu Parent <math.parent at gmail.com>
Date: Sun Jul 26 23:02:57 2015 +0200
Fix various spelling errors
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
Autobuild-Date(master): Fri Nov 6 13:43:45 CET 2015 on sn-devel-104
commit f3033a1943462f98e994f095ed5805be27acadd0
Author: Thomas Nagy <tnagy at waf.io>
Date: Thu Nov 5 19:00:18 2015 +0100
build:wafsamba: Remove the print_commands code from the build scripts
Using the print_commands tool makes it easier to upgrade to Waf 1.8.
Signed-off-by: Thomas Nagy <tnagy at waf.io>
Reviewed-by: Uri Simchoni uri at samba.org
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 7c5a92a1043d5990d415014f081c8cd560fd3caa
Author: Thomas Nagy <tnagy at waf.io>
Date: Thu Nov 5 18:57:14 2015 +0100
build:wafsamba: Include the print_commands.py tool from upstream
The tool 'print_commands' is provided by default in Waf 1.8. Keeping
the old code in Samba complicates the Waf upgrade.
Signed-off-by: Thomas Nagy <tnagy at waf.io>
Reviewed-by: Uri Simchoni uri at samba.org
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 963ccff806cf58898cdc8808138453d95df41b01
Author: Thomas Nagy <tnagy at waf.io>
Date: Thu Nov 5 02:06:42 2015 +0100
build:wafsamba: Remove samba_utils.runonce
The decorator order matters in the following:
"""
@runonce
@conf
function()
"""
First, the @conf decorator binds the function to the configuration context
and then returns the same function. The @runonce decorator then takes
the output function and replaces it by another that performs caching. This new
function remains in the current script and is never bound to the configuration
context, so caching never occurs.
The declaration would have been correct if written like this:
"""
@conf
@runonce
function()
"""
Yet the decorator @run_once does not keep the function name (__name__), so the
annotation with @conf would fail. The straightforward approach is to remove
all the incorrect @runonce occurrences.
Besides that, the function Utils.run_once is already present in the Waf library,
and is sufficient for the current needs of the Samba code (it caches only the
first argument). Therefore samba_utils.runonce can be safely replaced by
Utils.run_once, which is also present in Waf 1.8.
Note: at runtime, only SETUP_BUILD_GROUPS seems to actually use caching.
Signed-off-by: Thomas Nagy <tnagy at waf.io>
Reviewed-by: Uri Simchoni uri at samba.org
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 1f4f081b7aa7cbb8c9f92f0c5e39a870a5c1c6a3
Author: Thomas Nagy <tnagy at waf.io>
Date: Thu Nov 5 00:41:38 2015 +0100
build:wafsamba: Remove the unnecessary intltool module dependency
The 'intltool' module is completely unnecessary for the build process,
and it does not exist in waf 1.8
Signed-off-by: Thomas Nagy <tnagy at waf.io>
Reviewed-by: Uri Simchoni uri at samba.org
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 973197909887ccd38eb5b5aaf48235dea09fdc81
Author: Thomas Nagy <tnagy at waf.io>
Date: Thu Nov 5 00:39:25 2015 +0100
build:wafsamba: Moved samba_before_apply_obj_vars to samba_utils
The function samba_before_apply_obj_vars serves to remove system paths,
it is certainly not an optimisation and has no place in that module.
By optimisation, we mean that the build process could run without it.
Signed-off-by: Thomas Nagy <tnagy at waf.io>
Reviewed-by: Uri Simchoni uri at samba.org
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 40a2deb52099c6149a072c545010093d11b0b1a7
Author: Thomas Nagy <tnagy at waf.io>
Date: Thu Nov 5 00:34:03 2015 +0100
build:wafsamba: Removed unnecessary and misleading variables
There is no 'allow_duplicates' attribute anywhere.
The function 'check_duplicate_sources' always returns True unless it raises an exception
There is no list of source files to use
The variable 'tstart' is unused
Signed-off-by: Thomas Nagy <tnagy at waf.io>
Reviewed-by: Uri Simchoni uri at samba.org
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
-----------------------------------------------------------------------
Summary of changes:
buildtools/wafsamba/samba_autoconf.py | 3 +-
buildtools/wafsamba/samba_bundled.py | 5 +-
buildtools/wafsamba/samba_deps.py | 10 +---
buildtools/wafsamba/samba_optimisation.py | 22 +-------
buildtools/wafsamba/samba_perl.py | 6 ---
buildtools/wafsamba/samba_utils.py | 62 +++++++++-------------
buildtools/wafsamba/wafsamba.py | 2 +-
buildtools/wafsamba/wscript | 3 +-
ctdb/client/ctdb_client.c | 2 +-
ctdb/common/rb_tree.c | 6 +--
ctdb/common/system_aix.c | 2 +-
ctdb/common/system_freebsd.c | 4 +-
ctdb/common/system_gnu.c | 4 +-
ctdb/common/system_kfreebsd.c | 4 +-
ctdb/common/system_linux.c | 4 +-
ctdb/config/events.d/10.interface | 2 +-
ctdb/config/statd-callout | 4 +-
ctdb/doc/ctdbd.1.xml | 2 +-
ctdb/doc/ctdbd.conf.5.xml | 2 +-
ctdb/packaging/RPM/ctdb.spec.in | 24 ++++-----
ctdb/server/ctdb_call.c | 2 +-
ctdb/server/ctdb_daemon.c | 2 +-
ctdb/server/ctdb_ltdb_server.c | 2 +-
ctdb/server/ctdb_monitor.c | 4 +-
ctdb/server/ctdb_recoverd.c | 18 +++----
ctdb/server/ctdb_server.c | 2 +-
ctdb/server/ctdb_takeover.c | 16 +++---
ctdb/server/ctdb_update_record.c | 2 +-
ctdb/server/ctdb_vacuum.c | 4 +-
ctdb/utils/smnotify/smnotify.c | 2 +-
docs-xml/Samba3-HOWTO/TOSHARG-Passdb.xml | 2 +-
docs-xml/archives/THANKS | 2 +-
docs-xml/manpages/idmap_rfc2307.8.xml | 2 +-
docs-xml/manpages/net.8.xml | 10 ++--
docs-xml/manpages/pam_winbind.8.xml | 2 +-
docs-xml/manpages/pam_winbind.conf.5.xml | 2 +-
docs-xml/manpages/pdbedit.8.xml | 2 +-
docs-xml/manpages/vfs_ceph.8.xml | 2 +-
docs-xml/manpages/vfs_shadow_copy2.8.xml | 4 +-
docs-xml/manpages/vfs_smb_traffic_analyzer.8.xml | 2 +-
docs-xml/manpages/wbinfo.1.xml | 2 +-
docs-xml/smbdotconf/logging/loglevel.xml | 2 +-
docs-xml/smbdotconf/misc/dosfiletimes.xml | 2 +-
docs-xml/smbdotconf/misc/rpcdaemon.xml | 2 +-
docs-xml/smbdotconf/misc/rpcserver.xml | 2 +-
docs-xml/smbdotconf/security/lanmanauth.xml | 2 +-
docs-xml/smbdotconf/security/serverrole.xml | 2 +-
.../smbdotconf/winbind/winbindofflinelogon.xml | 2 +-
docs-xml/using_samba/ch02.xml | 2 +-
docs-xml/using_samba/ch05.xml | 2 +-
dynconfig/wscript | 2 +-
lib/krb5_wrap/krb5_samba.c | 4 +-
lib/ldb/common/ldb_controls.c | 2 +-
lib/replace/wscript | 4 +-
lib/tdb/docs/mutex.txt | 4 +-
lib/util/debug.c | 2 +-
libgpo/gpo_ldap.c | 2 +-
nsswitch/wb_common.c | 2 +-
python/samba/netcmd/user.py | 2 +-
source3/client/clitar.c | 2 +-
source3/include/MacExtensions.h | 10 ++--
.../examples/netdomjoin-gui/netdomjoin-gui.c | 2 +-
source3/lib/privileges.c | 2 +-
source3/lib/smbldap.c | 2 +-
source3/lib/util_sock.c | 2 +-
source3/libsmb/clireadwrite.c | 4 +-
source3/registry/reg_objects.c | 4 +-
source3/rpc_server/lsa/srv_lsa_nt.c | 2 +-
source3/smbd/open.c | 2 +-
source3/winbindd/winbindd_ads.c | 2 +-
source3/winbindd/winbindd_cache.c | 2 +-
source3/winbindd/winbindd_msrpc.c | 2 +-
source3/winbindd/winbindd_pam.c | 4 +-
source4/auth/kerberos/kerberos-notes.txt | 2 +-
source4/dsdb/samdb/ldb_modules/rootdse.c | 2 +-
source4/dsdb/samdb/ldb_modules/samldb.c | 4 +-
source4/dsdb/tests/python/acl.py | 2 +-
source4/echo_server/echo_server.c | 2 +-
source4/lib/wmi/wmi_wrap.c | 2 +-
source4/ntvfs/posix/python/pyposix_eadb.c | 2 +-
source4/ntvfs/posix/python/pyxattr_native.c | 2 +-
source4/ntvfs/posix/python/pyxattr_tdb.c | 2 +-
source4/rpc_server/spoolss/dcesrv_spoolss.c | 2 +-
source4/scripting/bin/samba_upgradeprovision | 2 +-
source4/torture/basic/misc.c | 2 +-
source4/torture/raw/pingpong.c | 2 +-
source4/torture/rpc/backupkey.c | 40 +++++++-------
source4/torture/rpc/spoolss.c | 2 +-
source4/torture/vfs/fruit.c | 2 +-
source4/utils/man/ntlm_auth4.1.xml | 2 +-
testprogs/win32/spoolss/README.win32 | 2 +-
testprogs/win32/spoolss/testspoolss.c | 4 +-
.../waf/wafadmin/3rdparty/print_commands.py | 25 +++++++++
93 files changed, 212 insertions(+), 236 deletions(-)
create mode 100644 third_party/waf/wafadmin/3rdparty/print_commands.py
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py
index 296f9fb..99ceb77 100644
--- a/buildtools/wafsamba/samba_autoconf.py
+++ b/buildtools/wafsamba/samba_autoconf.py
@@ -4,7 +4,7 @@ import os, sys
import Build, Options, preproc, Logs
from Configure import conf
from TaskGen import feature
-from samba_utils import TO_LIST, GET_TARGET_TYPE, SET_TARGET_TYPE, runonce, unique_list, mkdir_p
+from samba_utils import TO_LIST, GET_TARGET_TYPE, SET_TARGET_TYPE, unique_list, mkdir_p
missing_headers = set()
@@ -13,7 +13,6 @@ missing_headers = set()
# to waf a bit easier for those used to autoconf
# m4 files
- at runonce
@conf
def DEFINE(conf, d, v, add_to_cflags=False, quote=False):
'''define a config option'''
diff --git a/buildtools/wafsamba/samba_bundled.py b/buildtools/wafsamba/samba_bundled.py
index bfc7ecc..ea88807 100644
--- a/buildtools/wafsamba/samba_bundled.py
+++ b/buildtools/wafsamba/samba_bundled.py
@@ -3,7 +3,7 @@
import sys
import Build, Options, Logs
from Configure import conf
-from samba_utils import TO_LIST, runonce
+from samba_utils import TO_LIST
def PRIVATE_NAME(bld, name, private_extension, private_library):
'''possibly rename a library to include a bundled extension'''
@@ -108,7 +108,6 @@ def LIB_MUST_BE_PRIVATE(conf, libname):
return ('ALL' in conf.env.PRIVATE_LIBS or
libname in conf.env.PRIVATE_LIBS)
- at runonce
@conf
def CHECK_BUNDLED_SYSTEM_PKG(conf, libname, minversion='0.0.0',
onlyif=None, implied_deps=None, pkg=None):
@@ -122,7 +121,6 @@ def CHECK_BUNDLED_SYSTEM_PKG(conf, libname, minversion='0.0.0',
implied_deps=implied_deps,
pkg=pkg)
- at runonce
@conf
def CHECK_BUNDLED_SYSTEM(conf, libname, minversion='0.0.0',
checkfunctions=None, headers=None, checkcode=None,
@@ -219,7 +217,6 @@ def CHECK_BUNDLED_SYSTEM(conf, libname, minversion='0.0.0',
def tuplize_version(version):
return tuple([int(x) for x in version.split(".")])
- at runonce
@conf
def CHECK_BUNDLED_SYSTEM_PYTHON(conf, libname, modulename, minversion='0.0.0'):
'''check if a python module is available on the system and
diff --git a/buildtools/wafsamba/samba_deps.py b/buildtools/wafsamba/samba_deps.py
index f869dee..9e5eab7 100644
--- a/buildtools/wafsamba/samba_deps.py
+++ b/buildtools/wafsamba/samba_deps.py
@@ -260,15 +260,10 @@ def add_init_functions(self):
def check_duplicate_sources(bld, tgt_list):
- '''see if we are compiling the same source file more than once
- without an allow_duplicates attribute'''
+ '''see if we are compiling the same source file more than once'''
debug('deps: checking for duplicate sources')
-
targets = LOCAL_CACHE(bld, 'TARGET_TYPE')
- ret = True
-
- global tstart
for t in tgt_list:
source_list = TO_LIST(getattr(t, 'source', ''))
@@ -286,7 +281,6 @@ def check_duplicate_sources(bld, tgt_list):
# build a list of targets that each source file is part of
for t in tgt_list:
- sources = []
if not targets[t.sname] in [ 'LIBRARY', 'BINARY', 'PYTHON' ]:
continue
for obj in t.add_objects:
@@ -306,7 +300,7 @@ def check_duplicate_sources(bld, tgt_list):
if len(subsystems[s][tname]) > 1:
raise Utils.WafError("ERROR: source %s is in more than one subsystem of target '%s': %s" % (s, tname, subsystems[s][tname]))
- return ret
+ return True
def check_orphaned_targets(bld, tgt_list):
diff --git a/buildtools/wafsamba/samba_optimisation.py b/buildtools/wafsamba/samba_optimisation.py
index 9d4fad1..5008f83 100644
--- a/buildtools/wafsamba/samba_optimisation.py
+++ b/buildtools/wafsamba/samba_optimisation.py
@@ -266,24 +266,4 @@ def apply_lib_vars(self):
if val:
self.env.append_value(v, val)
- at feature('cprogram', 'cshlib', 'cstaticlib')
- at after('apply_lib_vars')
- at before('apply_obj_vars')
-def samba_before_apply_obj_vars(self):
- """before apply_obj_vars for uselib, this removes the standard pathes"""
-
- def is_standard_libpath(env, path):
- for _path in env.STANDARD_LIBPATH:
- if _path == os.path.normpath(path):
- return True
- return False
-
- v = self.env
-
- for i in v['RPATH']:
- if is_standard_libpath(v, i):
- v['RPATH'].remove(i)
-
- for i in v['LIBPATH']:
- if is_standard_libpath(v, i):
- v['LIBPATH'].remove(i)
+
diff --git a/buildtools/wafsamba/samba_perl.py b/buildtools/wafsamba/samba_perl.py
index c07387a..f2f176d 100644
--- a/buildtools/wafsamba/samba_perl.py
+++ b/buildtools/wafsamba/samba_perl.py
@@ -5,12 +5,6 @@ done = {}
@conf
def SAMBA_CHECK_PERL(conf, mandatory=True, version=(5,0,0)):
- #
- # TODO: use the @runonce mechanism for this.
- # The problem is that @runonce currently does
- # not seem to work together with @conf...
- # So @runonce (and/or) @conf needs fixing.
- #
if "done" in done:
return
done["done"] = True
diff --git a/buildtools/wafsamba/samba_utils.py b/buildtools/wafsamba/samba_utils.py
index fb1355c..49a8759 100644
--- a/buildtools/wafsamba/samba_utils.py
+++ b/buildtools/wafsamba/samba_utils.py
@@ -3,7 +3,7 @@
import os, sys, re, fnmatch, shlex
import Build, Options, Utils, Task, Logs, Configure
-from TaskGen import feature, before
+from TaskGen import feature, before, after
from Configure import conf, ConfigurationContext
from Logs import debug
@@ -35,22 +35,6 @@ def GET_TARGET_TYPE(ctx, target):
return cache[target]
-######################################################
-# this is used as a decorator to make functions only
-# run once. Based on the idea from
-# http://stackoverflow.com/questions/815110/is-there-a-decorator-to-simply-cache-function-return-values
-def runonce(function):
- runonce_ret = {}
- def runonce_wrapper(*args):
- if args in runonce_ret:
- return runonce_ret[args]
- else:
- ret = function(*args)
- runonce_ret[args] = ret
- return ret
- return runonce_wrapper
-
-
def ADD_LD_LIBRARY_PATH(path):
'''add something to LD_LIBRARY_PATH'''
if 'LD_LIBRARY_PATH' in os.environ:
@@ -135,27 +119,6 @@ def dict_concat(d1, d2):
if t not in d1:
d1[t] = d2[t]
-
-def exec_command(self, cmd, **kw):
- '''this overrides the 'waf -v' debug output to be in a nice
- unix like format instead of a python list.
- Thanks to ita on #waf for this'''
- _cmd = cmd
- if isinstance(cmd, list):
- _cmd = ' '.join(cmd)
- debug('runner: %s' % _cmd)
- if self.log:
- self.log.write('%s\n' % cmd)
- kw['log'] = self.log
- try:
- if not kw.get('cwd', None):
- kw['cwd'] = self.cwd
- except AttributeError:
- self.cwd = kw['cwd'] = self.bldnode.abspath()
- return Utils.exec_command(cmd, **kw)
-Build.BuildContext.exec_command = exec_command
-
-
def ADD_COMMAND(opt, name, function):
'''add a new top level command to waf'''
Utils.g_module.__dict__[name] = function
@@ -683,3 +646,26 @@ def AD_DC_BUILD_IS_ENABLED(self):
return False
Build.BuildContext.AD_DC_BUILD_IS_ENABLED = AD_DC_BUILD_IS_ENABLED
+
+ at feature('cprogram', 'cshlib', 'cstaticlib')
+ at after('apply_lib_vars')
+ at before('apply_obj_vars')
+def samba_before_apply_obj_vars(self):
+ """before apply_obj_vars for uselib, this removes the standard paths"""
+
+ def is_standard_libpath(env, path):
+ for _path in env.STANDARD_LIBPATH:
+ if _path == os.path.normpath(path):
+ return True
+ return False
+
+ v = self.env
+
+ for i in v['RPATH']:
+ if is_standard_libpath(v, i):
+ v['RPATH'].remove(i)
+
+ for i in v['LIBPATH']:
+ if is_standard_libpath(v, i):
+ v['LIBPATH'].remove(i)
+
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 318dabf..a8e122c 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -674,7 +674,7 @@ Build.BuildContext.SAMBA_GENERATOR = SAMBA_GENERATOR
- at runonce
+ at Utils.run_once
def SETUP_BUILD_GROUPS(bld):
'''setup build groups used to ensure that the different build
phases happen consecutively'''
diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript
index 69c556c..a4cb620 100755
--- a/buildtools/wafsamba/wscript
+++ b/buildtools/wafsamba/wscript
@@ -203,7 +203,7 @@ def set_options(opt):
metavar="PYTHON", dest='EXTRA_PYTHON', default=None)
- at wafsamba.runonce
+ at Utils.run_once
def configure(conf):
conf.env.hlist = []
conf.env.srcdir = conf.srcdir
@@ -216,6 +216,7 @@ def configure(conf):
# load our local waf extensions
conf.check_tool('gnu_dirs')
conf.check_tool('wafsamba')
+ conf.check_tool('print_commands')
conf.CHECK_CC_ENV()
diff --git a/ctdb/client/ctdb_client.c b/ctdb/client/ctdb_client.c
index 765f4f6..c655ffd 100644
--- a/ctdb/client/ctdb_client.c
+++ b/ctdb/client/ctdb_client.c
@@ -1014,7 +1014,7 @@ static void ctdb_client_reply_control(struct ctdb_context *ctdb,
c->errorlen);
}
- /* state->outdata now uses resources from c so we dont want c
+ /* state->outdata now uses resources from c so we don't want c
to just dissappear from under us while state is still alive
*/
talloc_steal(state, c);
diff --git a/ctdb/common/rb_tree.c b/ctdb/common/rb_tree.c
index 4b1ff97..6b0982f 100644
--- a/ctdb/common/rb_tree.c
+++ b/ctdb/common/rb_tree.c
@@ -64,9 +64,9 @@ static int tree_destructor(trbt_tree_t *tree)
/* traverse the tree and remove the node destructor and steal
the node to the temporary context.
- we dont want to use the existing destructor for the node
+ we don't want to use the existing destructor for the node
since that will remove the nodes one by one from the tree.
- since the entire tree will be completely destroyed we dont care
+ since the entire tree will be completely destroyed we don't care
if it is inconsistent or unbalanced while freeing the
individual nodes
*/
@@ -504,7 +504,7 @@ delete_node(trbt_node_t *node, bool from_destructor)
Once the delete of the node is finished, we remove this dummy
node, which is simple to do since it is guaranteed that it will
still not have any children after the delete operation.
- This is because we dont represent the leaf-nodes as actual nodes
+ This is because we don't represent the leaf-nodes as actual nodes
in this implementation.
*/
if (!child) {
diff --git a/ctdb/common/system_aix.c b/ctdb/common/system_aix.c
index e2b6536..141e891 100644
--- a/ctdb/common/system_aix.c
+++ b/ctdb/common/system_aix.c
@@ -212,7 +212,7 @@ int ctdb_sys_close_capture_socket(void *private_data)
*/
int ctdb_sys_send_arp(const ctdb_sock_addr *addr, const char *iface)
{
- /* FIXME AIX: We dont do gratuitous arp yet */
+ /* FIXME AIX: We don't do gratuitous arp yet */
return -1;
}
diff --git a/ctdb/common/system_freebsd.c b/ctdb/common/system_freebsd.c
index 320941f..b8f3fbe 100644
--- a/ctdb/common/system_freebsd.c
+++ b/ctdb/common/system_freebsd.c
@@ -81,7 +81,7 @@ static uint16_t tcp_checksum6(uint16_t *data, size_t n, struct ip6_hdr *ip6)
*/
int ctdb_sys_send_arp(const ctdb_sock_addr *addr, const char *iface)
{
- /* FIXME FreeBSD: We dont do gratuitous arp yet */
+ /* FIXME FreeBSD: We don't do gratuitous arp yet */
return -1;
}
@@ -220,7 +220,7 @@ int ctdb_sys_send_tcp(const ctdb_sock_addr *dest,
return -1;
}
- /* sendto() dont like if the port is set and the socket is
+ /* sendto() don't like if the port is set and the socket is
in raw mode.
*/
tmpdest = discard_const(dest);
diff --git a/ctdb/common/system_gnu.c b/ctdb/common/system_gnu.c
index f38e622..ec79862 100644
--- a/ctdb/common/system_gnu.c
+++ b/ctdb/common/system_gnu.c
@@ -80,7 +80,7 @@ static uint16_t tcp_checksum6(uint16_t *data, size_t n, struct ip6_hdr *ip6)
*/
int ctdb_sys_send_arp(const ctdb_sock_addr *addr, const char *iface)
{
- /* FIXME GNU/Hurd: We dont do gratuitous arp yet */
+ /* FIXME GNU/Hurd: We don't do gratuitous arp yet */
return -1;
}
@@ -215,7 +215,7 @@ int ctdb_sys_send_tcp(const ctdb_sock_addr *dest,
return -1;
}
- /* sendto() dont like if the port is set and the socket is
+ /* sendto() don't like if the port is set and the socket is
in raw mode.
*/
tmpdest = discard_const(dest);
diff --git a/ctdb/common/system_kfreebsd.c b/ctdb/common/system_kfreebsd.c
index f4ecc28..cc478e8 100644
--- a/ctdb/common/system_kfreebsd.c
+++ b/ctdb/common/system_kfreebsd.c
@@ -80,7 +80,7 @@ static uint16_t tcp_checksum6(uint16_t *data, size_t n, struct ip6_hdr *ip6)
*/
int ctdb_sys_send_arp(const ctdb_sock_addr *addr, const char *iface)
{
- /* FIXME kFreeBSD: We dont do gratuitous arp yet */
+ /* FIXME kFreeBSD: We don't do gratuitous arp yet */
return -1;
}
@@ -215,7 +215,7 @@ int ctdb_sys_send_tcp(const ctdb_sock_addr *dest,
return -1;
}
- /* sendto() dont like if the port is set and the socket is
+ /* sendto() don't like if the port is set and the socket is
in raw mode.
*/
tmpdest = discard_const(dest);
diff --git a/ctdb/common/system_linux.c b/ctdb/common/system_linux.c
index d8a6e68..1a36b12 100644
--- a/ctdb/common/system_linux.c
+++ b/ctdb/common/system_linux.c
@@ -419,7 +419,7 @@ int ctdb_sys_send_tcp(const ctdb_sock_addr *dest,
return -1;
}
- /* sendto() dont like if the port is set and the socket is
+ /* sendto() don't like if the port is set and the socket is
in raw mode.
*/
tmpdest = discard_const(dest);
@@ -577,7 +577,7 @@ bool ctdb_sys_check_iface_exists(const char *iface)
s = socket(PF_PACKET, SOCK_RAW, 0);
if (s == -1){
- /* We dont know if the interface exists, so assume yes */
+ /* We don't know if the interface exists, so assume yes */
DEBUG(DEBUG_CRIT,(__location__ " failed to open raw socket\n"));
return true;
}
diff --git a/ctdb/config/events.d/10.interface b/ctdb/config/events.d/10.interface
index acc0fc8..045a1cf 100755
--- a/ctdb/config/events.d/10.interface
+++ b/ctdb/config/events.d/10.interface
@@ -130,7 +130,7 @@ monitor_interfaces()
mark_up $iface
;;
ib*)
- # we dont know how to test ib links
+ # we don't know how to test ib links
mark_up $iface
;;
*)
diff --git a/ctdb/config/statd-callout b/ctdb/config/statd-callout
index e2f4c28..f56e50f 100755
--- a/ctdb/config/statd-callout
+++ b/ctdb/config/statd-callout
@@ -93,7 +93,7 @@ case "$1" in
notify)
# we must restart the lockmanager (on all nodes) so that we get
- # a clusterwide grace period (so other clients dont take out
+ # a clusterwide grace period (so other clients don't take out
# conflicting locks through other nodes before all locks have been
# reclaimed)
@@ -103,7 +103,7 @@ case "$1" in
#echo 0 > /proc/sys/net/ipv4/tcp_max_tw_buckets
#echo 0 > /proc/sys/net/ipv4/tcp_max_orphans
- # Delete the notification list for statd, we dont want it to
+ # Delete the notification list for statd, we don't want it to
# ping any clients
rm -f /var/lib/nfs/statd/sm/*
rm -f /var/lib/nfs/statd/sm.bak/*
diff --git a/ctdb/doc/ctdbd.1.xml b/ctdb/doc/ctdbd.1.xml
index 916585c..ae61792 100644
--- a/ctdb/doc/ctdbd.1.xml
+++ b/ctdb/doc/ctdbd.1.xml
@@ -400,7 +400,7 @@
<listitem>
<para>
IPADDR specifies the single IP that CTDB will use in
- conjuction with LVS.
+ conjunction with LVS.
</para>
<para>
Please see the <citetitle>LVS</citetitle> section in
diff --git a/ctdb/doc/ctdbd.conf.5.xml b/ctdb/doc/ctdbd.conf.5.xml
index 6a6007f..15ee746 100644
--- a/ctdb/doc/ctdbd.conf.5.xml
+++ b/ctdb/doc/ctdbd.conf.5.xml
@@ -414,7 +414,7 @@
</para>
<para>
If you change this then you probably want to set this in
- root's enviroment (perhaps in a file in
+ root's environment (perhaps in a file in
<filename>/etc/profile.d</filename>) so that you can use
the <citerefentry><refentrytitle>ctdb</refentrytitle>
<manvolnum>1</manvolnum></citerefentry> command in a
diff --git a/ctdb/packaging/RPM/ctdb.spec.in b/ctdb/packaging/RPM/ctdb.spec.in
index 00e7f17..9985dfe 100644
--- a/ctdb/packaging/RPM/ctdb.spec.in
+++ b/ctdb/packaging/RPM/ctdb.spec.in
@@ -277,7 +277,7 @@ Performance Co-Pilot (PCP) support for CTDB
* Tue Nov 8 2011 : Version 1.12
- Add new tunable : AllowClientDBAttach that can be used to stop
client db access during maintenance operations
- - Updated logging for interfaces that are missing or dont exist but are
+ - Updated logging for interfaces that are missing or don't exist but are
configured to be used.
- Add timeout argument to ctdb_cmdline_client
- PDMA support
@@ -343,7 +343,7 @@ Performance Co-Pilot (PCP) support for CTDB
just do a less disruptive ip-reallocation
- When starting ctdbd, wait until all initial recoveries have finished
before we issue the "startup" event.
- So dont start services or monitoring until the cluster has
+ So don't start services or monitoring until the cluster has
stabilized.
- Major eventscript overhaul by Ronnie, Rusty and Martins and fixes of a few
bugs found.
@@ -392,14 +392,14 @@ Performance Co-Pilot (PCP) support for CTDB
"time since last ..." if from either the last recovery OR the last failover
- Michael A: transaction updates
* Wed Oct 28 2009 : Version 1.0.101
- - create a separate context for non-monitoring events so they dont interfere with the monitor event
+ - create a separate context for non-monitoring events so they don't interfere with the monitor event
- make sure to return status 0 in teh callback when we abort an event
* Wed Oct 28 2009 : Version 1.0.100
- Change eventscript handling to allow EventScriptTimeout for each individual script instead of for all scripts as a whole.
- Enhanced logging from the eventscripts, log the name and the duration for each script as it finishes.
--
Samba Shared Repository
More information about the samba-cvs
mailing list