summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2008-03-28 22:04:52 +1100
committerAndrew Bartlett <abartlet@samba.org>2008-03-28 22:04:52 +1100
commit5c4e340ee3ff3dc5d8fdb8b4c6441cfb1071b098 (patch)
treeafc885ed00776acfc6b4f592c2a7eba4b763d2ef
parent142fbfb3c1f9f8cda7f0edaa801f8345f23d805f (diff)
parent52013b846a7b97022b8368b51734e7a960e704f4 (diff)
downloadsamba-5c4e340ee3ff3dc5d8fdb8b4c6441cfb1071b098.tar.gz
samba-5c4e340ee3ff3dc5d8fdb8b4c6441cfb1071b098.tar.bz2
samba-5c4e340ee3ff3dc5d8fdb8b4c6441cfb1071b098.zip
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit 764b7879d23bfa413a6747226f377ce2eaeaea26)
-rw-r--r--source4/cldap_server/cldap_server.h2
-rw-r--r--source4/lib/replace/samba.m42
-rw-r--r--source4/libcli/security/security.h2
-rw-r--r--source4/torture/util_provision.c7
4 files changed, 8 insertions, 5 deletions
diff --git a/source4/cldap_server/cldap_server.h b/source4/cldap_server/cldap_server.h
index e683d2b83f..da2bd20050 100644
--- a/source4/cldap_server/cldap_server.h
+++ b/source4/cldap_server/cldap_server.h
@@ -29,4 +29,6 @@ struct cldapd_server {
struct ldb_context *samctx;
};
+struct ldap_SearchRequest;
+
#include "cldap_server/proto.h"
diff --git a/source4/lib/replace/samba.m4 b/source4/lib/replace/samba.m4
index e62c3d3cd1..7984ef31db 100644
--- a/source4/lib/replace/samba.m4
+++ b/source4/lib/replace/samba.m4
@@ -23,7 +23,7 @@ done
SMB_SUBSYSTEM(LIBREPLACE,
[${LIBREPLACE_OBJS}],
- [LIBREPLACE_EXT],
+ [LIBREPLACE_EXT LIBREPLACE_NETWORK],
[-Ilib/replace])
LIBREPLACE_HOSTCC_OBJS=`echo ${LIBREPLACE_OBJS} |sed -e 's/\.o/\.ho/g'`
diff --git a/source4/libcli/security/security.h b/source4/libcli/security/security.h
index c7f2a09311..46ef6186b8 100644
--- a/source4/libcli/security/security.h
+++ b/source4/libcli/security/security.h
@@ -26,4 +26,6 @@ enum security_user_level {
SECURITY_SYSTEM
};
+struct auth_session_info;
+
#include "libcli/security/proto.h"
diff --git a/source4/torture/util_provision.c b/source4/torture/util_provision.c
index d7c8f479e6..d214fc120f 100644
--- a/source4/torture/util_provision.c
+++ b/source4/torture/util_provision.c
@@ -20,6 +20,8 @@
#include "includes.h"
#include "auth/auth.h"
#include "lib/ldb_wrap.h"
+#include "torture/torture.h"
+#include "libcli/raw/libcliraw.h"
#include "torture/util.h"
#include "param/param.h"
@@ -27,12 +29,9 @@
#include "scripting/python/modules.h"
NTSTATUS provision_bare(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx,
- struct provision_settings *settings)
+ struct provision_settings *settings)
{
- bool ok;
PyObject *provision_mod, *provision_dict, *provision_fn, *result, *parameters;
- struct ldb_context *ldb;
- char *sam_ldb_path;
DEBUG(0,("Provision for Become-DC test using python\n"));