diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2010-04-20 15:35:51 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2010-04-22 18:37:18 +1000 |
| commit | cbb818222aea20b47adbcd5e4461949d7e5d5107 (patch) | |
| tree | 9d410501958440e4bcc521bbf01c277dfad82175 /source4/dsdb/samdb | |
| parent | 9eacde808ee464343620a311bb2bdea5ac7b5ee8 (diff) | |
| download | samba-cbb818222aea20b47adbcd5e4461949d7e5d5107.tar.gz samba-cbb818222aea20b47adbcd5e4461949d7e5d5107.tar.bz2 samba-cbb818222aea20b47adbcd5e4461949d7e5d5107.zip | |
s4:OpenLDAP-backend Use the new rdnval module in OpenLDAP
This is rather than rdn_name, which tries to do the job on the client
side. We need to leave this module in the stack for Fedora DS (and of
course the LDB backend).
Andrew Bartlett
Diffstat (limited to 'source4/dsdb/samdb')
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/samba_dsdb.c | 9 | ||||
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/simple_ldap_map.c | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/samba_dsdb.c b/source4/dsdb/samdb/ldb_modules/samba_dsdb.c index 8f7e5407c7..bbdb768705 100644 --- a/source4/dsdb/samdb/ldb_modules/samba_dsdb.c +++ b/source4/dsdb/samdb/ldb_modules/samba_dsdb.c @@ -185,11 +185,15 @@ static int samba_dsdb_init(struct ldb_module *module) "kludge_acl", "schema_load", "instancetype", - "rdn_name", NULL }; const char **link_modules; + static const char *fedora_ds_modules[] = { + "rdn_name", NULL }; + static const char *openldap_modules[] = { + NULL }; static const char *tdb_modules_list[] = { + "rdn_name", "subtree_delete", "repl_meta_data", "subtree_rename", @@ -252,11 +256,12 @@ static int samba_dsdb_init(struct ldb_module *module) extended_dn_module = extended_dn_module_ldb; link_modules = tdb_modules_list; } else { - link_modules = NULL; if (strcasecmp(backendType, "fedora-ds") == 0) { + link_modules = fedora_ds_modules; backend_modules = fedora_ds_backend_modules; extended_dn_module = extended_dn_module_fds; } else if (strcasecmp(backendType, "openldap") == 0) { + link_modules = openldap_modules; backend_modules = openldap_backend_modules; extended_dn_module = extended_dn_module_openldap; } diff --git a/source4/dsdb/samdb/ldb_modules/simple_ldap_map.c b/source4/dsdb/samdb/ldb_modules/simple_ldap_map.c index bf9cd4fdda..592cd01b22 100644 --- a/source4/dsdb/samdb/ldb_modules/simple_ldap_map.c +++ b/source4/dsdb/samdb/ldb_modules/simple_ldap_map.c @@ -287,7 +287,7 @@ static const struct ldb_map_attribute entryuuid_attributes[] = .type = LDB_MAP_RENAME, .u = { .rename = { - .remote_name = "samba4RDN" + .remote_name = "rdnValue" } } }, |