From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 4 Jun 2019 12:12:56 +0000 (+0200)
Subject: s3:rpc_server: simplify the error checking of create_tcpip_socket() callers
X-Git-Tag: talloc-2.3.0~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ed7ee7279911fc98b9f81dddc6f396d368ab2c8;p=thirdparty%2Fsamba.git

s3:rpc_server: simplify the error checking of create_tcpip_socket() callers

create_tcpip_socket() never returns a valid fd and left port as 0.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
---

diff --git a/source3/rpc_server/rpc_sock_helper.c b/source3/rpc_server/rpc_sock_helper.c
index 392005d8a78..d575e2ea1dc 100644
--- a/source3/rpc_server/rpc_sock_helper.c
+++ b/source3/rpc_server/rpc_sock_helper.c
@@ -61,11 +61,8 @@ NTSTATUS rpc_create_tcpip_sockets(const struct ndr_interface_table *iface,
 			int fd;
 
 			fd = create_tcpip_socket(ifss, &p);
-			if (fd < 0 || p == 0) {
+			if (fd < 0) {
 				status = NT_STATUS_UNSUCCESSFUL;
-				if (fd != -1) {
-					close(fd);
-				}
 				goto done;
 			}
 			listen_fd[*listen_fd_size] = fd;
@@ -125,11 +122,8 @@ NTSTATUS rpc_create_tcpip_sockets(const struct ndr_interface_table *iface,
 			}
 
 			fd = create_tcpip_socket(&ss, &p);
-			if (fd < 0 || p == 0) {
+			if (fd < 0) {
 				status = NT_STATUS_UNSUCCESSFUL;
-				if (fd != -1) {
-					close(fd);
-				}
 				goto done;
 			}
 			listen_fd[*listen_fd_size] = fd;