Fix include paths to new location of libutil.

[bbaumbach/samba-autobuild/.git] / source4 / param / secrets.c

diff --git a/source4/param/secrets.c b/source4/param/secrets.c
index 06dc850c8e6b317388c6e237775420ac89fa1a48..576df0a4fe475de523807eef4816cdfb940afa3a 100644 (file)
--- a/source4/param/secrets.c
+++ b/source4/param/secrets.c
@@ -27,9 +27,9 @@
 #include "system/filesys.h"
 #include "tdb_wrap.h"
 #include "lib/ldb/include/ldb.h"
-#include "lib/tdb/include/tdb.h"
-#include "lib/util/util_tdb.h"
-#include "lib/util/util_ldb.h"
+#include "../tdb/include/tdb.h"
+#include "../lib/util/util_tdb.h"
+#include "../lib/util/util_ldb.h"
 #include "librpc/gen_ndr/ndr_security.h"
 
 /**
@@ -85,7 +85,9 @@ struct tdb_wrap *secrets_init(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_c
 /**
   connect to the secrets ldb
 */
-struct ldb_context *secrets_db_connect(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx)
+struct ldb_context *secrets_db_connect(TALLOC_CTX *mem_ctx,
+                                       struct event_context *ev_ctx,
+                                       struct loadparm_context *lp_ctx)
 {
        char *path;
        const char *url;
@@ -103,7 +105,7 @@ struct ldb_context *secrets_db_connect(TALLOC_CTX *mem_ctx, struct loadparm_cont
 
        /* Secrets.ldb *must* always be local.  If we call for a
         * system_session() we will recurse */
-       ldb = ldb_init(mem_ctx);
+       ldb = ldb_init(mem_ctx, ev_ctx);
        if (!ldb) {
                talloc_free(path);
                return NULL;
@@ -127,6 +129,7 @@ struct ldb_context *secrets_db_connect(TALLOC_CTX *mem_ctx, struct loadparm_cont
  * @return pointer to a SID object if the SID could be obtained, NULL otherwise
  */
 struct dom_sid *secrets_get_domain_sid(TALLOC_CTX *mem_ctx,
+                                      struct event_context *ev_ctx,
                                       struct loadparm_context *lp_ctx,
                                       const char *domain)
 {
@@ -138,7 +141,7 @@ struct dom_sid *secrets_get_domain_sid(TALLOC_CTX *mem_ctx,
        const struct ldb_val *v;
        enum ndr_err_code ndr_err;
 
-       ldb = secrets_db_connect(mem_ctx, lp_ctx);
+       ldb = secrets_db_connect(mem_ctx, ev_ctx, lp_ctx);
        if (ldb == NULL) {
                DEBUG(5, ("secrets_db_connect failed\n"));
                return NULL;