From 5dbebbe2add359da8c416634e3ec2d8e2569478a Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sun, 16 Jan 2005 20:48:53 +0000 Subject: r4781: the tolower() in schema.c is a premature optimisation. I suspect the "distinguishedName" checking in that module is incorrect and should be removed, but meanwhile, lets not make it slow down the compile of every other module. (This used to be commit 6534ce650bef7405e0926c9b75b185943429ed18) --- source4/include/includes.h | 4 ---- source4/lib/ldb/modules/schema.c | 17 ++++++++--------- 2 files changed, 8 insertions(+), 13 deletions(-) (limited to 'source4') diff --git a/source4/include/includes.h b/source4/include/includes.h index b6f49ed827..cc03607e91 100644 --- a/source4/include/includes.h +++ b/source4/include/includes.h @@ -53,10 +53,6 @@ #include #include -#ifdef HAVE_CTYPE_H -#include -#endif - #ifdef HAVE_STDINT_H #include #endif diff --git a/source4/lib/ldb/modules/schema.c b/source4/lib/ldb/modules/schema.c index 114c7f44aa..7a772d87aa 100644 --- a/source4/lib/ldb/modules/schema.c +++ b/source4/lib/ldb/modules/schema.c @@ -35,6 +35,7 @@ #include "includes.h" #include "ldb/include/ldb.h" #include "ldb/include/ldb_private.h" +#include struct attribute_syntax { const char *name; @@ -103,15 +104,13 @@ static int schema_attr_cmp(const char *attr1, const char *attr2) ret = ldb_attr_cmp(attr1, attr2); if (ret != 0) { - if (tolower(*attr1) == 'd' && tolower(*attr2) == 'd') { - if ((ldb_attr_cmp("dn", attr1) == 0) && - (ldb_attr_cmp("distinguishedName", attr2) == 0)) { - return 0; - } - if ((ldb_attr_cmp("dn", attr2) == 0) && - (ldb_attr_cmp("distinguishedName", attr1) == 0)) { - return 0; - } + if ((ldb_attr_cmp("dn", attr1) == 0) && + (ldb_attr_cmp("distinguishedName", attr2) == 0)) { + return 0; + } + if ((ldb_attr_cmp("dn", attr2) == 0) && + (ldb_attr_cmp("distinguishedName", attr1) == 0)) { + return 0; } } return ret; -- cgit