r10007: Merge data_blk and data_len member of registry_value into a DATA_BLOB.

[tprouty/samba.git] / source4 / lib / registry / tools / regpatch.c

diff --git a/source4/lib/registry/tools/regpatch.c b/source4/lib/registry/tools/regpatch.c
index c2f01ce5b4f9a241e84bde92653bcabd6294b36f..5f7d4376d40707c2787fac38b20f330d2c17d075 100644 (file)
--- a/source4/lib/registry/tools/regpatch.c
+++ b/source4/lib/registry/tools/regpatch.c
@@ -704,9 +704,11 @@ static int nt_apply_reg_command_file(struct registry_context *r, const char *cmd
                                        DEBUG(0, ("Error removing value '%s'\n", val->name));
                                  }
                                  modified = True;
-                         }
-                         else {
-                                 if(!W_ERROR_IS_OK(reg_val_set(tmp, val->name, val->type, val->val, strlen(val->val)))) {
+                         } else {
+                                 DATA_BLOB blob;
+                                 blob.data = (uint8_t *)val->val;
+                                 blob.length = strlen(val->val);
+                                 if(!W_ERROR_IS_OK(reg_val_set(tmp, val->name, val->type, blob))) {
                                          DEBUG(0, ("Error adding new value '%s'\n", val->name));
                                          continue;
                                  }