diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-08-20 16:02:13 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-08-20 16:02:13 +1000 |
| commit | e7db2325e9beaf4a329c4b7274c998b5952073b6 (patch) | |
| tree | 02f8f00690b9af2eaf2ca66ca14853382d7ecbd6 /source4 | |
| parent | 4bfab3bedbf36979424e3d284e8bd67c8224d47b (diff) | |
| parent | 9dffeab5a8770de7c97e1b4e88fda372e5760147 (diff) | |
| download | samba-e7db2325e9beaf4a329c4b7274c998b5952073b6.tar.gz samba-e7db2325e9beaf4a329c4b7274c998b5952073b6.tar.bz2 samba-e7db2325e9beaf4a329c4b7274c998b5952073b6.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
(This used to be commit ae502f9e3991209d70a745bef3a3e6e7484cdb5f)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/lib/ldb/common/ldb_attributes.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source4/lib/ldb/common/ldb_attributes.c b/source4/lib/ldb/common/ldb_attributes.c index 1e69f412df..3b9d01682c 100644 --- a/source4/lib/ldb/common/ldb_attributes.c +++ b/source4/lib/ldb/common/ldb_attributes.c @@ -64,6 +64,10 @@ int ldb_schema_attribute_add_with_syntax(struct ldb_context *ldb, for (i = 0; i < ldb->schema.num_attributes; i++) { int cmp = ldb_attr_cmp(attribute, a[i].name); if (cmp == 0) { + /* silently ignore attempts to overwrite fixed attributes */ + if (a[i].flags & LDB_ATTR_FLAG_FIXED) { + return 0; + } if (a[i].flags & LDB_ATTR_FLAG_ALLOCATED) { talloc_free(discard_const_p(char, a[i].name)); } |