From 999a1a16a5c5755342c6a636f1b8529cdbb1d7f1 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Thu, 23 Feb 2006 17:06:51 +0000 Subject: r13661: fixed conflict is merge --- source/nsswitch/winbindd_ads.c | 5 ----- 1 file changed, 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) { -- cgit v1.2.1