[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  7cf1a29... s4-smbtorture: add smbcli_rap_netoemchangepassword().
       via  732a132... rap: add rap_NetOEMChangePassword() to IDL.
      from  0085a3b... Fix the processing of unlocks followed by locks. We now pass SMB2-LOCK test.

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


- Log -----------------------------------------------------------------
commit 7cf1a2986fcc1654f254f22edf29bcde1e393c1d
Author: Günther Deschner <gd at samba.org>
Date:   Fri May 7 22:10:51 2010 +0200

    s4-smbtorture: add smbcli_rap_netoemchangepassword().
    
    Guenther

commit 732a132c4f9699de629d3d12a14b4345ac51fb9a
Author: Günther Deschner <gd at samba.org>
Date:   Fri May 7 19:26:43 2010 +0200

    rap: add rap_NetOEMChangePassword() to IDL.
    
    Guenther

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

Summary of changes:
 librpc/idl/rap.idl        |    8 +++++++
 source4/torture/rap/rap.c |   49 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/librpc/idl/rap.idl b/librpc/idl/rap.idl
index 8ab9fd2..8392c27 100644
--- a/librpc/idl/rap.idl
+++ b/librpc/idl/rap.idl
@@ -764,6 +764,14 @@ interface rap
 		[out] uint16 convert
 	);
 
+	/* not documented in MS-RAP */
+	[public] void rap_NetOEMChangePassword(
+		[in] astring UserName,
+		[in] uint8 crypt_password[516],
+		[in] uint8 password_hash[16],
+		[out] rap_status status,
+		[out] uint16 convert
+	);
 
 	/* Parameter description strings for RAP calls   */
 	/* Names are defined name for RAP call with _REQ */
diff --git a/source4/torture/rap/rap.c b/source4/torture/rap/rap.c
index 0e9900a..c116dde 100644
--- a/source4/torture/rap/rap.c
+++ b/source4/torture/rap/rap.c
@@ -1648,6 +1648,55 @@ NTSTATUS smbcli_rap_netuserpasswordset2(struct smbcli_tree *tree,
 	return result;
 }
 
+NTSTATUS smbcli_rap_netoemchangepassword(struct smbcli_tree *tree,
+					 struct smb_iconv_convenience *iconv_convenience,
+					 TALLOC_CTX *mem_ctx,
+					 struct rap_NetOEMChangePassword *r)
+{
+	struct rap_call *call;
+	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+
+	if (!(call = new_rap_cli_call(mem_ctx, iconv_convenience, RAP_SamOEMChgPasswordUser2_P))) {
+		return NT_STATUS_NO_MEMORY;
+	}
+
+	rap_cli_push_string(call, r->in.UserName);
+	rap_cli_push_sendbuf(call, 532);
+	ndr_push_bytes(call->ndr_push_param, r->in.crypt_password, 516);
+	ndr_push_bytes(call->ndr_push_param, r->in.password_hash, 16);
+
+	rap_cli_expect_format(call, "");
+	rap_cli_expect_extra_format(call, "B516B16");
+
+	if (DEBUGLEVEL >= 10) {
+		NDR_PRINT_IN_DEBUG(rap_NetOEMChangePassword, r);
+	}
+
+	result = rap_cli_do_call(tree, iconv_convenience, call);
+
+	if (!NT_STATUS_IS_OK(result))
+		goto done;
+
+	result = NT_STATUS_INVALID_PARAMETER;
+
+	NDR_GOTO(ndr_pull_rap_status(call->ndr_pull_param, NDR_SCALARS, &r->out.status));
+	NDR_GOTO(ndr_pull_uint16(call->ndr_pull_param, NDR_SCALARS, &r->out.convert));
+
+	result = NT_STATUS_OK;
+
+	if (!NT_STATUS_IS_OK(result)) {
+		goto done;
+	}
+
+	if (DEBUGLEVEL >= 10) {
+		NDR_PRINT_OUT_DEBUG(rap_NetOEMChangePassword, r);
+	}
+
+ done:
+	talloc_free(call);
+	return result;
+}
+
 static bool test_netservergetinfo(struct torture_context *tctx, 
 				  struct smbcli_state *cli)
 {


-- 
Samba Shared Repository