From 8ce8107a5bcd821585138fd6e7c690547b783bbf Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 5 Aug 2011 11:28:12 +1000 Subject: [PATCH] s4-dsdb: use dn_format shortcut to find DN format this saves some string comparisons --- source4/dsdb/samdb/ldb_modules/extended_dn_out.c | 4 ++-- source4/dsdb/samdb/ldb_modules/extended_dn_store.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source4/dsdb/samdb/ldb_modules/extended_dn_out.c b/source4/dsdb/samdb/ldb_modules/extended_dn_out.c index 3333a376441b..0f37bbebd434 100644 --- a/source4/dsdb/samdb/ldb_modules/extended_dn_out.c +++ b/source4/dsdb/samdb/ldb_modules/extended_dn_out.c @@ -76,7 +76,7 @@ static int extended_dn_out_dereference_setup_control(struct ldb_context *ldb, st } for (cur = schema->attributes; cur; cur = cur->next) { - if (dsdb_dn_oid_to_format(cur->syntax->ldap_oid) != DSDB_NORMAL_DN) { + if (cur->dn_format != DSDB_NORMAL_DN) { continue; } dereference_control->dereference @@ -508,7 +508,7 @@ static int extended_callback(struct ldb_request *req, struct ldb_reply *ares, } /* Look to see if this attributeSyntax is a DN */ - if (dsdb_dn_oid_to_format(attribute->syntax->ldap_oid) == DSDB_INVALID_DN) { + if (attribute->dn_format == DSDB_INVALID_DN) { continue; } diff --git a/source4/dsdb/samdb/ldb_modules/extended_dn_store.c b/source4/dsdb/samdb/ldb_modules/extended_dn_store.c index c4235201d9bb..57dc88330d61 100644 --- a/source4/dsdb/samdb/ldb_modules/extended_dn_store.c +++ b/source4/dsdb/samdb/ldb_modules/extended_dn_store.c @@ -325,7 +325,7 @@ static int extended_dn_add(struct ldb_module *module, struct ldb_request *req) } /* We only setup an extended DN GUID on DN elements */ - if (dsdb_dn_oid_to_format(schema_attr->syntax->ldap_oid) == DSDB_INVALID_DN) { + if (schema_attr->dn_format == DSDB_INVALID_DN) { continue; } @@ -400,7 +400,7 @@ static int extended_dn_modify(struct ldb_module *module, struct ldb_request *req } /* We only setup an extended DN GUID on these particular DN objects */ - if (dsdb_dn_oid_to_format(schema_attr->syntax->ldap_oid) == DSDB_INVALID_DN) { + if (schema_attr->dn_format == DSDB_INVALID_DN) { continue; } -- 2.34.1