s3-registry: add regval_ctr_addvalue_multi_sz.

Guenther
(cherry picked from commit 05e8e90976e86689425ccafc9ecfc1d99c53a3db)
(cherry picked from commit 1febace29881995901eb5694f22ee333e7166fd7)

diff --git a/source3/include/proto.h b/source3/include/proto.h
index a04b86eebdeb37d488ffdcfa06312c0c4b9ef23d..c9f57b46a66f43b10359a069496bdd8808a410db 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5114,6 +5114,7 @@ struct regval_blob *regval_compose(TALLOC_CTX *ctx, const char *name,
 int regval_ctr_addvalue(struct regval_ctr *ctr, const char *name, uint16 type,
                        const char *data_p, size_t size);
 int regval_ctr_addvalue_sz(struct regval_ctr *ctr, const char *name, const char *data);
+int regval_ctr_addvalue_multi_sz(struct regval_ctr *ctr, const char *name, const char **data);
 int regval_ctr_copyvalue(struct regval_ctr *ctr, struct regval_blob *val);
 int regval_ctr_delvalue(struct regval_ctr *ctr, const char *name);
 struct regval_blob* regval_ctr_getvalue(struct regval_ctr *ctr,

diff --git a/source3/registry/reg_objects.c b/source3/registry/reg_objects.c
index 82086caef45e855c77afcabaf4cf55a9dc0337a1..b4b8ff26307d79124a6bc0e55af3630bf672f27a 100644 (file)
--- a/source3/registry/reg_objects.c
+++ b/source3/registry/reg_objects.c
@@ -506,6 +506,23 @@ int regval_ctr_addvalue_sz(struct regval_ctr *ctr, const char *name, const char
                                   blob.length);
 }
 
+/***********************************************************************
+ Add a new registry MULTI_SZ value to the array
+ **********************************************************************/
+
+int regval_ctr_addvalue_multi_sz(struct regval_ctr *ctr, const char *name, const char **data)
+{
+       DATA_BLOB blob;
+
+       if (!push_reg_multi_sz(ctr, &blob, data)) {
+               return -1;
+       }
+
+       return regval_ctr_addvalue(ctr, name, REG_MULTI_SZ,
+                                  (const char *)blob.data,
+                                  blob.length);
+}
+
 /***********************************************************************
  Add a new registry value to the array
  **********************************************************************/