svn commit: samba r13661 - in branches/SAMBA_3_0_RELEASE/source/nsswitch: .

[jerry at samba.org]

Author: jerry
Date: 2006-02-23 17:06:51 +0000 (Thu, 23 Feb 2006)
New Revision: 13661

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13661

Log:
fixed conflict is merge
Modified:
   branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd_ads.c


Changeset:
Modified: branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd_ads.c
===================================================================
--- branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd_ads.c	2006-02-23 16:51:53 UTC (rev 13660)
+++ branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd_ads.c	2006-02-23 17:06:51 UTC (rev 13661)
@@ -483,17 +483,12 @@
 	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) {