ldb:pyldb.h - revert to the previous header behaviour

"ldb_private.h" is private and therefore might not always be available.

diff --git a/source4/dsdb/pydsdb.c b/source4/dsdb/pydsdb.c
index 64b7266e723814a009f42817ae6472ad432ecd30..f304153604a5bead4bc6d57b5b1d860e98d318e3 100644 (file)
--- 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"

diff --git a/source4/lib/ldb-samba/pyldb.c b/source4/lib/ldb-samba/pyldb.c
index f198d74b515d16fbee7bb4065cd84b352758380c..9345145af1a6c76fdaa13cd89e39025f3110272b 100644 (file)
--- 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 44a006ffb305c0aa37cfa6cf22ebc5585b1c1c59..0167c570c566cd93cc54f12a3e8c8b39425c16f4 100644 (file)
--- 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 afc8c518818e9c1e23ae3cc9f11a8dc40b15b37d..211789c18ba600c9fc9eba8b6d2b3ebc8af6d14a 100644 (file)
--- 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 35071f364540f55e4670c7abdbc895b6d92c0664..79077416be4c828f71d78fdad7d18fd263da91bf 100644 (file)
--- 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 28dee5935df4b8ee1e0255be9c4d933e76cd27d0..48cf4a416dcc5723bf289c1dd85326723fb13045 100644 (file)
--- 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 790cf83783bd69af339cb5f23134dbf0ad3d23da..f1ef695ac0e1cb43987d971e1d57549ac048f005 100644 (file)
--- 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"