sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-02 00:22:11 +03:00
Code Activity

r12731: Simplify and re-implemenet support for --parameter-name=foo

Browse Source 
--service-name=bar in testparm.

Andrew Bartlett
(This used to be commit be067e9a04)
This commit is contained in:
Andrew Bartlett
2006-01-06 02:50:46 +00:00
committed by Gerald (Jerry) Carter
parent 1b29552e70
commit c66bc0dadb
2 changed files with 17 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
source4/param/loadparm.c
View File

@ -2231,40 +2231,31 @@ static void dump_a_service(service * pService, FILE * f)
BOOL lp_dump_a_parameter(int snum, char *parm_name, FILE * f, BOOL isGlobal)
{
service * pService = ServicePtrs[snum];
int i, result = False;
parm_class p_class;
unsigned flag = 0;
struct parm_struct *parm;
void *ptr;
if (isGlobal) {
p_class = P_GLOBAL;
flag = FLAG_GLOBAL;
} else
p_class = P_LOCAL;
for (i = 0; parm_table[i].label; i++) {
if (strwicmp(parm_table[i].label, parm_name) == 0 &&
(parm_table[i].class == p_class || parm_table[i].flags & flag) &&
parm_table[i].ptr &&
(*parm_table[i].label != '-') &&
(i == 0 || (parm_table[i].ptr != parm_table[i - 1].ptr)))
{
void *ptr;
if (isGlobal)
ptr = parm_table[i].ptr;
else
ptr = ((char *)pService) +
PTR_DIFF(parm_table[i].ptr, &sDefault);
print_parameter(&parm_table[i],
ptr, f);
fprintf(f, "\n");
result = True;
break;
}
parm = lp_parm_struct(parm_name);
if (!parm) {
return False;
}
return result;
if (isGlobal)
ptr = parm->ptr;
else
ptr = ((char *)pService) +
PTR_DIFF(parm->ptr, &sDefault);
print_parameter(parm,
ptr, f);
fprintf(f, "\n");
return True;
}
/***************************************************************************

2
source4/utils/testparm.c
View File

@ -215,7 +215,7 @@ static int do_global_checks(void)
lp_dump_one(stdout, show_defaults, s);
}
} else {
ret = lp_dump_a_parameter(s, parameter_name, stdout, isGlobal);
ret = !lp_dump_a_parameter(s, parameter_name, stdout, isGlobal);
}
} else {
lp_dump(stdout, show_defaults, lp_numservices());