diff options
| author | Stefan Metzmacher <metze@samba.org> | 2010-03-25 15:14:02 +0100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2010-05-06 14:08:37 +0200 |
| commit | 7884f2879d94dffb279a8b0bcae508afcc7e66dc (patch) | |
| tree | dcb4804e348fdbd9e8eddd11cae396bbfbb56b24 | |
| parent | 48ab7d0bd7b606620111ea31aa062edc8ae26f7f (diff) | |
| download | samba-7884f2879d94dffb279a8b0bcae508afcc7e66dc.tar.gz | |
s3:winbindd_cm: use cli_state_is_connected() helper function
metze
(cherry picked from commit 408a3eb35a0e61b5d66a3b48ebbd1a6796672d0f)
(cherry picked from commit 00a93190d2cae31cd2213b810ea348c055670399)
Signed-off-by: Stefan Metzmacher <metze@samba.org>
(cherry picked from commit 21afa222ab9502ecb33decd16fe540d6d855ff13)
| -rw-r--r-- | source3/winbindd/winbindd_cm.c | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c index 32afe40cae6..cb8027ebd62 100644 --- a/source3/winbindd/winbindd_cm.c +++ b/source3/winbindd/winbindd_cm.c @@ -1592,21 +1592,11 @@ void close_conns_after_fork(void) 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; - } + bool ok; - 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", + 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; } |