config: fix handing of 'homehost' in AUTO line.
We should be looking for the policy "auto=homehost", not "auto=auto". Signed-off-by: NeilBrown <neilb@suse.de>
This commit is contained in:
parent
da8fe5aa9b
commit
b10c663ea9
10
config.c
10
config.c
|
@ -641,7 +641,7 @@ void autoline(char *line)
|
||||||
* We translate that to policy by creating 'auto=yes' when we see
|
* We translate that to policy by creating 'auto=yes' when we see
|
||||||
* a '+version' line, 'auto=no' if we see '-version' before 'homehost',
|
* a '+version' line, 'auto=no' if we see '-version' before 'homehost',
|
||||||
* or 'auto=homehost' if we see '-version' after 'homehost'.
|
* or 'auto=homehost' if we see '-version' after 'homehost'.
|
||||||
* When we see yes, no, +all or -all we stop an any version that hasn't
|
* When we see yes, no, +all or -all we stop and any version that hasn't
|
||||||
* been seen gets an appropriate auto= entry.
|
* been seen gets an appropriate auto= entry.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
@ -921,19 +921,19 @@ int conf_test_metadata(const char *version, struct dev_policy *pol, int is_homeh
|
||||||
* else 'yes'.
|
* else 'yes'.
|
||||||
*/
|
*/
|
||||||
struct dev_policy *p;
|
struct dev_policy *p;
|
||||||
int no=0, found_auto=0;
|
int no=0, found_homehost=0;
|
||||||
load_conffile();
|
load_conffile();
|
||||||
|
|
||||||
pol = pol_find(pol, pol_auto);
|
pol = pol_find(pol, pol_auto);
|
||||||
pol_for_each(p, pol, version) {
|
pol_for_each(p, pol, version) {
|
||||||
if (strcmp(p->value, "yes") == 0)
|
if (strcmp(p->value, "yes") == 0)
|
||||||
return 1;
|
return 1;
|
||||||
if (strcmp(p->value, "auto") == 0)
|
if (strcmp(p->value, "homehost") == 0)
|
||||||
found_auto = 1;
|
found_homehost = 1;
|
||||||
if (strcmp(p->value, "no") == 0)
|
if (strcmp(p->value, "no") == 0)
|
||||||
no = 1;
|
no = 1;
|
||||||
}
|
}
|
||||||
if (is_homehost && found_auto)
|
if (is_homehost && found_homehost)
|
||||||
return 1;
|
return 1;
|
||||||
if (no)
|
if (no)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
Loading…
Reference in New Issue