Author: jra Date: 2006-09-14 10:25:44 +0000 (Thu, 14 Sep 2006) New Revision: 18513
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18513 Log: Ensure we always return the canonicalized name even with the evil "use default domain" case. Jeremy. Modified: branches/SAMBA_3_0_23/source/nsswitch/winbindd_util.c Changeset: Modified: branches/SAMBA_3_0_23/source/nsswitch/winbindd_util.c =================================================================== --- branches/SAMBA_3_0_23/source/nsswitch/winbindd_util.c 2006-09-14 10:21:46 UTC (rev 18512) +++ branches/SAMBA_3_0_23/source/nsswitch/winbindd_util.c 2006-09-14 10:25:44 UTC (rev 18513) @@ -886,7 +886,8 @@ Also, if omit DOMAIN if 'winbind trusted domains only = true', as the username is then unqualified in unix - + + We always canonicalize as UPPERCASE DOMAIN, lowercase username. */ void fill_domain_username(fstring name, const char *domain, const char *user, BOOL can_assume) { @@ -896,7 +897,7 @@ strlower_m(tmp_user); if (can_assume && assume_domain(domain)) { - strlcpy(name, user, sizeof(fstring)); + strlcpy(name, tmp_user, sizeof(fstring)); } else { slprintf(name, sizeof(fstring) - 1, "%s%c%s", domain, *lp_winbind_separator(),
