s3:rpc_server: Rename rpc_create_tcpip_sockets

Signed-off-by: Samuel Cabrero <scabrero@suse.de>
Reviewed-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

diff --git a/source3/rpc_server/epmd.c b/source3/rpc_server/epmd.c
index 8aa305abbf55524a968f420cf4fd34d0d88b34ad..4b8950b0653b6f9a155f1e25182510e573436717 100644 (file)
--- a/source3/rpc_server/epmd.c
+++ b/source3/rpc_server/epmd.c
@@ -180,11 +180,11 @@ void start_epmd(struct tevent_context *ev_ctx,
                exit(1);
        }
 
-       status = rpc_setup_tcpip_sockets(ev_ctx,
-                                        msg_ctx,
-                                        &ndr_table_epmapper,
-                                        NULL,
-                                        135);
+       status = dcesrv_setup_ncacn_ip_tcp_sockets(ev_ctx,
+                                                  msg_ctx,
+                                                  &ndr_table_epmapper,
+                                                  NULL,
+                                                  135);
        if (!NT_STATUS_IS_OK(status)) {
                DEBUG(0, ("Failed to open epmd tcpip sockets!\n"));
                exit(1);

diff --git a/source3/rpc_server/lsasd.c b/source3/rpc_server/lsasd.c
index 653f0bed9944095a1679b22940b8323172bfb37d..be99f825693f13f65a03b36d893e49dc5efcb54c 100644 (file)
--- a/source3/rpc_server/lsasd.c
+++ b/source3/rpc_server/lsasd.c
@@ -607,11 +607,11 @@ static bool lsasd_create_sockets(struct tevent_context *ev_ctx,
        }
 
        /* Create only one tcpip listener for all services */
-       status = rpc_create_tcpip_sockets(&ndr_table_lsarpc,
-                                         v_orig,
-                                         0,
-                                         listen_fd,
-                                         listen_fd_size);
+       status = dcesrv_create_ncacn_ip_tcp_sockets(&ndr_table_lsarpc,
+                                                   v_orig,
+                                                   0,
+                                                   listen_fd,
+                                                   listen_fd_size);
        if (!NT_STATUS_IS_OK(status)) {
                goto done;
        }

diff --git a/source3/rpc_server/rpc_sock_helper.c b/source3/rpc_server/rpc_sock_helper.c
index f4c95cd312e14197f0d1a10248f0de0764ed95f9..dae48e16dfb877a1bc4b6bb5036a0a3b932870f0 100644 (file)
--- a/source3/rpc_server/rpc_sock_helper.c
+++ b/source3/rpc_server/rpc_sock_helper.c
@@ -27,11 +27,12 @@
 #include "rpc_server/rpc_server.h"
 #include "rpc_server/rpc_sock_helper.h"
 
-NTSTATUS rpc_create_tcpip_sockets(const struct ndr_interface_table *iface,
-                                 struct dcerpc_binding_vector *bvec,
-                                 uint16_t port,
-                                 int *listen_fd,
-                                 int *listen_fd_size)
+NTSTATUS dcesrv_create_ncacn_ip_tcp_sockets(
+                               const struct ndr_interface_table *iface,
+                               struct dcerpc_binding_vector *bvec,
+                               uint16_t port,
+                               int *listen_fd,
+                               int *listen_fd_size)
 {
        uint32_t num_ifs = iface_count();
        uint32_t i;
@@ -150,11 +151,11 @@ done:
        return status;
 }
 
-NTSTATUS rpc_setup_tcpip_sockets(struct tevent_context *ev_ctx,
-                                struct messaging_context *msg_ctx,
-                                const struct ndr_interface_table *iface,
-                                struct dcerpc_binding_vector *bvec,
-                                uint16_t port)
+NTSTATUS dcesrv_setup_ncacn_ip_tcp_sockets(struct tevent_context *ev_ctx,
+                               struct messaging_context *msg_ctx,
+                               const struct ndr_interface_table *iface,
+                               struct dcerpc_binding_vector *bvec,
+                               uint16_t port)
 {
        uint32_t num_ifs = iface_count();
        uint32_t i;

diff --git a/source3/rpc_server/rpc_sock_helper.h b/source3/rpc_server/rpc_sock_helper.h
index 0590d1f8e4242954e281c1b7077fd63ab8424346..9fd1c40bd0fa497632e6b101dc58c1e4efaa5ef0 100644 (file)
--- a/source3/rpc_server/rpc_sock_helper.h
+++ b/source3/rpc_server/rpc_sock_helper.h
@@ -23,17 +23,18 @@
 #ifndef _RPC_SOCK_HELPER_H_
 #define _RPC_SOCK_HELPER_H_
 
-NTSTATUS rpc_create_tcpip_sockets(const struct ndr_interface_table *iface,
-                                 struct dcerpc_binding_vector *bvec,
-                                 uint16_t port,
-                                 int *listen_fd,
-                                 int *listen_fd_size);
+NTSTATUS dcesrv_create_ncacn_ip_tcp_sockets(
+                               const struct ndr_interface_table *iface,
+                               struct dcerpc_binding_vector *bvec,
+                               uint16_t port,
+                               int *listen_fd,
+                               int *listen_fd_size);
 
-NTSTATUS rpc_setup_tcpip_sockets(struct tevent_context *ev_ctx,
-                                struct messaging_context *msg_ctx,
-                                const struct ndr_interface_table *iface,
-                                struct dcerpc_binding_vector *bvec,
-                                uint16_t port);
+NTSTATUS dcesrv_setup_ncacn_ip_tcp_sockets(struct tevent_context *ev_ctx,
+                               struct messaging_context *msg_ctx,
+                               const struct ndr_interface_table *iface,
+                               struct dcerpc_binding_vector *bvec,
+                               uint16_t port);
 
 #endif /* _RPC_SOCK_HELPER_H_ */