diff options
| author | Andrew Tridgell <tridge@samba.org> | 2009-09-15 10:02:04 -0700 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2009-09-15 10:02:04 -0700 |
| commit | efe9f952504a5a3114cada5f0caed315c4bc654d (patch) | |
| tree | 158ae6f521152da00b0bd008aaef2a84e6656259 /source4/dsdb | |
| parent | 5464ce6df678a6ce3022f4a30fd9553996cefb69 (diff) | |
| parent | 8fa5e567e76d4edb818d4cd88886918470d78ad1 (diff) | |
| download | samba-efe9f952504a5a3114cada5f0caed315c4bc654d.tar.gz samba-efe9f952504a5a3114cada5f0caed315c4bc654d.tar.bz2 samba-efe9f952504a5a3114cada5f0caed315c4bc654d.zip | |
Merge branch 'master' of /home/tridge/samba/git/combined
Diffstat (limited to 'source4/dsdb')
| -rw-r--r-- | source4/dsdb/repl/replicated_objects.c | 5 | ||||
| -rw-r--r-- | source4/dsdb/schema/schema_init.c | 4 | ||||
| -rw-r--r-- | source4/dsdb/schema/schema_set.c | 4 |
3 files changed, 9 insertions, 4 deletions
diff --git a/source4/dsdb/repl/replicated_objects.c b/source4/dsdb/repl/replicated_objects.c index fb6d4c18ec..2f4efc0fee 100644 --- a/source4/dsdb/repl/replicated_objects.c +++ b/source4/dsdb/repl/replicated_objects.c @@ -297,6 +297,11 @@ WERROR dsdb_extended_replicated_objects_commit(struct ldb_context *ldb, return WERR_FOOBAR; } + DEBUG(2,("Replicated %u objects (%u linked attributes) for %s\n", + out->num_objects, out->linked_attributes_count, + ldb_dn_get_linearized(out->partition_dn))); + + if (_out) { *_out = out; } else { diff --git a/source4/dsdb/schema/schema_init.c b/source4/dsdb/schema/schema_init.c index 3b701ad31c..9f7d967158 100644 --- a/source4/dsdb/schema/schema_init.c +++ b/source4/dsdb/schema/schema_init.c @@ -967,7 +967,7 @@ int dsdb_schema_from_ldb_results(TALLOC_CTX *mem_ctx, struct ldb_context *ldb, return LDB_ERR_CONSTRAINT_VIOLATION; } - DLIST_ADD_END(schema->attributes, sa, struct dsdb_attribute *); + DLIST_ADD(schema->attributes, sa); } for (i=0; i < objectclass_res->count; i++) { @@ -988,7 +988,7 @@ int dsdb_schema_from_ldb_results(TALLOC_CTX *mem_ctx, struct ldb_context *ldb, return LDB_ERR_CONSTRAINT_VIOLATION; } - DLIST_ADD_END(schema->classes, sc, struct dsdb_class *); + DLIST_ADD(schema->classes, sc); } schema->fsmo.master_dn = ldb_msg_find_attr_as_dn(ldb, schema, schema_res->msgs[0], "fSMORoleOwner"); diff --git a/source4/dsdb/schema/schema_set.c b/source4/dsdb/schema/schema_set.c index 6745bde127..6f09f63596 100644 --- a/source4/dsdb/schema/schema_set.c +++ b/source4/dsdb/schema/schema_set.c @@ -555,7 +555,7 @@ WERROR dsdb_set_schema_from_ldif(struct ldb_context *ldb, const char *pf, const goto failed; } - DLIST_ADD_END(schema->attributes, sa, struct dsdb_attribute *); + DLIST_ADD(schema->attributes, sa); } else if (is_sc) { struct dsdb_class *sc; @@ -569,7 +569,7 @@ WERROR dsdb_set_schema_from_ldif(struct ldb_context *ldb, const char *pf, const goto failed; } - DLIST_ADD_END(schema->classes, sc, struct dsdb_class *); + DLIST_ADD(schema->classes, sc); } } |