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/2012-03-27-0427/flakey.log The samba3 build logs are available here: http://git.samba.org/autobuild.flakey/2012-03-27-0427/samba3.stderr http://git.samba.org/autobuild.flakey/2012-03-27-0427/samba3.stdout The source4 build logs are available here: http://git.samba.org/autobuild.flakey/2012-03-27-0427/samba4.stderr http://git.samba.org/autobuild.flakey/2012-03-27-0427/samba4.stdout The top commit at the time of the failure was: commit 95ebb111ba7e5fbc1e8ca6c560c473d24c5d6c2d Author: Jelmer Vernooij Date: Sun Mar 25 21:38:59 2012 +0100 selftest.py: Add get_interface. Autobuild-User: Jelmer Vernooij Autobuild-Date: Tue Mar 27 00:32:48 CEST 2012 on sn-devel-104
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 95ebb11 selftest.py: Add get_interface.
from a9da040 ndr: Update ABI.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 95ebb111ba7e5fbc1e8ca6c560c473d24c5d6c2d
Author: Jelmer Vernooij
Date: Sun Mar 25 21:38:59 2012 +0100
selftest.py: Add get_interface.
Autobuild-User: Jelmer Vernooij
Autobuild-Date: Tue Mar 27 00:32:48 CEST 2012 on sn-devel-104
---
Summary of changes:
selftest/target/samba.py | 34 ++
selftest/tests/test_samba.py | 15 +++
2 files changed, 45 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/selftest/target/samba.py b/selftest/target/samba.py
index 1ea156c..666d223 100644
--- a/selftest/target/samba.py
+++ b/selftest/target/samba.py
@@ -119,3 +119,37 @@ def cleanup_child(pid, name, outf=None):
else:
outf.write("%s child process %d exited with value %d.\n" % (name,
childpid, status >> 8))
return childpid
+
+
+def get_interface(netbiosname):
+"""Return interface id for a particular server.
+"""
+netbiosname = netbiosname.lower()
+
+interfaces = {
+"locals3dc2": 2,
+"localmember3": 3,
+"localshare4": 4,
+"localserver5": 5,
+"localktest6": 6,
+"maptoguest": 7,
+
+# 11-16 used by selftest.pl for client interfaces
+"localdc": 21,
+"localvampiredc": 22,
+"s4member": 23,
+"localrpcproxy": 24,
+"dc5": 25,
+"dc6": 26,
+"dc7": 27,
+"rodc": 28,
+"localadmember": 29,
+"plugindc": 30,
+"localsubdc": 31,
+"chgdcpass": 32,
+}
+
+# update lib/socket_wrapper/socket_wrapper.c
+# #define MAX_WRAPPED_INTERFACES 32
+# if you wish to have more than 32 interfaces
+return interfaces[netbiosname]
diff --git a/selftest/tests/test_samba.py b/selftest/tests/test_samba.py
index f06d846..b49463e 100644
--- a/selftest/tests/test_samba.py
+++ b/selftest/tests/test_samba.py
@@ -19,16 +19,13 @@
"""Tests for selftest.target.samba."""
-import os
-import sys
-
from cStringIO import StringIO
from selftest.tests import TestCase
from selftest.target.samba import (
bindir_path,
-cleanup_child,
+get_interface,
mk_realms_stanza,
write_krb5_conf,
)
@@ -107,3 +104,13 @@ class WriteKrb5ConfTests(TestCase):
}
''', f.getvalue())
+
+
+class GetInterfaceTests(TestCase):
+
+def test_get_interface(self):
+self.assertEquals(21, get_interface("localdc"))
+self.assertEquals(4, get_interface("localshare4"))
+
+def test_unknown(self):
+self.assertRaises(KeyError, get_interface, "unknown")
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via a9da040 ndr: Update ABI.
via acd63fd wafsamba: Cope with slight differences in gdb output
regarding incomplete sequences.
via 9c5723a Add ABI file for libndr.
from fa6f61e s3: Pass filters explicitly through vfs notify watch
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit a9da0409ba0e859533acea83c5c85798705cb5eb
Author: Jelmer Vernooij
Date: Mon Mar 26 18:25:37 2012 +0200
ndr: Update ABI.
Autobuild-User: Jelmer Vernooij
Autobuild-Date: Mon Mar 26 19:58:25 CEST 2012 on sn-devel-104
commit acd63fdb86769ff4328ccb6a4096181e65e4d30f
Author: Jelmer Vernooij
Date: Tue Mar 20 02:31:02 2012 +0100
wafsamba: Cope with slight differences in gdb output regarding incomplete
sequences.
Bug: https://bugzilla.samba.org/show_bug.cgi?id=8820
commit 9c5723ab7aa0db9c239027b4783bb1f3986b1dbf
Author: Jelmer Vernooij
Date: Sat Mar 24 15:42:22 2012 +0100
Add ABI file for libndr.
---
Summary of changes:
buildtools/wafsamba/samba_abi.py |4 +
buildtools/wafsamba/tests/__init__.py |1 +
buildtools/wafsamba/tests/test_abi.py | 53 +++
librpc/ABI/ndr-0.0.1.sigs | 245 +
librpc/wscript_build |6 +-
source4/selftest/tests.py |2 +-
6 files changed, 308 insertions(+), 3 deletions(-)
create mode 100644 buildtools/wafsamba/tests/test_abi.py
create mode 100644 librpc/ABI/ndr-0.0.1.sigs
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/samba_abi.py b/buildtools/wafsamba/samba_abi.py
index 990e1e5..76c2d8b 100644
--- a/buildtools/wafsamba/samba_abi.py
+++ b/buildtools/wafsamba/samba_abi.py
@@ -18,6 +18,7 @@ def normalise_signature(sig):
sig = re.sub('^\$[0-9]+\s=\s\{*', '', sig)
sig = re.sub('\}(\s0x[0-9a-f]+\s<\w+>)?$', '', sig)
sig = re.sub('0x[0-9a-f]+', '0x', sig)
+sig = re.sub('", ', r'\1"', sig)
for t in abi_type_maps:
# we need to cope with non-word characters in mapped types
@@ -30,11 +31,13 @@ def normalise_signature(sig):
sig = re.sub(m, abi_type_maps[t], sig)
return sig
+
def normalise_varargs(sig):
'''cope with older versions of gdb'''
sig = re.sub(',\s\.\.\.', '', sig)
return sig
+
def parse_sigs(sigs, abi_match):
'''parse ABI signatures file'''
abi_match = samba_utils.TO_LIST(abi_match)
@@ -54,6 +57,7 @@ def parse_sigs(sigs, abi_match):
break
if not matched:
continue
+print "%s -> %s" % (sa[1], normalise_signature(sa[1]))
ret[sa[0]] = normalise_signature(sa[1])
return ret
diff --git a/buildtools/wafsamba/tests/__init__.py
b/buildtools/wafsamba/tests/__init__.py
index 7678880..c9f2fb6 100644
--- a/buildtools/wafsamba/tests/__init__.py
+++ b/buildtools/wafsamba/tests/__init__.py
@@ -23,6 +23,7 @@ from unittest import (
def test_suite():
names = [
+'abi',
'utils',
]
module_names = ['wafsamba.tests.test_' + name for name in names]
diff --git a/buildtools/wafsamba/tests/test_abi.py
b/buildtools/wafsamba/tests/test_abi.py
new file mode 100644
index 000..0aa0d56
--- /dev/null
+++ b/buildtools/wafsamba/tests/test_abi.py
@@ -0,0 +1,53 @@
+# Copyright (C) 2012 Jelmer Vernooij
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License for more details.
+
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+from wafsamba.tests import TestCase
+
+from wafsamba.samba_abi import (
+normalise_signature,
+)
+
+
+class NormaliseSignatureTests(TestCase):
+
+def test_function_simple(self):
+self.assertEquals("int (const struct GUID *, const struct GUID *)",
+normalise_signature("$2 = {int (const struct GUID *, const struct
GUID *)} 0xe871 "))
+
+def test_maps_Bool(self):
+# Some types have different internal names
+self.assertEquals("bool (const struct GUID *)",
+normalise_signature("$1 = {_Bool (const struct GUID *)} 0xe75b
"))
+
+def test_function_keep(self):
+self.assertEquals(
+"enum ndr_err_code (struct ndr_push *, int, const union
winreg_Data *)",
+
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via fa6f61e s3: Pass filters explicitly through vfs notify watch
via c3a506b s3: Fix a typo
via 58c8857 s3: Rename a variable in inotify_watch for clarity
via 6355d2e s3: Pass "filter" instead of "notify_entry" to inotify_map
via 6804e46 s3-docs: Prepend '/' to filename argument (Bug #8826)
from 7290a62 s4-dsdb: use constant-time search for descriptor ->
get_last_structural_class()
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit fa6f61e83565f49fb4e75248cffaa1ef31567d20
Author: Volker Lendecke
Date: Mon Mar 26 12:46:11 2012 +0200
s3: Pass filters explicitly through vfs notify watch
This removes a dependency on "struct notify_entry" and makes the nature of
the
API more explicit. We depend upon the VFS module to mask out elements from
e->filter and e->subdir_filter that it took over to handle.
Autobuild-User: Volker Lendecke
Autobuild-Date: Mon Mar 26 17:45:44 CEST 2012 on sn-devel-104
commit c3a506b64e248152212ab647048a47bd63039452
Author: Volker Lendecke
Date: Mon Mar 26 13:11:02 2012 +0200
s3: Fix a typo
commit 58c8857b72fc76fb4ef5787daa823e26b58e5f12
Author: Volker Lendecke
Date: Mon Mar 26 13:09:33 2012 +0200
s3: Rename a variable in inotify_watch for clarity
commit 6355d2e68a5d959f38fcab12af46e61013abd72a
Author: Volker Lendecke
Date: Mon Mar 26 13:00:53 2012 +0200
s3: Pass "filter" instead of "notify_entry" to inotify_map
This makes the potential modification a bit more obvious
commit 6804e46811dd13cfd405f7c48a3dc2bc6501d75c
Author: SATOH Fumiyasu
Date: Mon Mar 26 19:13:12 2012 +0900
s3-docs: Prepend '/' to filename argument (Bug #8826)
---
Summary of changes:
docs-xml/manpages-3/smbcacls.1.xml |2 +-
examples/VFS/skel_opaque.c |5 -
examples/VFS/skel_transparent.c|6 --
source3/include/vfs.h |6 --
source3/include/vfs_macros.h |8
source3/modules/vfs_default.c |7 ---
source3/modules/vfs_full_audit.c |6 --
source3/modules/vfs_notify_fam.c |9 +
source3/modules/vfs_time_audit.c |6 --
source3/smbd/notify.c |4 ++--
source3/smbd/notify_inotify.c | 25 +
source3/smbd/proto.h |3 ++-
source3/smbd/vfs.c |6 --
13 files changed, 55 insertions(+), 38 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/manpages-3/smbcacls.1.xml
b/docs-xml/manpages-3/smbcacls.1.xml
index 756000a..8674ecf 100644
--- a/docs-xml/manpages-3/smbcacls.1.xml
+++ b/docs-xml/manpages-3/smbcacls.1.xml
@@ -20,7 +20,7 @@
smbcacls
//server/share
- filename
+ /filename
-D|--delete acls
-M|--modify acls
-a|--add acls
diff --git a/examples/VFS/skel_opaque.c b/examples/VFS/skel_opaque.c
index 7b67e56..5c97e23 100644
--- a/examples/VFS/skel_opaque.c
+++ b/examples/VFS/skel_opaque.c
@@ -383,7 +383,10 @@ static char *skel_realpath(vfs_handle_struct *handle,
const char *path)
}
static NTSTATUS skel_notify_watch(struct vfs_handle_struct *handle,
- struct sys_notify_context *ctx, struct notify_entry *e,
+ struct sys_notify_context *ctx,
+ const char *path,
+ uint32_t *filter,
+ uint32_t *subdir_filter,
void (*callback)(struct sys_notify_context *ctx, void
*private_data, struct notify_event *ev),
void *private_data, void *handle_p)
{
diff --git a/examples/VFS/skel_transparent.c b/examples/VFS/skel_transparent.c
index 964ba6d..c57545c 100644
--- a/examples/VFS/skel_transparent.c
+++ b/examples/VFS/skel_transparent.c
@@ -360,13 +360,15 @@ static char *skel_realpath(vfs_handle_struct *handle,
const char *path)
static NTSTATUS skel_notify_watch(
struct vfs_handle_struct *handle,
struct sys_notify_context *ctx,
- struct notify_entry *e,
const char *path,
+ uint32_t *filter,
+ uint32_t *subdir_filter,
void (*callback)(struct sys_notify_context *ctx, void *private_data,
struct notify_event *ev),
void *private_data, void *handle_p)
{
- return SMB_VFS_NEXT_NOTIFY_WATCH(handle, ctx, e, path, callback,
+ return SMB_VFS_NEXT_NOTIFY_WATCH(handle, ctx, path,
+filter, subdir_filter, callback,
private_data, handle_p);
}
diff --git a/source3/include/vfs.h b/source3/include/vfs.h
index c038c56..212da7e 100644
--- a/source3/include/vfs.h
+++ b/source3/include/vfs.h
@@ -284,8 +284,9 @@ struct vfs_fn_pointers {
char *(*realpath_fn)(struct vfs_handle_struct *hand
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/2012-03-26-1226/flakey.log The samba3 build logs are available here: http://git.samba.org/autobuild.flakey/2012-03-26-1226/samba3.stderr http://git.samba.org/autobuild.flakey/2012-03-26-1226/samba3.stdout The source4 build logs are available here: http://git.samba.org/autobuild.flakey/2012-03-26-1226/samba4.stderr http://git.samba.org/autobuild.flakey/2012-03-26-1226/samba4.stdout The top commit at the time of the failure was: commit 7290a622844def1086cff993aaba958bc976538d Author: Andrew Bartlett Date: Mon Mar 26 12:06:39 2012 +1100 s4-dsdb: use constant-time search for descriptor -> get_last_structural_class() The objectClass list is sorted at this point, as we are called below the objectclass module here, or are working from a search result. Andrew Bartlett Autobuild-User: Andrew Bartlett Autobuild-Date: Mon Mar 26 05:38:13 CEST 2012 on sn-devel-104
