Use talloc_tos() in regkey_access_check()

diff --git a/source3/registry/reg_dispatcher.c b/source3/registry/reg_dispatcher.c
index 106d38e9a537d0088c662aa356d9676b8826714b..f8c382536fadac9e708c790b0d5903f11de47745 100644 (file)
--- a/source3/registry/reg_dispatcher.c
+++ b/source3/registry/reg_dispatcher.c
@@ -161,7 +161,6 @@ bool regkey_access_check( REGISTRY_KEY *key, uint32 requested, uint32 *granted,
        SEC_DESC *sec_desc;
        NTSTATUS status;
        WERROR err;
-       TALLOC_CTX *mem_ctx;
 
        /* use the default security check if the backend has not defined its
         * own */
@@ -171,30 +170,20 @@ bool regkey_access_check( REGISTRY_KEY *key, uint32 requested, uint32 *granted,
                                                  granted, token);
        }
 
-       /*
-        * The secdesc routines can't yet cope with a NULL talloc ctx sanely.
-        */
-
-       if (!(mem_ctx = talloc_init("regkey_access_check"))) {
-               return false;
-       }
-
-       err = regkey_get_secdesc(mem_ctx, key, &sec_desc);
+       err = regkey_get_secdesc(talloc_tos(), key, &sec_desc);
 
        if (!W_ERROR_IS_OK(err)) {
-               TALLOC_FREE(mem_ctx);
                return false;
        }
 
        se_map_generic( &requested, &reg_generic_map );
 
        status =se_access_check(sec_desc, token, requested, granted);
+       TALLOC_FREE(sec_desc);
        if (!NT_STATUS_IS_OK(status)) {
-               TALLOC_FREE(mem_ctx);
                return false;
        }
 
-       TALLOC_FREE(mem_ctx);
        return NT_STATUS_IS_OK(status);
 }