summaryrefslogtreecommitdiff
path: root/source3/rpc_server/srv_reg_nt.c
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2005-10-07 12:14:25 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:04:54 -0500
commit01a1e5cdb0339a7cb3a85280b118985562bb2d7f (patch)
tree34067426544a5cdfe872943db9a80d1da36f82c1 /source3/rpc_server/srv_reg_nt.c
parent5b32737374419525dd57216f595440847bb3c619 (diff)
downloadsamba-01a1e5cdb0339a7cb3a85280b118985562bb2d7f.tar.gz
samba-01a1e5cdb0339a7cb3a85280b118985562bb2d7f.tar.bz2
samba-01a1e5cdb0339a7cb3a85280b118985562bb2d7f.zip
r10819: merging a couple of fixes from trunk
* only keep the registry,tdb file open when we have an open key handle * tpot's setup.py fix * removing files that no longer exist in trunk and copying some that were missing in 3.0 (This used to be commit 6c6bf6ca5fd430a7a20bf20ed08050328660e570)
Diffstat (limited to 'source3/rpc_server/srv_reg_nt.c')
-rw-r--r--source3/rpc_server/srv_reg_nt.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/source3/rpc_server/srv_reg_nt.c b/source3/rpc_server/srv_reg_nt.c
index 0ba3e04b99..47c8746b12 100644
--- a/source3/rpc_server/srv_reg_nt.c
+++ b/source3/rpc_server/srv_reg_nt.c
@@ -43,7 +43,7 @@ static struct generic_mapping reg_generic_map =
static void free_regkey_info(void *ptr)
{
- TALLOC_FREE( ptr );
+ regkey_close_internal( (REGISTRY_KEY*)ptr );
}
/******************************************************************
@@ -99,10 +99,9 @@ static WERROR open_registry_key( pipes_struct *p, POLICY_HND *hnd,
if ( !create_policy_hnd( p, hnd, free_regkey_info, *keyinfo ) ) {
result = WERR_BADFILE;
- TALLOC_FREE( *keyinfo );
+ regkey_close_internal( *keyinfo );
}
-
return result;
}