From 0521ed1ddff403094e6d0f22541f47ac87747679 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 22 Aug 2008 18:37:34 +1000 Subject: fixed the GUID and objectSID canonicalisation functions (This used to be commit 115053ea7e70b067e7873668ed83f1f10908287d) --- source4/lib/ldb-samba/ldif_handlers.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'source4/lib') diff --git a/source4/lib/ldb-samba/ldif_handlers.c b/source4/lib/ldb-samba/ldif_handlers.c index 04fcd66b6e..a16582d294 100644 --- a/source4/lib/ldb-samba/ldif_handlers.c +++ b/source4/lib/ldb-samba/ldif_handlers.c @@ -134,6 +134,7 @@ static int ldb_canonicalise_objectSid(struct ldb_context *ldb, void *mem_ctx, /* Perhaps not a string after all */ return ldb_handler_copy(ldb, mem_ctx, in, out); } + return 0; } return ldb_handler_copy(ldb, mem_ctx, in, out); } @@ -148,7 +149,7 @@ static int ldif_read_objectGUID(struct ldb_context *ldb, void *mem_ctx, char *guid_string; NTSTATUS status; enum ndr_err_code ndr_err; - guid_string = talloc_strndup(mem_ctx, in->data, in->length); + guid_string = talloc_strndup(mem_ctx, (const char *)in->data, in->length); if (!guid_string) { return -1; } @@ -251,6 +252,7 @@ static int ldb_canonicalise_objectGUID(struct ldb_context *ldb, void *mem_ctx, /* Perhaps it wasn't a valid string after all */ return ldb_handler_copy(ldb, mem_ctx, in, out); } + return 0; } return ldb_handler_copy(ldb, mem_ctx, in, out); } -- cgit