[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  0e3f031... s3: Fix an error message in winbindd_pam_chauthtok()
       via  15d58f6... s3: Ensure null termination in winbindd_pam_chauthtok()
      from  6d9b2e6... s3: Make check_info3_in_group static

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 0e3f031e59ff304ad8816ed0a4dcec30805b5c24
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Mar 31 22:06:23 2010 +0200

    s3: Fix an error message in winbindd_pam_chauthtok()

commit 15d58f688f3ebc267632eaecbe5e18ee994729ea
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Mar 31 22:05:02 2010 +0200

    s3: Ensure null termination in winbindd_pam_chauthtok()

-----------------------------------------------------------------------

Summary of changes:
 source3/winbindd/winbindd_pam.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/winbindd/winbindd_pam.c b/source3/winbindd/winbindd_pam.c
index 74b8237..fc8d7ca 100644
--- a/source3/winbindd/winbindd_pam.c
+++ b/source3/winbindd/winbindd_pam.c
@@ -2014,6 +2014,10 @@ void winbindd_pam_chauthtok(struct winbindd_cli_state *state)
 	struct winbindd_domain *contact_domain;
 	NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL;
 
+	/* Ensure null termination */
+	state->request->data.chauthtok.user[
+		sizeof(state->request->data.chauthtok.user)-1]='\0';
+
 	DEBUG(3, ("[%5lu]: pam chauthtok %s\n", (unsigned long)state->pid,
 		state->request->data.chauthtok.user));
 
@@ -2039,7 +2043,7 @@ void winbindd_pam_chauthtok(struct winbindd_cli_state *state)
 		set_auth_errors(state->response, NT_STATUS_NO_SUCH_USER);
 		DEBUG(5, ("winbindd_pam_chauthtok: canonicalize_username %s failed with %s"
 			  "(PAM: %d)\n",
-			  state->request->data.auth.user,
+			  state->request->data.chauthtok.user,
 			  state->response->data.auth.nt_status_string,
 			  state->response->data.auth.pam_error));
 		request_error(state);


-- 
Samba Shared Repository