[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 1b63c78 waf: the libXX.inst.so file also depends on the vscript via 283686a s3-vfstest: fixed paths in vfstest from e928032 wintest flush DNS on Windows clients to improve reliablity http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 1b63c78693ab5d244006769c1b41ff37d990d1b2 Author: Andrew Tridgell tri...@samba.org Date: Fri Dec 10 17:59:34 2010 +1100 waf: the libXX.inst.so file also depends on the vscript this fixes a problem with installed libraries not relinking after a git version change Autobuild-User: Andrew Tridgell tri...@samba.org Autobuild-Date: Fri Dec 10 09:30:46 CET 2010 on sn-devel-104 commit 283686af75c4ca3b8317f04754dab64bbf9f64e8 Author: Andrew Tridgell tri...@samba.org Date: Thu Dec 9 22:41:58 2010 +1100 s3-vfstest: fixed paths in vfstest vfstest tries to create /messages.tdb as loadparm has not been initialised --- Summary of changes: buildtools/wafsamba/wafsamba.py |4 source3/torture/vfstest.c |2 ++ 2 files changed, 6 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py index fb68531..3cb97c0 100644 --- a/buildtools/wafsamba/wafsamba.py +++ b/buildtools/wafsamba/wafsamba.py @@ -215,6 +215,10 @@ def SAMBA_LIBRARY(bld, libname, source, ldflags.append(-Wl,--version-script=%s/%s % (bld.path.abspath(bld.env), vscript)) fullname = bld.env.shlib_PATTERN % bundled_name bld.add_manual_dependency(bld.path.find_or_declare(fullname), bld.path.find_or_declare(vscript)) +if Options.is_install: +# also make the .inst file depend on the vscript +instname = bld.env.shlib_PATTERN % (bundled_name + '.inst') +bld.add_manual_dependency(bld.path.find_or_declare(instname), bld.path.find_or_declare(vscript)) bld.SET_BUILD_GROUP(group) t = bld( diff --git a/source3/torture/vfstest.c b/source3/torture/vfstest.c index 3ebe63e..479bc86 100644 --- a/source3/torture/vfstest.c +++ b/source3/torture/vfstest.c @@ -457,6 +457,8 @@ int main(int argc, char *argv[]) poptFreeContext(pc); + lp_load_initial_only(get_dyn_CONFIGFILE()); + /* TODO: check output */ reload_services(smbd_messaging_context(), -1, False); -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 378295c build: detect if conf.env['CPP'] is an array or not
from 1b63c78 waf: the libXX.inst.so file also depends on the vscript
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 378295c3fe813c70815a14c7de608e4a859bd6cc
Author: Matthieu Patou m...@matws.net
Date: Fri Dec 10 10:06:44 2010 +0300
build: detect if conf.env['CPP'] is an array or not
Autobuild-User: Matthieu Patou m...@samba.org
Autobuild-Date: Fri Dec 10 10:18:20 CET 2010 on sn-devel-104
---
Summary of changes:
buildtools/wafsamba/samba_pidl.py |7 ++-
1 files changed, 6 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/samba_pidl.py
b/buildtools/wafsamba/samba_pidl.py
index 6476211..d0af9f2 100644
--- a/buildtools/wafsamba/samba_pidl.py
+++ b/buildtools/wafsamba/samba_pidl.py
@@ -61,12 +61,17 @@ def SAMBA_PIDL(bld, pname, source,
cpp =
cc =
if bld.CONFIG_SET(CPP):
-cpp = CPP=%s % bld.CONFIG_GET(CPP)
+if isinstance(bld.CONFIG_GET(CPP), list):
+cpp = CPP=%s % bld.CONFIG_GET(CPP)[0]
+else:
+cpp = CPP=%s % bld.CONFIG_GET(CPP)
+
if bld.CONFIG_SET(CC):
if isinstance(bld.CONFIG_GET(CC), list):
cc = CC=%s % bld.CONFIG_GET(CC)[0]
else:
cc = CC=%s % bld.CONFIG_GET(CC)
+
t = bld(rule='cd .. %s %s ${PERL} ${PIDL} --quiet ${OPTIONS}
--outputdir ${OUTPUTDIR} -- ${SRC[0].abspath(env)}' % (cpp, cc),
ext_out= '.c',
before = 'cc',
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via b285d03 s4-tests: Modified sec_descriptor.py to use the sd_utils helpers. via c9264bb s4-tests: Modified acl.py to use the sd_utils helpers. via c5480e6 s4-tests: Moved some commonly redefined security descriptor methods to a utils class from 378295c build: detect if conf.env['CPP'] is an array or not http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit b285d0304a58fbacb9fcaa8359271bcd717c16f7 Author: Nadezhda Ivanova nivan...@samba.org Date: Fri Dec 10 10:31:58 2010 +0200 s4-tests: Modified sec_descriptor.py to use the sd_utils helpers. Autobuild-User: Nadezhda Ivanova nivan...@samba.org Autobuild-Date: Fri Dec 10 11:03:28 CET 2010 on sn-devel-104 commit c9264bb04e58c7549e4f21bddae731e9b9dffa38 Author: Nadezhda Ivanova nivan...@samba.org Date: Fri Dec 10 10:31:19 2010 +0200 s4-tests: Modified acl.py to use the sd_utils helpers. commit c5480e659e270852a3e099eb3fafbae19bbb8988 Author: Nadezhda Ivanova nivan...@samba.org Date: Fri Dec 10 10:29:14 2010 +0200 s4-tests: Moved some commonly redefined security descriptor methods to a utils class These methods are used in more than one testsuite now so they are now in a utility class instead of being defined everywhere. --- Summary of changes: source4/dsdb/tests/python/acl.py| 213 ++- source4/dsdb/tests/python/sec_descriptor.py | 379 --- source4/scripting/python/samba/sd_utils.py | 79 ++ 3 files changed, 336 insertions(+), 335 deletions(-) create mode 100644 source4/scripting/python/samba/sd_utils.py Changeset truncated at 500 lines: diff --git a/source4/dsdb/tests/python/acl.py b/source4/dsdb/tests/python/acl.py index c540e7e..d336fa9 100755 --- a/source4/dsdb/tests/python/acl.py +++ b/source4/dsdb/tests/python/acl.py @@ -25,7 +25,7 @@ from samba.ndr import ndr_pack, ndr_unpack from samba.dcerpc import security from samba.auth import system_session -from samba import gensec +from samba import gensec, sd_utils from samba.samdb import SamDB from samba.credentials import Credentials import samba.tests @@ -66,32 +66,12 @@ class AclTests(samba.tests.TestCase): self.domain_sid = security.dom_sid(ldb.get_domain_sid()) self.user_pass = samba123@ self.configuration_dn = self.ldb_admin.get_config_basedn().get_linearized() +self.sd_utils = sd_utils.SDUtils(ldb) print baseDN: %s % self.base_dn def get_user_dn(self, name): return CN=%s,CN=Users,%s % (name, self.base_dn) -def modify_desc(self, object_dn, desc): - Modify security descriptor using either SDDL string -or security.descriptor object - -assert(isinstance(desc, str) or isinstance(desc, security.descriptor)) -mod = -dn: + object_dn + -changetype: modify -replace: nTSecurityDescriptor - -if isinstance(desc, str): -mod += nTSecurityDescriptor: %s % desc -elif isinstance(desc, security.descriptor): -mod += nTSecurityDescriptor:: %s % base64.b64encode(ndr_pack(desc)) -self.ldb_admin.modify_ldif(mod) - -def read_desc(self, object_dn): -res = self.ldb_admin.search(object_dn, SCOPE_BASE, None, [nTSecurityDescriptor]) -desc = res[0][nTSecurityDescriptor][0] -return ndr_unpack(security.descriptor, desc) - def get_ldb_connection(self, target_username, target_password): creds_tmp = Credentials() creds_tmp.set_username(target_username) @@ -104,27 +84,6 @@ replace: nTSecurityDescriptor ldb_target = SamDB(url=host, credentials=creds_tmp, lp=lp) return ldb_target -def get_object_sid(self, object_dn): -res = self.ldb_admin.search(object_dn) -return ndr_unpack(security.dom_sid, res[0][objectSid][0]) - -def dacl_add_ace(self, object_dn, ace): -desc = self.read_desc(object_dn) -desc_sddl = desc.as_sddl(self.domain_sid) -if ace in desc_sddl: -return -if desc_sddl.find(() = 0: -desc_sddl = desc_sddl[:desc_sddl.index(()] + ace + desc_sddl[desc_sddl.index(():] -else: -desc_sddl = desc_sddl + ace -self.modify_desc(object_dn, desc_sddl) - -def get_desc_sddl(self, object_dn): - Return object nTSecutiryDescriptor in SDDL format - -desc = self.read_desc(object_dn) -return desc.as_sddl(self.domain_sid) - # Test if we have any additional groups for users than default ones def assert_user_no_group_member(self, username): res = self.ldb_admin.search(self.base_dn, expression=(distinguishedName=%s) % self.get_user_dn(username)) @@ -189,9 +148,9 @@ class AclAddTests(AclTests): # Change descriptor for top
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via d1bfa33 build: reset cpp on host with xlr_c and let pidl use $CC -E from b285d03 s4-tests: Modified sec_descriptor.py to use the sd_utils helpers. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit d1bfa333f58010ec727e4edb952edb015ba0c31c Author: Matthieu Patou m...@matws.net Date: Fri Dec 10 14:37:00 2010 +0300 build: reset cpp on host with xlr_c and let pidl use $CC -E Autobuild-User: Matthieu Patou m...@samba.org Autobuild-Date: Fri Dec 10 13:27:22 CET 2010 on sn-devel-104 --- Summary of changes: buildtools/wafsamba/samba_pidl.py |4 1 files changed, 4 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/buildtools/wafsamba/samba_pidl.py b/buildtools/wafsamba/samba_pidl.py index d0af9f2..79fc5b0 100644 --- a/buildtools/wafsamba/samba_pidl.py +++ b/buildtools/wafsamba/samba_pidl.py @@ -66,6 +66,10 @@ def SAMBA_PIDL(bld, pname, source, else: cpp = CPP=%s % bld.CONFIG_GET(CPP) +if cpp == xlr_c: +cpp = + + if bld.CONFIG_SET(CC): if isinstance(bld.CONFIG_GET(CC), list): cc = CC=%s % bld.CONFIG_GET(CC)[0] -- Samba Shared Repository
[SCM] build.samba.org - branch master updated
The branch, master has been updated via be00e3a use compilers variable, print also which compiler is working via 37e237e builder72: readd cc that removed by error from 5da1eb6 Sane error message on unknown revision. http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit be00e3a59a48749de34a99f30ea45ef4432d9f93 Author: Matthieu Patou m...@matws.net Date: Fri Dec 10 19:35:19 2010 +0300 use compilers variable, print also which compiler is working commit 37e237ea813d1a5450b4ad2c90077b6c6fa9768d Author: Matthieu Patou m...@matws.net Date: Fri Dec 10 19:14:30 2010 +0300 builder72: readd cc that removed by error --- Summary of changes: builder72.fns |2 ++ generic.fns |3 ++- 2 files changed, 4 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/builder72.fns b/builder72.fns index 45a7997..63bfc1f 100644 --- a/builder72.fns +++ b/builder72.fns @@ -4,5 +4,7 @@ MAXTIME=32400 # 9 hours SMBD_MAXTIME=25200 # 7 hours for a samba process .. # default maximum memory size (100M) for any command export MAXTIME SMBD_MAXTIME +compilers=gcc cc +export compilers . generic.fns diff --git a/generic.fns b/generic.fns index a19abdf..9de2b76 100644 --- a/generic.fns +++ b/generic.fns @@ -12,8 +12,9 @@ if [ x$compilers = x ]; then compilers=gcc cc icc fi -for compiler in gcc cc icc; do +for compiler in $compilers; do + echo working with compiler $compiler # arrgh, which gives no err code on solaris path=`which $compiler` if [ -x $path ]; then -- build.samba.org
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 6ef8524 build: compiler on aix is xlc_r not xlr_c from d1bfa33 build: reset cpp on host with xlr_c and let pidl use $CC -E http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 6ef8524840e7e65775341934e4c67e1fd4a17f7a Author: Matthieu Patou m...@matws.net Date: Fri Dec 10 19:08:18 2010 +0300 build: compiler on aix is xlc_r not xlr_c Autobuild-User: Matthieu Patou m...@samba.org Autobuild-Date: Fri Dec 10 17:54:49 CET 2010 on sn-devel-104 --- Summary of changes: buildtools/wafsamba/samba_pidl.py |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/buildtools/wafsamba/samba_pidl.py b/buildtools/wafsamba/samba_pidl.py index 79fc5b0..720f8e6 100644 --- a/buildtools/wafsamba/samba_pidl.py +++ b/buildtools/wafsamba/samba_pidl.py @@ -66,7 +66,7 @@ def SAMBA_PIDL(bld, pname, source, else: cpp = CPP=%s % bld.CONFIG_GET(CPP) -if cpp == xlr_c: +if cpp == xlc_r: cpp = -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 26a3728 drsblobs.idl: remove nopython from
package_PrimaryKerberosBlob related stuff
via bde8046 pidl:Samba4/Python.pm: ignore SUBCONTEXT levels
via 8babee2 pidl:Samba4/Python.pm: don't handle scalar reference types
special
from 6ef8524 build: compiler on aix is xlc_r not xlr_c
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 26a37284b9caffa1e2aebad27d683b15632e7240
Author: Stefan Metzmacher me...@samba.org
Date: Wed Dec 1 15:12:58 2010 +0100
drsblobs.idl: remove nopython from package_PrimaryKerberosBlob related stuff
This allows parsing and construction of the supplementatlCredentials
attribute in python.
metze
Autobuild-User: Stefan Metzmacher me...@samba.org
Autobuild-Date: Fri Dec 10 19:08:33 CET 2010 on sn-devel-104
commit bde8046ca5a736f5c56e680767ee7c820df6a29c
Author: Stefan Metzmacher me...@samba.org
Date: Wed Dec 8 15:11:48 2010 +0100
pidl:Samba4/Python.pm: ignore SUBCONTEXT levels
These are only important for the NDR marshalling
and not for the python bindings.
metze
commit 8babee2c0083c5ec3d3824a6919ef1217eec6c31
Author: Stefan Metzmacher me...@samba.org
Date: Fri Dec 10 16:32:35 2010 +0100
pidl:Samba4/Python.pm: don't handle scalar reference types special
The only special thing is that don't need get_value_of(),
all other checks are needed.
metze
---
Summary of changes:
librpc/idl/drsblobs.idl | 16 +-
pidl/lib/Parse/Pidl/Samba4/Python.pm | 49 -
2 files changed, 38 insertions(+), 27 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/idl/drsblobs.idl b/librpc/idl/drsblobs.idl
index d160270..064f6ea 100644
--- a/librpc/idl/drsblobs.idl
+++ b/librpc/idl/drsblobs.idl
@@ -334,13 +334,13 @@ interface drsblobs {
[in] package_PackagesBlob blob
);
- typedef [nopython] struct {
+ typedef struct {
[value(2*strlen_m(string))] uint16 length;
[value(2*strlen_m(string))] uint16 size;
[relative,subcontext(0),subcontext_size(size),flag(STR_NOTERM|NDR_REMAINING)]
string *string;
} package_PrimaryKerberosString;
- typedef [nopython] struct {
+ typedef struct {
[value(0)] uint16 reserved1;
[value(0)] uint16 reserved2;
[value(0)] uint32 reserved3;
@@ -349,7 +349,7 @@ interface drsblobs {
[relative,subcontext(0),subcontext_size(value_len),flag(NDR_REMAINING)]
DATA_BLOB *value;
} package_PrimaryKerberosKey3;
- typedef [nopython] struct {
+ typedef struct {
uint16 num_keys;
uint16 num_old_keys;
package_PrimaryKerberosString salt;
@@ -362,7 +362,7 @@ interface drsblobs {
[value(0)] uint32 padding5;
} package_PrimaryKerberosCtr3;
- typedef [nopython] struct {
+ typedef struct {
[value(0)] uint16 reserved1;
[value(0)] uint16 reserved2;
[value(0)] uint32 reserved3;
@@ -372,7 +372,7 @@ interface drsblobs {
[relative,subcontext(0),subcontext_size(value_len),flag(NDR_REMAINING)]
DATA_BLOB *value;
} package_PrimaryKerberosKey4;
- typedef [nopython] struct {
+ typedef struct {
uint16 num_keys;
[value(0)] uint16 num_service_keys;
uint16 num_old_keys;
@@ -385,18 +385,18 @@ interface drsblobs {
package_PrimaryKerberosKey4 older_keys[num_older_keys];
} package_PrimaryKerberosCtr4;
- typedef [nodiscriminant,nopython] union {
+ typedef [nodiscriminant] union {
[case(3)] package_PrimaryKerberosCtr3 ctr3;
[case(4)] package_PrimaryKerberosCtr4 ctr4;
} package_PrimaryKerberosCtr;
- typedef [public,nopython] struct {
+ typedef [public] struct {
uint16 version;
[value(0)] uint16 flags;
[switch_is(version)] package_PrimaryKerberosCtr ctr;
} package_PrimaryKerberosBlob;
- [nopython] void decode_PrimaryKerberos(
+ void decode_PrimaryKerberos(
[in] package_PrimaryKerberosBlob blob
);
diff --git a/pidl/lib/Parse/Pidl/Samba4/Python.pm
b/pidl/lib/Parse/Pidl/Samba4/Python.pm
index 1ed75ae..8fdb66a 100644
--- a/pidl/lib/Parse/Pidl/Samba4/Python.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/Python.pm
@@ -979,12 +979,15 @@ sub ConvertObjectFromPythonLevel()
{
my ($self, $env, $mem_ctx, $py_var, $e, $l, $var_name, $fail) = @_;
my $nl = GetNextLevel($e, $l);
+ if ($nl and $nl-{TYPE} eq SUBCONTEXT) {
+
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated via 7d4e274 s3-vfstest: fixed paths in vfstest from aab5998 libcli/auth: let spnego_write_mech_types() check the asn1_load() return http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test - Log - commit 7d4e274d6ba5acffbd8572f11d4aecabe837fffb Author: Andrew Tridgell tri...@samba.org Date: Thu Dec 9 22:41:58 2010 +1100 s3-vfstest: fixed paths in vfstest vfstest tries to create /messages.tdb as loadparm has not been initialised (cherry picked from commit 283686af75c4ca3b8317f04754dab64bbf9f64e8) --- Summary of changes: source3/torture/vfstest.c |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/torture/vfstest.c b/source3/torture/vfstest.c index 3ebe63e..479bc86 100644 --- a/source3/torture/vfstest.c +++ b/source3/torture/vfstest.c @@ -457,6 +457,8 @@ int main(int argc, char *argv[]) poptFreeContext(pc); + lp_load_initial_only(get_dyn_CONFIGFILE()); + /* TODO: check output */ reload_services(smbd_messaging_context(), -1, False); -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via a1db341 build: cpp is prefixed by CPP=
via 6875a61 build: add a function to test if -lc is needed
from 26a3728 drsblobs.idl: remove nopython from
package_PrimaryKerberosBlob related stuff
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit a1db341e4603cbd605eab7f1d4d4abe246468670
Author: Matthieu Patou m...@matws.net
Date: Fri Dec 10 23:47:54 2010 +0300
build: cpp is prefixed by CPP=
Autobuild-User: Matthieu Patou m...@samba.org
Autobuild-Date: Fri Dec 10 22:34:45 CET 2010 on sn-devel-104
commit 6875a611a71bf6d1623fc62361fc8b145b1f6559
Author: Matthieu Patou m...@matws.net
Date: Fri Dec 10 23:16:28 2010 +0300
build: add a function to test if -lc is needed
This is needed on openbsd as some linking flags makes mandatory to
specify the libc for the linking
---
Summary of changes:
buildtools/wafsamba/samba_conftests.py | 45
buildtools/wafsamba/samba_pidl.py |2 +-
source4/wscript|2 +
3 files changed, 48 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/samba_conftests.py
b/buildtools/wafsamba/samba_conftests.py
index 2246ac3..c7e596d 100644
--- a/buildtools/wafsamba/samba_conftests.py
+++ b/buildtools/wafsamba/samba_conftests.py
@@ -108,6 +108,51 @@ int foo(int v) {
return conf.check(features='cc cshlib',vnum=1,fragment=snip,msg=msg)
@conf
+def CHECK_NEED_LC(conf, msg):
+'''check if we need -lc'''
+
+dir = find_config_dir(conf)
+
+env = conf.env
+
+bdir = os.path.join(dir, 'testbuild2')
+if not os.path.exists(bdir):
+os.makedirs(bdir)
+
+
+subdir = os.path.join(dir, liblctest)
+
+os.makedirs(subdir)
+
+dest = open(os.path.join(subdir, 'liblc1.c'), 'w')
+dest.write('#include stdio.h\nint lib_func(void) { FILE *f =
fopen(foo, r);}\n')
+dest.close()
+
+bld = Build.BuildContext()
+bld.log = conf.log
+bld.all_envs.update(conf.all_envs)
+bld.all_envs['default'] = env
+bld.lst_variants = bld.all_envs.keys()
+bld.load_dirs(dir, bdir)
+
+bld.rescan(bld.srcnode)
+
+bld(features='cc cshlib',
+source='liblctest/liblc1.c',
+ldflags=conf.env['EXTRA_LDFLAGS'],
+target='liblc',
+name='liblc')
+
+try:
+bld.compile()
+conf.check_message(msg, '', True)
+return True
+except:
+conf.check_message(msg, '', False)
+return False
+
+
+...@conf
def CHECK_SHLIB_W_PYTHON(conf, msg):
'''check if we need -undefined dynamic_lookup'''
diff --git a/buildtools/wafsamba/samba_pidl.py
b/buildtools/wafsamba/samba_pidl.py
index 720f8e6..d5ac217 100644
--- a/buildtools/wafsamba/samba_pidl.py
+++ b/buildtools/wafsamba/samba_pidl.py
@@ -66,7 +66,7 @@ def SAMBA_PIDL(bld, pname, source,
else:
cpp = CPP=%s % bld.CONFIG_GET(CPP)
-if cpp == xlc_r:
+if cpp == CPP=xlc_r:
cpp =
diff --git a/source4/wscript b/source4/wscript
index 3213e7c..93391da 100644
--- a/source4/wscript
+++ b/source4/wscript
@@ -113,6 +113,8 @@ def configure(conf):
# allows us to find problems on our development hosts faster.
# It also results in faster load time.
conf.ADD_LDFLAGS('-Wl,--as-needed', testflags=True)
+if not conf.CHECK_NEED_LC(-lc not needed):
+conf.ADD_LDFLAGS('-lc', testflags=False)
# we don't want PYTHONDIR in config.h, as otherwise changing
# --prefix causes a complete rebuild
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 533ba5a heimdal: unset SLIST_ENTRY only if we are with windows from a1db341 build: cpp is prefixed by CPP= http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 533ba5a919b08a3eb040af7ea980163661b642c7 Author: Matthieu Patou m...@matws.net Date: Sat Dec 11 01:39:34 2010 +0300 heimdal: unset SLIST_ENTRY only if we are with windows This is needed because otherwise on some OS like netbsd,openbsd,MacOSX. The preprossessing of ./heimdal/lib/gssapi/mech/cred.h on this plateform is broken because mechqueue.h's definition won't be used as SLIST_HEAD is already defined. The definition occurs when net/if.h is included as it includes sys/queue.h Autobuild-User: Matthieu Patou m...@samba.org Autobuild-Date: Sat Dec 11 00:34:51 CET 2010 on sn-devel-104 --- Summary of changes: source4/heimdal/lib/roken/roken-common.h |4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/heimdal/lib/roken/roken-common.h b/source4/heimdal/lib/roken/roken-common.h index d9369a3..6a09da4 100644 --- a/source4/heimdal/lib/roken/roken-common.h +++ b/source4/heimdal/lib/roken/roken-common.h @@ -148,13 +148,15 @@ #define MAXPATHLEN (1024+4) #endif -#endif /* !_WIN32 */ +#else/* !_WIN32 */ /* Minimize conflict with WinNT.h */ #ifdef SLIST_ENTRY #undef SLIST_ENTRY #endif +#endif /* _WIN32 */ + #ifndef PATH_MAX #define PATH_MAX MAX_PATH #endif -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated
via 5dd10a4 Add documentation for smb2 max credits. (cherry picked
from commit 5562a97ece27c26019504f589d4e7992617f1846)
via 309db0a Add a SMB2 crediting algorithm, by default the same as
Windows. Defaults to 128 credits.
from 7d4e274 s3-vfstest: fixed paths in vfstest
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -
commit 5dd10a43d45f66b6da9b3273d2c4b044db97006d
Author: Jeremy Allison j...@samba.org
Date: Fri Dec 10 14:40:17 2010 -0800
Add documentation for smb2 max credits.
(cherry picked from commit 5562a97ece27c26019504f589d4e7992617f1846)
commit 309db0a55cea2d504217a8689005b31d41d5542e
Author: Jeremy Allison j...@samba.org
Date: Fri Dec 10 15:46:41 2010 -0800
Add a SMB2 crediting algorithm, by default the same as Windows. Defaults to
128 credits.
Jeremy.
(cherry picked from commit 2ac579ca76452c58022e8b9e41d5168dd25fe3b0)
---
Summary of changes:
docs-xml/smbdotconf/protocol/smb2maxcredits.xml | 15 +++
source3/include/local.h |5 +
source3/include/proto.h |1 +
source3/param/loadparm.c| 25 +++-
source3/smbd/globals.h |5 +-
source3/smbd/smb2_server.c | 155 +++
6 files changed, 178 insertions(+), 28 deletions(-)
create mode 100644 docs-xml/smbdotconf/protocol/smb2maxcredits.xml
Changeset truncated at 500 lines:
diff --git a/docs-xml/smbdotconf/protocol/smb2maxcredits.xml
b/docs-xml/smbdotconf/protocol/smb2maxcredits.xml
new file mode 100644
index 000..69d04f7
--- /dev/null
+++ b/docs-xml/smbdotconf/protocol/smb2maxcredits.xml
@@ -0,0 +1,15 @@
+samba:parameter name=smb2 max credits
+ type=integer
+ context=G
+ advanced=1 developer=1
+ xmlns:samba=http://www.samba.org/samba/DTD/samba-doc;
+description
+paraThis option controls the maximum number of outstanding simultaneous SMB2
operations
+that Samba tells the client it will allow. This is similar to the
smbconfoption name=max mux/
+parameter for SMB1. You should never need to set this parameter.
+/para
+paraThe default is 128 credits, which is the same as a Windows SMB2
server./para
+/description
+
+value type=default128/value
+/samba:parameter
diff --git a/source3/include/local.h b/source3/include/local.h
index 6c9a8c3..3014f61 100644
--- a/source3/include/local.h
+++ b/source3/include/local.h
@@ -265,4 +265,9 @@
#define CLIENT_NDR_PADDING_SIZE 8
#define SERVER_NDR_PADDING_SIZE 8
+#define DEFAULT_SMB2_MAX_READ (1024*1024)
+#define DEFAULT_SMB2_MAX_WRITE (1024*1024)
+#define DEFAULT_SMB2_MAX_TRANSACT (1024*1024)
+#define DEFAULT_SMB2_MAX_CREDITS 128
+
#endif
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 19c693b..402dc3f 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -3349,6 +3349,7 @@ int lp_config_backend(void);
int lp_smb2_max_read(void);
int lp_smb2_max_write(void);
int lp_smb2_max_trans(void);
+int lp_smb2_max_credits(void);
char *lp_preexec(int );
char *lp_postexec(int );
char *lp_rootpreexec(int );
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 0bc27dc..833358d 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -378,6 +378,7 @@ struct global {
int ismb2_max_read;
int ismb2_max_write;
int ismb2_max_trans;
+ int ismb2_max_credits;
char *ncalrpc_dir;
};
@@ -2615,6 +2616,15 @@ static struct parm_struct parm_table[] = {
.enum_list = NULL,
.flags = FLAG_ADVANCED,
},
+ {
+ .label = smb2 max credits,
+ .type = P_INTEGER,
+ .p_class= P_GLOBAL,
+ .ptr= Globals.ismb2_max_credits,
+ .special= NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
+ },
{N_(Printing Options), P_SEP, P_SEPARATOR},
@@ -5384,9 +5394,10 @@ static void init_globals(bool reinit_globals)
Globals.bMapUntrustedToDomain = false;
Globals.bMulticastDnsRegister = true;
- Globals.ismb2_max_read = 1024*1024;
- Globals.ismb2_max_write = 1024*1024;
- Globals.ismb2_max_trans = 1024*1024;
+ Globals.ismb2_max_read = DEFAULT_SMB2_MAX_READ;
+ Globals.ismb2_max_write = DEFAULT_SMB2_MAX_WRITE;
+ Globals.ismb2_max_trans = DEFAULT_SMB2_MAX_TRANSACT;
+ Globals.ismb2_max_credits = DEFAULT_SMB2_MAX_CREDITS;
string_set(Globals.ncalrpc_dir, get_dyn_NCALRPCDIR());
@@ -5755,7 +5766,13 @@ FN_GLOBAL_INTEGER(lp_config_backend,
Globals.ConfigBackend)
FN_GLOBAL_INTEGER(lp_smb2_max_read,
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via d2e9171 Add documentation for smb2 max credits.
via 2ac579c Add a SMB2 crediting algorithm, by default the same as
Windows. Defaults to 128 credits.
from 533ba5a heimdal: unset SLIST_ENTRY only if we are with windows
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit d2e9171f1d45f6c10a7f85df1f81c73c198ce3e0
Author: Jeremy Allison j...@samba.org
Date: Fri Dec 10 14:40:17 2010 -0800
Add documentation for smb2 max credits.
Autobuild-User: Jeremy Allison j...@samba.org
Autobuild-Date: Sat Dec 11 02:14:07 CET 2010 on sn-devel-104
commit 2ac579ca76452c58022e8b9e41d5168dd25fe3b0
Author: Jeremy Allison j...@samba.org
Date: Fri Dec 10 15:46:41 2010 -0800
Add a SMB2 crediting algorithm, by default the same as Windows. Defaults to
128 credits.
Jeremy.
---
Summary of changes:
docs-xml/smbdotconf/protocol/smb2maxcredits.xml | 15 +++
source3/include/local.h |5 +
source3/include/proto.h |1 +
source3/param/loadparm.c| 25 +++-
source3/smbd/globals.h |5 +-
source3/smbd/smb2_server.c | 155 +++
6 files changed, 178 insertions(+), 28 deletions(-)
create mode 100644 docs-xml/smbdotconf/protocol/smb2maxcredits.xml
Changeset truncated at 500 lines:
diff --git a/docs-xml/smbdotconf/protocol/smb2maxcredits.xml
b/docs-xml/smbdotconf/protocol/smb2maxcredits.xml
new file mode 100644
index 000..69d04f7
--- /dev/null
+++ b/docs-xml/smbdotconf/protocol/smb2maxcredits.xml
@@ -0,0 +1,15 @@
+samba:parameter name=smb2 max credits
+ type=integer
+ context=G
+ advanced=1 developer=1
+ xmlns:samba=http://www.samba.org/samba/DTD/samba-doc;
+description
+paraThis option controls the maximum number of outstanding simultaneous SMB2
operations
+that Samba tells the client it will allow. This is similar to the
smbconfoption name=max mux/
+parameter for SMB1. You should never need to set this parameter.
+/para
+paraThe default is 128 credits, which is the same as a Windows SMB2
server./para
+/description
+
+value type=default128/value
+/samba:parameter
diff --git a/source3/include/local.h b/source3/include/local.h
index 6c9a8c3..3014f61 100644
--- a/source3/include/local.h
+++ b/source3/include/local.h
@@ -265,4 +265,9 @@
#define CLIENT_NDR_PADDING_SIZE 8
#define SERVER_NDR_PADDING_SIZE 8
+#define DEFAULT_SMB2_MAX_READ (1024*1024)
+#define DEFAULT_SMB2_MAX_WRITE (1024*1024)
+#define DEFAULT_SMB2_MAX_TRANSACT (1024*1024)
+#define DEFAULT_SMB2_MAX_CREDITS 128
+
#endif
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 3ef1215..084d97f 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -3351,6 +3351,7 @@ int lp_config_backend(void);
int lp_smb2_max_read(void);
int lp_smb2_max_write(void);
int lp_smb2_max_trans(void);
+int lp_smb2_max_credits(void);
char *lp_preexec(int );
char *lp_postexec(int );
char *lp_rootpreexec(int );
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 807d074..ced8223 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -380,6 +380,7 @@ struct global {
int ismb2_max_read;
int ismb2_max_write;
int ismb2_max_trans;
+ int ismb2_max_credits;
char *ncalrpc_dir;
};
@@ -2635,6 +2636,15 @@ static struct parm_struct parm_table[] = {
.enum_list = NULL,
.flags = FLAG_ADVANCED,
},
+ {
+ .label = smb2 max credits,
+ .type = P_INTEGER,
+ .p_class= P_GLOBAL,
+ .ptr= Globals.ismb2_max_credits,
+ .special= NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
+ },
{N_(Printing Options), P_SEP, P_SEPARATOR},
@@ -5404,9 +5414,10 @@ static void init_globals(bool reinit_globals)
Globals.bMapUntrustedToDomain = false;
Globals.bMulticastDnsRegister = true;
- Globals.ismb2_max_read = 1024*1024;
- Globals.ismb2_max_write = 1024*1024;
- Globals.ismb2_max_trans = 1024*1024;
+ Globals.ismb2_max_read = DEFAULT_SMB2_MAX_READ;
+ Globals.ismb2_max_write = DEFAULT_SMB2_MAX_WRITE;
+ Globals.ismb2_max_trans = DEFAULT_SMB2_MAX_TRANSACT;
+ Globals.ismb2_max_credits = DEFAULT_SMB2_MAX_CREDITS;
string_set(Globals.ncalrpc_dir, get_dyn_NCALRPCDIR());
@@ -5777,7 +5788,13 @@ FN_GLOBAL_INTEGER(lp_config_backend,
Globals.ConfigBackend)
FN_GLOBAL_INTEGER(lp_smb2_max_read, Globals.ismb2_max_read)
FN_GLOBAL_INTEGER(lp_smb2_max_write, Globals.ismb2_max_write)
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 7ef1de3 smbtorture: correct error handling in BASE-OPEN.
from d2e9171 Add documentation for smb2 max credits.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 7ef1de3973ea694abb7e330dd538a0f3679365fb
Author: James Peach jpe...@samba.org
Date: Mon Dec 6 11:27:31 2010 -0800
smbtorture: correct error handling in BASE-OPEN.
There are a number of cases in BASE-OPEN where an initial failure cascades
into multiple failures due to lack of cleanup between test phases. Fix
all these so that they close open file handles correctly. Replace
torture_comment with torture_result where appropriate so that the results
output contains a useful diagnostic.
Autobuild-User: Jeremy Allison j...@samba.org
Autobuild-Date: Sat Dec 11 03:19:39 CET 2010 on sn-devel-104
---
Summary of changes:
source4/torture/basic/base.c | 175 +-
1 files changed, 104 insertions(+), 71 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/torture/basic/base.c b/source4/torture/basic/base.c
index 9953573..3ed8291 100644
--- a/source4/torture/basic/base.c
+++ b/source4/torture/basic/base.c
@@ -812,14 +812,16 @@ static bool run_vuidtest(struct torture_context *tctx,
}
if (NT_STATUS_IS_ERR(smbcli_setatr(cli1-tree, fname,
FILE_ATTRIBUTE_READONLY, 0))) {
- torture_comment(tctx, smbcli_setatr failed (%s)\n,
smbcli_errstr(cli1-tree));
+ torture_result(tctx, TORTURE_FAIL,
+ __location__ : smbcli_setatr failed (%s)\n,
smbcli_errstr(cli1-tree));
CHECK_MAX_FAILURES(error_test1);
return false;
}
fnum1 = smbcli_open(cli1-tree, fname, O_RDONLY, DENY_WRITE);
if (fnum1 == -1) {
- torture_comment(tctx, open of %s failed (%s)\n, fname,
smbcli_errstr(cli1-tree));
+ torture_result(tctx, TORTURE_FAIL,
+ __location__ : open of %s failed (%s)\n, fname,
smbcli_errstr(cli1-tree));
CHECK_MAX_FAILURES(error_test1);
return false;
}
@@ -833,6 +835,7 @@ static bool run_vuidtest(struct torture_context *tctx,
}
torture_comment(tctx, finished open test 1\n);
+
error_test1:
smbcli_close(cli1-tree, fnum1);
@@ -887,13 +890,15 @@ error_test1:
/* Ensure size == 20. */
if (NT_STATUS_IS_ERR(smbcli_getatr(cli1-tree, fname, NULL, fsize,
NULL))) {
- torture_comment(tctx, (3) getatr failed (%s)\n,
smbcli_errstr(cli1-tree));
+ torture_result(tctx, TORTURE_FAIL,
+ __location__ : (3) getatr failed (%s)\n,
smbcli_errstr(cli1-tree));
CHECK_MAX_FAILURES(error_test3);
return false;
}
if (fsize != 20) {
- torture_comment(tctx, (3) file size != 20\n);
+ torture_result(tctx, TORTURE_FAIL,
+ __location__ : (3) file size != 20\n);
CHECK_MAX_FAILURES(error_test3);
return false;
}
@@ -902,60 +907,70 @@ error_test1:
fnum1 = smbcli_open(cli1-tree, fname, O_RDONLY|O_TRUNC, DENY_NONE);
if (fnum1 == -1) {
- torture_comment(tctx, (3) open (2) of %s failed (%s)\n,
fname, smbcli_errstr(cli1-tree));
+ torture_result(tctx, TORTURE_FAIL,
+ __location__ : (3) open (2) of %s failed (%s)\n,
fname, smbcli_errstr(cli1-tree));
CHECK_MAX_FAILURES(error_test3);
return false;
}
if (NT_STATUS_IS_ERR(smbcli_close(cli1-tree, fnum1))) {
- torture_comment(tctx, close2 failed (%s)\n,
smbcli_errstr(cli1-tree));
+ torture_result(tctx, TORTURE_FAIL,
+ __location__ : close2 failed (%s)\n,
smbcli_errstr(cli1-tree));
return false;
}
/* Ensure size == 0. */
if (NT_STATUS_IS_ERR(smbcli_getatr(cli1-tree, fname, NULL, fsize,
NULL))) {
- torture_comment(tctx, (3) getatr failed (%s)\n,
smbcli_errstr(cli1-tree));
+ torture_result(tctx, TORTURE_FAIL,
+ __location__ : (3) getatr failed (%s)\n,
smbcli_errstr(cli1-tree));
CHECK_MAX_FAILURES(error_test3);
return false;
}
if (fsize != 0) {
- torture_comment(tctx, (3) file size != 0\n);
+ torture_result(tctx, TORTURE_FAIL,
+ __location__ : (3) file size != 0\n);
CHECK_MAX_FAILURES(error_test3);
return false;
}
torture_comment(tctx, finished open test 3\n);
error_test3:
+
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 35fbc7b s4-smbtorture: Make test names lowercase and dot-separated. via 68d97f8 talloc: Add ability to generate Python docs using pydoctor. from 7ef1de3 smbtorture: correct error handling in BASE-OPEN. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 35fbc7bbda5851f7172538f79fc79be201f1d521 Author: Jelmer Vernooij jel...@samba.org Date: Sat Dec 11 03:26:31 2010 +0100 s4-smbtorture: Make test names lowercase and dot-separated. This is consistent with the test names used by selftest, should make the names less confusing and easier to integrate with other tools. Autobuild-User: Jelmer Vernooij jel...@samba.org Autobuild-Date: Sat Dec 11 04:16:13 CET 2010 on sn-devel-104 commit 68d97f8b492d1d075ed77a4bab7f178d10570106 Author: Jelmer Vernooij jel...@samba.org Date: Sat Dec 11 01:05:13 2010 +0100 talloc: Add ability to generate Python docs using pydoctor. --- Summary of changes: lib/compression/testsuite.c |2 +- lib/nss_wrapper/testsuite.c |2 +- lib/socket_wrapper/testsuite.c |2 +- lib/talloc/Makefile |3 + lib/talloc/wscript |7 ++ lib/tdr/testsuite.c |2 +- lib/tevent/testsuite.c |2 +- lib/util/charset/tests/charset.c|2 +- lib/util/charset/tests/iconv.c |2 +- lib/util/tests/asn1_tests.c |2 +- lib/util/tests/data_blob.c |2 +- lib/util/tests/dlinklist.c |2 +- lib/util/tests/file.c |5 +- lib/util/tests/genrand.c|2 +- lib/util/tests/idtree.c |2 +- lib/util/tests/parmlist.c |2 +- lib/util/tests/str.c|2 +- lib/util/tests/strlist.c|2 +- lib/util/tests/time.c |2 +- nsswitch/libwbclient/tests/wbclient.c |2 +- source3/script/tests/test_posix_s3.sh | 98 ++-- source3/selftest/tests.sh |9 +-- source4/auth/credentials/tests/simple.c |3 +- source4/dsdb/common/tests/dsdb_dn.c |8 +- source4/dsdb/schema/tests/schema_syntax.c |2 +- source4/lib/messaging/tests/irpc.c |2 +- source4/lib/messaging/tests/messaging.c |2 +- source4/lib/registry/tests/diff.c |2 +- source4/lib/registry/tests/generic.c|2 +- source4/lib/registry/tests/hive.c |2 +- source4/lib/registry/tests/registry.c |2 +- source4/lib/socket/testsuite.c |3 +- source4/libcli/resolve/testsuite.c |2 +- source4/libcli/security/tests/sddl.c|2 +- source4/librpc/tests/binding_string.c |2 +- source4/param/tests/loadparm.c |2 +- source4/param/tests/share.c |2 +- source4/selftest/knownfail | 42 +- source4/selftest/tests.py | 127 +-- source4/torture/auth/ntlmssp.c |3 +- source4/torture/auth/pac.c |2 +- source4/torture/basic/aliases.c |2 +- source4/torture/basic/base.c| 98 ++-- source4/torture/basic/charset.c |2 +- source4/torture/basic/delaywrite.c |2 +- source4/torture/basic/delete.c |3 +- source4/torture/basic/locking.c |2 +- source4/torture/dfs/domaindfs.c |4 +- source4/torture/drs/drs_init.c |4 +- source4/torture/drs/rpc/dssync.c|2 +- source4/torture/drs/unit/prefixmap_tests.c |2 +- source4/torture/drs/unit/schemainfo_tests.c |2 +- source4/torture/ldap/common.c | 16 ++-- source4/torture/ldb/ldb.c | 12 ++-- source4/torture/libnet/libnet.c | 67 +++--- source4/torture/libnetapi/libnetapi.c | 10 +- source4/torture/libsmbclient/libsmbclient.c | 12 ++-- source4/torture/local/dbspeed.c |2 +- source4/torture/local/local.c | 13 ++-- source4/torture/local/torture.c |3 +- source4/torture/nbench/nbench.c |8 +- source4/torture/nbt/dgram.c |2 +- source4/torture/nbt/nbt.c |2 +- source4/torture/nbt/query.c |2 +- source4/torture/nbt/register.c |2 +- source4/torture/nbt/wins.c |2 +- source4/torture/nbt/winsbench.c |3 +- source4/torture/nbt/winsreplication.c |5 +-
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated
via a73f539 smbtorture: correct error handling in BASE-OPEN.
from 5dd10a4 Add documentation for smb2 max credits. (cherry picked
from commit 5562a97ece27c26019504f589d4e7992617f1846)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -
commit a73f539b7cffb75734fb892acafc6ff740a82c0d
Author: James Peach jpe...@samba.org
Date: Mon Dec 6 11:27:31 2010 -0800
smbtorture: correct error handling in BASE-OPEN.
There are a number of cases in BASE-OPEN where an initial failure cascades
into multiple failures due to lack of cleanup between test phases. Fix
all these so that they close open file handles correctly. Replace
torture_comment with torture_result where appropriate so that the results
output contains a useful diagnostic.
Autobuild-User: Jeremy Allison j...@samba.org
Autobuild-Date: Sat Dec 11 03:19:39 CET 2010 on sn-devel-104
(cherry picked from commit 7ef1de3973ea694abb7e330dd538a0f3679365fb)
---
Summary of changes:
source4/torture/basic/base.c | 175 +-
1 files changed, 104 insertions(+), 71 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/torture/basic/base.c b/source4/torture/basic/base.c
index 9953573..3ed8291 100644
--- a/source4/torture/basic/base.c
+++ b/source4/torture/basic/base.c
@@ -812,14 +812,16 @@ static bool run_vuidtest(struct torture_context *tctx,
}
if (NT_STATUS_IS_ERR(smbcli_setatr(cli1-tree, fname,
FILE_ATTRIBUTE_READONLY, 0))) {
- torture_comment(tctx, smbcli_setatr failed (%s)\n,
smbcli_errstr(cli1-tree));
+ torture_result(tctx, TORTURE_FAIL,
+ __location__ : smbcli_setatr failed (%s)\n,
smbcli_errstr(cli1-tree));
CHECK_MAX_FAILURES(error_test1);
return false;
}
fnum1 = smbcli_open(cli1-tree, fname, O_RDONLY, DENY_WRITE);
if (fnum1 == -1) {
- torture_comment(tctx, open of %s failed (%s)\n, fname,
smbcli_errstr(cli1-tree));
+ torture_result(tctx, TORTURE_FAIL,
+ __location__ : open of %s failed (%s)\n, fname,
smbcli_errstr(cli1-tree));
CHECK_MAX_FAILURES(error_test1);
return false;
}
@@ -833,6 +835,7 @@ static bool run_vuidtest(struct torture_context *tctx,
}
torture_comment(tctx, finished open test 1\n);
+
error_test1:
smbcli_close(cli1-tree, fnum1);
@@ -887,13 +890,15 @@ error_test1:
/* Ensure size == 20. */
if (NT_STATUS_IS_ERR(smbcli_getatr(cli1-tree, fname, NULL, fsize,
NULL))) {
- torture_comment(tctx, (3) getatr failed (%s)\n,
smbcli_errstr(cli1-tree));
+ torture_result(tctx, TORTURE_FAIL,
+ __location__ : (3) getatr failed (%s)\n,
smbcli_errstr(cli1-tree));
CHECK_MAX_FAILURES(error_test3);
return false;
}
if (fsize != 20) {
- torture_comment(tctx, (3) file size != 20\n);
+ torture_result(tctx, TORTURE_FAIL,
+ __location__ : (3) file size != 20\n);
CHECK_MAX_FAILURES(error_test3);
return false;
}
@@ -902,60 +907,70 @@ error_test1:
fnum1 = smbcli_open(cli1-tree, fname, O_RDONLY|O_TRUNC, DENY_NONE);
if (fnum1 == -1) {
- torture_comment(tctx, (3) open (2) of %s failed (%s)\n,
fname, smbcli_errstr(cli1-tree));
+ torture_result(tctx, TORTURE_FAIL,
+ __location__ : (3) open (2) of %s failed (%s)\n,
fname, smbcli_errstr(cli1-tree));
CHECK_MAX_FAILURES(error_test3);
return false;
}
if (NT_STATUS_IS_ERR(smbcli_close(cli1-tree, fnum1))) {
- torture_comment(tctx, close2 failed (%s)\n,
smbcli_errstr(cli1-tree));
+ torture_result(tctx, TORTURE_FAIL,
+ __location__ : close2 failed (%s)\n,
smbcli_errstr(cli1-tree));
return false;
}
/* Ensure size == 0. */
if (NT_STATUS_IS_ERR(smbcli_getatr(cli1-tree, fname, NULL, fsize,
NULL))) {
- torture_comment(tctx, (3) getatr failed (%s)\n,
smbcli_errstr(cli1-tree));
+ torture_result(tctx, TORTURE_FAIL,
+ __location__ : (3) getatr failed (%s)\n,
smbcli_errstr(cli1-tree));
CHECK_MAX_FAILURES(error_test3);
return false;
}
if (fsize != 0) {
- torture_comment(tctx, (3) file size != 0\n);
+ torture_result(tctx, TORTURE_FAIL,
+ __location__ : (3) file size != 0\n);
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated via ce4a7dc s4-smbtorture: Make test names lowercase and dot-separated. from a73f539 smbtorture: correct error handling in BASE-OPEN. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test - Log - commit ce4a7dcd9c76bacd1c9a327ac79206cd70297b7f Author: Jelmer Vernooij jel...@samba.org Date: Sat Dec 11 03:26:31 2010 +0100 s4-smbtorture: Make test names lowercase and dot-separated. This is consistent with the test names used by selftest, should make the names less confusing and easier to integrate with other tools. Autobuild-User: Jelmer Vernooij jel...@samba.org Autobuild-Date: Sat Dec 11 04:16:13 CET 2010 on sn-devel-104 (cherry picked from commit 35fbc7bbda5851f7172538f79fc79be201f1d521) --- Summary of changes: lib/compression/testsuite.c |2 +- lib/nss_wrapper/testsuite.c |2 +- lib/socket_wrapper/testsuite.c |2 +- lib/tdr/testsuite.c |2 +- lib/tevent/testsuite.c |2 +- lib/util/charset/tests/charset.c|2 +- lib/util/charset/tests/iconv.c |2 +- lib/util/tests/asn1_tests.c |2 +- lib/util/tests/data_blob.c |2 +- lib/util/tests/dlinklist.c |2 +- lib/util/tests/file.c |5 +- lib/util/tests/genrand.c|2 +- lib/util/tests/idtree.c |2 +- lib/util/tests/parmlist.c |2 +- lib/util/tests/str.c|2 +- lib/util/tests/strlist.c|2 +- lib/util/tests/time.c |2 +- nsswitch/libwbclient/tests/wbclient.c |2 +- source3/script/tests/test_posix_s3.sh | 98 ++-- source3/selftest/tests.sh |9 +-- source4/auth/credentials/tests/simple.c |3 +- source4/dsdb/common/tests/dsdb_dn.c |8 +- source4/dsdb/schema/tests/schema_syntax.c |2 +- source4/lib/messaging/tests/irpc.c |2 +- source4/lib/messaging/tests/messaging.c |2 +- source4/lib/registry/tests/diff.c |2 +- source4/lib/registry/tests/generic.c|2 +- source4/lib/registry/tests/hive.c |2 +- source4/lib/registry/tests/registry.c |2 +- source4/lib/socket/testsuite.c |3 +- source4/libcli/resolve/testsuite.c |2 +- source4/libcli/security/tests/sddl.c|2 +- source4/librpc/tests/binding_string.c |2 +- source4/param/tests/loadparm.c |2 +- source4/param/tests/share.c |2 +- source4/selftest/knownfail | 42 +- source4/selftest/tests.py | 127 +-- source4/torture/auth/ntlmssp.c |3 +- source4/torture/auth/pac.c |2 +- source4/torture/basic/aliases.c |2 +- source4/torture/basic/base.c| 98 ++-- source4/torture/basic/charset.c |2 +- source4/torture/basic/delaywrite.c |2 +- source4/torture/basic/delete.c |3 +- source4/torture/basic/locking.c |2 +- source4/torture/dfs/domaindfs.c |4 +- source4/torture/drs/drs_init.c |4 +- source4/torture/drs/rpc/dssync.c|2 +- source4/torture/drs/unit/prefixmap_tests.c |2 +- source4/torture/drs/unit/schemainfo_tests.c |2 +- source4/torture/ldap/common.c | 16 ++-- source4/torture/ldb/ldb.c | 12 ++-- source4/torture/libnet/libnet.c | 67 +++--- source4/torture/libnetapi/libnetapi.c | 10 +- source4/torture/libsmbclient/libsmbclient.c | 12 ++-- source4/torture/local/dbspeed.c |2 +- source4/torture/local/local.c | 13 ++-- source4/torture/local/torture.c |3 +- source4/torture/nbench/nbench.c |8 +- source4/torture/nbt/dgram.c |2 +- source4/torture/nbt/nbt.c |2 +- source4/torture/nbt/query.c |2 +- source4/torture/nbt/register.c |2 +- source4/torture/nbt/wins.c |2 +- source4/torture/nbt/winsbench.c |3 +- source4/torture/nbt/winsreplication.c |5 +- source4/torture/ndr/ndr.c |2 +- source4/torture/ntp/ntp_signd.c |6 +- source4/torture/rap/printing.c |2 +- source4/torture/rap/rap.c |6 +- source4/torture/rap/rpc.c |2 +- source4/torture/rap/sam.c |
autobuild: intermittent test failure detected
The autobuild test system has detected an intermittent failing test in the current master tree. The autobuild log of the failure is available here: http://git.samba.org/autobuild.flakey/2010-12-11-0644/flakey.log The source3 build logs are available here: http://git.samba.org/autobuild.flakey/2010-12-11-0644/source3.stderr http://git.samba.org/autobuild.flakey/2010-12-11-0644/source3.stdout The source4 build logs are available here: http://git.samba.org/autobuild.flakey/2010-12-11-0644/source4.stderr http://git.samba.org/autobuild.flakey/2010-12-11-0644/source4.stdout The top commit at the time of the failure was: commit 35fbc7bbda5851f7172538f79fc79be201f1d521 Author: Jelmer Vernooij jel...@samba.org Date: Sat Dec 11 03:26:31 2010 +0100 s4-smbtorture: Make test names lowercase and dot-separated. This is consistent with the test names used by selftest, should make the names less confusing and easier to integrate with other tools. Autobuild-User: Jelmer Vernooij jel...@samba.org Autobuild-Date: Sat Dec 11 04:16:13 CET 2010 on sn-devel-104
autobuild: intermittent test failure detected
The autobuild test system has detected an intermittent failing test in the current master tree. The autobuild log of the failure is available here: http://git.samba.org/autobuild.flakey/2010-12-11-0845/flakey.log The source3 build logs are available here: http://git.samba.org/autobuild.flakey/2010-12-11-0845/source3.stderr http://git.samba.org/autobuild.flakey/2010-12-11-0845/source3.stdout The source4 build logs are available here: http://git.samba.org/autobuild.flakey/2010-12-11-0845/source4.stderr http://git.samba.org/autobuild.flakey/2010-12-11-0845/source4.stdout The top commit at the time of the failure was: commit 35fbc7bbda5851f7172538f79fc79be201f1d521 Author: Jelmer Vernooij jel...@samba.org Date: Sat Dec 11 03:26:31 2010 +0100 s4-smbtorture: Make test names lowercase and dot-separated. This is consistent with the test names used by selftest, should make the names less confusing and easier to integrate with other tools. Autobuild-User: Jelmer Vernooij jel...@samba.org Autobuild-Date: Sat Dec 11 04:16:13 CET 2010 on sn-devel-104
