s3:net rpc registry: use regsubkey_ctr_init() instead of using talloc directly.
authorMichael Adam <obnox@samba.org>
Wed, 25 Feb 2009 13:49:30 +0000 (14:49 +0100)
committerMichael Adam <obnox@samba.org>
Thu, 19 Mar 2009 17:03:59 +0000 (18:03 +0100)
Michael

Signed-off-by: Michael Adam <obnox@samba.org>
source/utils/net_rpc_registry.c

index 72ca31e56413ba93ae5fdbfd24904e930bbb03e6..ff86d868fb0072429dd167754433fdc70c2b905b 100644 (file)
@@ -974,9 +974,12 @@ static bool write_registry_tree( REGF_FILE *infile, REGF_NK_REC *nk,
        struct regsubkey_ctr *subkeys = NULL;
        int i;
        char *path = NULL;
+       WERROR werr;
 
-       if ( !( subkeys = TALLOC_ZERO_P( infile->mem_ctx, struct regsubkey_ctr )) ) {
-               DEBUG(0,("write_registry_tree: talloc() failed!\n"));
+       werr = regsubkey_ctr_init(infile->mem_ctx, &subkeys);
+       if (!W_ERROR_IS_OK(werr)) {
+               DEBUG(0, ("write_registry_tree: regsubkey_ctr_init failed: "
+                         "%s\n", dos_errstr(werr)));
                return false;
        }