[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-1100-ga8868d7

[Günther Deschner]

The branch, v3-4-test has been updated
       via  a8868d7fbf51e4706a7d2ee44a9066a8e1efcb4a (commit)
       via  745f8d37fffe9d2ac2938101b08ff39ebf50c94c (commit)
       via  aebc22c407c60588eabae324eb9cc06e73538dd4 (commit)
      from  7021008d5ed401d60b3b2d5f7fe6c78d63c3495b (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test


- Log -----------------------------------------------------------------
commit a8868d7fbf51e4706a7d2ee44a9066a8e1efcb4a
Author: Günther Deschner <gd at samba.org>
Date:   Fri May 29 13:15:27 2009 +0200

    s3-netlogon: Fix _netr_LogonSamLogon{Ex} with validation level != 3.
    
    Guenther
    (cherry picked from commit 90b38906541de554e3964d96ed83a7c71b5ea05c)

commit 745f8d37fffe9d2ac2938101b08ff39ebf50c94c
Author: Günther Deschner <gd at samba.org>
Date:   Fri May 29 12:42:15 2009 +0200

    s3-netlogon: return proper error code for unsupported validation class.
    
    Guenther
    (cherry picked from commit 65f86a644a8171a99c63b6cb32e01e22897174f6)

commit aebc22c407c60588eabae324eb9cc06e73538dd4
Author: Günther Deschner <gd at samba.org>
Date:   Fri May 29 12:41:41 2009 +0200

    s3-rpc_server: increase max number of open policy handles per pipe to 2048.
    
    Guenther
    (cherry picked from commit 9bd8b0a15773d3d5c0649bfb49bb16acfb4bb5f1)

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

Summary of changes:
 source3/rpc_server/srv_lsa_hnd.c   |    2 +-
 source3/rpc_server/srv_netlog_nt.c |   13 +++++++------
 2 files changed, 8 insertions(+), 7 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 e853bb2..a09c7ec 100644
--- a/source3/rpc_server/srv_lsa_hnd.c
+++ b/source3/rpc_server/srv_lsa_hnd.c
@@ -26,7 +26,7 @@
 
 /* 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 e0d1e22..79606ab 100644
--- a/source3/rpc_server/srv_netlog_nt.c
+++ b/source3/rpc_server/srv_netlog_nt.c
@@ -881,6 +881,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;
@@ -888,12 +895,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) {
 


-- 
Samba Shared Repository