r2091: only use sAMAccountName and not userPrincipalName since the breaks winbindd...

diff --git a/source/libads/ldap.c b/source/libads/ldap.c
index 78ea9f1497d63c933385fa95ffe5bd666ea4850b..d1539b83da73241eab2c4d2659c26ccdadec7a51 100644 (file)
--- a/source/libads/ldap.c
+++ b/source/libads/ldap.c
@@ -2184,13 +2184,19 @@ BOOL ads_pull_sd(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx,
  */
 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");
 }