Merge branch 'master' of ssh://git.samba.org/data/git/samba into crypt

[kai/samba.git] / source4 / rpc_server / handles.c

diff --git a/source4/rpc_server/handles.c b/source4/rpc_server/handles.c
index 043318c075c81d760b758afd2f3ff9d04f97033d..284354feb484380ac9dc24bf75010efd3ad268b9 100644 (file)
--- a/source4/rpc_server/handles.c
+++ b/source4/rpc_server/handles.c
@@ -7,7 +7,7 @@
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -16,70 +16,68 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
+#include "../lib/util/dlinklist.h"
+#include "rpc_server/dcerpc_server.h"
+
+/*
+  destroy a rpc handle
+*/
+static int dcesrv_handle_destructor(struct dcesrv_handle *h)
+{
+       DLIST_REMOVE(h->context->handles, h);
+       return 0;
+}
+
 
 /*
   allocate a new rpc handle
 */
-struct dcesrv_handle *dcesrv_handle_new(struct dcesrv_connection *dce_conn, 
-                                       uint8 handle_type)
+_PUBLIC_ struct dcesrv_handle *dcesrv_handle_new(struct dcesrv_connection_context *context, 
+                                       uint8_t handle_type)
 {
-       TALLOC_CTX *mem_ctx;
        struct dcesrv_handle *h;
 
-       mem_ctx = talloc_init("rpc handle type %d\n", handle_type);
-       if (!mem_ctx) {
-               return NULL;
-       }
-       h = talloc(mem_ctx, sizeof(*h));
+       h = talloc(context, struct dcesrv_handle);
        if (!h) {
-               talloc_destroy(mem_ctx);
                return NULL;
        }
-       h->mem_ctx = mem_ctx;
        h->data = NULL;
+       h->context = context;
 
        h->wire_handle.handle_type = handle_type;
-       uuid_generate_random(&h->wire_handle.uuid);
+       h->wire_handle.uuid = GUID_random();
        
-       DLIST_ADD(dce_conn->handles, h);
+       DLIST_ADD(context->handles, h);
 
-       return h;
-}
+       talloc_set_destructor(h, dcesrv_handle_destructor);
 
-/*
-  destroy a rpc handle
-*/
-void dcesrv_handle_destroy(struct dcesrv_connection *dce_conn, 
-                          struct dcesrv_handle *h)
-{
-       DLIST_REMOVE(dce_conn->handles, h);
-       talloc_destroy(h->mem_ctx);
+       return h;
 }
 
-
-/*
+/**
   find an internal handle given a wire handle. If the wire handle is NULL then
   allocate a new handle
 */
-struct dcesrv_handle *dcesrv_handle_fetch(struct dcesrv_connection *dce_conn, 
+_PUBLIC_ struct dcesrv_handle *dcesrv_handle_fetch(
+                                         struct dcesrv_connection_context *context, 
                                          struct policy_handle *p,
-                                         uint8 handle_type)
+                                         uint8_t handle_type)
 {
        struct dcesrv_handle *h;
 
        if (policy_handle_empty(p)) {
-               return dcesrv_handle_new(dce_conn, handle_type);
+               return dcesrv_handle_new(context, handle_type);
        }
 
-       for (h=dce_conn->handles; h; h=h->next) {
+       for (h=context->handles; h; h=h->next) {
                if (h->wire_handle.handle_type == p->handle_type &&
-                   uuid_equal(&p->uuid, &h->wire_handle.uuid)) {
-                       if (p->handle_type != handle_type) {
+                   GUID_equal(&p->uuid, &h->wire_handle.uuid)) {
+                       if (handle_type != DCESRV_HANDLE_ANY &&
+                           p->handle_type != handle_type) {
                                DEBUG(0,("client gave us the wrong handle type (%d should be %d)\n",
                                         p->handle_type, handle_type));
                                return NULL;