diff options
| author | Volker Lendecke <vlendec@samba.org> | 2006-10-06 14:39:47 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:15:15 -0500 |
| commit | fd1cf23567566b65cdeecdbc04f58f29e29edd79 (patch) | |
| tree | c37c3650eadf0ba8e39d25ffe8d59a43b8b74257 /source3/lib/ldb/common/ldb_dn.c | |
| parent | d898cbce90673d1f13d2fd0b2c8308af34e2fb9c (diff) | |
| download | samba-fd1cf23567566b65cdeecdbc04f58f29e29edd79.tar.gz samba-fd1cf23567566b65cdeecdbc04f58f29e29edd79.tar.bz2 samba-fd1cf23567566b65cdeecdbc04f58f29e29edd79.zip | |
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)
Diffstat (limited to 'source3/lib/ldb/common/ldb_dn.c')
| -rw-r--r-- | source3/lib/ldb/common/ldb_dn.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source3/lib/ldb/common/ldb_dn.c b/source3/lib/ldb/common/ldb_dn.c index f9b044d5b8..5ff27d1a37 100644 --- a/source3/lib/ldb/common/ldb_dn.c +++ b/source3/lib/ldb/common/ldb_dn.c @@ -112,7 +112,7 @@ static struct ldb_val ldb_dn_unescape_value(void *mem_ctx, const char *src) LDB_DN_NULL_FAILED(src); - dst = p = talloc_memdup(mem_ctx, src, strlen(src) + 1); + dst = p = (char *)talloc_memdup(mem_ctx, src, strlen(src) + 1); LDB_DN_NULL_FAILED(dst); end = &dst[strlen(dst)]; @@ -300,7 +300,8 @@ static struct ldb_dn_component ldb_dn_explode_component(void *mem_ctx, char *raw p[qe] = '\0'; p = p + qs + 1; dc.value.length = strlen(p); - dc.value.data = talloc_memdup(mem_ctx, p, dc.value.length + 1); + dc.value.data = (uint8_t *)talloc_memdup(mem_ctx, p, + dc.value.length + 1); break; default: /* mismatched quotes ot other error, bail out */ |