diff options
| author | Gerald Carter <jerry@samba.org> | 2006-02-23 17:06:51 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2006-02-23 17:06:51 +0000 |
| commit | 999a1a16a5c5755342c6a636f1b8529cdbb1d7f1 (patch) | |
| tree | 08685559c9fee102c6c389d9653cfd3b955e3ab2 | |
| parent | 13867f26d15f7724a36227b2e4066a9b5575d171 (diff) | |
| download | samba-999a1a16a5c5755342c6a636f1b8529cdbb1d7f1.tar.gz | |
r13661: fixed conflict is merge
| -rw-r--r-- | source/nsswitch/winbindd_ads.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/source/nsswitch/winbindd_ads.c b/source/nsswitch/winbindd_ads.c index b6e6c507327..96137733e24 100644 --- a/source/nsswitch/winbindd_ads.c +++ b/source/nsswitch/winbindd_ads.c @@ -483,17 +483,12 @@ static NTSTATUS query_user(struct winbindd_domain *domain, info->acct_name = ads_pull_username(ads, mem_ctx, msg); if (use_nss_info("sfu")) { -<<<<<<< .working - info->homedir = ads_pull_string(ads, mem_ctx, msg, ads->schema.sfu_homedir_attr); - info->shell = ads_pull_string(ads, mem_ctx, msg, ads->schema.sfu_shell_attr); -======= info->homedir = ads_pull_string(ads, mem_ctx, msg, ads->schema.sfu_homedir_attr); info->shell = ads_pull_string(ads, mem_ctx, msg, ads->schema.sfu_shell_attr); info->full_name = ads_pull_string(ads, mem_ctx, msg, ads->schema.sfu_gecos_attr); ->>>>>>> .merge-right.r13657 } if (info->full_name == NULL) { |