diff options
| -rw-r--r-- | source4/dsdb/common/util.c | 11 | ||||
| -rw-r--r-- | source4/dsdb/common/util.h | 1 | ||||
| -rw-r--r-- | source4/dsdb/samdb/samdb.h | 3 | ||||
| -rw-r--r-- | source4/setup/schema_samba4.ldif | 1 |
4 files changed, 15 insertions, 1 deletions
diff --git a/source4/dsdb/common/util.c b/source4/dsdb/common/util.c index f5443ea59d..cf28f1dd01 100644 --- a/source4/dsdb/common/util.c +++ b/source4/dsdb/common/util.c @@ -2752,7 +2752,7 @@ WERROR dsdb_savereps(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx, struct ld el->values[i] = v; } - if (ldb_modify(sam_ctx, msg) != LDB_SUCCESS) { + if (dsdb_modify(sam_ctx, msg, 0) != LDB_SUCCESS) { DEBUG(0,("Failed to store %s - %s\n", attr, ldb_errstring(sam_ctx))); goto failed; } @@ -3658,6 +3658,15 @@ int dsdb_request_add_controls(struct ldb_request *req, uint32_t dsdb_flags) } } + if (dsdb_flags & DSDB_SEARCH_NO_GLOBAL_CATALOG) { + ret = ldb_request_add_control(req, + DSDB_CONTROL_NO_GLOBAL_CATALOG, + false, NULL); + if (ret != LDB_SUCCESS) { + return ret; + } + } + if (dsdb_flags & DSDB_SEARCH_SHOW_DELETED) { ret = ldb_request_add_control(req, LDB_CONTROL_SHOW_DELETED_OID, true, NULL); if (ret != LDB_SUCCESS) { diff --git a/source4/dsdb/common/util.h b/source4/dsdb/common/util.h index 0140f2956e..75ef49e1c3 100644 --- a/source4/dsdb/common/util.h +++ b/source4/dsdb/common/util.h @@ -36,6 +36,7 @@ #define DSDB_SEARCH_SHOW_RECYCLED 0x0400 #define DSDB_PROVISION 0x0800 #define DSDB_BYPASS_PASSWORD_HASH 0x1000 +#define DSDB_SEARCH_NO_GLOBAL_CATALOG 0x2000 bool is_attr_in_list(const char * const * attrs, const char *attr); diff --git a/source4/dsdb/samdb/samdb.h b/source4/dsdb/samdb/samdb.h index 8fb7b644ad..f60f34b2ae 100644 --- a/source4/dsdb/samdb/samdb.h +++ b/source4/dsdb/samdb/samdb.h @@ -82,6 +82,9 @@ struct dsdb_control_password_change_status { #define DSDB_CONTROL_PASSWORD_CHANGE_OID "1.3.6.1.4.1.7165.4.3.10" +/* passed when we want to get the behaviour of the non-global catalog port */ +#define DSDB_CONTROL_NO_GLOBAL_CATALOG "1.3.6.1.4.1.7165.4.3.17" + struct dsdb_control_password_change { const struct samr_Password *old_nt_pwd_hash; const struct samr_Password *old_lm_pwd_hash; diff --git a/source4/setup/schema_samba4.ldif b/source4/setup/schema_samba4.ldif index 1102fcd8d4..aa3426dbf8 100644 --- a/source4/setup/schema_samba4.ldif +++ b/source4/setup/schema_samba4.ldif @@ -191,6 +191,7 @@ #Allocated: DSDB_CONTROL_CHANGEREPLMETADATA_OID 1.3.6.1.4.1.7165.4.3.14 #Allocated: (not used anymore) DSDB_CONTROL_SEARCH_APPLY_ACCESS 1.3.6.1.4.1.7165.4.3.15 #Allocated: LDB_CONTROL_PROVISION_OID 1.3.6.1.4.1.7165.4.3.16 +#Allocated: DSDB_CONTROL_NO_GLOBAL_CATALOG 1.3.6.1.4.1.7165.4.3.17 # Extended 1.3.6.1.4.1.7165.4.4.x #Allocated: DSDB_EXTENDED_REPLICATED_OBJECTS_OID 1.3.6.1.4.1.7165.4.4.1 |