r26423: try to fix the build on solaris

metze
(This used to be commit 5b62180946a7cb9f3981ce740cfe830f6f0a00ff)

diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index 07b8cbbdf4c7f35a8868e146d0913f20c1f17eb5..8b84cefc192fe80acd3c85564d3d7e4bae99e167 100644 (file)
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -2252,7 +2252,12 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx)
                     parm_table[i].type == P_USTRING) &&
                    parm_table[i].offset != -1 &&
                    !(lp_ctx->flags[i] & FLAG_CMDLINE)) {
-                       char **r = ((char *)(parm_table[i].class == P_LOCAL)?&sDefault:lp_ctx->globals) + parm_table[i].offset;
+                       char **r;
+                       if (parm_table[i].class == P_LOCAL) {
+                               r = (char **)(&sDefault + parm_table[i].offset);
+                       } else {
+                               r = (char **)(lp_ctx->globals + parm_table[i].offset);
+                       }
                        *r = talloc_strdup(lp_ctx, "");
                }
        }