summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Dieter Wallnöfer <mdw@samba.org>2010-10-23 16:06:17 +0200
committerMatthias Dieter Wallnöfer <mdw@samba.org>2010-10-23 16:37:29 +0200
commit89c42a96fcaa43a7f2c9aef9e708276a639e0051 (patch)
tree15903897872d0269ae4cfdb37a4159ec453cb0bf
parenta60965b879f4b4c7fc8507073c6000967b80b724 (diff)
downloadsamba-89c42a96fcaa43a7f2c9aef9e708276a639e0051.tar.gz
samba-89c42a96fcaa43a7f2c9aef9e708276a639e0051.tar.bz2
samba-89c42a96fcaa43a7f2c9aef9e708276a639e0051.zip
ldb:rename LDB_CONTROL_BYPASSOPERATIONAL_OID into LDB_CONTROL_BYPASS_OPERATIONAL_OID
It's nicer to have this consistent with "BYPASS_PASSWORD_HASH".
-rw-r--r--source4/dsdb/samdb/ldb_modules/operational.c6
-rw-r--r--source4/lib/ldb/common/ldb_controls.c2
-rw-r--r--source4/lib/ldb/include/ldb.h2
-rw-r--r--source4/libcli/ldap/ldap_controls.c4
-rw-r--r--source4/setup/schema_samba4.ldif2
5 files changed, 8 insertions, 8 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/operational.c b/source4/dsdb/samdb/ldb_modules/operational.c
index 5a5b5e903a..e14b1d4cb0 100644
--- a/source4/dsdb/samdb/ldb_modules/operational.c
+++ b/source4/dsdb/samdb/ldb_modules/operational.c
@@ -777,9 +777,9 @@ static int operational_search(struct ldb_module *module, struct ldb_request *req
ac->controls_flags = talloc(ac, struct op_controls_flags);
/* remember if the SD_FLAGS_OID was set */
ac->controls_flags->sd = (ldb_request_get_control(req, LDB_CONTROL_SD_FLAGS_OID) != NULL);
- /* remember if the LDB_CONTROL_BYPASSOPERATIONAL_OID */
- ac->controls_flags->bypassoperational = (ldb_request_get_control(req,
- LDB_CONTROL_BYPASSOPERATIONAL_OID) != NULL);
+ /* remember if the LDB_CONTROL_BYPASS_OPERATIONAL_OID */
+ ac->controls_flags->bypassoperational =
+ (ldb_request_get_control(req, LDB_CONTROL_BYPASS_OPERATIONAL_OID) != NULL);
/* in the list of attributes we are looking for, rename any
attributes to the alias for any hidden attributes that can
diff --git a/source4/lib/ldb/common/ldb_controls.c b/source4/lib/ldb/common/ldb_controls.c
index f0afe8a96a..6ce08652a7 100644
--- a/source4/lib/ldb/common/ldb_controls.c
+++ b/source4/lib/ldb/common/ldb_controls.c
@@ -528,7 +528,7 @@ struct ldb_control **ldb_parse_control_strings(struct ldb_context *ldb, TALLOC_C
ldb_oom(ldb);
return NULL;
}
- ctrl[i]->oid = LDB_CONTROL_BYPASSOPERATIONAL_OID;
+ ctrl[i]->oid = LDB_CONTROL_BYPASS_OPERATIONAL_OID;
ctrl[i]->critical = crit;
ctrl[i]->data = NULL;
diff --git a/source4/lib/ldb/include/ldb.h b/source4/lib/ldb/include/ldb.h
index 7f4752e252..7edad06957 100644
--- a/source4/lib/ldb/include/ldb.h
+++ b/source4/lib/ldb/include/ldb.h
@@ -487,7 +487,7 @@ typedef int (*ldb_qsort_cmp_fn_t) (void *v1, void *v2, void *opaque);
It can be used to access attribute that used to be stored in the sam
and that are now calculated.
*/
-#define LDB_CONTROL_BYPASSOPERATIONAL_OID "1.3.6.1.4.1.7165.4.3.13"
+#define LDB_CONTROL_BYPASS_OPERATIONAL_OID "1.3.6.1.4.1.7165.4.3.13"
/**
OID for recalculate SD control. This control force the
diff --git a/source4/libcli/ldap/ldap_controls.c b/source4/libcli/ldap/ldap_controls.c
index 8cc0a61cb3..478481b422 100644
--- a/source4/libcli/ldap/ldap_controls.c
+++ b/source4/libcli/ldap/ldap_controls.c
@@ -1181,8 +1181,8 @@ static const struct ldap_control_handler ldap_known_controls[] = {
{ DSDB_CONTROL_APPLY_LINKS, NULL, NULL },
/* DSDB_CONTROL_BYPASS_PASSWORD_HASH_OID is internal only, and has no network representation */
{ DSDB_CONTROL_BYPASS_PASSWORD_HASH_OID, NULL, NULL },
-/* LDB_CONTROL_BYPASSOPERATIONAL_OID is internal only, and has no network representation */
- { LDB_CONTROL_BYPASSOPERATIONAL_OID, NULL, NULL },
+/* LDB_CONTROL_BYPASS_OPERATIONAL_OID is internal only, and has no network representation */
+ { LDB_CONTROL_BYPASS_OPERATIONAL_OID, NULL, NULL },
/* DSDB_CONTROL_CHANGEREPLMETADATA_OID is internal only, and has no network representation */
{ DSDB_CONTROL_CHANGEREPLMETADATA_OID, NULL, NULL },
/* DSDB_CONTROL_SEARCH_APPLY_ACCESS is internal only, and has no network representation */
diff --git a/source4/setup/schema_samba4.ldif b/source4/setup/schema_samba4.ldif
index 7fb37dec59..f703b5aaad 100644
--- a/source4/setup/schema_samba4.ldif
+++ b/source4/setup/schema_samba4.ldif
@@ -185,7 +185,7 @@
#Allocated: DSDB_CONTROL_PASSWORD_CHANGE_OID 1.3.6.1.4.1.7165.4.3.10
#Allocated: DSDB_CONTROL_APPLY_LINKS 1.3.6.1.4.1.7165.4.3.11
#Allocated: DSDB_CONTROL_BYPASS_PASSWORD_HASH_OID 1.3.6.1.4.1.7165.4.3.12
-#Allocated: LDB_CONTROL_BYPASSOPERATIONAL_OID 1.3.6.1.4.1.7165.4.3.13
+#Allocated: LDB_CONTROL_BYPASS_OPERATIONAL_OID 1.3.6.1.4.1.7165.4.3.13
#Allocated: DSDB_CONTROL_CHANGEREPLMETADATA_OID 1.3.6.1.4.1.7165.4.3.14
#Allocated: DSDB_CONTROL_SEARCH_APPLY_ACCESS 1.3.6.1.4.1.7165.4.3.15