[Samba] winbind problem (?) on samba 3 ADS

[Gerald (Jerry) Carter]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Emir Faisal wrote:

| The only thing that I CAN'T do is to access the share
| on samba machine. The "wbinfo -u" shows a wrong
| combination of "WRKGRP\myloginame.full" instead of our
| usual login combination "WRKGRP\myloginame" or
| "myloginame.full at REALM.FQDN"

Try this patch (already applied to the 3.0 svn tree.






cheers, jerry
- ---------------------------------------------------------------------
Alleviating the pain of Windows(tm)      ------- http://www.samba.org
GnuPG Key                ----- http://www.plainjoe.org/gpg_public.asc
"If we're adding to the noise, turn off this song"--Switchfoot (2003)
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFBNHa6IR7qMdg1EfYRAlD4AJ4p1wikZFw56vSvEHiQoTZuOZ+6SgCfa4Me
7fIpFJwN1YWMbPVWOnf2Se0=
=xnB4
-----END PGP SIGNATURE-----
-------------- next part --------------
Index: libads/ldap.c
===================================================================
--- libads/ldap.c	(revision 1381)
+++ libads/ldap.c	(revision 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");
 }