s3:rpc_server: Unify RPC client disconnect and termination functions

These functions are used by endpoint mapper to delete the endpoints
when a NCALRPC connection from an external daemon is lost and by
preforked childs to accept the next client as soon as the current
connection terminates. We can use the same function for both purposes.

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/printing/spoolssd.c b/source3/printing/spoolssd.c
index cfd275418dea256b3a5d545f500100eb03843f58..815609b10c6e8910fa9a4ede8b2848bb84adad35 100644 (file)
--- a/source3/printing/spoolssd.c
+++ b/source3/printing/spoolssd.c
@@ -368,7 +368,7 @@ static int spoolss_children_main(struct tevent_context *ev_ctx,
        return ret;
 }
 
-static void spoolss_client_terminated(void *pvt)
+static void spoolss_client_terminated(struct pipes_struct *p, void *pvt)
 {
        struct spoolss_children_data *data;
 
@@ -455,7 +455,6 @@ static void spoolss_handle_client(struct tevent_req *req)
                            cli_addr,
                            srv_addr,
                            sd,
-                           NULL,  /* disconnect function */
                            spoolss_client_terminated,
                            data);
 }

diff --git a/source3/rpc_server/epmapper/srv_epmapper.c b/source3/rpc_server/epmapper/srv_epmapper.c
index 0bc2f58f6f2bf5d336104d9428305b50e653384e..d548a2c2d7b04bd82fb412e51a0181b1ab7a4276 100644 (file)
--- a/source3/rpc_server/epmapper/srv_epmapper.c
+++ b/source3/rpc_server/epmapper/srv_epmapper.c
@@ -306,7 +306,7 @@ static bool is_privileged_pipe(struct auth_session_info *info) {
        return true;
 }
 
-bool srv_epmapper_delete_endpoints(struct pipes_struct *p)
+void srv_epmapper_delete_endpoints(struct pipes_struct *p, void *private_data)
 {
        struct epm_Delete r;
        struct dcesrv_ep_entry_list *el = p->ep_entries;
@@ -323,7 +323,8 @@ bool srv_epmapper_delete_endpoints(struct pipes_struct *p)
 
                result = _epm_Delete(p, &r);
                if (result != EPMAPPER_STATUS_OK) {
-                       return false;
+                       DBG_ERR("Failed to delete endpoint maps\n");
+                       return;
                }
 
                DLIST_REMOVE(p->ep_entries, el);
@@ -331,8 +332,6 @@ bool srv_epmapper_delete_endpoints(struct pipes_struct *p)
 
                el = next;
        }
-
-       return true;
 }
 
 void srv_epmapper_cleanup(void)

diff --git a/source3/rpc_server/epmapper/srv_epmapper.h b/source3/rpc_server/epmapper/srv_epmapper.h
index 1abc583e20fa0c5f73429c5aa85f8ae27f389c70..b591844c2b2ff8fd98c6a827a3d502befe12d8e7 100644 (file)
--- a/source3/rpc_server/epmapper/srv_epmapper.h
+++ b/source3/rpc_server/epmapper/srv_epmapper.h
@@ -27,7 +27,11 @@
  */
 void srv_epmapper_cleanup(void);
 
-bool srv_epmapper_delete_endpoints(struct pipes_struct *p);
+/**
+ * @brief Cleanup function used to delete endpoints when a ncalrpc connection
+ *        from an external daemon is lost
+ */
+void srv_epmapper_delete_endpoints(struct pipes_struct *p, void *private_data);
 
 #endif /*_SRV_EPMAPPER_H_ */
 

diff --git a/source3/rpc_server/epmd.c b/source3/rpc_server/epmd.c
index eca1c2e3ea740fc7607857f3a20da99b03ae24b7..872c48a1fbe92ce3839e9b1257347df6ba2a6c1b 100644 (file)
--- a/source3/rpc_server/epmd.c
+++ b/source3/rpc_server/epmd.c
@@ -195,7 +195,8 @@ void start_epmd(struct tevent_context *ev_ctx,
        status = dcesrv_setup_ncalrpc_socket(ev_ctx,
                                             msg_ctx,
                                             "EPMAPPER",
-                                            srv_epmapper_delete_endpoints);
+                                            srv_epmapper_delete_endpoints,
+                                            NULL);
        if (!NT_STATUS_IS_OK(status)) {
                DEBUG(0, ("Failed to open epmd ncalrpc pipe!\n"));
                exit(1);

diff --git a/source3/rpc_server/lsasd.c b/source3/rpc_server/lsasd.c
index ed10bc08b1157883f25fe78cc1fe8523a3a1522f..eb69026b620a200b2100750b7108453a0fa77d36 100644 (file)
--- a/source3/rpc_server/lsasd.c
+++ b/source3/rpc_server/lsasd.c
@@ -346,7 +346,7 @@ static int lsasd_children_main(struct tevent_context *ev_ctx,
        return ret;
 }
 
-static void lsasd_client_terminated(void *pvt)
+static void lsasd_client_terminated(struct pipes_struct *p, void *pvt)
 {
        struct lsasd_children_data *data;
 
@@ -451,7 +451,6 @@ static void lsasd_handle_client(struct tevent_req *req)
                                    cli_addr,
                                    srv_addr,
                                    sd,
-                                   NULL,  /* disconnect function */
                                    lsasd_client_terminated,
                                    data);
        } else if (tsocket_address_is_unix(srv_addr)) {
@@ -479,7 +478,6 @@ static void lsasd_handle_client(struct tevent_req *req)
                                            NULL,  /* remote client address */
                                            NULL,  /* local server address */
                                            sd,
-                                           NULL,  /* disconnect function */
                                            lsasd_client_terminated,
                                            data);
 
@@ -491,7 +489,6 @@ static void lsasd_handle_client(struct tevent_req *req)
                                            cli_addr,
                                            srv_addr,
                                            sd,
-                                           NULL,  /* disconnect function */
                                            lsasd_client_terminated,
                                            data);
                }

diff --git a/source3/rpc_server/mdssd.c b/source3/rpc_server/mdssd.c
index 08c5c260111e7c016d80cce27b5d1ccb7cdf7f3a..80330a15aa1f8978e66371b552b5bc9258f5318c 100644 (file)
--- a/source3/rpc_server/mdssd.c
+++ b/source3/rpc_server/mdssd.c
@@ -286,7 +286,7 @@ static int mdssd_children_main(struct tevent_context *ev_ctx,
        return ret;
 }
 
-static void mdssd_client_terminated(void *pvt)
+static void mdssd_client_terminated(struct pipes_struct *p, void *pvt)
 {
        struct mdssd_children_data *data;
 
@@ -391,7 +391,6 @@ static void mdssd_handle_client(struct tevent_req *req)
                                    cli_addr,
                                    srv_addr,
                                    sd,
-                                   NULL,  /* disconnect function */
                                    mdssd_client_terminated,
                                    data);
        } else if (tsocket_address_is_unix(srv_addr)) {
@@ -419,7 +418,6 @@ static void mdssd_handle_client(struct tevent_req *req)
                                            NULL,  /* remote client address */
                                            NULL,  /* local server address */
                                            sd,
-                                           NULL,  /* disconnect function */
                                            mdssd_client_terminated,
                                            data);
                } else {
@@ -430,7 +428,6 @@ static void mdssd_handle_client(struct tevent_req *req)
                                            cli_addr,
                                            srv_addr,
                                            sd,
-                                           NULL,  /* disconnect function */
                                            mdssd_client_terminated,
                                            data);
                }

diff --git a/source3/rpc_server/rpc_ncacn_np.c b/source3/rpc_server/rpc_ncacn_np.c
index e5a75254df713fd634d2dcfc2f0ea502d137fcd9..da22c24b638f5d5b83226b0e8923804e6b6c7447 100644 (file)
--- a/source3/rpc_server/rpc_ncacn_np.c
+++ b/source3/rpc_server/rpc_ncacn_np.c
@@ -114,7 +114,6 @@ NTSTATUS make_internal_rpc_pipe_socketpair(
                                        msg_ctx,
                                        NCACN_NP,
                                        pipe_name,
-                                       NULL, /* disconnect fn */
                                        NULL, /* termination fn */
                                        NULL, /* termination data */
                                        &ncacn_conn);

diff --git a/source3/rpc_server/rpc_server.c b/source3/rpc_server/rpc_server.c
index 871cd76008b6a7a7e90e2854ac4b5b6a030a8669..c0c0f9a22a4db313a92aa944b13f19029ed48b4c 100644 (file)
--- a/source3/rpc_server/rpc_server.c
+++ b/source3/rpc_server/rpc_server.c
@@ -91,7 +91,6 @@ struct dcerpc_ncacn_listen_state {
 
        struct tevent_context *ev_ctx;
        struct messaging_context *msg_ctx;
-       dcerpc_ncacn_disconnect_fn disconnect_fn;
        dcerpc_ncacn_termination_fn termination_fn;
        void *termination_data;
 };
@@ -253,7 +252,6 @@ static void dcesrv_ncacn_np_listener(struct tevent_context *ev,
                            NULL, /* remote client address */
                            NULL, /* local server address */
                            sd,
-                           state->disconnect_fn,
                            state->termination_fn,
                            state->termination_data);
 }
@@ -324,7 +322,6 @@ NTSTATUS dcesrv_setup_ncacn_ip_tcp_socket(struct tevent_context *ev_ctx,
 
        state->fd = -1;
        state->ep.port = *port;
-       state->disconnect_fn = NULL;
 
        status = dcesrv_create_ncacn_ip_tcp_socket(ifss, &state->ep.port,
                                                   &state->fd);
@@ -437,7 +434,6 @@ static void dcesrv_ncacn_ip_tcp_listener(struct tevent_context *ev,
                            cli_addr,
                            srv_addr,
                            s,
-                           state->disconnect_fn,
                            state->termination_fn,
                            state->termination_data);
 }
@@ -489,7 +485,8 @@ out:
 NTSTATUS dcesrv_setup_ncalrpc_socket(struct tevent_context *ev_ctx,
                                     struct messaging_context *msg_ctx,
                                     const char *name,
-                                    dcerpc_ncacn_disconnect_fn fn)
+                                    dcerpc_ncacn_termination_fn term_fn,
+                                    void *termination_data)
 {
        struct dcerpc_ncacn_listen_state *state;
        struct tevent_fd *fde;
@@ -503,7 +500,8 @@ NTSTATUS dcesrv_setup_ncalrpc_socket(struct tevent_context *ev_ctx,
        }
 
        state->fd = -1;
-       state->disconnect_fn = fn;
+       state->termination_fn = term_fn;
+       state->termination_data = termination_data;
 
        if (name == NULL) {
                name = "DEFAULT";
@@ -621,22 +619,15 @@ static void dcesrv_ncalrpc_listener(struct tevent_context *ev,
                            NCALRPC,
                            state->ep.name,
                            cli_addr, srv_addr, sd,
-                           state->disconnect_fn,
                            state->termination_fn,
                            state->termination_data);
 }
 
 static int dcerpc_ncacn_conn_destructor(struct dcerpc_ncacn_conn *ncacn_conn)
 {
-       if (ncacn_conn->disconnect_fn != NULL) {
-               bool ok = ncacn_conn->disconnect_fn(ncacn_conn->p);
-               if (!ok) {
-                       DBG_WARNING("Failed to call disconnect function\n");
-               }
-       }
-
        if (ncacn_conn->termination_fn != NULL) {
-               ncacn_conn->termination_fn(ncacn_conn->termination_data);
+               ncacn_conn->termination_fn(ncacn_conn->p,
+                                          ncacn_conn->termination_data);
        }
 
        return 0;
@@ -647,7 +638,6 @@ NTSTATUS dcerpc_ncacn_conn_init(TALLOC_CTX *mem_ctx,
                                struct messaging_context *msg_ctx,
                                enum dcerpc_transport_t transport,
                                const char *name,
-                               dcerpc_ncacn_disconnect_fn disconnect_fn,
                                dcerpc_ncacn_termination_fn term_fn,
                                void *termination_data,
                                struct dcerpc_ncacn_conn **out)
@@ -664,7 +654,6 @@ NTSTATUS dcerpc_ncacn_conn_init(TALLOC_CTX *mem_ctx,
        ncacn_conn->ev_ctx = ev_ctx;
        ncacn_conn->msg_ctx = msg_ctx;
        ncacn_conn->sock = -1;
-       ncacn_conn->disconnect_fn = disconnect_fn;
        ncacn_conn->termination_fn = term_fn;
        ncacn_conn->termination_data = termination_data;
        if (name != NULL) {
@@ -691,7 +680,6 @@ void dcerpc_ncacn_accept(struct tevent_context *ev_ctx,
                         struct tsocket_address *cli_addr,
                         struct tsocket_address *srv_addr,
                         int s,
-                        dcerpc_ncacn_disconnect_fn disconnect_fn,
                         dcerpc_ncacn_termination_fn termination_fn,
                         void *termination_data)
 {
@@ -706,7 +694,6 @@ void dcerpc_ncacn_accept(struct tevent_context *ev_ctx,
                                        msg_ctx,
                                        transport,
                                        name,
-                                       disconnect_fn,
                                        termination_fn,
                                        termination_data,
                                        &ncacn_conn);

diff --git a/source3/rpc_server/rpc_server.h b/source3/rpc_server/rpc_server.h
index 35ccd51ee8e504588d12da53ce687a7c065944ef..01ca3d072189a670ee83edf6f8a0eab8034d5b41 100644 (file)
--- a/source3/rpc_server/rpc_server.h
+++ b/source3/rpc_server/rpc_server.h
@@ -25,8 +25,7 @@
 struct pipes_struct;
 struct auth_session_info;
 
-typedef bool (*dcerpc_ncacn_disconnect_fn)(struct pipes_struct *p);
-typedef void (*dcerpc_ncacn_termination_fn)(void *private_data);
+typedef void (*dcerpc_ncacn_termination_fn)(struct pipes_struct *, void *);
 
 struct dcerpc_ncacn_conn {
        enum dcerpc_transport_t transport;
@@ -35,7 +34,6 @@ struct dcerpc_ncacn_conn {
        int sock;
 
        struct pipes_struct *p;
-       dcerpc_ncacn_disconnect_fn disconnect_fn;
        dcerpc_ncacn_termination_fn termination_fn;
        void *termination_data;
 
@@ -60,7 +58,6 @@ NTSTATUS dcerpc_ncacn_conn_init(TALLOC_CTX *mem_ctx,
                                struct messaging_context *msg_ctx,
                                enum dcerpc_transport_t transport,
                                const char *name,
-                               dcerpc_ncacn_disconnect_fn disconnect_fn,
                                dcerpc_ncacn_termination_fn term_fn,
                                void *termination_data,
                                struct dcerpc_ncacn_conn **out);
@@ -94,7 +91,8 @@ NTSTATUS dcesrv_create_ncalrpc_socket(const char *name, int *out_fd);
 NTSTATUS dcesrv_setup_ncalrpc_socket(struct tevent_context *ev_ctx,
                                     struct messaging_context *msg_ctx,
                                     const char *name,
-                                    dcerpc_ncacn_disconnect_fn fn);
+                                    dcerpc_ncacn_termination_fn term_fn,
+                                    void *termination_data);
 
 void dcerpc_ncacn_accept(struct tevent_context *ev_ctx,
                         struct messaging_context *msg_ctx,
@@ -103,7 +101,6 @@ void dcerpc_ncacn_accept(struct tevent_context *ev_ctx,
                         struct tsocket_address *cli_addr,
                         struct tsocket_address *srv_addr,
                         int s,
-                        dcerpc_ncacn_disconnect_fn disconnect_fn,
                         dcerpc_ncacn_termination_fn termination_fn,
                         void *termination_data);
 void dcerpc_ncacn_packet_process(struct tevent_req *subreq);