Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
#include "lib/param/param_global.h"
#include "lib/param/param_global.h"
-#define NUMPARAMETERS (num_parameters())
-
struct loadparm_service *lpcfg_default_service(struct loadparm_context *lp_ctx)
{
if (lp_ctx->s3_fns) {
struct loadparm_service *lpcfg_default_service(struct loadparm_context *lp_ctx)
{
if (lp_ctx->s3_fns) {
TALLOC_FREE(pservice->copymap);
TALLOC_FREE(pservice->copymap);
- pservice->copymap = bitmap_talloc(NULL, NUMPARAMETERS);
+ pservice->copymap = bitmap_talloc(NULL, num_parameters());
if (!pservice->copymap)
DEBUG(0,
("Couldn't allocate copymap!! (size %d)\n",
if (!pservice->copymap)
DEBUG(0,
("Couldn't allocate copymap!! (size %d)\n",
+ (int)num_parameters()));
- for (i = 0; i < NUMPARAMETERS; i++)
+ for (i = 0; i < num_parameters(); i++)
bitmap_set(pservice->copymap, i);
}
bitmap_set(pservice->copymap, i);
}
for (i=parmnum-1;i>=0 && parm_table[i].offset == parm_table[parmnum].offset;i--) {
lp_ctx->flags[i] &= ~FLAG_DEFAULT;
}
for (i=parmnum-1;i>=0 && parm_table[i].offset == parm_table[parmnum].offset;i--) {
lp_ctx->flags[i] &= ~FLAG_DEFAULT;
}
- for (i=parmnum+1;i<NUMPARAMETERS && parm_table[i].offset == parm_table[parmnum].offset;i++) {
+ for (i=parmnum+1;i<num_parameters() && parm_table[i].offset == parm_table[parmnum].offset;i++) {
lp_ctx->flags[i] &= ~FLAG_DEFAULT;
}
}
lp_ctx->flags[i] &= ~FLAG_DEFAULT;
}
}
lp_ctx->flags[i] |= FLAG_CMDLINE;
}
for (i=parmnum+1;
lp_ctx->flags[i] |= FLAG_CMDLINE;
}
for (i=parmnum+1;
parm_table[i].p_class == parm_table[parmnum].p_class &&
parm_table[i].offset == parm_table[parmnum].offset;
i++) {
parm_table[i].p_class == parm_table[parmnum].p_class &&
parm_table[i].offset == parm_table[parmnum].offset;
i++) {
/* This appears odd, but globals in s3 isn't a pointer */
lp_ctx->globals->ctx = lp_ctx->globals;
lp_ctx->sDefault = talloc_zero(lp_ctx, struct loadparm_service);
/* This appears odd, but globals in s3 isn't a pointer */
lp_ctx->globals->ctx = lp_ctx->globals;
lp_ctx->sDefault = talloc_zero(lp_ctx, struct loadparm_service);
- lp_ctx->flags = talloc_zero_array(lp_ctx, unsigned int, NUMPARAMETERS);
+ lp_ctx->flags = talloc_zero_array(lp_ctx, unsigned int, num_parameters());
lp_ctx->sDefault->iMaxPrintJobs = 1000;
lp_ctx->sDefault->bAvailable = true;
lp_ctx->sDefault->iMaxPrintJobs = 1000;
lp_ctx->sDefault->bAvailable = true;