From 6614f847e06551b08f59106352df02c5d13ff23a Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 3 Nov 2010 20:37:08 +1100 Subject: s4-ldb: fixed sorting of module names this should also fix a valgrind error on freebsd thanks to Matthieu for spotting this --- source4/lib/ldb/common/ldb_modules.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'source4/lib') diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c index 121890771d..1457298798 100644 --- a/source4/lib/ldb/common/ldb_modules.c +++ b/source4/lib/ldb/common/ldb_modules.c @@ -906,6 +906,11 @@ static int ldb_modules_load_one(const char *path, const char *version) return ret; } +static int qsort_string(const char **s1, const char **s2) +{ + return strcmp(*s1, *s2); +} + /* load all modules from the given ldb modules directory. This is run once @@ -961,7 +966,7 @@ static int ldb_modules_load_dir(const char *modules_dir, const char *version) closedir(dir); /* sort the directory, so we get consistent load ordering */ - qsort(modlist, num_modules, sizeof(modlist[0]), QSORT_CAST strcmp); + TYPESAFE_QSORT(modlist, num_modules, qsort_string); for (i=0; i