Merge commit 'origin/v4-1-test^' into v4-1-stablesamba-4.1.10

This was needed because of a changed commit message (fixed version number)
in v4-1-stable after generating the 'samba-4.1.9' tag.

Karolin

Signed-off-by: Karolin Seeger <kseeger@samba.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>

1 files changed, 10 insertions, 6 deletions

diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index d539c5974ed..9e249d1a6b9 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -838,12 +838,16 @@ static bool open_sockets_smbd(struct smbd_parent_context *parent,
 					continue;
 				}
 
-				if (!smbd_open_one_socket(parent,
-							  ev_ctx,
-							  &ss,
-							  port)) {
-					return false;
-				}
+				/*
+				 * If we fail to open any sockets
+				 * in this loop the parent-sockets == NULL
+				 * case below will prevent us from starting.
+				 */
+
+				(void)smbd_open_one_socket(parent,
+						  ev_ctx,
+						  &ss,
+						  port);
 			}
 		}
 	}