diff options
| author | Andrew Kroeger <andrew@sprocks.gotdns.com> | 2008-03-28 05:43:52 -0500 |
|---|---|---|
| committer | Andrew Kroeger <andrew@sprocks.gotdns.com> | 2008-03-28 05:43:52 -0500 |
| commit | ba4739547ef9bf2eb4aac45be9d71264a845e4fc (patch) | |
| tree | 796aa806a662230e09deee4b4bbc1ac0cae062db | |
| parent | 8f8c56bfbcbfe8f80afb09eb1d481a108b252bee (diff) | |
| parent | 52013b846a7b97022b8368b51734e7a960e704f4 (diff) | |
| download | samba-ba4739547ef9bf2eb4aac45be9d71264a845e4fc.tar.gz samba-ba4739547ef9bf2eb4aac45be9d71264a845e4fc.tar.bz2 samba-ba4739547ef9bf2eb4aac45be9d71264a845e4fc.zip | |
Merge branch 'v4-0-test' of git://git.samba.org/samba into v4-0-local
(This used to be commit 9b4449b46c0404b3c694ac9c592be63185c366b7)
| -rw-r--r-- | source4/cldap_server/cldap_server.h | 2 | ||||
| -rw-r--r-- | source4/lib/replace/samba.m4 | 2 | ||||
| -rw-r--r-- | source4/libcli/security/security.h | 2 | ||||
| -rw-r--r-- | source4/torture/util_provision.c | 7 |
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")); |