diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-03-19 10:18:35 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-03-19 10:18:35 +1100 |
| commit | b1b37e3776c6e6e20f42140a907e296b65cc0c62 (patch) | |
| tree | 601f049791bcbd9df9daef64b0b1003dbf1a413b /source4/lib/ldb/common | |
| parent | 9e6b0c28712ee77ce878809c8576826a3ba08d95 (diff) | |
| parent | 52669d84722c175555e17a222077f845d9aa958f (diff) | |
| download | samba-b1b37e3776c6e6e20f42140a907e296b65cc0c62.tar.gz samba-b1b37e3776c6e6e20f42140a907e296b65cc0c62.tar.bz2 samba-b1b37e3776c6e6e20f42140a907e296b65cc0c62.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit 400c16e7004bc3a881bb6efb99a273cdac87f70c)
Diffstat (limited to 'source4/lib/ldb/common')
| -rw-r--r-- | source4/lib/ldb/common/ldb.c | 2 | ||||
| -rw-r--r-- | source4/lib/ldb/common/ldb_modules.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/source4/lib/ldb/common/ldb.c b/source4/lib/ldb/common/ldb.c index 3c9ef3ff69..b51c288993 100644 --- a/source4/lib/ldb/common/ldb.c +++ b/source4/lib/ldb/common/ldb.c @@ -65,7 +65,7 @@ static struct backends_list_entry { #ifdef HAVE_LDB_LDAP #define LDAP_INIT &ldb_ldap_backend_ops, \ - &ldb_ildap_backend_ops, \ + &ldb_ldapi_backend_ops, \ &ldb_ldaps_backend_ops, #else #define LDAP_INIT diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c index 7da7b9ba34..34e0afbf93 100644 --- a/source4/lib/ldb/common/ldb_modules.c +++ b/source4/lib/ldb/common/ldb_modules.c @@ -129,11 +129,11 @@ static struct ops_list_entry { #ifndef STATIC_LIBLDB_MODULES #define STATIC_LIBLDB_MODULES \ - ldb_operational_module_ops, \ - ldb_rdn_name_module_ops, \ - ldb_paged_results_module_ops, \ - ldb_sort_module_ops, \ - ldb_asq_module_ops, \ + &ldb_operational_module_ops, \ + &ldb_rdn_name_module_ops, \ + &ldb_paged_results_module_ops, \ + &ldb_server_sort_module_ops, \ + &ldb_asq_module_ops, \ NULL #endif |