diff options
| author | Günther Deschner <gd@samba.org> | 2004-09-29 13:34:41 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:52:50 -0500 |
| commit | 4edd6528f9f516c05c1ec3f5ad0880475c132c41 (patch) | |
| tree | 19578b068b4ec5532394b9072a63d56127d8e63f /source3/passdb | |
| parent | 676aa559fe80a50e9d0398d80aabc6d4e41db09e (diff) | |
| download | samba-4edd6528f9f516c05c1ec3f5ad0880475c132c41.tar.gz samba-4edd6528f9f516c05c1ec3f5ad0880475c132c41.tar.bz2 samba-4edd6528f9f516c05c1ec3f5ad0880475c132c41.zip | |
r2752: Fix the paranoia-check to ensure the ldap-attribute and the
smb.conf-parameter for samba's "algorithmic rid base" in ldapsam are
identical.
It tried to get the value of LDAP_ATTR_ALGORITHMIC_RID_BASE via
get_userattr_key2string() for a very long time now. This just can not
work because LDAP_ATTR_ALGORITHMIC_RID_BASE is neither in attrib_map_v22
nor in attrib_map_v30. Instead, get it directly from dominfo_attr_list.
Ldapsam will now correctly refuse to initialize when admins tried
manually to have differing values for "algorithmic rid base" in ldap and
smb.conf. idmap_ldap is another story...
Guenther
(This used to be commit c5b8bc6c2e9a3f789f41742438b31152721c0bf4)
Diffstat (limited to 'source3/passdb')
| -rw-r--r-- | source3/passdb/pdb_ldap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c index 60312d265f..751ec7e049 100644 --- a/source3/passdb/pdb_ldap.c +++ b/source3/passdb/pdb_ldap.c @@ -2993,7 +2993,7 @@ and will risk BDCs having inconsistant SIDs\n")); } if (smbldap_get_single_pstring(ldap_state->smbldap_state->ldap_struct, entry, - get_userattr_key2string(ldap_state->schema_ver, LDAP_ATTR_ALGORITHMIC_RID_BASE), + get_attr_key2string( dominfo_attr_list, LDAP_ATTR_ALGORITHMIC_RID_BASE ), alg_rid_base_string)) { alg_rid_base = (uint32)atol(alg_rid_base_string); if (alg_rid_base != algorithmic_rid_base()) { |