summaryrefslogtreecommitdiff
path: root/source3/rpc_server/srv_winreg_nt.c
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2009-01-07 18:44:52 +0100
committerVolker Lendecke <vl@samba.org>2009-01-08 22:29:54 +0100
commit84292022bf801112d2cb7f0f8512cf00079def20 (patch)
tree465b8f7c2f51769cf4a15d2b82e2ba4465bdfe40 /source3/rpc_server/srv_winreg_nt.c
parent825500f5dafb848b95f5a5ea6595cc24f377bc3a (diff)
downloadsamba-84292022bf801112d2cb7f0f8512cf00079def20.tar.gz
samba-84292022bf801112d2cb7f0f8512cf00079def20.tar.bz2
samba-84292022bf801112d2cb7f0f8512cf00079def20.zip
Now that all policy_handle free_fn's are just TALLOC_FREE, dump free_fn
Diffstat (limited to 'source3/rpc_server/srv_winreg_nt.c')
-rw-r--r--source3/rpc_server/srv_winreg_nt.c20
1 files changed, 5 insertions, 15 deletions
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
@@ -26,16 +26,6 @@
#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;
}