rpc_server: Pass dcerpc_binding to dcesrv_create_ncalrpc_socket()

It does not need a dcesrv_endpoint.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/source3/rpc_server/rpc_server.c b/source3/rpc_server/rpc_server.c
index 20b727b64dfa77e509fcdfb535fe5bdbcaf1a76c..0e3e0e14e953fd7c265473623713d2cb15b703c6 100644 (file)
--- a/source3/rpc_server/rpc_server.c
+++ b/source3/rpc_server/rpc_server.c
@@ -178,14 +178,13 @@ NTSTATUS dcesrv_create_ncacn_ip_tcp_socket(const struct sockaddr_storage *ifss,
  * Start listening on the ncalrpc socket
  ********************************************************************/
 
-NTSTATUS dcesrv_create_ncalrpc_socket(struct dcesrv_endpoint *e, int *out_fd)
+NTSTATUS dcesrv_create_ncalrpc_socket(struct dcerpc_binding *b, int *out_fd)
 {
        int fd = -1;
        const char *endpoint = NULL;
        NTSTATUS status;
 
-       endpoint = dcerpc_binding_get_string_option(e->ep_description,
-                                                   "endpoint");
+       endpoint = dcerpc_binding_get_string_option(b, "endpoint");
        if (endpoint == NULL) {
                /*
                 * No identifier specified: use DEFAULT or SMBD.
@@ -205,9 +204,8 @@ NTSTATUS dcesrv_create_ncalrpc_socket(struct dcesrv_endpoint *e, int *out_fd)
                } else {
                        endpoint = "DEFAULT";
                }
-               status = dcerpc_binding_set_string_option(e->ep_description,
-                                                         "endpoint",
-                                                         endpoint);
+               status = dcerpc_binding_set_string_option(
+                       b, "endpoint", endpoint);
                if (!NT_STATUS_IS_OK(status)) {
                        DBG_ERR("Failed to set ncalrpc 'endpoint' binding "
                                "string option to '%s': %s\n",

diff --git a/source3/rpc_server/rpc_server.h b/source3/rpc_server/rpc_server.h
index e4a18eb830a8b6c3e0d342a165f7a0592965ab8a..563fb6bf3f23fe6ed3dc4c76926479273fba9a19 100644 (file)
--- a/source3/rpc_server/rpc_server.h
+++ b/source3/rpc_server/rpc_server.h
@@ -73,7 +73,7 @@ NTSTATUS dcesrv_create_ncacn_ip_tcp_socket(const struct sockaddr_storage *ifss,
                                           uint16_t *port,
                                           int *out_fd);
 
-NTSTATUS dcesrv_create_ncalrpc_socket(struct dcesrv_endpoint *e, int *fd);
+NTSTATUS dcesrv_create_ncalrpc_socket(struct dcerpc_binding *b, int *fd);
 
 struct dcerpc_ncacn_listen_state;
 int dcesrv_setup_ncacn_listener(

diff --git a/source3/rpc_server/rpc_service_setup.c b/source3/rpc_server/rpc_service_setup.c
index abdd3b81af877f8c3ed9df98543055e5d692a471..c82e28be4a77e2a2df12c33b60187952ad29e7b0 100644 (file)
--- a/source3/rpc_server/rpc_service_setup.c
+++ b/source3/rpc_server/rpc_service_setup.c
@@ -114,7 +114,7 @@ NTSTATUS dcesrv_create_endpoint_sockets(struct tevent_context *ev_ctx,
 
        switch (transport) {
        case NCALRPC:
-               status = dcesrv_create_ncalrpc_socket(e, fds);
+               status = dcesrv_create_ncalrpc_socket(e->ep_description, fds);
                break;
 
        case NCACN_IP_TCP: {
@@ -269,7 +269,7 @@ NTSTATUS dcesrv_setup_endpoint_sockets(struct tevent_context *ev_ctx,
 
        switch (transport) {
        case NCALRPC:
-               status = dcesrv_create_ncalrpc_socket(e, &fd);
+               status = dcesrv_create_ncalrpc_socket(e->ep_description, &fd);
                break;
 
        case NCACN_IP_TCP: