diff options
| author | Jeremy Allison <jra@samba.org> | 2009-10-17 10:36:33 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2009-10-17 10:36:33 -0700 |
| commit | 7c51fa6d699a653cafa90df8e44911b576118ebd (patch) | |
| tree | 543bf9ca698e03eff81104898b33e77f1abed319 /source3/registry/reg_backend_db.c | |
| parent | cc3a6770c77ec8fe1cd63bf4c682853c56201f0c (diff) | |
| parent | 3e3214fd91471bca5b6c4d3782e922d252d588fb (diff) | |
| download | samba-7c51fa6d699a653cafa90df8e44911b576118ebd.tar.gz samba-7c51fa6d699a653cafa90df8e44911b576118ebd.tar.bz2 samba-7c51fa6d699a653cafa90df8e44911b576118ebd.zip | |
Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
Diffstat (limited to 'source3/registry/reg_backend_db.c')
| -rw-r--r-- | source3/registry/reg_backend_db.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/source3/registry/reg_backend_db.c b/source3/registry/reg_backend_db.c index dec43ae741..2b6259c03a 100644 --- a/source3/registry/reg_backend_db.c +++ b/source3/registry/reg_backend_db.c @@ -250,8 +250,6 @@ WERROR init_registry_key(const char *add_path) static void regdb_ctr_add_value(struct regval_ctr *ctr, struct builtin_regkey_value *value) { - UNISTR2 data; - switch(value->type) { case REG_DWORD: regval_ctr_addvalue(ctr, value->valuename, REG_DWORD, @@ -260,10 +258,8 @@ static void regdb_ctr_add_value(struct regval_ctr *ctr, break; case REG_SZ: - init_unistr2(&data, value->data.string, UNI_STR_TERMINATE); - regval_ctr_addvalue(ctr, value->valuename, REG_SZ, - (char*)data.buffer, - data.uni_str_len*sizeof(uint16)); + regval_ctr_addvalue_sz(ctr, value->valuename, + value->data.string); break; default: |