svn commit: samba r22730 - in branches: SAMBA_3_0/source/nsswitch SAMBA_3_0_26/source/nsswitch

[jerry at samba.org]

Author: jerry
Date: 2007-05-06 22:22:47 +0000 (Sun, 06 May 2007)
New Revision: 22730

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22730

Log:
Fix password changes via pam_winbindd when using "winbind normalize names"
and the username has been munged.  Make sure to munge it back before
performing the change_password() request.


Modified:
   branches/SAMBA_3_0/source/nsswitch/winbindd_pam.c
   branches/SAMBA_3_0_26/source/nsswitch/winbindd_pam.c


Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_pam.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/winbindd_pam.c	2007-05-06 22:18:44 UTC (rev 22729)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_pam.c	2007-05-06 22:22:47 UTC (rev 22730)
@@ -1976,6 +1976,8 @@
 
 	/* Setup crap */
 
+	ws_name_return( state->request.data.auth.user, WB_REPLACE_CHAR );
+
 	if (!canonicalize_username(state->request.data.chauthtok.user, domain, user)) {
 		set_auth_errors(&state->response, NT_STATUS_NO_SUCH_USER);
 		DEBUG(5, ("winbindd_pam_chauthtok: canonicalize_username %s failed with %s"

Modified: branches/SAMBA_3_0_26/source/nsswitch/winbindd_pam.c
===================================================================
--- branches/SAMBA_3_0_26/source/nsswitch/winbindd_pam.c	2007-05-06 22:18:44 UTC (rev 22729)
+++ branches/SAMBA_3_0_26/source/nsswitch/winbindd_pam.c	2007-05-06 22:22:47 UTC (rev 22730)
@@ -1976,6 +1976,8 @@
 
 	/* Setup crap */
 
+	ws_name_return( state->request.data.auth.user, WB_REPLACE_CHAR );
+
 	if (!canonicalize_username(state->request.data.chauthtok.user, domain, user)) {
 		set_auth_errors(&state->response, NT_STATUS_NO_SUCH_USER);
 		DEBUG(5, ("winbindd_pam_chauthtok: canonicalize_username %s failed with %s"