diff options
| author | Andrew Tridgell <tridge@samba.org> | 2008-08-22 18:37:34 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2008-08-22 18:37:34 +1000 |
| commit | 0521ed1ddff403094e6d0f22541f47ac87747679 (patch) | |
| tree | 473fd43492f110f171e06b42d3a2ff9db3d7fb17 /source4/lib | |
| parent | c50d361e076625b6fc89b5ee197227a17149c70c (diff) | |
| download | samba-0521ed1ddff403094e6d0f22541f47ac87747679.tar.gz samba-0521ed1ddff403094e6d0f22541f47ac87747679.tar.bz2 samba-0521ed1ddff403094e6d0f22541f47ac87747679.zip | |
fixed the GUID and objectSID canonicalisation functions
(This used to be commit 115053ea7e70b067e7873668ed83f1f10908287d)
Diffstat (limited to 'source4/lib')
| -rw-r--r-- | source4/lib/ldb-samba/ldif_handlers.c | 4 |
1 files changed, 3 insertions, 1 deletions
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); } |