From fd1cf23567566b65cdeecdbc04f58f29e29edd79 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Fri, 6 Oct 2006 14:39:47 +0000 Subject: r19132: Fix some C++ warnings. Is there interest to have them in Samba4 as well? I have some problems resolving the last 3 ones in attrib_handlers.c. In line 251 the function ldb_dn_explode_casefold is called with mem_ctx as the first argument. Looking at ldb_dn_explode_casefold I see that the first argument it expects is a struct ldb_context. I could certainly add a cast to (struct ldb_context *) to that call, but I would assume that this is the wrong fix. Is it possible that attrib_handlers.c:251 and :254 should have ldb and not mem_ctx as the first argument? Can anybody from Samba4 clarify this for me and apply the correct fix? Thanks a lot. Volker (This used to be commit 26f2cb71ebf00b2c6f356da5f32384f7fa083521) --- source3/lib/ldb/common/ldb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/lib/ldb/common/ldb.c') diff --git a/source3/lib/ldb/common/ldb.c b/source3/lib/ldb/common/ldb.c index 00bf5e79ba..b54febf208 100644 --- a/source3/lib/ldb/common/ldb.c +++ b/source3/lib/ldb/common/ldb.c @@ -160,7 +160,7 @@ static const struct ldb_dn *ldb_set_default_basedn(struct ldb_context *ldb) struct ldb_result *res; struct ldb_dn *basedn=NULL; - basedn = ldb_get_opaque(ldb, "default_baseDN"); + basedn = (struct ldb_dn *)ldb_get_opaque(ldb, "default_baseDN"); if (basedn) { return basedn; } @@ -182,7 +182,7 @@ static const struct ldb_dn *ldb_set_default_basedn(struct ldb_context *ldb) const struct ldb_dn *ldb_get_default_basedn(struct ldb_context *ldb) { - return ldb_get_opaque(ldb, "default_baseDN"); + return (const struct ldb_dn *)ldb_get_opaque(ldb, "default_baseDN"); } /* -- cgit