s4:rpc_server: Fix duplicated function name between s3 and s4

It can lead to link errors:

/usr/lib64/gcc/x86_64-suse-linux/11/../../../../x86_64-suse-linux/bin/ld: source3/rpc_server/rpc_server.c.24.o: in function `dcesrv_assoc_group_find':
/home/scabrero/workspace/samba/samba/bin/default/../../source3/rpc_server/rpc_server.c:229: multiple definition of `dcesrv_assoc_group_find'; source4/rpc_server/dcerpc_server.c.5.o:/home/scabrero/workspace/samba/samba/bin/default/../../source4/rpc_server/dcerpc_server.c:121: first defined here

Signed-off-by: Samuel Cabrero <scabrero@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/source4/rpc_server/dcerpc_server.c b/source4/rpc_server/dcerpc_server.c
index 17bcbf42cbb3cc4b98962c2f3b627bc0bc112593..e941b6cf8b0d37fb44ac5b34f6e117053782f4bc 100644 (file)
--- a/source4/rpc_server/dcerpc_server.c
+++ b/source4/rpc_server/dcerpc_server.c
@@ -115,7 +115,7 @@ static struct dcesrv_assoc_group *dcesrv_assoc_group_new(struct dcesrv_connectio
        return assoc_group;
 }
 
-NTSTATUS dcesrv_assoc_group_find(
+NTSTATUS dcesrv_assoc_group_find_s4(
        struct dcesrv_call_state *call,
        void *private_data)
 {

diff --git a/source4/rpc_server/service_rpc.c b/source4/rpc_server/service_rpc.c
index ebb50f8a7ef3864ced97fdefabb0c547a243f6bc..8c6b751c95ad61626d95d9a5ed3a72f8f6d486a3 100644 (file)
--- a/source4/rpc_server/service_rpc.c
+++ b/source4/rpc_server/service_rpc.c
@@ -53,7 +53,7 @@ static struct dcesrv_context_callbacks srv_callbacks = {
        .auth.gensec_prepare = dcesrv_gensec_prepare,
        .auth.become_root = skip_become_root,
        .auth.unbecome_root = skip_unbecome_root,
-       .assoc_group.find = dcesrv_assoc_group_find,
+       .assoc_group.find = dcesrv_assoc_group_find_s4,
 };
 
 /*

diff --git a/source4/torture/rpc/spoolss_notify.c b/source4/torture/rpc/spoolss_notify.c
index 487236ffc14caa4d18e0cd5533837664049f6de2..bd9dac48afeda68371e954ffa16367cf6e761b6a 100644 (file)
--- a/source4/torture/rpc/spoolss_notify.c
+++ b/source4/torture/rpc/spoolss_notify.c
@@ -37,7 +37,7 @@
 static struct dcesrv_context_callbacks srv_cb = {
        .log.successful_authz = log_successful_dcesrv_authz_event,
        .auth.gensec_prepare = dcesrv_gensec_prepare,
-       .assoc_group.find = dcesrv_assoc_group_find,
+       .assoc_group.find = dcesrv_assoc_group_find_s4,
 };
 
 static NTSTATUS spoolss__op_bind(struct dcesrv_connection_context *context,