sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

s3:winbindd_cm: make use of cli_state_is_connected()

Browse Source 
metze
This commit is contained in:
Stefan Metzmacher 2011-07-11 14:19:55 +02:00
parent 1f50d04a5c
commit 0791a4d5be
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
source3/winbindd/winbindd_cm.c
View File

@ -1445,12 +1445,10 @@ static void store_current_dc_in_gencache(const char *domain_name,
char *key = NULL; char *key = NULL;
char *value = NULL; char *value = NULL;
if (cli == NULL) { if (!cli_state_is_connected(cli)) {
return;
}
if (cli->fd == -1) {
return; return;
} }
get_peer_addr(cli->fd, addr, sizeof(addr)); get_peer_addr(cli->fd, addr, sizeof(addr));
key = current_dc_key(talloc_tos(), domain_name); key = current_dc_key(talloc_tos(), domain_name);
@ -1718,7 +1716,7 @@ void close_conns_after_fork(void)
* so that we don't generate any SMBclose * so that we don't generate any SMBclose
* requests in invalidate_cm_connection() * requests in invalidate_cm_connection()
*/ */
if (cli && cli->fd != -1) { if (cli_state_is_connected(domain->conn.cli)) {
close(domain->conn.cli->fd); close(domain->conn.cli->fd);
domain->conn.cli->fd = -1; domain->conn.cli->fd = -1;
} }
@ -2739,12 +2737,11 @@ void winbind_msg_ip_dropped(struct messaging_context *msg_ctx,
for (domain = domain_list(); domain != NULL; domain = domain->next) { for (domain = domain_list(); domain != NULL; domain = domain->next) {
char sockaddr[INET6_ADDRSTRLEN]; char sockaddr[INET6_ADDRSTRLEN];
if (domain->conn.cli == NULL) {
continue; if (!cli_state_is_connected(domain->conn.cli)) {
}
if (domain->conn.cli->fd == -1) {
continue; continue;
} }
client_socket_addr(domain->conn.cli->fd, sockaddr, client_socket_addr(domain->conn.cli->fd, sockaddr,
sizeof(sockaddr)); sizeof(sockaddr));
if (strequal(sockaddr, addr)) { if (strequal(sockaddr, addr)) {