server: fix samdb_connect() signature.

This is a merge of r2578 from the plugfest branch. Providing
signatures of samba functions was a hack, which we'll fix in due course.

git-svn-id: https://svn.openchange.org/openchange@2646 71d39326-ef09-db11-b2a4-00e04c779ad1

diff --git a/trunk/mapiproxy/servers/default/emsmdb/dcesrv_exchange_emsmdb.h b/trunk/mapiproxy/servers/default/emsmdb/dcesrv_exchange_emsmdb.h
index 4cc7c0a18e65c0b8cc9591aaca212e353c4f374d..2eeb70422a357e2bd8041a2ecbed3f9494a93c25 100644 (file)
--- a/trunk/mapiproxy/servers/default/emsmdb/dcesrv_exchange_emsmdb.h
+++ b/trunk/mapiproxy/servers/default/emsmdb/dcesrv_exchange_emsmdb.h
@@ -167,7 +167,7 @@ struct emsmdbp_object {
 __BEGIN_DECLS
 
 NTSTATUS       samba_init_module(void);
-struct ldb_context *samdb_connect(TALLOC_CTX *, struct tevent_context *, struct loadparm_context *, struct auth_session_info *);
+struct ldb_context *samdb_connect(TALLOC_CTX *, struct tevent_context *, struct loadparm_context *, struct auth_session_info *, int);
 
 /* definitions from emsmdbp.c */
 struct emsmdbp_context *emsmdbp_init(struct loadparm_context *, const char *, void *);

diff --git a/trunk/mapiproxy/servers/default/emsmdb/emsmdbp.c b/trunk/mapiproxy/servers/default/emsmdb/emsmdbp.c
index 949a7fc34297f9f958e9ca3d2ac858bbf2b8a896..33e27490827fe8c905cd798eb9b1e51ef793a031 100644 (file)
--- a/trunk/mapiproxy/servers/default/emsmdb/emsmdbp.c
+++ b/trunk/mapiproxy/servers/default/emsmdb/emsmdbp.c
@@ -109,7 +109,7 @@ _PUBLIC_ struct emsmdbp_context *emsmdbp_init(struct loadparm_context *lp_ctx,
        emsmdbp_ctx->lp_ctx = lp_ctx;
 
        /* return an opaque context pointer on samDB database */
-       emsmdbp_ctx->samdb_ctx = samdb_connect(mem_ctx, ev, lp_ctx, system_session(lp_ctx));
+       emsmdbp_ctx->samdb_ctx = samdb_connect(mem_ctx, ev, lp_ctx, system_session(lp_ctx), 0);
        if (!emsmdbp_ctx->samdb_ctx) {
                talloc_free(mem_ctx);
                DEBUG(0, ("[%s:%d]: Connection to \"sam.ldb\" failed\n", __FUNCTION__, __LINE__));

diff --git a/trunk/mapiproxy/servers/default/nspi/dcesrv_exchange_nsp.h b/trunk/mapiproxy/servers/default/nspi/dcesrv_exchange_nsp.h
index 1d1f48f99c99b92536af7eda57a368e051c6f677..1bc3517a5d858a2b0db5231a124886e78e8d0736 100644 (file)
--- a/trunk/mapiproxy/servers/default/nspi/dcesrv_exchange_nsp.h
+++ b/trunk/mapiproxy/servers/default/nspi/dcesrv_exchange_nsp.h
@@ -109,7 +109,7 @@ struct EphemeralEntryID {
 __BEGIN_DECLS
 
 NTSTATUS       samba_init_module(void);
-struct ldb_context *samdb_connect(TALLOC_CTX *, struct tevent_context *, struct loadparm_context *, struct auth_session_info *);
+struct ldb_context *samdb_connect(TALLOC_CTX *, struct tevent_context *, struct loadparm_context *, struct auth_session_info *, int);
 const struct GUID *samdb_ntds_objectGUID(struct ldb_context *);
 
 /* definitions from emsabp.c */

diff --git a/trunk/mapiproxy/servers/default/nspi/emsabp.c b/trunk/mapiproxy/servers/default/nspi/emsabp.c
index da443a76bfcc7055cc0f72708b4dea5072a46354..2bbcfcc35c19958bb63cf11ae58867ede6ecbfb6 100644 (file)
--- a/trunk/mapiproxy/servers/default/nspi/emsabp.c
+++ b/trunk/mapiproxy/servers/default/nspi/emsabp.c
@@ -68,7 +68,7 @@ _PUBLIC_ struct emsabp_context *emsabp_init(struct loadparm_context *lp_ctx,
        emsabp_ctx->lp_ctx = lp_ctx;
 
        /* Return an opaque context pointer on samDB database */
-       emsabp_ctx->samdb_ctx = samdb_connect(mem_ctx, ev, lp_ctx, system_session(lp_ctx));
+       emsabp_ctx->samdb_ctx = samdb_connect(mem_ctx, ev, lp_ctx, system_session(lp_ctx), 0);
        if (!emsabp_ctx->samdb_ctx) {
                talloc_free(mem_ctx);
                DEBUG(0, ("[%s:%d]: Connection to \"sam.ldb\" failed\n", __FUNCTION__, __LINE__));