The branch, master has been updated
via 12496ea5aba3a53691ca74f12192f489d7831592 (commit)
via 059401e4575922ee23656b880c2c2ef230a7cebe (commit)
via 90b38906541de554e3964d96ed83a7c71b5ea05c (commit)
via 65f86a644a8171a99c63b6cb32e01e22897174f6 (commit)
via 9bd8b0a15773d3d5c0649bfb49bb16acfb4bb5f1 (commit)
from 1a7898e3a8f2c2e2cacd645b97da88054df931ae (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 12496ea5aba3a53691ca74f12192f489d7831592
Author: Günther Deschner <[email protected]>
Date: Fri May 29 13:18:23 2009 +0200
s4-smbtorture: remove trailing whitespace.
Guenther
commit 059401e4575922ee23656b880c2c2ef230a7cebe
Author: Günther Deschner <[email protected]>
Date: Fri May 29 13:16:25 2009 +0200
s4-smbtorture: Fix test_SamLogon() for netlogon servers not yet supporting
validation level 6.
Guenther
commit 90b38906541de554e3964d96ed83a7c71b5ea05c
Author: Günther Deschner <[email protected]>
Date: Fri May 29 13:15:27 2009 +0200
s3-netlogon: Fix _netr_LogonSamLogon{Ex} with validation level != 3.
Guenther
commit 65f86a644a8171a99c63b6cb32e01e22897174f6
Author: Günther Deschner <[email protected]>
Date: Fri May 29 12:42:15 2009 +0200
s3-netlogon: return proper error code for unsupported validation class.
Guenther
commit 9bd8b0a15773d3d5c0649bfb49bb16acfb4bb5f1
Author: Günther Deschner <[email protected]>
Date: Fri May 29 12:41:41 2009 +0200
s3-rpc_server: increase max number of open policy handles per pipe to 2048.
Guenther
-----------------------------------------------------------------------
Summary of changes:
source3/rpc_server/srv_lsa_hnd.c | 2 +-
source3/rpc_server/srv_netlog_nt.c | 13 +++++++------
source4/torture/rpc/samr.c | 10 +++++++---
3 files changed, 15 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/rpc_server/srv_lsa_hnd.c b/source3/rpc_server/srv_lsa_hnd.c
index d8c4805..94e73fb 100644
--- a/source3/rpc_server/srv_lsa_hnd.c
+++ b/source3/rpc_server/srv_lsa_hnd.c
@@ -46,7 +46,7 @@ struct handle_list {
/* This is the max handles across all instances of a pipe name. */
#ifndef MAX_OPEN_POLS
-#define MAX_OPEN_POLS 1024
+#define MAX_OPEN_POLS 2048
#endif
/****************************************************************************
diff --git a/source3/rpc_server/srv_netlog_nt.c
b/source3/rpc_server/srv_netlog_nt.c
index 333eabe..7f45a48 100644
--- a/source3/rpc_server/srv_netlog_nt.c
+++ b/source3/rpc_server/srv_netlog_nt.c
@@ -882,6 +882,13 @@ NTSTATUS _netr_LogonSamLogon(pipes_struct *p,
return NT_STATUS_ACCESS_DENIED;
}
+ *r->out.authoritative = true; /* authoritative response */
+ if (r->in.validation_level != 2 && r->in.validation_level != 3) {
+ DEBUG(0,("%s: bad validation_level value %d.\n",
+ fn, (int)r->in.validation_level));
+ return NT_STATUS_INVALID_INFO_CLASS;
+ }
+
sam3 = TALLOC_ZERO_P(p->mem_ctx, struct netr_SamInfo3);
if (!sam3) {
return NT_STATUS_NO_MEMORY;
@@ -889,12 +896,6 @@ NTSTATUS _netr_LogonSamLogon(pipes_struct *p,
/* store the user information, if there is any. */
r->out.validation->sam3 = sam3;
- *r->out.authoritative = true; /* authoritative response */
- if (r->in.validation_level != 2 && r->in.validation_level != 3) {
- DEBUG(0,("%s: bad validation_level value %d.\n",
- fn, (int)r->in.validation_level));
- return NT_STATUS_ACCESS_DENIED;
- }
if (process_creds) {
diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c
index a1a60bf..30e7e08 100644
--- a/source4/torture/rpc/samr.c
+++ b/source4/torture/rpc/samr.c
@@ -2674,7 +2674,7 @@ static bool test_QueryUserInfo_pwdlastset(struct
dcerpc_pipe *p,
}
static bool test_SamLogon(struct torture_context *tctx,
- struct dcerpc_pipe *p,
+ struct dcerpc_pipe *p,
struct cli_credentials *test_credentials,
NTSTATUS expected_result)
{
@@ -2745,6 +2745,10 @@ static bool test_SamLogon(struct torture_context *tctx,
r.in.validation_level = 6;
status = dcerpc_netr_LogonSamLogonEx(p, tctx, &r);
+ if (NT_STATUS_EQUAL(status, NT_STATUS_INVALID_INFO_CLASS)) {
+ r.in.validation_level = 3;
+ status = dcerpc_netr_LogonSamLogonEx(p, tctx, &r);
+ }
if (!NT_STATUS_IS_OK(status)) {
torture_assert_ntstatus_equal(tctx, status, expected_result,
"LogonSamLogonEx failed");
return true;
@@ -2904,7 +2908,7 @@ static bool test_SetPassword_pwdlastset(struct
dcerpc_pipe *p,
b->flags &= ~DCERPC_AUTH_OPTIONS;
b->flags |= DCERPC_SCHANNEL | DCERPC_SIGN | DCERPC_SCHANNEL_128;
- status = dcerpc_pipe_connect_b(tctx, &np, b,
+ status = dcerpc_pipe_connect_b(tctx, &np, b,
&ndr_table_netlogon,
machine_credentials, tctx->ev,
tctx->lp_ctx);
@@ -6177,7 +6181,7 @@ static bool test_ManyObjects(struct dcerpc_pipe *p,
uint32_t i;
struct policy_handle *handles = talloc_zero_array(tctx, struct
policy_handle, num_total);
-
+
/* query */
{
--
Samba Shared Repository
