diff options
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/repl_meta_data.c | 50 | ||||
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/samldb.c | 5 | ||||
| -rw-r--r-- | source4/dsdb/samdb/samdb.h | 5 | ||||
| -rw-r--r-- | source4/setup/schema_samba4.ldif | 2 |
4 files changed, 1 insertions, 61 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c index 4b12c68175..53fd46f116 100644 --- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c +++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c @@ -168,23 +168,6 @@ static int add_uint64_element(struct ldb_message *msg, const char *attr, uint64_ return 0; } -static int replmd_add_replicated(struct ldb_module *module, struct ldb_request *req, struct ldb_control *ctrl) -{ - struct ldb_control **saved_ctrls; - int ret; - - ldb_debug(module->ldb, LDB_DEBUG_TRACE, "replmd_add_replicated\n"); - - if (!save_controls(ctrl, req, &saved_ctrls)) { - return LDB_ERR_OPERATIONS_ERROR; - } - - ret = ldb_next_request(module, req); - req->controls = saved_ctrls; - - return ret; -} - static int replmd_add_originating(struct ldb_module *module, struct ldb_request *req) { struct ldb_request *down_req; @@ -265,39 +248,14 @@ static int replmd_add_originating(struct ldb_module *module, struct ldb_request static int replmd_add(struct ldb_module *module, struct ldb_request *req) { - struct ldb_control *ctrl; - /* do not manipulate our control entries */ if (ldb_dn_is_special(req->op.add.message->dn)) { return ldb_next_request(module, req); } - ctrl = get_control_from_list(req->controls, DSDB_CONTROL_REPLICATED_OBJECT_OID); - if (ctrl) { - /* handle replicated objects different */ - return replmd_add_replicated(module, req, ctrl); - } - return replmd_add_originating(module, req); } -static int replmd_modify_replicated(struct ldb_module *module, struct ldb_request *req, struct ldb_control *ctrl) -{ - struct ldb_control **saved_ctrls; - int ret; - - ldb_debug(module->ldb, LDB_DEBUG_TRACE, "replmd_modify_replicated\n"); - - if (!save_controls(ctrl, req, &saved_ctrls)) { - return LDB_ERR_OPERATIONS_ERROR; - } - - ret = ldb_next_request(module, req); - req->controls = saved_ctrls; - - return ret; -} - static int replmd_modify_originating(struct ldb_module *module, struct ldb_request *req) { struct ldb_request *down_req; @@ -352,19 +310,11 @@ static int replmd_modify_originating(struct ldb_module *module, struct ldb_reque static int replmd_modify(struct ldb_module *module, struct ldb_request *req) { - struct ldb_control *ctrl; - /* do not manipulate our control entries */ if (ldb_dn_is_special(req->op.mod.message->dn)) { return ldb_next_request(module, req); } - ctrl = get_control_from_list(req->controls, DSDB_CONTROL_REPLICATED_OBJECT_OID); - if (ctrl) { - /* handle replicated objects different */ - return replmd_modify_replicated(module, req, ctrl); - } - return replmd_modify_originating(module, req); } diff --git a/source4/dsdb/samdb/ldb_modules/samldb.c b/source4/dsdb/samdb/ldb_modules/samldb.c index 07d77ee3fc..1c1ff0ea6e 100644 --- a/source4/dsdb/samdb/ldb_modules/samldb.c +++ b/source4/dsdb/samdb/ldb_modules/samldb.c @@ -680,11 +680,6 @@ static int samldb_add(struct ldb_module *module, struct ldb_request *req) return ldb_next_request(module, req); } - if (get_control_from_list(req->controls, DSDB_CONTROL_REPLICATED_OBJECT_OID)) { - /* if it's a replicated object we have nothing to do */ - return ldb_next_request(module, req); - } - /* is user or computer? */ if ((samdb_find_attribute(module->ldb, msg, "objectclass", "user") != NULL) || (samdb_find_attribute(module->ldb, msg, "objectclass", "computer") != NULL)) { diff --git a/source4/dsdb/samdb/samdb.h b/source4/dsdb/samdb/samdb.h index f1b5b8616d..678ae09969 100644 --- a/source4/dsdb/samdb/samdb.h +++ b/source4/dsdb/samdb/samdb.h @@ -35,11 +35,6 @@ struct dsdb_extended_replicated_objects; #include "dsdb/schema/schema.h" #include "dsdb/samdb/samdb_proto.h" -#define DSDB_CONTROL_REPLICATED_OBJECT_OID "1.3.6.1.4.1.7165.4.3.1" -struct dsdb_control_replicated_object { - uint8_t __dummy; -}; - #define DSDB_EXTENDED_REPLICATED_OBJECTS_OID "1.3.6.1.4.1.7165.4.4.1" struct dsdb_extended_replicated_object { struct ldb_message *msg; diff --git a/source4/setup/schema_samba4.ldif b/source4/setup/schema_samba4.ldif index 217680b369..cf991414ba 100644 --- a/source4/setup/schema_samba4.ldif +++ b/source4/setup/schema_samba4.ldif @@ -147,7 +147,7 @@ attributeID: 1.3.6.1.4.1.5322.10.1.10 attributeSyntax: 2.5.5.10 oMSyntax: 4 -#Allocated: DSDB_CONTROL_REPLICATED_OBJECT_OID 1.3.6.1.4.1.7165.4.3.1 +#Allocated: (not used anymore) DSDB_CONTROL_REPLICATED_OBJECT_OID 1.3.6.1.4.1.7165.4.3.1 #Allocated: DSDB_EXTENDED_REPLICATED_OBJECTS_OID 1.3.6.1.4.1.7165.4.4.1 |