mirror of
https://github.com/samba-team/samba.git
synced 2025-01-19 10:03:58 +03:00
bdee131f30
quite a large change as we had lots of code that assumed that objectSid was a string in S- format. metze and simo tried to convince me to use NDR format months ago, but I didn't listen, so its fair that I have the pain of fixing all the code now :-) This builds on the ldb_register_samba_handlers() and ldif handlers code I did earlier this week. There are still three parts of this conversion I have not finished: - the ltdb index records need to use the string form of the objectSid (to keep the DNs sane). Until that it done I have disabled indexing on objectSid, which is a big performance hit, but allows us to pass all our tests while I rejig the indexing system to use a externally supplied conversion function - I haven't yet put in place the code that allows client to use the "S-xxx-yyy" form for objectSid in ldap search expressions. w2k3 supports this, presumably by looking for the "S-" prefix to determine what type of objectSid form is being used by the client. I have been working on ways to handle this, but am not happy with them yet so they aren't part of this patch - I need to change pidl to generate push functions that take a "const void *" instead of a "void*" for the data pointer. That will fix the couple of new warnings this code generates. Luckily it many places the conversion to NDR formatted records actually simplified the code, as it means we no longer need as many calls to dom_sid_parse_talloc(). In some places it got more complex, but not many. (This used to be commit d40bc2fa8ddd43560315688eebdbe98bdd02756c)
90 lines
2.4 KiB
C
90 lines
2.4 KiB
C
/*
|
|
ldb database library - ldif handlers for Samba
|
|
|
|
Copyright (C) Andrew Tridgell 2005
|
|
|
|
** NOTE! The following LGPL license applies to the ldb
|
|
** library. This does NOT imply that all of Samba is released
|
|
** under the LGPL
|
|
|
|
This library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2 of the License, or (at your option) any later version.
|
|
|
|
This library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with this library; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*/
|
|
|
|
#include "includes.h"
|
|
#include "ldb/include/ldb.h"
|
|
#include "ldb/include/ldb_private.h"
|
|
#include "librpc/gen_ndr/ndr_security.h"
|
|
|
|
/*
|
|
convert a ldif formatted objectSid to a NDR formatted blob
|
|
*/
|
|
static int ldif_read_objectSid(struct ldb_context *ldb, const struct ldb_val *in,
|
|
struct ldb_val *out)
|
|
{
|
|
struct dom_sid *sid;
|
|
NTSTATUS status;
|
|
sid = dom_sid_parse_talloc(ldb, in->data);
|
|
if (sid == NULL) {
|
|
return -1;
|
|
}
|
|
status = ndr_push_struct_blob(out, ldb, sid,
|
|
(ndr_push_flags_fn_t)ndr_push_dom_sid);
|
|
talloc_free(sid);
|
|
if (!NT_STATUS_IS_OK(status)) {
|
|
return -1;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
convert a NDR formatted blob to a ldif formatted objectSid
|
|
*/
|
|
static int ldif_write_objectSid(struct ldb_context *ldb, const struct ldb_val *in,
|
|
struct ldb_val *out)
|
|
{
|
|
struct dom_sid *sid;
|
|
NTSTATUS status;
|
|
sid = talloc(ldb, struct dom_sid);
|
|
if (sid == NULL) {
|
|
return -1;
|
|
}
|
|
status = ndr_pull_struct_blob(in, sid, sid,
|
|
(ndr_pull_flags_fn_t)ndr_pull_dom_sid);
|
|
if (!NT_STATUS_IS_OK(status)) {
|
|
talloc_free(sid);
|
|
return -1;
|
|
}
|
|
out->data = dom_sid_string(ldb, sid);
|
|
talloc_free(sid);
|
|
if (out->data == NULL) {
|
|
return -1;
|
|
}
|
|
out->length = strlen(out->data);
|
|
return 0;
|
|
}
|
|
|
|
|
|
static const struct ldb_ldif_handler samba_handlers[] = {
|
|
{ "objectSid", ldif_read_objectSid, ldif_write_objectSid }
|
|
};
|
|
|
|
/*
|
|
register the samba ldif handlers
|
|
*/
|
|
int ldb_register_samba_handlers(struct ldb_context *ldb)
|
|
{
|
|
return ldb_ldif_add_handlers(ldb, samba_handlers, ARRAY_SIZE(samba_handlers));
|
|
}
|