diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-08-20 15:52:08 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-08-20 15:52:08 +1000 |
| commit | 4bfab3bedbf36979424e3d284e8bd67c8224d47b (patch) | |
| tree | 35531e74f8349559ab534a50f0938aa6479379f1 /source4/lib/ldb/common/ldb_attributes.c | |
| parent | 6e5f2454acb6ad11e799faed834fb4937651737d (diff) | |
| parent | f96f623854d3cd8bdaacd25979618f1cb53b8f93 (diff) | |
| download | samba-4bfab3bedbf36979424e3d284e8bd67c8224d47b.tar.gz samba-4bfab3bedbf36979424e3d284e8bd67c8224d47b.tar.xz samba-4bfab3bedbf36979424e3d284e8bd67c8224d47b.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
(This used to be commit 9fa48b3572cb4e55cfaa48a8b516a91904048573)
Diffstat (limited to 'source4/lib/ldb/common/ldb_attributes.c')
| -rw-r--r-- | source4/lib/ldb/common/ldb_attributes.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source4/lib/ldb/common/ldb_attributes.c b/source4/lib/ldb/common/ldb_attributes.c index ab6aa0b7341..1e69f412df9 100644 --- a/source4/lib/ldb/common/ldb_attributes.c +++ b/source4/lib/ldb/common/ldb_attributes.c @@ -157,6 +157,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)); } |