s4:rpc_server: remove the old dcesrv_handle_{new,fetch}() api

BUG: https://bugzilla.samba.org/show_bug.cgi?id=7113
BUG: https://bugzilla.samba.org/show_bug.cgi?id=11892

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/source4/rpc_server/dcerpc_server.h b/source4/rpc_server/dcerpc_server.h
index ba14ab8f824eace11f3a868760d5706779d6c899..7923d3bd23428b9d04b2ecedf564a9302753a7cd 100644 (file)
--- a/source4/rpc_server/dcerpc_server.h
+++ b/source4/rpc_server/dcerpc_server.h
@@ -427,15 +427,9 @@ NTSTATUS dcesrv_init_context(TALLOC_CTX *mem_ctx,
                                      const char **endpoint_servers, struct dcesrv_context **_dce_ctx);
 
 NTSTATUS dcesrv_reply(struct dcesrv_call_state *call);
-struct dcesrv_handle *dcesrv_handle_new(struct dcesrv_connection_context *context, 
-                                       uint8_t handle_type);
 struct dcesrv_handle *dcesrv_handle_create(struct dcesrv_call_state *call,
                                           uint8_t handle_type);
 
-struct dcesrv_handle *dcesrv_handle_fetch(
-                                         struct dcesrv_connection_context *context, 
-                                         const struct policy_handle *p,
-                                         uint8_t handle_type);
 struct dcesrv_handle *dcesrv_handle_lookup(struct dcesrv_call_state *call,
                                           const struct policy_handle *p,
                                           uint8_t handle_type);

diff --git a/source4/rpc_server/handles.c b/source4/rpc_server/handles.c
index 043870fa663e635ee4d882d4b308f61abdc43cac..2362a89dbd687f50277f4e2fa47a6bccef7bc5d0 100644 (file)
--- a/source4/rpc_server/handles.c
+++ b/source4/rpc_server/handles.c
@@ -38,9 +38,11 @@ static int dcesrv_handle_destructor(struct dcesrv_handle *h)
 /*
   allocate a new rpc handle
 */
-_PUBLIC_ struct dcesrv_handle *dcesrv_handle_new(struct dcesrv_connection_context *context, 
-                                                uint8_t handle_type)
+_PUBLIC_
+struct dcesrv_handle *dcesrv_handle_create(struct dcesrv_call_state *call,
+                                          uint8_t handle_type)
 {
+       struct dcesrv_connection_context *context = call->context;
        struct dcesrv_handle *h;
        struct dom_sid *sid;
 
@@ -73,22 +75,17 @@ _PUBLIC_ struct dcesrv_handle *dcesrv_handle_new(struct dcesrv_connection_contex
        return h;
 }
 
-_PUBLIC_
-struct dcesrv_handle *dcesrv_handle_create(struct dcesrv_call_state *call,
-                                          uint8_t handle_type)
-{
-       return dcesrv_handle_new(call->context, handle_type);
-}
-
 /**
   find an internal handle given a wire handle. If the wire handle is NULL then
   allocate a new handle
 */
-_PUBLIC_ struct dcesrv_handle *dcesrv_handle_fetch(
-                                         struct dcesrv_connection_context *context, 
-                                         const struct policy_handle *p,
-                                         uint8_t handle_type)
+
+_PUBLIC_
+struct dcesrv_handle *dcesrv_handle_lookup(struct dcesrv_call_state *call,
+                                          const struct policy_handle *p,
+                                          uint8_t handle_type)
 {
+       struct dcesrv_connection_context *context = call->context;
        struct dcesrv_handle *h;
        struct dom_sid *sid;
 
@@ -101,7 +98,7 @@ _PUBLIC_ struct dcesrv_handle *dcesrv_handle_fetch(
 
        if (ndr_policy_handle_empty(p)) {
                /* TODO: we should probably return a NULL handle here */
-               return dcesrv_handle_new(context, handle_type);
+               return dcesrv_handle_create(call, handle_type);
        }
 
        for (h=context->conn->assoc_group->handles; h; h=h->next) {
@@ -129,11 +126,3 @@ _PUBLIC_ struct dcesrv_handle *dcesrv_handle_fetch(
 
        return NULL;
 }
-
-_PUBLIC_
-struct dcesrv_handle *dcesrv_handle_lookup(struct dcesrv_call_state *call,
-                                          const struct policy_handle *p,
-                                          uint8_t handle_type)
-{
-       return dcesrv_handle_fetch(call->context, p, handle_type);
-}