sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-23 09:57:40 +03:00
Code

As pdb_ldap.c does not compile in HEAD anyway, a not-compiled merge

Browse Source 
from 2_2.

Volker
This commit is contained in:
Volker Lendecke -
parent d4cafc076b
commit 7d70b30dbd
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/passdb/pdb_ldap.c
View File

@ -439,9 +439,9 @@ static BOOL init_sam_from_ldap (SAM_ACCOUNT * sampass,
get_single_attribute(ldap_struct, entry, "description", acct_desc);
get_single_attribute(ldap_struct, entry, "userWorkstations", workstations);
get_single_attribute(ldap_struct, entry, "rid", temp);
user_rid = (uint32)strtol(temp, NULL, 16);
user_rid = (uint32)strtol(temp, NULL, 10);
get_single_attribute(ldap_struct, entry, "primaryGroupID", temp);
group_rid = (uint32)strtol(temp, NULL, 16);
group_rid = (uint32)strtol(temp, NULL, 10);
/* These values MAY be in LDAP, but they can also be retrieved through
@ -577,9 +577,13 @@ static BOOL init_ldap_from_sam (LDAPMod *** mods, int ldap_state, const SAM_ACCO
make_a_mod(mods, ldap_state, "description", pdb_get_acct_desc(sampass));
make_a_mod(mods, ldap_state, "userWorkstations", pdb_get_workstations(sampass));
if ( !sampass->user_rid)
sampass->user_rid = pdb_uid_to_user_rid(pdb_get_uid(sampass));
slprintf(temp, sizeof(temp) - 1, "%i", sampass->user_rid);
make_a_mod(mods, ldap_state, "rid", temp);
if ( !sampass->group_rid)
sampass->group_rid = pdb_gid_to_group_rid(pdb_get_gid(sampass));
slprintf(temp, sizeof(temp) - 1, "%i", sampass->group_rid);
make_a_mod(mods, ldap_state, "primaryGroupID", temp);