sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

s3: Make QueryDispInfo and QueryInfo match for guest

Browse Source
This commit is contained in:
Volker Lendecke 2011-02-19 17:44:48 +01:00
parent 3e4da94669
commit 351b672426
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
source3/passdb/pdb_ads.c
View File

@ -1956,6 +1956,7 @@ static bool pdb_ads_search_filter(struct pdb_methods *m,
for (i=0; i<num_users; i++) {
struct samr_displayentry *e;
struct dom_sid sid;
uint32_t ctrl;
e = &sstate->entries[sstate->num_entries];
@ -1966,18 +1967,30 @@ static bool pdb_ads_search_filter(struct pdb_methods *m,
}
sid_peek_rid(&sid, &e->rid);
e->acct_flags = ACB_NORMAL;
e->account_name = tldap_talloc_single_attribute(
users[i], "samAccountName", sstate->entries);
if (e->rid == DOMAIN_RID_GUEST) {
/*
* Guest is specially crafted in s3. Make
* QueryDisplayInfo match QueryUserInfo
*/
e->account_name = lp_guestaccount();
e->fullname = lp_guestaccount();
e->description = "";
e->acct_flags = ACB_NORMAL;
} else {
e->account_name = tldap_talloc_single_attribute(
users[i], "samAccountName", sstate->entries);
e->fullname = tldap_talloc_single_attribute(
users[i], "displayName", sstate->entries);
e->description = tldap_talloc_single_attribute(
users[i], "description", sstate->entries);
}
if (e->account_name == NULL) {
return false;
}
e->fullname = tldap_talloc_single_attribute(
users[i], "displayName", sstate->entries);
if (e->fullname == NULL) {
e->fullname = "";
}
e->description = tldap_talloc_single_attribute(
users[i], "description", sstate->entries);
if (e->description == NULL) {
e->description = "";
}