[SCM] Samba Shared Repository - branch master updated -
9617a3945b804bf2d1409285df2a7add12690063
Jelmer Vernooij
jelmer at samba.org
Fri Dec 19 22:55:17 GMT 2008
The branch, master has been updated
via 9617a3945b804bf2d1409285df2a7add12690063 (commit)
via 0898b96d26981d553e041a78721e32946bd4bddf (commit)
via 89043bda3e8922f1442f7e0a0f087697ad1ed7a7 (commit)
via 071a71e27f4d62fcdfa641669368f2d2a42a86af (commit)
via 5076c64d43c68a028ac944c336715b4cb277365f (commit)
via 6998ef4fe021ebf40f63c2191d3259888a8ad7f4 (commit)
from d26a34c22f5d2685f8e75149f87db8d086e32e13 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 9617a3945b804bf2d1409285df2a7add12690063
Merge: 0898b96d26981d553e041a78721e32946bd4bddf d26a34c22f5d2685f8e75149f87db8d086e32e13
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Dec 19 23:51:23 2008 +0100
Merge branch 'master' of ssh://git.samba.org/data/git/samba
commit 0898b96d26981d553e041a78721e32946bd4bddf
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Dec 19 23:48:30 2008 +0100
Reprocess LDB SWIG file.
commit 89043bda3e8922f1442f7e0a0f087697ad1ed7a7
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Dec 19 23:33:43 2008 +0100
Depend on specific version of LDB, as the API seems to unstable
to predict that newer versions (even minor versions) are going to be be
backwards compatible :-(
commit 071a71e27f4d62fcdfa641669368f2d2a42a86af
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Dec 19 22:03:11 2008 +0100
Specify explicit path to tevent.h, compilation breaks without it for me.
commit 5076c64d43c68a028ac944c336715b4cb277365f
Merge: 6998ef4fe021ebf40f63c2191d3259888a8ad7f4 13eefa7c435cb5ac656f662c78260a82caf43180
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Dec 19 21:47:45 2008 +0100
Merge branch 'master' of ssh://git.samba.org/data/git/samba
commit 6998ef4fe021ebf40f63c2191d3259888a8ad7f4
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Dec 19 21:47:31 2008 +0100
Avoid use of parentheses in Python import statements, as it's not supported by Python2.3.
-----------------------------------------------------------------------
Summary of changes:
source4/configure.ac | 2 +-
source4/lib/events/events.h | 2 +-
source4/lib/ldb/ldb_wrap.c | 2 ++
source4/lib/ldb/tests/python/ldap.py | 8 ++++----
source4/scripting/python/samba/tests/samba3.py | 4 ++--
source4/setup/provision | 4 +---
source4/setup/provision-backend | 2 +-
7 files changed, 12 insertions(+), 12 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/configure.ac b/source4/configure.ac
index 7162081..b2c169c 100644
--- a/source4/configure.ac
+++ b/source4/configure.ac
@@ -61,7 +61,7 @@ SMB_EXT_LIB_FROM_PKGCONFIG(LIBTDB, tdb >= 1.1.3,
SMB_INCLUDE_MK(../lib/tdb/python.mk)
-SMB_EXT_LIB_FROM_PKGCONFIG(LIBLDB, ldb >= 0.9.1,
+SMB_EXT_LIB_FROM_PKGCONFIG(LIBLDB, ldb = 0.9.1,
[
SMB_INCLUDE_MK(lib/ldb/ldb_ildap/config.mk)
SMB_INCLUDE_MK(lib/ldb/tools/config.mk)
diff --git a/source4/lib/events/events.h b/source4/lib/events/events.h
index d2e81f5..9c6e825 100644
--- a/source4/lib/events/events.h
+++ b/source4/lib/events/events.h
@@ -1 +1 @@
-#include <tevent.h>
+#include <../lib/tevent/tevent.h>
diff --git a/source4/lib/ldb/ldb_wrap.c b/source4/lib/ldb/ldb_wrap.c
index e290b85..2055695 100644
--- a/source4/lib/ldb/ldb_wrap.c
+++ b/source4/lib/ldb/ldb_wrap.c
@@ -3067,6 +3067,8 @@ static void py_ldb_debug(void *context, enum ldb_debug_level level, const char *
if (ldif == NULL) {
return Py_None;
} else {
+ /* We don't want this attached to the 'ldb' any more */
+ talloc_steal(NULL, ldif);
return Py_BuildValue((char *)"(iO)", ldif->changetype,
SWIG_NewPointerObj(ldif->msg, SWIGTYPE_p_ldb_message, 0));
}
diff --git a/source4/lib/ldb/tests/python/ldap.py b/source4/lib/ldb/tests/python/ldap.py
index c64d85a..821bd04 100755
--- a/source4/lib/ldb/tests/python/ldap.py
+++ b/source4/lib/ldb/tests/python/ldap.py
@@ -13,10 +13,10 @@ sys.path.append("../lib/subunit/python")
import samba.getopt as options
from samba.auth import system_session
-from ldb import (SCOPE_SUBTREE, SCOPE_ONELEVEL, SCOPE_BASE, LdbError,
- LDB_ERR_NO_SUCH_OBJECT, LDB_ERR_ATTRIBUTE_OR_VALUE_EXISTS,
- LDB_ERR_ENTRY_ALREADY_EXISTS, LDB_ERR_UNWILLING_TO_PERFORM,
- LDB_ERR_NOT_ALLOWED_ON_NON_LEAF, LDB_ERR_OTHER, LDB_ERR_INVALID_DN_SYNTAX)
+from ldb import SCOPE_SUBTREE, SCOPE_ONELEVEL, SCOPE_BASE, LdbError
+from ldb import LDB_ERR_NO_SUCH_OBJECT, LDB_ERR_ATTRIBUTE_OR_VALUE_EXISTS
+from ldb import LDB_ERR_ENTRY_ALREADY_EXISTS, LDB_ERR_UNWILLING_TO_PERFORM
+from ldb import LDB_ERR_NOT_ALLOWED_ON_NON_LEAF, LDB_ERR_OTHER, LDB_ERR_INVALID_DN_SYNTAX
from samba import Ldb
from subunit import SubunitTestRunner
from samba import param
diff --git a/source4/scripting/python/samba/tests/samba3.py b/source4/scripting/python/samba/tests/samba3.py
index 1755cbd..95a9fc2 100644
--- a/source4/scripting/python/samba/tests/samba3.py
+++ b/source4/scripting/python/samba/tests/samba3.py
@@ -18,8 +18,8 @@
#
import unittest
-from samba.samba3 import (GroupMappingDatabase, Registry, PolicyDatabase, SecretsDatabase, TdbSam,
- WinsDatabase, SmbpasswdFile, ACB_NORMAL, IdmapDatabase, SAMUser)
+from samba.samba3 import GroupMappingDatabase, Registry, PolicyDatabase, SecretsDatabase, TdbSam
+from samba.samba3 import WinsDatabase, SmbpasswdFile, ACB_NORMAL, IdmapDatabase, SAMUser
import os
DATADIR=os.path.join(os.path.dirname(__file__), "../../../../../testdata/samba3")
diff --git a/source4/setup/provision b/source4/setup/provision
index bf6898f..4b48bab 100755
--- a/source4/setup/provision
+++ b/source4/setup/provision
@@ -35,9 +35,7 @@ from samba.credentials import DONT_USE_KERBEROS
from samba.auth import system_session
import samba.getopt as options
from samba import param
-from samba.provision import (provision,
- FILL_FULL, FILL_NT4SYNC,
- FILL_DRS)
+from samba.provision import provision, FILL_FULL, FILL_NT4SYNC, FILL_DRS
# how do we make this case insensitive??
diff --git a/source4/setup/provision-backend b/source4/setup/provision-backend
index 0943da2..7d20ef5 100755
--- a/source4/setup/provision-backend
+++ b/source4/setup/provision-backend
@@ -34,7 +34,7 @@ from samba import param
from samba.auth import system_session
import samba.getopt as options
-from samba.provision import (provision_backend)
+from samba.provision import provision_backend
parser = optparse.OptionParser("provision [options]")
sambaopts = options.SambaOptions(parser)
--
Samba Shared Repository
More information about the samba-cvs
mailing list