Author: tridge Date: 2005-05-13 06:07:53 +0000 (Fri, 13 May 2005) New Revision: 6763
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6763 Log: added functions in libcli/ldap/ to binary encode some NDR structures into ldap friendly filter strings Added: branches/SAMBA_4_0/source/libcli/ldap/ldap_ndr.c Modified: branches/SAMBA_4_0/source/libcli/ldap/config.mk branches/SAMBA_4_0/source/libcli/ldap/ldap.c branches/SAMBA_4_0/source/libcli/ldap/ldap.h Changeset: Modified: branches/SAMBA_4_0/source/libcli/ldap/config.mk =================================================================== --- branches/SAMBA_4_0/source/libcli/ldap/config.mk 2005-05-13 06:06:19 UTC (rev 6762) +++ branches/SAMBA_4_0/source/libcli/ldap/config.mk 2005-05-13 06:07:53 UTC (rev 6763) @@ -3,7 +3,8 @@ [SUBSYSTEM::LIBCLI_LDAP] ADD_OBJ_FILES = libcli/ldap/ldap.o \ libcli/ldap/ldap_client.o \ - libcli/ldap/ldap_ldif.o + libcli/ldap/ldap_ldif.o \ + libcli/ldap/ldap_ndr.o NOPROTO=YES # End SUBSYSTEM LIBCLI_LDAP ################################# Modified: branches/SAMBA_4_0/source/libcli/ldap/ldap.c =================================================================== --- branches/SAMBA_4_0/source/libcli/ldap/ldap.c 2005-05-13 06:06:19 UTC (rev 6762) +++ branches/SAMBA_4_0/source/libcli/ldap/ldap.c 2005-05-13 06:07:53 UTC (rev 6763) @@ -144,7 +144,7 @@ encode a blob as a RFC2254 binary string, escaping any non-printable or '\' characters */ -static const char *ldap_binary_encode(TALLOC_CTX *mem_ctx, DATA_BLOB blob) +const char *ldap_binary_encode(TALLOC_CTX *mem_ctx, DATA_BLOB blob) { int i; char *ret; @@ -1345,3 +1345,6 @@ { return ldap_parse_filter(mem_ctx, &s); } + + + Modified: branches/SAMBA_4_0/source/libcli/ldap/ldap.h =================================================================== --- branches/SAMBA_4_0/source/libcli/ldap/ldap.h 2005-05-13 06:06:19 UTC (rev 6762) +++ branches/SAMBA_4_0/source/libcli/ldap/ldap.h 2005-05-13 06:07:53 UTC (rev 6763) @@ -325,6 +325,7 @@ char **host, uint16_t *port, BOOL *ldaps); struct ldap_parse_tree *ldap_parse_filter_string(TALLOC_CTX *mem_ctx, const char *s); +const char *ldap_binary_encode(TALLOC_CTX *mem_ctx, DATA_BLOB blob); /* The following definitions come from libcli/ldap/ldap_client.c */ @@ -378,4 +379,10 @@ int *num_mods); struct ldap_message *ldap_ldif2msg(TALLOC_CTX *mem_ctx, const char *s); +/* The following definitions come from libcli/ldap/ldap_ndr.c */ + +const char *ldap_encode_ndr_uint32(TALLOC_CTX *mem_ctx, uint32_t value); +const char *ldap_encode_ndr_dom_sid(TALLOC_CTX *mem_ctx, struct dom_sid *sid); +const char *ldap_encode_ndr_GUID(TALLOC_CTX *mem_ctx, struct GUID *guid); + #endif Added: branches/SAMBA_4_0/source/libcli/ldap/ldap_ndr.c =================================================================== --- branches/SAMBA_4_0/source/libcli/ldap/ldap_ndr.c 2005-05-13 06:06:19 UTC (rev 6762) +++ branches/SAMBA_4_0/source/libcli/ldap/ldap_ndr.c 2005-05-13 06:07:53 UTC (rev 6763) @@ -0,0 +1,76 @@ +/* + Unix SMB/CIFS mplementation. + + wrap/unwrap NDR encoded elements for ldap calls + + Copyright (C) Andrew Tridgell 2005 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program 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 General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +*/ + +#include "includes.h" +#include "libcli/ldap/ldap.h" +#include "librpc/gen_ndr/ndr_security.h" + +/* + encode a NDR uint32 as a ldap filter element +*/ +const char *ldap_encode_ndr_uint32(TALLOC_CTX *mem_ctx, uint32_t value) +{ + uint8_t buf[4]; + DATA_BLOB blob; + SIVAL(buf, 0, value); + blob.data = buf; + blob.length = 4; + return ldap_binary_encode(mem_ctx, blob); +} + +/* + encode a NDR dom_sid as a ldap filter element +*/ +const char *ldap_encode_ndr_dom_sid(TALLOC_CTX *mem_ctx, struct dom_sid *sid) +{ + DATA_BLOB blob; + NTSTATUS status; + const char *ret; + status = ndr_push_struct_blob(&blob, mem_ctx, sid, + (ndr_push_flags_fn_t)ndr_push_dom_sid); + if (!NT_STATUS_IS_OK(status)) { + return NULL; + } + ret = ldap_binary_encode(mem_ctx, blob); + data_blob_free(&blob); + return ret; +} + + +/* + encode a NDR GUID as a ldap filter element +*/ +const char *ldap_encode_ndr_GUID(TALLOC_CTX *mem_ctx, struct GUID *guid) +{ + DATA_BLOB blob; + NTSTATUS status; + const char *ret; + status = ndr_push_struct_blob(&blob, mem_ctx, guid, + (ndr_push_flags_fn_t)ndr_push_GUID); + if (!NT_STATUS_IS_OK(status)) { + return NULL; + } + ret = ldap_binary_encode(mem_ctx, blob); + data_blob_free(&blob); + return ret; +}