Changeset 745 for trunk/server/source4/lib/registry/hive.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source4/lib/registry/hive.c (modified) (3 diffs)

trunk/server/source4/lib/registry/hive.c

@@ -55 +55 @@
         if (!strncmp(peek, "regf", 4)) {
                 close(fd);
-                return reg_open_regf_file(parent_ctx, location, lp_iconv_convenience(lp_ctx), root);
+                return reg_open_regf_file(parent_ctx, location, root);
         } else if (!strncmp(peek, "TDB file", 8)) {
                 close(fd);
@@ -92 +92 @@
 }
 
-_PUBLIC_ WERROR hive_key_del(const struct hive_key *key, const char *name)
+_PUBLIC_ WERROR hive_key_del(TALLOC_CTX *mem_ctx, const struct hive_key *key,
+                             const char *name)
 {
-        return key->ops->del_key(key, name);
+        return key->ops->del_key(mem_ctx, key, name);
 }
 
@@ -164 +165 @@
 }
 
-WERROR hive_key_del_value(struct hive_key *key, const char *name)
+WERROR hive_key_del_value(TALLOC_CTX *mem_ctx, struct hive_key *key,
+                          const char *name)
 {
         if (key->ops->delete_value == NULL)
                 return WERR_NOT_SUPPORTED;
 
-        return key->ops->delete_value(key, name);
+        return key->ops->delete_value(mem_ctx, key, name);
 }