From 84292022bf801112d2cb7f0f8512cf00079def20 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Wed, 7 Jan 2009 18:44:52 +0100 Subject: Now that all policy_handle free_fn's are just TALLOC_FREE, dump free_fn --- source3/rpc_server/srv_winreg_nt.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) (limited to 'source3/rpc_server/srv_winreg_nt.c') diff --git a/source3/rpc_server/srv_winreg_nt.c b/source3/rpc_server/srv_winreg_nt.c index 1131033b04..8092601202 100644 --- a/source3/rpc_server/srv_winreg_nt.c +++ b/source3/rpc_server/srv_winreg_nt.c @@ -25,16 +25,6 @@ #undef DBGC_CLASS #define DBGC_CLASS DBGC_RPC_SRV -/****************************************************************** - free() function for struct registry_key - *****************************************************************/ - -static void free_regkey(void *ptr) -{ - struct registry_key *key = (struct registry_key *)ptr; - TALLOC_FREE(key); -} - /****************************************************************** Find a registry key handle and return a struct registry_key * *****************************************************************/ @@ -69,19 +59,19 @@ static WERROR open_registry_key( pipes_struct *p, POLICY_HND *hnd, struct registry_key *key; if (parent == NULL) { - result = reg_openhive(NULL, subkeyname, access_desired, + result = reg_openhive(p->mem_ctx, subkeyname, access_desired, p->server_info->ptok, &key); } else { - result = reg_openkey(NULL, parent, subkeyname, access_desired, - &key); + result = reg_openkey(p->mem_ctx, parent, subkeyname, + access_desired, &key); } if ( !W_ERROR_IS_OK(result) ) { return result; } - if ( !create_policy_hnd( p, hnd, free_regkey, key ) ) { + if ( !create_policy_hnd( p, hnd, key ) ) { return WERR_BADFILE; } @@ -755,7 +745,7 @@ WERROR _winreg_CreateKey( pipes_struct *p, struct winreg_CreateKey *r) return result; } - if (!create_policy_hnd(p, r->out.new_handle, free_regkey, new_key)) { + if (!create_policy_hnd(p, r->out.new_handle, new_key)) { TALLOC_FREE(new_key); return WERR_BADFILE; } -- cgit