winbindd: simplify cm_open_connection()

Simplify to retry logic: if cm_prepare_connection() succeeded just exit the
retry loop, only if it failed check the "retry" variable.

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index 73bc441fd59299c83268d2dfeaa774a4a7a55ce8..761f808e3c61933519c99b698d05171e058a15cd 100644 (file)
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -1712,16 +1712,14 @@ static NTSTATUS cm_open_connection(struct winbindd_domain *domain,
 
                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 */
-                       if (fd != -1) {
-                               close(fd);
-                               fd = -1;
-                       }
+               if (NT_STATUS_IS_OK(result)) {
+                       break;
                }
-
-               if (!retry)
+               close(fd);
+               fd = -1;
+               if (!retry) {
                        break;
+               }
        }
 
        if (!NT_STATUS_IS_OK(result)) {