diff options
author | Andrew Bartlett <abartlet@samba.org> | 2011-07-05 10:14:12 +1000 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2011-10-07 17:45:20 +1100 |
commit | 36b2227eca55e769813eecc97366ba18a2832fb3 (patch) | |
tree | e7ad966a443a67762814a256d1ef3446471b8d27 /source3/lib/ldb_compat.h | |
parent | ed41edddde6b81b759d4b4c8d9e59ee541a37c0a (diff) | |
download | samba-36b2227eca55e769813eecc97366ba18a2832fb3.tar.gz samba-36b2227eca55e769813eecc97366ba18a2832fb3.tar.xz samba-36b2227eca55e769813eecc97366ba18a2832fb3.zip |
ldb: use ldb directly rather than via a copy
This avoids needing to manually sync the two files, which due to the
top level build must be API compatible at all times anyway.
The most important recent change was:
commit e3b76bd6205acfc1a89fbcab5d9588b32cb47b88
Author: Andrew Tridgell <tridge@samba.org>
Date: Thu Jul 28 15:51:31 2011 +1000
ldb: fixed a search expression parse bug
However, as we always control the search expression in the callers to
this code, no backport to other releases is required.
Andrew Bartlett
Diffstat (limited to 'source3/lib/ldb_compat.h')
-rw-r--r-- | source3/lib/ldb_compat.h | 87 |
1 files changed, 0 insertions, 87 deletions
diff --git a/source3/lib/ldb_compat.h b/source3/lib/ldb_compat.h deleted file mode 100644 index f05104a5c6..0000000000 --- a/source3/lib/ldb_compat.h +++ /dev/null @@ -1,87 +0,0 @@ -/* - ldb database library - - Copyright (C) Andrew Tridgell 2004 - - ** 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 3 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, see <http://www.gnu.org/licenses/>. -*/ - -#ifndef __LDB_COMPAT_H__ -#define __LDB_COMPAT_H__ - -char *ldb_binary_encode(void *mem_ctx, struct ldb_val val); -struct ldb_parse_tree *ldb_parse_tree(void *mem_ctx, const char *s); - -/* - structures for ldb_parse_tree handling code -*/ -enum ldb_parse_op { LDB_OP_AND=1, LDB_OP_OR=2, LDB_OP_NOT=3, - LDB_OP_EQUALITY=4, LDB_OP_SUBSTRING=5, - LDB_OP_GREATER=6, LDB_OP_LESS=7, LDB_OP_PRESENT=8, - LDB_OP_APPROX=9, LDB_OP_EXTENDED=10 }; - -struct ldb_parse_tree { - enum ldb_parse_op operation; - union { - struct { - struct ldb_parse_tree *child; - } isnot; - struct { - const char *attr; - struct ldb_val value; - } equality; - struct { - const char *attr; - int start_with_wildcard; - int end_with_wildcard; - struct ldb_val **chunks; - } substring; - struct { - const char *attr; - } present; - struct { - const char *attr; - struct ldb_val value; - } comparison; - struct { - const char *attr; - int dnAttributes; - char *rule_id; - struct ldb_val value; - } extended; - struct { - unsigned int num_elements; - struct ldb_parse_tree **elements; - } list; - } u; -}; - -struct ldb_message_element { - unsigned int flags; - const char *name; - unsigned int num_values; - struct ldb_val *values; -}; - -struct ldb_control { - const char *oid; - int critical; - void *data; -}; - -#endif |