summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2019-06-04 14:12:56 +0200
committerStefan Metzmacher <metze@samba.org>2019-07-22 16:49:13 +0000
commit5ed7ee7279911fc98b9f81dddc6f396d368ab2c8 (patch)
tree2fa16726d108e8c5f0b8ea126b0b4f00b158bfcd /source3
parentb52d58d6e1841f4c0d3d9f6c386e60e761ef4b1e (diff)
downloadsamba-5ed7ee7279911fc98b9f81dddc6f396d368ab2c8.tar.gz
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>
Diffstat (limited to 'source3')
-rw-r--r--source3/rpc_server/rpc_sock_helper.c10
1 files changed, 2 insertions, 8 deletions
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;