r5037: got rid of all of the TALLOC_DEPRECATED stuff. My apologies for the

[ab/samba.git/.git] / source4 / rpc_server / winreg / rpc_winreg.c

diff --git a/source4/rpc_server/winreg/rpc_winreg.c b/source4/rpc_server/winreg/rpc_winreg.c
index 58bee5e18b41b2b696fda0dfb7d7022a8f9f41ce..c0da3cbb1139c5fee9bf172ebb5cdd5f08178a2c 100644 (file)
--- a/source4/rpc_server/winreg/rpc_winreg.c
+++ b/source4/rpc_server/winreg/rpc_winreg.c
@@ -167,10 +167,10 @@ static WERROR winreg_EnumKey(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem
 
        if (W_ERROR_IS_OK(r->out.result)) {
                r->out.key_name_len = strlen(key->name);
-               r->out.out_name = talloc_zero_p(mem_ctx, struct winreg_EnumKeyNameResponse);
+               r->out.out_name = talloc_zero(mem_ctx, struct winreg_EnumKeyNameResponse);
                r->out.out_name->name = key->name;
-               r->out.class = talloc_zero_p(mem_ctx, struct winreg_String);
-               r->out.last_changed_time = talloc_zero_p(mem_ctx, struct winreg_Time);
+               r->out.class = talloc_zero(mem_ctx, struct winreg_String);
+               r->out.last_changed_time = talloc_zero(mem_ctx, struct winreg_Time);
        }
        
        return r->out.result;
@@ -197,11 +197,11 @@ static WERROR winreg_EnumValue(struct dcesrv_call_state *dce_call, TALLOC_CTX *m
                return result;
        }
        
-       r->out.type = talloc_p(mem_ctx, uint32_t);
+       r->out.type = talloc(mem_ctx, uint32_t);
        *r->out.type = value->data_type;
        r->out.name_out.name = value->name;
        r->out.value = value->data_blk;
-       r->out.size = talloc_p(mem_ctx, uint32_t);
+       r->out.size = talloc(mem_ctx, uint32_t);
        r->out.length = r->out.size;
        *r->out.size = value->data_len;
        
@@ -353,7 +353,7 @@ static WERROR winreg_QueryValue(struct dcesrv_call_state *dce_call, TALLOC_CTX *
        r->out.type = &val->data_type;
        r->out.length = &val->data_len;
        if (!r->in.data) {
-               r->out.size = talloc_p(mem_ctx, uint32);
+               r->out.size = talloc(mem_ctx, uint32);
                *r->out.size = val->data_len;
        } else {
                r->out.size = r->in.size;