diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-03-28 22:04:52 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-03-28 22:04:52 +1100 |
| commit | 764b7879d23bfa413a6747226f377ce2eaeaea26 (patch) | |
| tree | 83185e4c12e15cc71a9e105384a6705d3267f110 /source | |
| parent | 727ef40c2b56910028ef3c1092b8eab1bfa6ce63 (diff) | |
| parent | 326ae6ce9c8a6f5800d5ecb4a2bfdfc32336797d (diff) | |
| download | samba-764b7879d23bfa413a6747226f377ce2eaeaea26.tar.gz samba-764b7879d23bfa413a6747226f377ce2eaeaea26.tar.xz samba-764b7879d23bfa413a6747226f377ce2eaeaea26.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
Diffstat (limited to 'source')
| -rw-r--r-- | source/cldap_server/cldap_server.h | 2 | ||||
| -rw-r--r-- | source/lib/replace/samba.m4 | 2 | ||||
| -rw-r--r-- | source/libcli/security/security.h | 2 | ||||
| -rw-r--r-- | source/torture/util_provision.c | 7 |
4 files changed, 8 insertions, 5 deletions
diff --git a/source/cldap_server/cldap_server.h b/source/cldap_server/cldap_server.h index e683d2b83f2..da2bd20050a 100644 --- a/source/cldap_server/cldap_server.h +++ b/source/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/source/lib/replace/samba.m4 b/source/lib/replace/samba.m4 index e62c3d3cd17..7984ef31db6 100644 --- a/source/lib/replace/samba.m4 +++ b/source/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/source/libcli/security/security.h b/source/libcli/security/security.h index c7f2a093113..46ef6186b8d 100644 --- a/source/libcli/security/security.h +++ b/source/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/source/torture/util_provision.c b/source/torture/util_provision.c index d7c8f479e64..d214fc120f3 100644 --- a/source/torture/util_provision.c +++ b/source/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")); |