[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  0e31a3a... s3-ldb: fix build warning.
      from  0b2d965... s4: Reorganized dsHeuristics reset so the code can be reused

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 0e31a3af9457ff425efc19f952a4a9d07211e068
Author: Günther Deschner <gd at samba.org>
Date:   Tue Jul 13 16:45:52 2010 +0200

    s3-ldb: fix build warning.
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 source3/lib/ldb_compat.c |   45 +--------------------------------------------
 1 files changed, 1 insertions(+), 44 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/ldb_compat.c b/source3/lib/ldb_compat.c
index e6e0f08..d3b1266 100644
--- a/source3/lib/ldb_compat.c
+++ b/source3/lib/ldb_compat.c
@@ -22,6 +22,7 @@
 */
 
 #include "includes.h"
+#include "lib/ldb_compat.h"
 
 static struct ldb_parse_tree *ldb_parse_filter(void *mem_ctx, const char **s);
 
@@ -48,50 +49,6 @@ static int ldb_parse_hex2char(const char *x)
 
 
 /*
-   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;
-};
-
-/*
    decode a RFC2254 binary string representation of a buffer.
    Used in LDAP filters.
 */


-- 
Samba Shared Repository