Changeset 429 for trunk/server/source3/winbindd/winbindd_cm.c

Timestamp:

Apr 9, 2010, 3:51:41 PM (15 years ago)

Author:

Silvan Scherrer

Message:

Samba 3.5.x: trunk update to 3.5.2

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/winbindd/winbindd_cm.c (modified) (13 diffs)

trunk/server/source3/winbindd/winbindd_cm.c

@@ -1607 +1607 @@
 static bool connection_ok(struct winbindd_domain *domain)
 {
-        if (domain->conn.cli == NULL) {
-                DEBUG(8, ("connection_ok: Connection to %s for domain %s has NULL "
-                          "cli!\n", domain->dcname, domain->name));
-                return False;
-        }
-
-        if (!domain->conn.cli->initialised) {
-                DEBUG(3, ("connection_ok: Connection to %s for domain %s was never "
-                          "initialised!\n", domain->dcname, domain->name));
-                return False;
-        }
-
-        if (domain->conn.cli->fd == -1) {
-                DEBUG(3, ("connection_ok: Connection to %s for domain %s has died or was "
-                          "never started (fd == -1)\n", 
+        bool ok;
+
+        ok = cli_state_is_connected(domain->conn.cli);
+        if (!ok) {
+                DEBUG(3, ("connection_ok: Connection to %s for domain %s is not connected\n",
                           domain->dcname, domain->name));
                 return False;
@@ -1647 +1637 @@
         }
 
+        if (!winbindd_can_contact_domain(domain)) {
+                invalidate_cm_connection(&domain->conn);
+                domain->initialized = True;
+                return NT_STATUS_OK;
+        }
+
         if (connection_ok(domain)) {
                 if (!domain->initialized) {
@@ -1673 +1669 @@
 
         return init_dc_connection_network(domain);
+}
+
+static NTSTATUS init_dc_connection_rpc(struct winbindd_domain *domain)
+{
+        NTSTATUS status;
+
+        status = init_dc_connection(domain);
+        if (!NT_STATUS_IS_OK(status)) {
+                return status;
+        }
+
+        if (!domain->internal && domain->conn.cli == NULL) {
+                /* happens for trusted domains without inbound trust */
+                return NT_STATUS_TRUSTED_DOMAIN_FAILURE;
+        }
+
+        return NT_STATUS_OK;
 }
 
@@ -1770 +1783 @@
                         domain->initialized = True;
 
-                        if ( !winbindd_can_contact_domain( domain) )
-                                domain->internal = True;
-
                         break;
                 }               
@@ -2024 +2034 @@
         char *domain_name = NULL;
 
-        result = init_dc_connection(domain);
+        result = init_dc_connection_rpc(domain);
         if (!NT_STATUS_IS_OK(result)) {
                 return result;
@@ -2031 +2041 @@
         conn = &domain->conn;
 
-        if (conn->samr_pipe != NULL) {
+        if (rpccli_is_connected(conn->samr_pipe)) {
                 goto done;
         }
 
+        TALLOC_FREE(conn->samr_pipe);
 
         /*
@@ -2206 +2217 @@
         DEBUG(10,("cm_connect_lsa_tcp\n"));
 
-        status = init_dc_connection(domain);
+        status = init_dc_connection_rpc(domain);
         if (!NT_STATUS_IS_OK(status)) {
                 return status;
@@ -2216 +2227 @@
             conn->lsa_pipe_tcp->transport->transport == NCACN_IP_TCP &&
             conn->lsa_pipe_tcp->auth->auth_level == DCERPC_AUTH_LEVEL_PRIVACY &&
-            rpc_pipe_tcp_connection_ok(conn->lsa_pipe_tcp)) {
+            rpccli_is_connected(conn->lsa_pipe_tcp)) {
                 goto done;
         }
@@ -2252 +2263 @@
         struct netlogon_creds_CredentialState *p_creds;
 
-        result = init_dc_connection(domain);
+        result = init_dc_connection_rpc(domain);
         if (!NT_STATUS_IS_OK(result))
                 return result;
@@ -2258 +2269 @@
         conn = &domain->conn;
 
-        if (conn->lsa_pipe != NULL) {
+        if (rpccli_is_connected(conn->lsa_pipe)) {
                 goto done;
         }
+
+        TALLOC_FREE(conn->lsa_pipe);
 
         if ((conn->cli->user_name[0] == '\0') ||
@@ -2382 +2395 @@
         *cli = NULL;
 
-        result = init_dc_connection(domain);
+        result = init_dc_connection_rpc(domain);
         if (!NT_STATUS_IS_OK(result)) {
                 return result;
@@ -2389 +2402 @@
         conn = &domain->conn;
 
-        if (conn->netlogon_pipe != NULL) {
+        if (rpccli_is_connected(conn->netlogon_pipe)) {
                 *cli = conn->netlogon_pipe;
                 return NT_STATUS_OK;
         }
+
+        TALLOC_FREE(conn->netlogon_pipe);
 
         result = cli_rpc_pipe_open_noauth(conn->cli,
@@ -2472 +2487 @@
                           "was %s\n", nt_errstr(result)));
 
-                /* make sure we return something besides OK */
-                return !NT_STATUS_IS_OK(result) ? result : NT_STATUS_PIPE_NOT_AVAILABLE;
+                invalidate_cm_connection(conn);
+                return result;
         }