From: Andrew Bartlett Date: Fri, 30 Aug 2019 10:05:37 +0000 (+1200) Subject: dsdb: Remove unused simple_dn module X-Git-Tag: tevent-0.10.1~43 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=72201055f53a9a59c90fa6fe94cbc7e968a2b35a;p=thirdparty%2Fsamba.git dsdb: Remove unused simple_dn module This became unused with 2b0fc74a0916a6ab0d5ac007cc5e100d4682b2ea that removed the last of the support for the LDAP Backend Signed-off-by: Andrew Bartlett Reviewed-by: Garming Sam --- diff --git a/source4/dsdb/samdb/ldb_modules/simple_dn.c b/source4/dsdb/samdb/ldb_modules/simple_dn.c deleted file mode 100644 index 80ef3b56cd4..00000000000 --- a/source4/dsdb/samdb/ldb_modules/simple_dn.c +++ /dev/null @@ -1,79 +0,0 @@ -/* - ldb database library - - Copyright (C) Andrew Bartlett 2010 - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . -*/ -/* - * Name: ldb - * - * Component: ldb dn simplification module - * - * Description: Module to strip off extended componenets from search DNs (not accepted by OpenLDAP backends) - * - * Author: Andrew Bartlett - */ - - - -#include "includes.h" -#include "ldb_module.h" -#include "dsdb/samdb/ldb_modules/util.h" - -/* search */ -static int simple_dn_search(struct ldb_module *module, struct ldb_request *req) -{ - struct ldb_context *ldb; - struct ldb_request *down_req; - struct ldb_dn *new_base; - int ret; - - ldb = ldb_module_get_ctx(module); - - new_base = ldb_dn_copy(req, req->op.search.base); - if (!new_base) { - return ldb_module_oom(module); - } - - ldb_dn_remove_extended_components(new_base); - - ret = ldb_build_search_req_ex(&down_req, - ldb, req, - new_base, - req->op.search.scope, - req->op.search.tree, - req->op.search.attrs, - req->controls, - req, dsdb_next_callback, - req); - LDB_REQ_SET_LOCATION(down_req); - if (ret != LDB_SUCCESS) { - return ldb_operr(ldb); - } - talloc_steal(down_req, new_base); - - return ldb_next_request(module, down_req); -} - -static const struct ldb_module_ops ldb_simple_dn_module_ops = { - .name = "simple_dn", - .search = simple_dn_search -}; - -int ldb_simple_dn_module_init(const char *version) -{ - LDB_MODULE_CHECK_VERSION(version); - return ldb_register_module(&ldb_simple_dn_module_ops); -} diff --git a/source4/dsdb/samdb/ldb_modules/wscript_build_server b/source4/dsdb/samdb/ldb_modules/wscript_build_server index 155e9fb8bbc..877c83d3eb1 100644 --- a/source4/dsdb/samdb/ldb_modules/wscript_build_server +++ b/source4/dsdb/samdb/ldb_modules/wscript_build_server @@ -426,15 +426,6 @@ bld.SAMBA_MODULE('ldb_aclread', deps='talloc samba-security samdb DSDB_MODULE_HELPERS', ) -bld.SAMBA_MODULE('ldb_simple_dn', - source='simple_dn.c', - subsystem='ldb', - init_function='ldb_simple_dn_module_init', - module_init_name='ldb_init_module', - internal_module=False, - deps='talloc DSDB_MODULE_HELPERS' - ) - bld.SAMBA_MODULE('ldb_dirsync', source='dirsync.c', subsystem='ldb',