diff options
| author | Volker Lendecke <vl@samba.org> | 2008-06-18 16:30:37 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2008-06-18 22:41:05 +0200 |
| commit | ece9a659dee5e7f97125053745df7d1095bdb6ec (patch) | |
| tree | f0d035dd6813a983d25fa3629963824dfe4513db /source/services | |
| parent | 0f468b9821c5b2bfb2c0fdcb8853103cfa71fc9c (diff) | |
| download | samba-ece9a659dee5e7f97125053745df7d1095bdb6ec.tar.gz samba-ece9a659dee5e7f97125053745df7d1095bdb6ec.tar.xz samba-ece9a659dee5e7f97125053745df7d1095bdb6ec.zip | |
Revert "Fix a memleak in svcctl_init_keys()"
This reverts commit b1afb31f3cadd4749bf6e3eb5d8935588bf8ebfc.
This one is very strange: I need to investigate why valgrind showed it as
leaking, and why in my initial tests this did not fail.
(cherry picked from commit 24730f5981efb920811e7929a9483bd72bb0984c)
Diffstat (limited to 'source/services')
| -rw-r--r-- | source/services/services_db.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/source/services/services_db.c b/source/services/services_db.c index ae9fe1aeb7c..620b0369326 100644 --- a/source/services/services_db.c +++ b/source/services/services_db.c @@ -447,22 +447,15 @@ void svcctl_init_keys( void ) REGSUBKEY_CTR *subkeys; REGISTRY_KEY *key = NULL; WERROR wresult; - struct nt_user_token *token = get_root_nt_token(); - - if (token == NULL) { - DEBUG(0, ("svcctl_init_keys: get_root_nt_token failed\n")); - return; - } /* bad mojo here if the lookup failed. Should not happen */ wresult = regkey_open_internal( NULL, &key, KEY_SERVICES, - token, REG_KEY_ALL ); + get_root_nt_token(), REG_KEY_ALL ); if ( !W_ERROR_IS_OK(wresult) ) { DEBUG(0,("svcctl_init_keys: key lookup failed! (%s)\n", dos_errstr(wresult))); - TALLOC_FREE(token); return; } @@ -471,7 +464,6 @@ void svcctl_init_keys( void ) if ( !(subkeys = TALLOC_ZERO_P( key, REGSUBKEY_CTR )) ) { DEBUG(0,("svcctl_init_keys: talloc() failed!\n")); TALLOC_FREE( key ); - TALLOC_FREE(token); return; } @@ -494,7 +486,6 @@ void svcctl_init_keys( void ) } TALLOC_FREE( key ); - TALLOC_FREE(token); /* initialize the control hooks */ |