[SCM] Samba Shared Repository - branch master updated
Jelmer Vernooij
jelmer at samba.org
Sat Mar 10 15:14:03 MST 2012
The branch, master has been updated
via ce4531e tdb_wrap: Move to specific directory.
via f076186 samba.tests.blackbox.samba_tool_drs: Remove unused import.
via af08762 wscript: Include talloc, tdb and ldb in pydoctor output.
via adcdee8 samba.samdb: Fix formatting of arguments in docstring.
via d8a624a pydoctor: Specify --project-name.
via a0db69d python: samba: Use relative import for _glue.
via 4c292c8 tevent: Install tevent.py into PYTHONARCHDIR rather than PYTHONDIR for consistency with other Samba scripts.
from 16ecda3 selftest: fix running additional smbclient test for non-spnego session setup
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit ce4531ee312c1171fcffcdbe9e214ae43384cdfd
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Mar 10 21:33:11 2012 +0100
tdb_wrap: Move to specific directory.
It's a bit confusing to mix low-level and high-level libraries. We had
multiple libraries in one directory, and there were have circular
dependencies with other libraries outside that directory (in this case,
samba-hostconfig).
Autobuild-User: Jelmer Vernooij <jelmer at samba.org>
Autobuild-Date: Sat Mar 10 23:13:01 CET 2012 on sn-devel-104
commit f076186d3ab95c4d4c4d3d7b66f283881ac1fbbb
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Mar 7 10:30:34 2012 +0100
samba.tests.blackbox.samba_tool_drs: Remove unused import.
commit af087626531a9510c9b897cd520364ee746825b4
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Mar 6 23:40:39 2012 +0100
wscript: Include talloc, tdb and ldb in pydoctor output.
commit adcdee89335eba2a5b982900ab3c796a4003751a
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Mar 6 23:31:55 2012 +0100
samba.samdb: Fix formatting of arguments in docstring.
commit d8a624a71f86486ee3d8db41925bde5ff59b8b8f
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Mar 6 23:21:44 2012 +0100
pydoctor: Specify --project-name.
commit a0db69dd79c90a7a77e627b56ec3b854b7350537
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Mar 6 23:20:12 2012 +0100
python: samba: Use relative import for _glue.
For some reason, using an absolute import breaks pydoctor.
commit 4c292c8e622ba293c10a4dc4e5799b588699810a
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Mar 6 18:07:20 2012 +0100
tevent: Install tevent.py into PYTHONARCHDIR rather than PYTHONDIR for consistency with other Samba scripts.
-----------------------------------------------------------------------
Summary of changes:
lib/{util => tdb_wrap}/tdb_wrap.c | 2 +-
lib/{util => tdb_wrap}/tdb_wrap.h | 0
lib/tdb_wrap/wscript_build | 8 ++++++++
lib/tevent/wscript | 2 +-
lib/util/wscript_build | 7 -------
libcli/auth/schannel_state_tdb.c | 2 +-
source3/Makefile.in | 2 +-
source3/lib/dbwrap/dbwrap_ctdb.c | 2 +-
source3/lib/dbwrap/dbwrap_tdb.c | 2 +-
source3/lib/messages_local.c | 2 +-
source3/lib/server_mutex.c | 2 +-
source3/lib/serverid.c | 2 +-
source3/smbd/notify_internal.c | 2 +-
source4/cluster/local.c | 2 +-
source4/dsdb/samdb/ldb_modules/partition.h | 2 +-
source4/lib/messaging/messaging.c | 2 +-
source4/ntvfs/common/brlock_tdb.c | 2 +-
source4/ntvfs/common/notify.c | 2 +-
source4/ntvfs/common/opendb_tdb.c | 2 +-
source4/ntvfs/posix/python/pyxattr_tdb.c | 2 +-
source4/ntvfs/posix/vfs_posix.c | 2 +-
source4/ntvfs/posix/xattr_tdb.c | 2 +-
source4/param/secrets.c | 2 +-
source4/scripting/python/samba/__init__.py | 2 +-
source4/scripting/python/samba/samdb.py | 8 ++++----
.../python/samba/tests/blackbox/samba_tool_drs.py | 1 -
source4/torture/local/dbspeed.c | 2 +-
wscript | 11 ++++++++++-
wscript_build | 1 +
29 files changed, 45 insertions(+), 35 deletions(-)
rename lib/{util => tdb_wrap}/tdb_wrap.c (99%)
rename lib/{util => tdb_wrap}/tdb_wrap.h (100%)
create mode 100644 lib/tdb_wrap/wscript_build
Changeset truncated at 500 lines:
diff --git a/lib/util/tdb_wrap.c b/lib/tdb_wrap/tdb_wrap.c
similarity index 99%
rename from lib/util/tdb_wrap.c
rename to lib/tdb_wrap/tdb_wrap.c
index 7c3318b..0994b1b 100644
--- a/lib/util/tdb_wrap.c
+++ b/lib/tdb_wrap/tdb_wrap.c
@@ -21,7 +21,7 @@
#include "includes.h"
#include "lib/util/dlinklist.h"
-#include "lib/util/tdb_wrap.h"
+#include "lib/tdb_wrap/tdb_wrap.h"
#include "lib/param/param.h"
/* FIXME: TDB2 does this internally, so no need to wrap multiple opens! */
diff --git a/lib/util/tdb_wrap.h b/lib/tdb_wrap/tdb_wrap.h
similarity index 100%
rename from lib/util/tdb_wrap.h
rename to lib/tdb_wrap/tdb_wrap.h
diff --git a/lib/tdb_wrap/wscript_build b/lib/tdb_wrap/wscript_build
new file mode 100644
index 0000000..0811bc5
--- /dev/null
+++ b/lib/tdb_wrap/wscript_build
@@ -0,0 +1,8 @@
+#!/usr/bin/python
+
+bld.SAMBA_LIBRARY('tdb-wrap',
+ source='tdb_wrap.c',
+ deps='tdb_compat talloc samba-util samba-hostconfig',
+ private_library=True,
+ local_include=False
+ )
diff --git a/lib/tevent/wscript b/lib/tevent/wscript
index b4bcb71..d5d6791 100644
--- a/lib/tevent/wscript
+++ b/lib/tevent/wscript
@@ -103,7 +103,7 @@ def build(bld):
pattern='tevent.py',
installdir='python')
- bld.INSTALL_WILDCARD('${PYTHONDIR}', 'tevent.py', flat=False)
+ bld.INSTALL_WILDCARD('${PYTHONARCHDIR}', 'tevent.py', flat=False)
def test(ctx):
diff --git a/lib/util/wscript_build b/lib/util/wscript_build
index 1dc65fa..79b9f02 100755
--- a/lib/util/wscript_build
+++ b/lib/util/wscript_build
@@ -85,10 +85,3 @@ bld.SAMBA_SUBSYSTEM('UTIL_PW',
public_deps='talloc'
)
-
-bld.SAMBA_LIBRARY('tdb-wrap',
- source='tdb_wrap.c',
- deps='tdb_compat talloc samba-util samba-hostconfig',
- private_library=True,
- local_include=False
- )
diff --git a/libcli/auth/schannel_state_tdb.c b/libcli/auth/schannel_state_tdb.c
index f2b9188..5d5ddcc 100644
--- a/libcli/auth/schannel_state_tdb.c
+++ b/libcli/auth/schannel_state_tdb.c
@@ -28,7 +28,7 @@
#include "../lib/param/param.h"
#include "../libcli/auth/schannel.h"
#include "../librpc/gen_ndr/ndr_schannel.h"
-#include "lib/util/tdb_wrap.h"
+#include "lib/tdb_wrap/tdb_wrap.h"
#define SECRETS_SCHANNEL_STATE "SECRETS/SCHANNEL"
diff --git a/source3/Makefile.in b/source3/Makefile.in
index dc02b6a..5fcf859 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -256,7 +256,7 @@ EXTRA_ALL_TARGETS = @EXTRA_ALL_TARGETS@
######################################################################
TDB_LIB_OBJ = lib/util_tdb.o ../lib/util/util_tdb.o \
- ../lib/util/tdb_wrap.o \
+ ../lib/tdb_wrap/tdb_wrap.o \
lib/dbwrap/dbwrap.o \
lib/dbwrap/dbwrap_open.o \
lib/dbwrap/dbwrap_tdb.o \
diff --git a/source3/lib/dbwrap/dbwrap_ctdb.c b/source3/lib/dbwrap/dbwrap_ctdb.c
index 2e0146f..d50f75e 100644
--- a/source3/lib/dbwrap/dbwrap_ctdb.c
+++ b/source3/lib/dbwrap/dbwrap_ctdb.c
@@ -20,7 +20,7 @@
#include "includes.h"
#include "system/filesys.h"
-#include "lib/util/tdb_wrap.h"
+#include "lib/tdb_wrap/tdb_wrap.h"
#include "util_tdb.h"
#include "dbwrap/dbwrap_ctdb.h"
#include "dbwrap/dbwrap_rbt.h"
diff --git a/source3/lib/dbwrap/dbwrap_tdb.c b/source3/lib/dbwrap/dbwrap_tdb.c
index 2c82810..454073a 100644
--- a/source3/lib/dbwrap/dbwrap_tdb.c
+++ b/source3/lib/dbwrap/dbwrap_tdb.c
@@ -21,7 +21,7 @@
#include "dbwrap/dbwrap.h"
#include "dbwrap/dbwrap_private.h"
#include "dbwrap/dbwrap_tdb.h"
-#include "lib/util/tdb_wrap.h"
+#include "lib/tdb_wrap/tdb_wrap.h"
#include "lib/param/param.h"
#include "util_tdb.h"
diff --git a/source3/lib/messages_local.c b/source3/lib/messages_local.c
index 9b4e3c5..b398870 100644
--- a/source3/lib/messages_local.c
+++ b/source3/lib/messages_local.c
@@ -45,7 +45,7 @@
#include "includes.h"
#include "system/filesys.h"
#include "messages.h"
-#include "lib/util/tdb_wrap.h"
+#include "lib/tdb_wrap/tdb_wrap.h"
#include "lib/param/param.h"
struct messaging_tdb_context {
diff --git a/source3/lib/server_mutex.c b/source3/lib/server_mutex.c
index 7ceecfe..9430141 100644
--- a/source3/lib/server_mutex.c
+++ b/source3/lib/server_mutex.c
@@ -20,7 +20,7 @@
#include "includes.h"
#include "system/filesys.h"
-#include "lib/util/tdb_wrap.h"
+#include "lib/tdb_wrap/tdb_wrap.h"
#include "util_tdb.h"
#include "lib/param/param.h"
diff --git a/source3/lib/serverid.c b/source3/lib/serverid.c
index 02de2b4..48d5b42 100644
--- a/source3/lib/serverid.c
+++ b/source3/lib/serverid.c
@@ -23,7 +23,7 @@
#include "util_tdb.h"
#include "dbwrap/dbwrap.h"
#include "dbwrap/dbwrap_open.h"
-#include "lib/util/tdb_wrap.h"
+#include "lib/tdb_wrap/tdb_wrap.h"
#include "lib/param/param.h"
#include "ctdbd_conn.h"
#include "messages.h"
diff --git a/source3/smbd/notify_internal.c b/source3/smbd/notify_internal.c
index be91cd5..d68a720 100644
--- a/source3/smbd/notify_internal.c
+++ b/source3/smbd/notify_internal.c
@@ -30,7 +30,7 @@
#include "dbwrap/dbwrap_open.h"
#include "smbd/smbd.h"
#include "messages.h"
-#include "lib/util/tdb_wrap.h"
+#include "lib/tdb_wrap/tdb_wrap.h"
#include "util_tdb.h"
#include "lib/param/param.h"
diff --git a/source4/cluster/local.c b/source4/cluster/local.c
index c62c5cf..24cbe81 100644
--- a/source4/cluster/local.c
+++ b/source4/cluster/local.c
@@ -23,7 +23,7 @@
#include "cluster/cluster.h"
#include "cluster/cluster_private.h"
#include "tdb_compat.h"
-#include "lib/util/tdb_wrap.h"
+#include "lib/tdb_wrap/tdb_wrap.h"
#include "system/filesys.h"
#include "param/param.h"
#include "librpc/gen_ndr/server_id.h"
diff --git a/source4/dsdb/samdb/ldb_modules/partition.h b/source4/dsdb/samdb/ldb_modules/partition.h
index 0cb5705..ea05e94 100644
--- a/source4/dsdb/samdb/ldb_modules/partition.h
+++ b/source4/dsdb/samdb/ldb_modules/partition.h
@@ -21,7 +21,7 @@
#include <ldb.h>
#include <ldb_errors.h>
#include <ldb_module.h>
-#include "lib/util/tdb_wrap.h"
+#include "lib/tdb_wrap/tdb_wrap.h"
#include "dsdb/samdb/samdb.h"
#include "dsdb/samdb/ldb_modules/util.h"
#include "system/locale.h"
diff --git a/source4/lib/messaging/messaging.c b/source4/lib/messaging/messaging.c
index 21ff1b4..9c337f6 100644
--- a/source4/lib/messaging/messaging.c
+++ b/source4/lib/messaging/messaging.c
@@ -27,7 +27,7 @@
#include "lib/socket/socket.h"
#include "librpc/gen_ndr/ndr_irpc.h"
#include "lib/messaging/irpc.h"
-#include "lib/util/tdb_wrap.h"
+#include "lib/tdb_wrap/tdb_wrap.h"
#include "../lib/util/unix_privs.h"
#include "librpc/rpc/dcerpc.h"
#include "../lib/tdb_compat/tdb_compat.h"
diff --git a/source4/ntvfs/common/brlock_tdb.c b/source4/ntvfs/common/brlock_tdb.c
index fcaa756..5c89b41 100644
--- a/source4/ntvfs/common/brlock_tdb.c
+++ b/source4/ntvfs/common/brlock_tdb.c
@@ -28,7 +28,7 @@
#include "system/filesys.h"
#include "tdb_compat.h"
#include "messaging/messaging.h"
-#include "lib/util/tdb_wrap.h"
+#include "lib/tdb_wrap/tdb_wrap.h"
#include "lib/messaging/irpc.h"
#include "libcli/libcli.h"
#include "cluster/cluster.h"
diff --git a/source4/ntvfs/common/notify.c b/source4/ntvfs/common/notify.c
index 98f17a6..6b5ece9 100644
--- a/source4/ntvfs/common/notify.c
+++ b/source4/ntvfs/common/notify.c
@@ -28,7 +28,7 @@
#include "../lib/tdb_compat/tdb_compat.h"
#include "../lib/util/util_tdb.h"
#include "messaging/messaging.h"
-#include "lib/util/tdb_wrap.h"
+#include "lib/tdb_wrap/tdb_wrap.h"
#include "lib/messaging/irpc.h"
#include "librpc/gen_ndr/ndr_notify.h"
#include "../lib/util/dlinklist.h"
diff --git a/source4/ntvfs/common/opendb_tdb.c b/source4/ntvfs/common/opendb_tdb.c
index 9884e1f..ed8fb90 100644
--- a/source4/ntvfs/common/opendb_tdb.c
+++ b/source4/ntvfs/common/opendb_tdb.c
@@ -42,7 +42,7 @@
#include "system/filesys.h"
#include "../lib/tdb_compat/tdb_compat.h"
#include "messaging/messaging.h"
-#include "lib/util/tdb_wrap.h"
+#include "lib/tdb_wrap/tdb_wrap.h"
#include "lib/messaging/irpc.h"
#include "librpc/gen_ndr/ndr_opendb.h"
#include "ntvfs/ntvfs.h"
diff --git a/source4/ntvfs/posix/python/pyxattr_tdb.c b/source4/ntvfs/posix/python/pyxattr_tdb.c
index 7248560..1fdae76 100644
--- a/source4/ntvfs/posix/python/pyxattr_tdb.c
+++ b/source4/ntvfs/posix/python/pyxattr_tdb.c
@@ -21,7 +21,7 @@
#include <Python.h>
#include "includes.h"
#include "tdb_compat.h"
-#include "lib/util/tdb_wrap.h"
+#include "lib/tdb_wrap/tdb_wrap.h"
#include "librpc/ndr/libndr.h"
#include "lib/util/wrap_xattr.h"
#include "ntvfs/posix/vfs_posix.h"
diff --git a/source4/ntvfs/posix/vfs_posix.c b/source4/ntvfs/posix/vfs_posix.c
index cecaee0..3a3d1ea 100644
--- a/source4/ntvfs/posix/vfs_posix.c
+++ b/source4/ntvfs/posix/vfs_posix.c
@@ -27,7 +27,7 @@
#include "vfs_posix.h"
#include "librpc/gen_ndr/security.h"
#include "tdb_compat.h"
-#include "lib/util/tdb_wrap.h"
+#include "lib/tdb_wrap/tdb_wrap.h"
#include "libcli/security/security.h"
#include "lib/events/events.h"
#include "param/param.h"
diff --git a/source4/ntvfs/posix/xattr_tdb.c b/source4/ntvfs/posix/xattr_tdb.c
index 07b3712..2a320ba 100644
--- a/source4/ntvfs/posix/xattr_tdb.c
+++ b/source4/ntvfs/posix/xattr_tdb.c
@@ -20,7 +20,7 @@
*/
#include "includes.h"
-#include "lib/util/tdb_wrap.h"
+#include "lib/tdb_wrap/tdb_wrap.h"
#include "tdb_compat.h"
#include "vfs_posix.h"
diff --git a/source4/param/secrets.c b/source4/param/secrets.c
index 32a9745..aaf6259 100644
--- a/source4/param/secrets.c
+++ b/source4/param/secrets.c
@@ -25,7 +25,7 @@
#include "secrets.h"
#include "param/param.h"
#include "system/filesys.h"
-#include "lib/util/tdb_wrap.h"
+#include "lib/tdb_wrap/tdb_wrap.h"
#include "lib/ldb-samba/ldb_wrap.h"
#include <ldb.h>
#include "../lib/util/util_tdb.h"
diff --git a/source4/scripting/python/samba/__init__.py b/source4/scripting/python/samba/__init__.py
index f6af472..eb77008 100644
--- a/source4/scripting/python/samba/__init__.py
+++ b/source4/scripting/python/samba/__init__.py
@@ -347,7 +347,7 @@ def dn_from_dns_name(dnsdomain):
"""return a DN from a DNS name domain/forest root"""
return "DC=" + ",DC=".join(dnsdomain.split("."))
-from samba import _glue
+import _glue
version = _glue.version
interface_ips = _glue.interface_ips
set_debug_level = _glue.set_debug_level
diff --git a/source4/scripting/python/samba/samdb.py b/source4/scripting/python/samba/samdb.py
index 4c24989..d0955be 100644
--- a/source4/scripting/python/samba/samdb.py
+++ b/source4/scripting/python/samba/samdb.py
@@ -106,13 +106,13 @@ class SamDB(samba.Ldb):
def toggle_userAccountFlags(self, search_filter, flags, flags_str=None,
on=True, strict=False):
- """toggle_userAccountFlags
+ """Toggle_userAccountFlags
:param search_filter: LDAP filter to find the user (eg
samccountname=name)
- :flags: samba.dsdb.UF_* flags
- :on: on=True (default) => set, on=False => unset
- :strict: strict=False (default) ignore if no action is needed
+ :param flags: samba.dsdb.UF_* flags
+ :param on: on=True (default) => set, on=False => unset
+ :param strict: strict=False (default) ignore if no action is needed
strict=True raises an Exception if...
"""
res = self.search(base=self.domain_dn(), scope=ldb.SCOPE_SUBTREE,
diff --git a/source4/scripting/python/samba/tests/blackbox/samba_tool_drs.py b/source4/scripting/python/samba/tests/blackbox/samba_tool_drs.py
index 51274cc..f043f28 100644
--- a/source4/scripting/python/samba/tests/blackbox/samba_tool_drs.py
+++ b/source4/scripting/python/samba/tests/blackbox/samba_tool_drs.py
@@ -19,7 +19,6 @@
"""Blackbox tests for samba-tool drs."""
-import os
import samba.tests
diff --git a/source4/torture/local/dbspeed.c b/source4/torture/local/dbspeed.c
index 60721cc..51ea8ea 100644
--- a/source4/torture/local/dbspeed.c
+++ b/source4/torture/local/dbspeed.c
@@ -25,7 +25,7 @@
#include <ldb.h>
#include <ldb_errors.h>
#include "ldb_wrap.h"
-#include "lib/util/tdb_wrap.h"
+#include "lib/tdb_wrap/tdb_wrap.h"
#include "torture/smbtorture.h"
#include "param/param.h"
diff --git a/wscript b/wscript
index 96df563..e1fe953 100755
--- a/wscript
+++ b/wscript
@@ -151,7 +151,16 @@ def build(bld):
def pydoctor(ctx):
'''build python apidocs'''
- cmd='PYTHONPATH=bin/python pydoctor --project-name=Samba --project-url=http://www.samba.org --make-html --docformat=restructuredtext --add-package bin/python/samba'
+ bp = os.path.abspath('bin/python')
+ mpaths = {}
+ for m in ['talloc', 'tdb', 'ldb']:
+ f = os.popen("PYTHONPATH=%s python -c 'import %s; print %s.__file__'" % (bp, m, m), 'r')
+ try:
+ mpaths[m] = f.read().strip()
+ finally:
+ f.close()
+ cmd='PYTHONPATH=%s pydoctor --introspect-c-modules --project-name=Samba --project-url=http://www.samba.org --make-html --docformat=restructuredtext --add-package bin/python/samba --add-module %s --add-module %s --add-module %s' % (
+ bp, mpaths['tdb'], mpaths['ldb'], mpaths['talloc'])
print("Running: %s" % cmd)
os.system(cmd)
diff --git a/wscript_build b/wscript_build
index ab6f9be..f5dff8d 100644
--- a/wscript_build
+++ b/wscript_build
@@ -65,6 +65,7 @@ bld.RECURSE('lib/uid_wrapper')
bld.RECURSE('lib/popt')
bld.RECURSE('source4/lib/stream')
bld.RECURSE('lib/util')
+bld.RECURSE('lib/tdb_wrap')
bld.RECURSE('lib/tdr')
bld.RECURSE('lib/tsocket')
bld.RECURSE('lib/crypto')
--
Samba Shared Repository
More information about the samba-cvs
mailing list