summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2009-11-24 11:36:34 +1100
committerAndrew Bartlett <abartlet@samba.org>2009-11-24 11:36:34 +1100
commit4062d2b3763c65c81bccf74cd2899d8c156ae99d (patch)
treea54be48e8b545fb3486f9c282ce578258b392706
parentfdb5914b278f19dea20ca9a7ae5e8b9557f5c70b (diff)
downloadsamba-4062d2b3763c65c81bccf74cd2899d8c156ae99d.tar.gz
samba-4062d2b3763c65c81bccf74cd2899d8c156ae99d.tar.bz2
samba-4062d2b3763c65c81bccf74cd2899d8c156ae99d.zip
s4:dsdb Handle LDAP backends correctly with new samba_dsdb system
The original code had the wrong module names, and use strcasecmp() incorrectly. Andrew Bartlett
-rw-r--r--source4/dsdb/samdb/ldb_modules/samba_dsdb.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/samba_dsdb.c b/source4/dsdb/samdb/ldb_modules/samba_dsdb.c
index bb3f8affd5..d561780569 100644
--- a/source4/dsdb/samdb/ldb_modules/samba_dsdb.c
+++ b/source4/dsdb/samdb/ldb_modules/samba_dsdb.c
@@ -199,8 +199,8 @@ static int samba_dsdb_init(struct ldb_module *module)
const char *extended_dn_module;
const char *extended_dn_module_ldb = "extended_dn_out_ldb";
- const char *extended_dn_module_fds = "extended_dn_out_ldb";
- const char *extended_dn_module_openldap = "extended_dn_out_ldb";
+ const char *extended_dn_module_fds = "extended_dn_out_fds";
+ const char *extended_dn_module_openldap = "extended_dn_out_openldap";
static const char *modules_list2[] = {"show_deleted",
"new_partition",
@@ -211,7 +211,7 @@ static int samba_dsdb_init(struct ldb_module *module)
static const char *fedora_ds_backend_modules[] = {
"nsuniqueid", "paged_searches", NULL };
static const char *openldap_backend_modules[] = {
- "nsuniqueid", "paged_searches", NULL };
+ "entryuuid", "paged_searches", NULL };
static const char *samba_dsdb_attrs[] = { "backendType", "serverRole", NULL };
const char *backendType, *serverRole;
@@ -257,10 +257,10 @@ static int samba_dsdb_init(struct ldb_module *module)
} else {
objectguid_module = NULL;
link_modules = NULL;
- if (strcasecmp(backendType, "fedora-ds")) {
+ if (strcasecmp(backendType, "fedora-ds") == 0) {
backend_modules = fedora_ds_backend_modules;
extended_dn_module = extended_dn_module_fds;
- } else if (strcasecmp(backendType, "openldap")) {
+ } else if (strcasecmp(backendType, "openldap") == 0) {
backend_modules = openldap_backend_modules;
extended_dn_module = extended_dn_module_openldap;
}