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

Timestamp:

May 13, 2014, 11:39:04 AM (11 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update trunk to 3.6.23

Location:

trunk/server

Files:

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

trunk/server/source3/winbindd/winbindd_cm.c

@@ -338 +338 @@
 }
 
+void winbind_msg_domain_offline(struct messaging_context *msg_ctx,
+                                void *private_data,
+                                uint32_t msg_type,
+                                struct server_id server_id,
+                                DATA_BLOB *data)
+{
+        const char *domain_name = (const char *)data->data;
+        struct winbindd_domain *domain;
+
+        domain = find_domain_from_name_noinit(domain_name);
+        if (domain == NULL) {
+                return;
+        }
+
+        domain->online = false;
+
+        DEBUG(10, ("Domain %s is marked as offline now.\n",
+                   domain_name));
+}
+
+void winbind_msg_domain_online(struct messaging_context *msg_ctx,
+                                void *private_data,
+                                uint32_t msg_type,
+                                struct server_id server_id,
+                                DATA_BLOB *data)
+{
+        const char *domain_name = (const char *)data->data;
+        struct winbindd_domain *domain;
+
+        domain = find_domain_from_name_noinit(domain_name);
+        if (domain == NULL) {
+                return;
+        }
+
+        domain->online = true;
+
+        DEBUG(10, ("Domain %s is marked as online now.\n",
+                   domain_name));
+}
+
 /****************************************************************
  Set domain offline and also add handler to put us back online
@@ -345 +385 @@
 void set_domain_offline(struct winbindd_domain *domain)
 {
+        pid_t parent_pid = getppid();
+
         DEBUG(10,("set_domain_offline: called for domain %s\n",
                 domain->name ));
@@ -391 +433 @@
         DEBUG(10,("set_domain_offline: added event handler for domain %s\n",
                 domain->name ));
+
+        /* Send a message to the parent that the domain is offline. */
+        if (parent_pid > 1 && !domain->internal) {
+                messaging_send_buf(winbind_messaging_context(),
+                                   pid_to_procid(parent_pid),
+                                   MSG_WINBIND_DOMAIN_OFFLINE,
+                                   (uint8 *)domain->name,
+                                   strlen(domain->name) + 1);
+        }
 
         /* Send an offline message to the idmap child when our
@@ -416 +467 @@
 static void set_domain_online(struct winbindd_domain *domain)
 {
+        pid_t parent_pid = getppid();
+
         DEBUG(10,("set_domain_online: called for domain %s\n",
                 domain->name ));
@@ -466 +519 @@
 
         domain->online = True;
+
+        /* Send a message to the parent that the domain is online. */
+        if (parent_pid > 1 && !domain->internal) {
+                messaging_send_buf(winbind_messaging_context(),
+                                   pid_to_procid(parent_pid),
+                                   MSG_WINBIND_DOMAIN_ONLINE,
+                                   (uint8 *)domain->name,
+                                   strlen(domain->name) + 1);
+        }
 
         /* Send an online message to the idmap child when our
@@ -1024 +1086 @@
                 result = cli_set_domain((*cli), domain->name);
                 if (!NT_STATUS_IS_OK(result)) {
+                        SAFE_FREE(ipc_username);
+                        SAFE_FREE(ipc_domain);
+                        SAFE_FREE(ipc_password);
                         return result;
                 }
@@ -1603 +1668 @@
                 result = cm_prepare_connection(domain, fd, domain->dcname,
                         &new_conn->cli, &retry);
+                if (!NT_STATUS_IS_OK(result)) {
+                        /* Don't leak the smb connection socket */
+                        close(fd);
+                }
 
                 if (!retry)
@@ -2565 +2634 @@
 
 /****************************************************************************
+Open a LSA connection to a DC, suiteable for LSA lookup calls.
+****************************************************************************/
+
+NTSTATUS cm_connect_lsat(struct winbindd_domain *domain,
+                         TALLOC_CTX *mem_ctx,
+                         struct rpc_pipe_client **cli,
+                         struct policy_handle *lsa_policy)
+{
+        NTSTATUS status;
+
+        if (domain->can_do_ncacn_ip_tcp) {
+                status = cm_connect_lsa_tcp(domain, mem_ctx, cli);
+                if (NT_STATUS_EQUAL(status, NT_STATUS_ACCESS_DENIED) ||
+                    NT_STATUS_EQUAL(status, NT_STATUS_RPC_SEC_PKG_ERROR) ||
+                    NT_STATUS_EQUAL(status, NT_STATUS_NETWORK_ACCESS_DENIED)) {
+                        invalidate_cm_connection(&domain->conn);
+                        status = cm_connect_lsa_tcp(domain, mem_ctx, cli);
+                }
+                if (NT_STATUS_IS_OK(status)) {
+                        return status;
+                }
+
+                /*
+                 * we tried twice to connect via ncan_ip_tcp and schannel and
+                 * failed - maybe it is a trusted domain we can't connect to ?
+                 * do not try tcp next time - gd
+                 */
+                domain->can_do_ncacn_ip_tcp = false;
+        }
+
+        status = cm_connect_lsa(domain, mem_ctx, cli, lsa_policy);
+
+        return status;
+}
+
+/****************************************************************************
  Open the netlogon pipe to this DC. Use schannel if specified in client conf.
  session key stored in conn->netlogon_pipe->dc->sess_key.