Changeset 134 for branches/samba-3.0/source/rpc_client

Timestamp:

May 23, 2008, 6:56:41 AM (17 years ago)

Author:

Paul Smedley

Message:

Update source to 3.0.29

Location:

branches/samba-3.0/source/rpc_client

Files:

• cli_netlogon.c (modified) (3 diffs)
• cli_pipe.c (modified) (2 diffs)

branches/samba-3.0/source/rpc_client/cli_netlogon.c

@@ -265 +265 @@
         DOM_CHAL srv_chal_recv;
         struct dcinfo *dc;
+        bool retried = false;
 
         SMB_ASSERT(cli->pipe_idx == PI_NETLOGON);
@@ -286 +287 @@
         fstr_sprintf( dc->mach_acct, "%s$", machine_account);
 
+ again:
         /* Create the client challenge. */
         generate_random_buffer(clnt_chal_send.data, 8);
@@ -322 +324 @@
                         &clnt_chal_send, /* input. */
                         &srv_chal_recv); /* output */
+
+        /* we might be talking to NT4, so let's downgrade in that case and retry
+         * with the returned neg_flags - gd */
+
+        if (NT_STATUS_EQUAL(result, NT_STATUS_ACCESS_DENIED) && !retried) {
+                retried = true;
+                goto again;
+        }
 
         if (!NT_STATUS_IS_OK(result)) {

branches/samba-3.0/source/rpc_client/cli_pipe.c

@@ -2597 +2597 @@
                                                 NTSTATUS *perr)
 {
-        uint32 neg_flags = NETLOGON_NEG_SELECT_AUTH2_FLAGS|NETLOGON_NEG_SCHANNEL;
+        uint32_t neg_flags = NETLOGON_NEG_AUTH2_ADS_FLAGS;
         struct rpc_pipe_client *netlogon_pipe = NULL;
         struct rpc_pipe_client *result = NULL;
@@ -2631 +2631 @@
                                                 NTSTATUS *perr)
 {
-        uint32 neg_flags = NETLOGON_NEG_SELECT_AUTH2_FLAGS|NETLOGON_NEG_SCHANNEL;
+        uint32_t neg_flags = NETLOGON_NEG_AUTH2_ADS_FLAGS;
         struct rpc_pipe_client *netlogon_pipe = NULL;
         struct rpc_pipe_client *result = NULL;