[SCM] Samba Shared Repository - branch master updated
Simo Sorce
idra at samba.org
Thu Apr 19 09:37:04 MDT 2012
The branch, master has been updated
via e21029a waf: Fix mispelling
via 70d44a9 Fix Error messages
from b31f773 s3/ldap: remove outdated netscape ds 5 schema file
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit e21029a270a6e3b8bcc5ff33b74977cb0cd6cd17
Author: Simo Sorce <idra at samba.org>
Date: Mon Apr 9 08:33:37 2012 -0400
waf: Fix mispelling
Autobuild-User: Simo Sorce <idra at samba.org>
Autobuild-Date: Thu Apr 19 17:36:41 CEST 2012 on sn-devel-104
commit 70d44a9a177621b173c8a24c7cb503f5632a8ff7
Author: Simo Sorce <idra at samba.org>
Date: Thu Apr 19 09:35:08 2012 -0400
Fix Error messages
-----------------------------------------------------------------------
Summary of changes:
buildtools/wafsamba/samba_deps.py | 12 ++++++------
buildtools/wafsamba/samba_python.py | 6 +++---
buildtools/wafsamba/wafsamba.py | 2 +-
source4/auth/kerberos/srv_keytab.c | 6 ++----
source4/scripting/python/wscript_build | 2 +-
5 files changed, 13 insertions(+), 15 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/samba_deps.py b/buildtools/wafsamba/samba_deps.py
index 51b7da9..f073e41 100644
--- a/buildtools/wafsamba/samba_deps.py
+++ b/buildtools/wafsamba/samba_deps.py
@@ -214,7 +214,7 @@ def add_init_functions(self):
if m is not None:
modules.append(m)
- sentinal = getattr(self, 'init_function_sentinal', 'NULL')
+ sentinel = getattr(self, 'init_function_sentinel', 'NULL')
targets = LOCAL_CACHE(bld, 'TARGET_TYPE')
cflags = getattr(self, 'samba_cflags', [])[:]
@@ -222,8 +222,8 @@ def add_init_functions(self):
if modules == []:
sname = sname.replace('-','_')
sname = sname.replace('/','_')
- cflags.append('-DSTATIC_%s_MODULES=%s' % (sname, sentinal))
- if sentinal == 'NULL':
+ cflags.append('-DSTATIC_%s_MODULES=%s' % (sname, sentinel))
+ if sentinel == 'NULL':
cflags.append('-DSTATIC_%s_MODULES_PROTO' % sname)
self.ccflags = cflags
return
@@ -236,11 +236,11 @@ def add_init_functions(self):
if targets[d['TARGET']] != 'DISABLED':
init_fn_list.append(d['INIT_FUNCTION'])
if init_fn_list == []:
- cflags.append('-DSTATIC_%s_MODULES=%s' % (m, sentinal))
- if sentinal == 'NULL':
+ cflags.append('-DSTATIC_%s_MODULES=%s' % (m, sentinel))
+ if sentinel == 'NULL':
cflags.append('-DSTATIC_%s_MODULES_PROTO' % m)
else:
- cflags.append('-DSTATIC_%s_MODULES=%s' % (m, ','.join(init_fn_list) + ',' + sentinal))
+ cflags.append('-DSTATIC_%s_MODULES=%s' % (m, ','.join(init_fn_list) + ',' + sentinel))
proto=''
for f in init_fn_list:
proto = proto + '_MODULE_PROTO(%s)' % f
diff --git a/buildtools/wafsamba/samba_python.py b/buildtools/wafsamba/samba_python.py
index 503fa75..6bc32f0 100644
--- a/buildtools/wafsamba/samba_python.py
+++ b/buildtools/wafsamba/samba_python.py
@@ -21,7 +21,7 @@ def SAMBA_PYTHON(bld, name,
realname=None,
cflags='',
includes='',
- init_function_sentinal=None,
+ init_function_sentinel=None,
local_include=True,
vars=None,
enabled=True):
@@ -29,8 +29,8 @@ def SAMBA_PYTHON(bld, name,
# when we support static python modules we'll need to gather
# the list from all the SAMBA_PYTHON() targets
- if init_function_sentinal is not None:
- cflags += '-DSTATIC_LIBPYTHON_MODULES=%s' % init_function_sentinal
+ if init_function_sentinel is not None:
+ cflags += '-DSTATIC_LIBPYTHON_MODULES=%s' % init_function_sentinel
source = bld.EXPAND_VARIABLES(source, vars=vars)
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index fd72cf3..317bca1 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -477,7 +477,7 @@ def SAMBA_SUBSYSTEM(bld, modname, source,
cflags='',
cflags_end=None,
group='main',
- init_function_sentinal=None,
+ init_function_sentinel=None,
autoproto=None,
autoproto_extra_source='',
depends_on='',
diff --git a/source4/auth/kerberos/srv_keytab.c b/source4/auth/kerberos/srv_keytab.c
index ca2d385..b7a2079 100644
--- a/source4/auth/kerberos/srv_keytab.c
+++ b/source4/auth/kerberos/srv_keytab.c
@@ -54,8 +54,7 @@ static krb5_error_code principals_from_list(TALLOC_CTX *parent_ctx,
}
if (!realm) {
- *error_string = "Cannot have a kerberos secret in "
- "secrets.ldb without a realm";
+ *error_string = "Cannot make principal without a realm";
ret = EINVAL;
goto done;
}
@@ -134,8 +133,7 @@ static krb5_error_code salt_principal(TALLOC_CTX *parent_ctx,
}
if (!realm) {
- *error_string = "Cannot have a kerberos secret in "
- "secrets.ldb without a realm";
+ *error_string = "Cannot make principal without a realm";
return EINVAL;
}
diff --git a/source4/scripting/python/wscript_build b/source4/scripting/python/wscript_build
index 8879f75..9c23a96 100644
--- a/source4/scripting/python/wscript_build
+++ b/source4/scripting/python/wscript_build
@@ -10,7 +10,7 @@ bld.SAMBA_LIBRARY('samba_python',
bld.SAMBA_SUBSYSTEM('LIBPYTHON',
source='modules.c',
public_deps='',
- init_function_sentinal='{NULL,NULL}',
+ init_function_sentinel='{NULL,NULL}',
deps='talloc',
pyext=True,
)
--
Samba Shared Repository
More information about the samba-cvs
mailing list