sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-25 06:04:04 +03:00
Code

s4-loadparm: fixed dumping of non-default parms with testparm

Browse Source 
when using testparm without -v we should only dump non-default
parameters. This patch fixes up the handling of the FLAG_DEFAULT flag
in loadparm to correctly mark parameters as default or not, including
parametric options

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Andrew Tridgell 2010-11-11 10:39:19 +11:00
parent ed8ea4ed18
commit 1d7d09a8f7
1 changed files with 33 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
source4/param/loadparm.c
View File

@ -1053,6 +1053,10 @@ struct loadparm_service *lpcfg_add_service(struct loadparm_context *lp_ctx,
int num_to_alloc = lp_ctx->iNumServices + 1; int num_to_alloc = lp_ctx->iNumServices + 1;
struct parmlist_entry *data, *pdata; struct parmlist_entry *data, *pdata;
if (pservice == NULL) {
pservice = lp_ctx->sDefault;
}
tservice = *pservice; tservice = *pservice;
/* it might already exist */ /* it might already exist */
@ -1326,7 +1330,7 @@ static void copy_service(struct loadparm_service *pserviceDest,
pdata = pdata->next; pdata = pdata->next;
} }
if (not_added) { if (not_added) {
paramo = talloc(pserviceDest, struct parmlist_entry); paramo = talloc_zero(pserviceDest, struct parmlist_entry);
if (paramo == NULL) if (paramo == NULL)
smb_panic("OOM"); smb_panic("OOM");
paramo->key = talloc_reference(paramo, data->key); paramo->key = talloc_reference(paramo, data->key);
@ -1599,7 +1603,7 @@ static bool lp_do_parameter_parametric(struct loadparm_context *lp_ctx,
} }
} }
paramo = talloc(mem_ctx, struct parmlist_entry); paramo = talloc_zero(mem_ctx, struct parmlist_entry);
if (!paramo) if (!paramo)
smb_panic("OOM"); smb_panic("OOM");
paramo->key = talloc_strdup(paramo, name); paramo->key = talloc_strdup(paramo, name);
@ -1618,7 +1622,7 @@ static bool lp_do_parameter_parametric(struct loadparm_context *lp_ctx,
static bool set_variable(TALLOC_CTX *mem_ctx, int parmnum, void *parm_ptr, static bool set_variable(TALLOC_CTX *mem_ctx, int parmnum, void *parm_ptr,
const char *pszParmName, const char *pszParmValue, const char *pszParmName, const char *pszParmValue,
struct loadparm_context *lp_ctx) struct loadparm_context *lp_ctx, bool on_globals)
{ {
int i; int i;
/* if it is a special case then go ahead */ /* if it is a special case then go ahead */
@ -1697,7 +1701,7 @@ static bool set_variable(TALLOC_CTX *mem_ctx, int parmnum, void *parm_ptr,
break; break;
} }
if (lp_ctx->flags[parmnum] & FLAG_DEFAULT) { if (on_globals && (lp_ctx->flags[parmnum] & FLAG_DEFAULT)) {
lp_ctx->flags[parmnum] &= ~FLAG_DEFAULT; lp_ctx->flags[parmnum] &= ~FLAG_DEFAULT;
/* we have to also unset FLAG_DEFAULT on aliases */ /* we have to also unset FLAG_DEFAULT on aliases */
for (i=parmnum-1;i>=0 && parm_table[i].offset == parm_table[parmnum].offset;i--) { for (i=parmnum-1;i>=0 && parm_table[i].offset == parm_table[parmnum].offset;i--) {
@ -1733,8 +1737,8 @@ bool lpcfg_do_global_parameter(struct loadparm_context *lp_ctx,
parm_ptr = lpcfg_parm_ptr(lp_ctx, NULL, &parm_table[parmnum]); parm_ptr = lpcfg_parm_ptr(lp_ctx, NULL, &parm_table[parmnum]);
return set_variable(lp_ctx, parmnum, parm_ptr, return set_variable(lp_ctx->globals, parmnum, parm_ptr,
pszParmName, pszParmValue, lp_ctx); pszParmName, pszParmValue, lp_ctx, true);
} }
bool lpcfg_do_service_parameter(struct loadparm_context *lp_ctx, bool lpcfg_do_service_parameter(struct loadparm_context *lp_ctx,
@ -1778,7 +1782,7 @@ bool lpcfg_do_service_parameter(struct loadparm_context *lp_ctx,
service->copymap[i] = false; service->copymap[i] = false;
return set_variable(service, parmnum, parm_ptr, pszParmName, return set_variable(service, parmnum, parm_ptr, pszParmName,
pszParmValue, lp_ctx); pszParmValue, lp_ctx, false);
} }
/** /**
@ -2081,6 +2085,9 @@ static void dump_globals(struct loadparm_context *lp_ctx, FILE *f,
if (lp_ctx->globals->param_opt != NULL) { if (lp_ctx->globals->param_opt != NULL) {
for (data = lp_ctx->globals->param_opt; data; for (data = lp_ctx->globals->param_opt; data;
data = data->next) { data = data->next) {
if (!show_defaults && (data->priority & FLAG_DEFAULT)) {
continue;
}
fprintf(f, "\t%s = %s\n", data->key, data->value); fprintf(f, "\t%s = %s\n", data->key, data->value);
} }
} }
@ -2091,7 +2098,8 @@ static void dump_globals(struct loadparm_context *lp_ctx, FILE *f,
* Display the contents of a single services record. * Display the contents of a single services record.
*/ */
static void dump_a_service(struct loadparm_service * pService, struct loadparm_service *sDefault, FILE * f) static void dump_a_service(struct loadparm_service * pService, struct loadparm_service *sDefault, FILE * f,
unsigned int *flags)
{ {
int i; int i;
struct parmlist_entry *data; struct parmlist_entry *data;
@ -2106,8 +2114,14 @@ static void dump_a_service(struct loadparm_service * pService, struct loadparm_s
(i == 0 || (parm_table[i].offset != parm_table[i - 1].offset))) (i == 0 || (parm_table[i].offset != parm_table[i - 1].offset)))
{ {
if (pService == sDefault) { if (pService == sDefault) {
if (defaults_saved && is_default(sDefault, i)) if (flags && (flags[i] & FLAG_DEFAULT)) {
continue; continue;
}
if (defaults_saved) {
if (is_default(sDefault, i)) {
continue;
}
}
} else { } else {
if (equal_parameter(parm_table[i].type, if (equal_parameter(parm_table[i].type,
((char *)pService) + ((char *)pService) +
@ -2257,6 +2271,7 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx)
int i; int i;
char *myname; char *myname;
struct loadparm_context *lp_ctx; struct loadparm_context *lp_ctx;
struct parmlist_entry *parm;
lp_ctx = talloc_zero(mem_ctx, struct loadparm_context); lp_ctx = talloc_zero(mem_ctx, struct loadparm_context);
if (lp_ctx == NULL) if (lp_ctx == NULL)
@ -2444,6 +2459,12 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx)
} }
} }
for (parm=lp_ctx->globals->param_opt; parm; parm=parm->next) {
if (!(parm->priority & FLAG_CMDLINE)) {
parm->priority |= FLAG_DEFAULT;
}
}
return lp_ctx; return lp_ctx;
} }
@ -2577,12 +2598,11 @@ void lpcfg_dump(struct loadparm_context *lp_ctx, FILE *f, bool show_defaults,
{ {
int iService; int iService;
if (show_defaults) defaults_saved = !show_defaults;
defaults_saved = false;
dump_globals(lp_ctx, f, show_defaults); dump_globals(lp_ctx, f, show_defaults);
dump_a_service(lp_ctx->sDefault, lp_ctx->sDefault, f); dump_a_service(lp_ctx->sDefault, lp_ctx->sDefault, f, lp_ctx->flags);
for (iService = 0; iService < maxtoprint; iService++) for (iService = 0; iService < maxtoprint; iService++)
lpcfg_dump_one(f, show_defaults, lp_ctx->services[iService], lp_ctx->sDefault); lpcfg_dump_one(f, show_defaults, lp_ctx->services[iService], lp_ctx->sDefault);
@ -2596,7 +2616,7 @@ void lpcfg_dump_one(FILE *f, bool show_defaults, struct loadparm_service *servic
if (service != NULL) { if (service != NULL) {
if (service->szService[0] == '\0') if (service->szService[0] == '\0')
return; return;
dump_a_service(service, sDefault, f); dump_a_service(service, sDefault, f, NULL);
} }
} }