diff options
| author | Gerald Carter <jerry@samba.org> | 2004-08-27 16:15:23 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2004-08-27 16:15:23 +0000 |
| commit | 0a2048d909b0c234a62c26a1463d1998969b2f33 (patch) | |
| tree | 2ec5803a1e3748b029a7ba992c560056f82a7f70 | |
| parent | d17f857d6237fabd3f608aa443ed5d25d95b32d3 (diff) | |
| download | samba-0a2048d909b0c234a62c26a1463d1998969b2f33.tar.gz samba-0a2048d909b0c234a62c26a1463d1998969b2f33.tar.xz samba-0a2048d909b0c234a62c26a1463d1998969b2f33.zip | |
r2091: 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
| -rw-r--r-- | source/libads/ldap.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source/libads/ldap.c b/source/libads/ldap.c index 78ea9f1497d..d1539b83da7 100644 --- 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"); } |