svn commit: samba r26423 - in branches/SAMBA_4_0/source/param: .

[metze at samba.org]

Author: metze
Date: 2007-12-13 09:13:35 +0000 (Thu, 13 Dec 2007)
New Revision: 26423

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26423

Log:
try to fix the build on solaris

metze
Modified:
   branches/SAMBA_4_0/source/param/loadparm.c


Changeset:
Modified: branches/SAMBA_4_0/source/param/loadparm.c
===================================================================
--- branches/SAMBA_4_0/source/param/loadparm.c	2007-12-13 08:36:03 UTC (rev 26422)
+++ branches/SAMBA_4_0/source/param/loadparm.c	2007-12-13 09:13:35 UTC (rev 26423)
@@ -2252,7 +2252,12 @@
 		     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, "");
 		}
 	}