sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-08 21:18:16 +03:00
Code

CVE-2023-4154 s4-dsdb: Remove DSDB_ACL_CHECKS_DIRSYNC_FLAG

Browse Source 
It's no longer used anywhere.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15424

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

(cherry picked from commit 8b4e6f7b3f)
This commit is contained in:
Joseph Sutton 2023-02-14 17:19:27 +13:00 committed by Jule Anger
parent 13eac83bc6
commit 563b7a5667
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source4/dsdb/samdb/ldb_modules/dirsync.c
View File

@ -1005,7 +1005,6 @@ static int dirsync_ldb_search(struct ldb_module *module, struct ldb_request *req
struct dirsync_context *dsc;
struct ldb_context *ldb;
struct ldb_parse_tree *new_tree = req->op.search.tree;
uint32_t flags = 0;
enum ndr_err_code ndr_err;
DATA_BLOB blob;
const char **attrs;
@ -1117,13 +1116,8 @@ static int dirsync_ldb_search(struct ldb_module *module, struct ldb_request *req
return ret;
}
talloc_free(acl_res);
} else {
flags |= DSDB_ACL_CHECKS_DIRSYNC_FLAG;
if (ret != LDB_SUCCESS) {
return ret;
}
} else if (ret != LDB_SUCCESS) {
return ret;
}
dsc->functional_level = dsdb_functional_level(ldb);
@ -1394,7 +1388,6 @@ static int dirsync_ldb_search(struct ldb_module *module, struct ldb_request *req
req->controls,
dsc, dirsync_search_callback,
req);
ldb_req_set_custom_flags(down_req, flags);
LDB_REQ_SET_LOCATION(down_req);
if (ret != LDB_SUCCESS) {
return ret;

1
source4/dsdb/samdb/samdb.h
View File

@ -374,7 +374,6 @@ struct dsdb_extended_dn_store_format {
#define DSDB_FULL_JOIN_REPLICATION_COMPLETED_OPAQUE_NAME "DSDB_FULL_JOIN_REPLICATION_COMPLETED"
#define DSDB_ACL_CHECKS_DIRSYNC_FLAG 0x1
#define DSDB_SAMDB_MINIMUM_ALLOWED_RID 1000
#define DSDB_METADATA_SCHEMA_SEQ_NUM "SCHEMA_SEQ_NUM"