From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 20 Aug 2008 05:46:58 +0000 (+1000)
Subject: added a LDB_ATTR_FLAG_FIXED so the schema module can mark attributes
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9dce558206a2ce70c69b9b6c5c3c9c58ee165b1d;p=thirdparty%2Fsamba.git

added a LDB_ATTR_FLAG_FIXED so the schema module can mark attributes
as never to be removed.
---

diff --git a/source/lib/ldb/common/ldb_attributes.c b/source/lib/ldb/common/ldb_attributes.c
index effd93ae267..81aab52a089 100644
--- a/source/lib/ldb/common/ldb_attributes.c
+++ b/source/lib/ldb/common/ldb_attributes.c
@@ -149,6 +149,11 @@ void ldb_schema_attribute_remove(struct ldb_context *ldb, const char *name)
 		return;
 	}
 
+	/* FIXED attributes are never removed */
+	if (a->flags & LDB_ATTR_FLAG_FIXED) {
+		return;
+	}
+
 	if (a->flags & LDB_ATTR_FLAG_ALLOCATED) {
 		talloc_free(discard_const_p(char, a->name));
 	}
diff --git a/source/lib/ldb/include/ldb.h b/source/lib/ldb/include/ldb.h
index 0338ae1d938..7ce61034228 100644
--- a/source/lib/ldb/include/ldb.h
+++ b/source/lib/ldb/include/ldb.h
@@ -358,9 +358,9 @@ const struct ldb_schema_attribute *ldb_schema_attribute_by_name(struct ldb_conte
 #define LDB_ATTR_FLAG_ALLOCATED    (1<<1) 
 
 /**
-   The attribute is constructed from other attributes
+   The attribute is supplied by the application and should not be removed
 */
-#define LDB_ATTR_FLAG_CONSTRUCTED  (1<<1) 
+#define LDB_ATTR_FLAG_FIXED        (1<<2) 
 
 /**
   LDAP attribute syntax for a DN