From 830d10c196f714c71a0a33c9e369951b15e1755f Mon Sep 17 00:00:00 2001 From: Jo Sutton Date: Tue, 16 Apr 2024 14:31:11 +1200 Subject: [PATCH] s4:ldap_server: Rename privileged ops to indicate they are used for ldapi BUG: https://bugzilla.samba.org/show_bug.cgi?id=15634 Signed-off-by: Jo Sutton Reviewed-by: Andrew Bartlett (cherry picked from commit ec6579829f9781d113428b8b3c603edd3e6c222d) --- source4/ldap_server/ldap_server.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source4/ldap_server/ldap_server.c b/source4/ldap_server/ldap_server.c index a365bb206d0..dfa4fa36736 100644 --- a/source4/ldap_server/ldap_server.c +++ b/source4/ldap_server/ldap_server.c @@ -1156,7 +1156,7 @@ static const struct stream_server_ops ldap_stream_nonpriv_ops = { #define WITH_LDAPI_PRIV_SOCKET #ifdef WITH_LDAPI_PRIV_SOCKET -static void ldapsrv_accept_priv(struct stream_connection *c) +static void ldapsrv_accept_priv_ldapi(struct stream_connection *c) { struct ldapsrv_service *ldapsrv_service = talloc_get_type_abort( c->private_data, struct ldapsrv_service); @@ -1171,9 +1171,9 @@ static void ldapsrv_accept_priv(struct stream_connection *c) ldapsrv_accept(c, session_info, true); } -static const struct stream_server_ops ldap_stream_priv_ops = { +static const struct stream_server_ops ldapi_stream_priv_ops = { .name = "ldap", - .accept_connection = ldapsrv_accept_priv, + .accept_connection = ldapsrv_accept_priv_ldapi, .recv_handler = ldapsrv_recv, .send_handler = ldapsrv_send, }; @@ -1523,7 +1523,7 @@ static NTSTATUS ldapsrv_task_init(struct task_server *task) } status = stream_setup_socket(task, task->event_ctx, task->lp_ctx, - task->model_ops, &ldap_stream_priv_ops, + task->model_ops, &ldapi_stream_priv_ops, "unix", ldapi_path, NULL, lpcfg_socket_options(task->lp_ctx), ldap_service, -- 2.47.2