[SCM] Samba Shared Repository - branch master updated

[Matthias Dieter Wallnöfer]

The branch, master has been updated
       via  a910d0c s4:dsdb/pydsdb.c - don't throw another exception on "PyObject_AsDn"
       via  e4b2270 ldb:pyldb.h - revert to the previous header behaviour
      from  35206df build: move the import near the place where need it, so that we can build on hosts with python's zlib

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit a910d0cc643525cbbf654ea55e376598fb5106e3
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date:   Sun Dec 12 21:42:30 2010 +0100

    s4:dsdb/pydsdb.c - don't throw another exception on "PyObject_AsDn"
    
    Autobuild-User: Matthias Dieter Wallnöfer <mdw at samba.org>
    Autobuild-Date: Sun Dec 12 23:40:17 CET 2010 on sn-devel-104

commit e4b22702b6fc72a6ac8989144ded3f78cb05d641
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date:   Sun Dec 12 21:40:03 2010 +0100

    ldb:pyldb.h - revert to the previous header behaviour
    
    "ldb_private.h" is private and therefore might not always be available.

-----------------------------------------------------------------------

Summary of changes:
 source4/dsdb/pydsdb.c         |    6 ++++--
 source4/lib/ldb-samba/pyldb.c |    4 +++-
 source4/lib/ldb/pyldb.c       |    2 ++
 source4/lib/ldb/pyldb.h       |    2 --
 source4/lib/ldb/pyldb_util.c  |    2 ++
 source4/libnet/py_net.c       |    4 +++-
 source4/param/provision.c     |    4 +++-
 7 files changed, 17 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/dsdb/pydsdb.c b/source4/dsdb/pydsdb.c
index 64b7266..af03504 100644
--- a/source4/dsdb/pydsdb.c
+++ b/source4/dsdb/pydsdb.c
@@ -17,8 +17,10 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "lib/ldb/pyldb.h"
+#include <Python.h>
 #include "includes.h"
+#include <ldb.h>
+#include <pyldb.h>
 #include "dsdb/samdb/samdb.h"
 #include "libcli/security/security.h"
 #include "librpc/ndr/libndr.h"
@@ -165,7 +167,7 @@ static PyObject *py_samdb_set_ntds_settings_dn(PyLdbObject *self, PyObject *args
 	}
 
 	if (!PyObject_AsDn(tmp_ctx, py_ntds_settings_dn, ldb, &ntds_settings_dn)) {
-		PyErr_NoMemory();
+		/* exception thrown by "PyObject_AsDn" */
 		talloc_free(tmp_ctx);
 		return NULL;
 	}
diff --git a/source4/lib/ldb-samba/pyldb.c b/source4/lib/ldb-samba/pyldb.c
index f198d74..9345145 100644
--- a/source4/lib/ldb-samba/pyldb.c
+++ b/source4/lib/ldb-samba/pyldb.c
@@ -19,8 +19,10 @@
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "lib/ldb/pyldb.h"
+#include <Python.h>
 #include "includes.h"
+#include <ldb.h>
+#include <pyldb.h>
 #include "param/pyparam.h"
 #include "auth/credentials/pycredentials.h"
 #include "ldb_wrap.h"
diff --git a/source4/lib/ldb/pyldb.c b/source4/lib/ldb/pyldb.c
index 44a006f..0167c57 100644
--- a/source4/lib/ldb/pyldb.c
+++ b/source4/lib/ldb/pyldb.c
@@ -26,6 +26,8 @@
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <Python.h>
+#include "ldb_private.h"
 #include "pyldb.h"
 
 /* There's no Py_ssize_t in 2.4, apparently */
diff --git a/source4/lib/ldb/pyldb.h b/source4/lib/ldb/pyldb.h
index afc8c51..211789c 100644
--- a/source4/lib/ldb/pyldb.h
+++ b/source4/lib/ldb/pyldb.h
@@ -26,9 +26,7 @@
 #ifndef _PYLDB_H_
 #define _PYLDB_H_
 
-#include <Python.h>
 #include <talloc.h>
-#include "ldb_private.h"
 
 typedef struct {
 	PyObject_HEAD
diff --git a/source4/lib/ldb/pyldb_util.c b/source4/lib/ldb/pyldb_util.c
index 35071f3..7907741 100644
--- a/source4/lib/ldb/pyldb_util.c
+++ b/source4/lib/ldb/pyldb_util.c
@@ -23,6 +23,8 @@
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <Python.h>
+#include "ldb.h"
 #include "pyldb.h"
 
 static PyObject *ldb_module = NULL;
diff --git a/source4/libnet/py_net.c b/source4/libnet/py_net.c
index 28dee59..48cf4a4 100644
--- a/source4/libnet/py_net.c
+++ b/source4/libnet/py_net.c
@@ -18,8 +18,10 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "lib/ldb/pyldb.h"
+#include <Python.h>
 #include "includes.h"
+#include <ldb.h>
+#include <pyldb.h>
 #include "libnet.h"
 #include "auth/credentials/pycredentials.h"
 #include "libcli/security/security.h"
diff --git a/source4/param/provision.c b/source4/param/provision.c
index 790cf83..f1ef695 100644
--- a/source4/param/provision.c
+++ b/source4/param/provision.c
@@ -18,7 +18,9 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "lib/ldb/pyldb.h"
+#include <Python.h>
+#include <ldb.h>
+#include <pyldb.h>
 #include "includes.h"
 #include "librpc/ndr/libndr.h"
 #include "param/provision.h"


-- 
Samba Shared Repository