diff options
| author | Andrew Tridgell <tridge@samba.org> | 2008-08-20 15:46:58 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2008-08-20 15:46:58 +1000 |
| commit | 7e1c62f8b64c9e42018bea33557af31fb7fa7414 (patch) | |
| tree | b6f34fb1b15227f5194acb8bb5c16aff78c7a5c1 | |
| parent | e1188406fb1e42ac04abc46f8a09522a29b83178 (diff) | |
| download | samba-7e1c62f8b64c9e42018bea33557af31fb7fa7414.tar.gz samba-7e1c62f8b64c9e42018bea33557af31fb7fa7414.tar.bz2 samba-7e1c62f8b64c9e42018bea33557af31fb7fa7414.zip | |
added a LDB_ATTR_FLAG_FIXED so the schema module can mark attributes
as never to be removed.
(This used to be commit 9dce558206a2ce70c69b9b6c5c3c9c58ee165b1d)
| -rw-r--r-- | source4/lib/ldb/common/ldb_attributes.c | 5 | ||||
| -rw-r--r-- | source4/lib/ldb/include/ldb.h | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/source4/lib/ldb/common/ldb_attributes.c b/source4/lib/ldb/common/ldb_attributes.c index effd93ae26..81aab52a08 100644 --- a/source4/lib/ldb/common/ldb_attributes.c +++ b/source4/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/source4/lib/ldb/include/ldb.h b/source4/lib/ldb/include/ldb.h index 0338ae1d93..7ce6103422 100644 --- a/source4/lib/ldb/include/ldb.h +++ b/source4/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 |