summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2010-05-24 15:15:33 +0200
committerMichael Adam <obnox@samba.org>2010-05-25 10:35:25 +0200
commit70a81796fca29d3e924ab6a9396b1a4ab344a730 (patch)
tree851005de6568fab50067725944e98320a8571bd9
parentf7f9ce30caa838f8408faa4bddcaebe2e266a0e4 (diff)
downloadsamba-70a81796fca29d3e924ab6a9396b1a4ab344a730.tar.gz
samba-70a81796fca29d3e924ab6a9396b1a4ab344a730.tar.bz2
samba-70a81796fca29d3e924ab6a9396b1a4ab344a730.zip
s3:registry: fix regval_ctr_addvalue() to take data as uint8 *, not char *.
-rw-r--r--source3/include/reg_objects.h2
-rw-r--r--source3/registry/reg_objects.c8
2 files changed, 5 insertions, 5 deletions
diff --git a/source3/include/reg_objects.h b/source3/include/reg_objects.h
index 0ed5d3cae1..00ba68bf5c 100644
--- a/source3/include/reg_objects.h
+++ b/source3/include/reg_objects.h
@@ -192,7 +192,7 @@ struct regval_blob *regval_compose(TALLOC_CTX *ctx, const char *name,
uint16 type,
const uint8 *data_p, size_t size);
int regval_ctr_addvalue(struct regval_ctr *ctr, const char *name, uint16 type,
- const char *data_p, size_t size);
+ const uint8 *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);
diff --git a/source3/registry/reg_objects.c b/source3/registry/reg_objects.c
index b0d8da4227..52f2b6bbf1 100644
--- a/source3/registry/reg_objects.c
+++ b/source3/registry/reg_objects.c
@@ -453,7 +453,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)
+ const uint8 *data_p, size_t size)
{
if ( !name )
return ctr->num_values;
@@ -503,7 +503,7 @@ int regval_ctr_addvalue_sz(struct regval_ctr *ctr, const char *name, const char
}
return regval_ctr_addvalue(ctr, name, REG_SZ,
- (const char *)blob.data,
+ (const uint8 *)blob.data,
blob.length);
}
@@ -520,7 +520,7 @@ int regval_ctr_addvalue_multi_sz(struct regval_ctr *ctr, const char *name, const
}
return regval_ctr_addvalue(ctr, name, REG_MULTI_SZ,
- (const char *)blob.data,
+ (const uint8 *)blob.data,
blob.length);
}
@@ -532,7 +532,7 @@ int regval_ctr_copyvalue(struct regval_ctr *ctr, struct regval_blob *val)
{
if ( val ) {
regval_ctr_addvalue(ctr, val->valuename, val->type,
- (char *)val->data_p, val->size);
+ (uint8 *)val->data_p, val->size);
}
return ctr->num_values;