diff options
| author | Tim Potter <tpot@samba.org> | 2003-05-28 01:03:12 +0000 |
|---|---|---|
| committer | Tim Potter <tpot@samba.org> | 2003-05-28 01:03:12 +0000 |
| commit | d1f294b3c4dccd3cd02189d1d6bc7563d4df4ff6 (patch) | |
| tree | e54d674f03d4b17307d9cc0113d0a0ed866e0680 /source3 | |
| parent | 7c9e4739d4825fc9d9f7c0b9b3e70172d18a5b1d (diff) | |
| download | samba-d1f294b3c4dccd3cd02189d1d6bc7563d4df4ff6.tar.gz samba-d1f294b3c4dccd3cd02189d1d6bc7563d4df4ff6.tar.bz2 samba-d1f294b3c4dccd3cd02189d1d6bc7563d4df4ff6.zip | |
Merge of cut and paste fix from 3.0
(This used to be commit 34a0c7313a12d581e9aaf08322b105216cc94478)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/passdb/pdb_ldap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c index 29fa9eada6..fb63e81d28 100644 --- a/source3/passdb/pdb_ldap.c +++ b/source3/passdb/pdb_ldap.c @@ -202,7 +202,7 @@ static ATTRIB_MAP_ENTRY attrib_map_v30[] = { { LDAP_ATTR_KICKOFF_TIME, "sambaKickoffTime" }, { LDAP_ATTR_CN, "cn" }, { LDAP_ATTR_DISPLAY_NAME, "displayName" }, - { LDAP_ATTR_HOME_DRIVE, "sambaHoneDrive" }, + { LDAP_ATTR_HOME_DRIVE, "sambaHomeDrive" }, { LDAP_ATTR_HOME_PATH, "sambaHomePath" }, { LDAP_ATTR_LOGON_SCRIPT, "sambaLogonScript" }, { LDAP_ATTR_PROFILE_PATH, "sambaProfilePath" }, @@ -1957,7 +1957,7 @@ static BOOL init_sam_from_ldap (struct ldapsam_privates *ldap_state, pdb_set_domain(sampass, domain, PDB_DEFAULT); pdb_set_nt_username(sampass, nt_username, PDB_SET); - + /* deal with different attributes between the schema first */ if ( ldap_state->schema_ver == SCHEMAVER_SAMBASAMACCOUNT ) @@ -1968,7 +1968,7 @@ static BOOL init_sam_from_ldap (struct ldapsam_privates *ldap_state, pdb_set_user_sid_from_string(sampass, temp, PDB_SET); } - if (!get_single_attribute(ldap_state->ldap_struct, entry, + if (get_single_attribute(ldap_state->ldap_struct, entry, get_userattr_key2string(ldap_state->schema_ver, LDAP_ATTR_PRIMARY_GROUP_SID), temp)) { pdb_set_group_sid_from_string(sampass, temp, PDB_SET); |