From 51d5ddecc60b6e33e1d542cb92b2fe6736849398 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sun, 9 May 2004 12:30:30 +0000
Subject: r606: added a HIDDEN attribute on fields in ldb (in @ATTRIBUTES).
 This allows you to mark an attribute as only appearing in searches that
 explicitly name it. It will be used for attributes like nTSecurityDescriptor
 (This used to be commit f5cd3d733b71368ea652f8a4d653d87f45ff983f)

---
 source4/lib/ldb/ldb_tdb/ldb_cache.c  | 1 +
 source4/lib/ldb/ldb_tdb/ldb_search.c | 4 ++++
 source4/lib/ldb/ldb_tdb/ldb_tdb.h    | 1 +
 3 files changed, 6 insertions(+)

(limited to 'source4')

diff --git a/source4/lib/ldb/ldb_tdb/ldb_cache.c b/source4/lib/ldb/ldb_tdb/ldb_cache.c
index 87e9538d01..2a879f384c 100644
--- a/source4/lib/ldb/ldb_tdb/ldb_cache.c
+++ b/source4/lib/ldb/ldb_tdb/ldb_cache.c
@@ -222,6 +222,7 @@ int ltdb_attribute_flags(struct ldb_context *ldb, const char *attr_name)
 		{ "CASE_INSENSITIVE", LTDB_FLAG_CASE_INSENSITIVE },
 		{ "INTEGER", LTDB_FLAG_INTEGER },
 		{ "WILDCARD", LTDB_FLAG_WILDCARD },
+		{ "HIDDEN", LTDB_FLAG_HIDDEN },
 		{ NULL, 0}
 	};
 	size_t len;
diff --git a/source4/lib/ldb/ldb_tdb/ldb_search.c b/source4/lib/ldb/ldb_tdb/ldb_search.c
index e2c83202e9..25e22b3dd4 100644
--- a/source4/lib/ldb/ldb_tdb/ldb_search.c
+++ b/source4/lib/ldb/ldb_tdb/ldb_search.c
@@ -135,6 +135,10 @@ static int msg_add_all_elements(struct ldb_context *ldb, struct ldb_message *ret
 {
 	int i;
 	for (i=0;i<msg->num_elements;i++) {
+		int flags = ltdb_attribute_flags(ldb, msg->elements[i].name);
+		if (flags & LTDB_FLAG_HIDDEN) {
+			continue;
+		}
 		if (msg_add_element(ldb, ret, &msg->elements[i]) != 0) {
 			return -1;
 		}
diff --git a/source4/lib/ldb/ldb_tdb/ldb_tdb.h b/source4/lib/ldb/ldb_tdb/ldb_tdb.h
index c791cbe201..b678aac631 100644
--- a/source4/lib/ldb/ldb_tdb/ldb_tdb.h
+++ b/source4/lib/ldb/ldb_tdb/ldb_tdb.h
@@ -42,6 +42,7 @@ struct ltdb_private {
 #define LTDB_FLAG_INTEGER          (1<<1)
 #define LTDB_FLAG_WILDCARD         (1<<2)
 #define LTDB_FLAG_OBJECTCLASS      (1<<3)
+#define LTDB_FLAG_HIDDEN           (1<<4)
 
 
 #ifndef IVAL
-- 
cgit