Changeset 312 for branches/samba-3.0/source/rpc_server

Timestamp:

Aug 5, 2009, 6:34:45 PM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.0 to final 3.0.36 (source)

Location:

branches/samba-3.0/source/rpc_server

Files:

• srv_netlog_nt.c (modified) (2 diffs)
• srv_pipe.c (modified) (1 diff)

branches/samba-3.0/source/rpc_server/srv_netlog_nt.c

@@ -432 +432 @@
         DOM_CHAL srv_chal_out;
 
+        /* According to Microsoft (see bugid #6099)
+         * Windows 7 looks at the negotiate_flags
+         * returned in this structure *even if the
+         * call fails with access denied ! So in order
+         * to allow Win7 to connect to a Samba NT style
+         * PDC we set the flags before we know if it's
+         * an error or not.
+         */
+
+        srv_flgs.neg_flags = 0x000001ff;
+
+        if (lp_server_schannel() != False) {
+                srv_flgs.neg_flags |= NETLOGON_NEG_SCHANNEL;
+        }
+
+        /* set up the initial LSA AUTH 2 response */
+        ZERO_STRUCT(srv_chal_out);
+        init_net_r_auth_2(r_u, &srv_chal_out, &srv_flgs, NT_STATUS_OK);
+
         rpcstr_pull(mach_acct, q_u->clnt_id.uni_acct_name.buffer,sizeof(fstring),
                                 q_u->clnt_id.uni_acct_name.uni_str_len*2,0);
@@ -480 +499 @@
         }
 
-        srv_flgs.neg_flags = 0x000001ff;
-
-        if (lp_server_schannel() != False) {
-                srv_flgs.neg_flags |= NETLOGON_NEG_SCHANNEL;
-        }
-
-        /* set up the LSA AUTH 2 response */
+        /* set up the real LSA AUTH 2 response */
         init_net_r_auth_2(r_u, &srv_chal_out, &srv_flgs, NT_STATUS_OK);
 

branches/samba-3.0/source/rpc_server/srv_pipe.c

@@ -2063 +2063 @@
         auth_len = p->hdr.auth_len;
 
-        if (auth_len != RPC_AUTH_SCHANNEL_SIGN_OR_SEAL_CHK_LEN) {
+        if (auth_len < RPC_AUTH_SCHANNEL_SIGN_OR_SEAL_CHK_LEN ||
+                        auth_len > RPC_HEADER_LEN +
+                                        RPC_HDR_REQ_LEN +
+                                        RPC_HDR_AUTH_LEN +
+                                        auth_len) {
                 DEBUG(0,("Incorrect auth_len %u.\n", (unsigned int)auth_len ));
                 return False;