From: Günther Deschner <gd@samba.org>
Date: Thu, 7 May 2009 21:56:22 +0000 (+0200)
Subject: s3-samr: Do not leak information whether a user exist or not in pwd change calls.
X-Git-Tag: tdb-1.1.5~676
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=227b61d7ea9895240e0e7f554fbb10d3e78feaae;p=thirdparty%2Fsamba.git

s3-samr: Do not leak information whether a user exist or not in pwd change calls.

Found by torture test.

Guenther
---

diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c
index 1a1b5e9a747..6bd5635f2da 100644
--- a/source3/rpc_server/srv_samr_nt.c
+++ b/source3/rpc_server/srv_samr_nt.c
@@ -1914,6 +1914,10 @@ NTSTATUS _samr_ChangePasswordUser2(pipes_struct *p,
 
 	DEBUG(5,("_samr_ChangePasswordUser2: %d\n", __LINE__));
 
+	if (NT_STATUS_EQUAL(status, NT_STATUS_NO_SUCH_USER)) {
+		return NT_STATUS_WRONG_PASSWORD;
+	}
+
 	return status;
 }
 
@@ -1960,6 +1964,10 @@ NTSTATUS _samr_OemChangePasswordUser2(pipes_struct *p,
 				 0,
 				 NULL);
 
+	if (NT_STATUS_EQUAL(status, NT_STATUS_NO_SUCH_USER)) {
+		return NT_STATUS_WRONG_PASSWORD;
+	}
+
 	DEBUG(5,("_samr_OemChangePasswordUser2: %d\n", __LINE__));
 
 	return status;
@@ -2007,6 +2015,9 @@ NTSTATUS _samr_ChangePasswordUser3(pipes_struct *p,
 				 r->in.nt_password->data,
 				 r->in.nt_verifier->hash,
 				 &reject_reason);
+	if (NT_STATUS_EQUAL(status, NT_STATUS_NO_SUCH_USER)) {
+		return NT_STATUS_WRONG_PASSWORD;
+	}
 
 	if (NT_STATUS_EQUAL(status, NT_STATUS_PASSWORD_RESTRICTION) ||
 	    NT_STATUS_EQUAL(status, NT_STATUS_ACCOUNT_RESTRICTION)) {