summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2007-12-13 10:28:18 +0100
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:49:51 +0100
commit45d349eb80ebd6b08a8bbcb66f657e89c3480a92 (patch)
tree4fec41a78cc78bdb51ba7501bae7d63abdf982d5
parent03f178a728ba41f6ec82d35201ad25421e1bb951 (diff)
downloadsamba-45d349eb80ebd6b08a8bbcb66f657e89c3480a92.tar.gz
samba-45d349eb80ebd6b08a8bbcb66f657e89c3480a92.tar.bz2
samba-45d349eb80ebd6b08a8bbcb66f657e89c3480a92.zip
r26425: fix crash bug, sorry I should have tested that...
metze (This used to be commit 61d2f1a03b374404fd0f3e6191cda82ff0295834)
-rw-r--r--source4/param/loadparm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index 8b84cefc19..ef53a29b2b 100644
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -2254,9 +2254,9 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx)
!(lp_ctx->flags[i] & FLAG_CMDLINE)) {
char **r;
if (parm_table[i].class == P_LOCAL) {
- r = (char **)(&sDefault + parm_table[i].offset);
+ r = (char **)(((char *)&sDefault) + parm_table[i].offset);
} else {
- r = (char **)(lp_ctx->globals + parm_table[i].offset);
+ r = (char **)(((char *)lp_ctx->globals) + parm_table[i].offset);
}
*r = talloc_strdup(lp_ctx, "");
}