svn commit: samba r2091 - in branches/SAMBA_3_0/source/libads: .

[jerry at samba.org]

Author: jerry
Date: 2004-08-27 16:15:23 +0000 (Fri, 27 Aug 2004)
New Revision: 2091

WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/branches/SAMBA_3_0/source/libads&rev=2091&nolog=1

Log:
only use sAMAccountName and not userPrincipalName since the breaks winbindd (lookup_name() only works with the sAMAccountName) -- *please* test this change.  My tests all pass but there is probably something I missed
Modified:
   branches/SAMBA_3_0/source/libads/ldap.c


Changeset:
Modified: branches/SAMBA_3_0/source/libads/ldap.c
===================================================================
--- branches/SAMBA_3_0/source/libads/ldap.c	2004-08-27 16:13:50 UTC (rev 2090)
+++ branches/SAMBA_3_0/source/libads/ldap.c	2004-08-27 16:15:23 UTC (rev 2091)
@@ -2184,13 +2184,19 @@
  */
 char *ads_pull_username(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, void *msg)
 {
+#if 0	/* JERRY */
 	char *ret, *p;
 
+	/* lookup_name() only works on the sAMAccountName to 
+	   returning the username portion of userPrincipalName
+	   breaks winbindd_getpwnam() */
+
 	ret = ads_pull_string(ads, mem_ctx, msg, "userPrincipalName");
 	if (ret && (p = strchr(ret, '@'))) {
 		*p = 0;
 		return ret;
 	}
+#endif
 	return ads_pull_string(ads, mem_ctx, msg, "sAMAccountName");
 }