Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Fri, 28 Mar 2008 11:04:52 +0000 (22:04 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 28 Mar 2008 11:04:52 +0000 (22:04 +1100)
(This used to be commit 764b7879d23bfa413a6747226f377ce2eaeaea26)

source4/cldap_server/cldap_server.h
source4/lib/replace/samba.m4
source4/libcli/security/security.h
source4/torture/util_provision.c

index e683d2b83f243ef894beec995f1a11d3d4e909e4..da2bd20050aa3a8a6b35d15312b0442a556a36e7 100644 (file)
@@ -29,4 +29,6 @@ struct cldapd_server {
        struct ldb_context *samctx;
 };
 
+struct ldap_SearchRequest;
+
 #include "cldap_server/proto.h"
index e62c3d3cd1740f435936c4ecb95852aa9443c6e6..7984ef31db618183bbb8cdfcff321569e35bd88b 100644 (file)
@@ -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'`
index c7f2a093113acfb09e12fef1ea564cf4176dcd03..46ef6186b8da303fdc08d02935aeb60d88d421b8 100644 (file)
@@ -26,4 +26,6 @@ enum security_user_level {
        SECURITY_SYSTEM
 };
 
+struct auth_session_info;
+
 #include "libcli/security/proto.h"
index d7c8f479e648008061690baa2e127f3574096516..d214fc120f3e65da56ed2fc13e8de57d439ca32c 100644 (file)
@@ -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"
 #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"));