summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2008-04-08 22:23:57 +0200
committerMichael Adam <obnox@samba.org>2008-04-10 01:28:59 +0200
commit7f0127a90347c27a858eac0104e83df858bf5cc1 (patch)
treed3e9b48f3dff7d1464c284e09e40c902781bcd15
parent40c60b0917d1efb7976b7d0faac228378668bcc6 (diff)
downloadsamba-7f0127a90347c27a858eac0104e83df858bf5cc1.tar.gz
samba-7f0127a90347c27a858eac0104e83df858bf5cc1.tar.bz2
samba-7f0127a90347c27a858eac0104e83df858bf5cc1.zip
libsmbconf: more sanely print multi_sz values in registry backend
Michael (This used to be commit 382c623948abd1c6a5cf8ab7ee2be784fcef76ee)
-rw-r--r--source3/lib/smbconf/smbconf_reg.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/lib/smbconf/smbconf_reg.c b/source3/lib/smbconf/smbconf_reg.c
index e604a608e1..dada8eece0 100644
--- a/source3/lib/smbconf/smbconf_reg.c
+++ b/source3/lib/smbconf/smbconf_reg.c
@@ -337,8 +337,8 @@ static char *smbconf_format_registry_value(TALLOC_CTX *mem_ctx,
case REG_MULTI_SZ: {
uint32 j;
for (j = 0; j < value->v.multi_sz.num_strings; j++) {
- result = talloc_asprintf(mem_ctx, "%s \"%s\" ",
- result,
+ result = talloc_asprintf(mem_ctx, "%s\"%s\" ",
+ result ? result : "" ,
value->v.multi_sz.strings[j]);
if (result == NULL) {
break;