Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local

[jelmer/samba4-debian.git] / source / dsdb / samdb / samdb_privilege.c

diff --git a/source/dsdb/samdb/samdb_privilege.c b/source/dsdb/samdb/samdb_privilege.c
index 468a26bf989d0559bf863203957f7e54fd8c99c9..3945dbb14b88b41a8150d11f70956e658e086436 100644 (file)
--- a/source/dsdb/samdb/samdb_privilege.c
+++ b/source/dsdb/samdb/samdb_privilege.c
@@ -20,7 +20,7 @@
 */
 
 #include "includes.h"
-#include "libcli/ldap/ldap.h"
+#include "libcli/ldap/ldap_ndr.h"
 #include "dsdb/samdb/samdb.h"
 #include "auth/auth.h"
 #include "libcli/security/security.h"
@@ -73,7 +73,7 @@ static NTSTATUS samdb_privilege_setup_sid(void *samctx, TALLOC_CTX *mem_ctx,
   setup the privilege mask for this security token based on our
   local SAM
 */
-_PUBLIC_ NTSTATUS samdb_privilege_setup(struct security_token *token)
+_PUBLIC_ NTSTATUS samdb_privilege_setup(struct loadparm_context *lp_ctx, struct security_token *token)
 {
        void *samctx;
        TALLOC_CTX *mem_ctx;
@@ -97,7 +97,7 @@ _PUBLIC_ NTSTATUS samdb_privilege_setup(struct security_token *token)
        }
 
        mem_ctx = talloc_new(token);
-       samctx = samdb_connect(mem_ctx, global_loadparm, system_session(mem_ctx));
+       samctx = samdb_connect(mem_ctx, lp_ctx, system_session(mem_ctx, lp_ctx));
        if (samctx == NULL) {
                talloc_free(mem_ctx);
                return NT_STATUS_INTERNAL_DB_CORRUPTION;