* hesiod/hesiod.c (hesiod_init): Don't check for ctx->classes[0] == 0

or both classes equal here.
	(parse_config_file): If both classes are equal, clear the second one.
This commit is contained in:
Ulrich Drepper 2005-06-15 06:44:01 +00:00
parent b399a0c2e2
commit 7b01092b16
2 changed files with 9 additions and 2 deletions

View File

@ -1,3 +1,9 @@
2005-06-15 Jakub Jelinek <jakub@redhat.com>
* hesiod/hesiod.c (hesiod_init): Don't check for ctx->classes[0] == 0
or both classes equal here.
(parse_config_file): If both classes are equal, clear the second one.
2005-06-08 Karl Kelley <kekelley@iastate.edu>
* hesiod/hesiod_p.h (struct hesiod_p): Add classes array.

View File

@ -126,7 +126,7 @@ hesiod_init(void **context) {
* If there is no default hesiod realm set, we return an
* error.
*/
if (!ctx->RHS || ctx->classes[0] == 0 || ctx->classes[0] == ctx->classes[1]) {
if (!ctx->RHS) {
__set_errno(ENOEXEC);
goto cleanup;
}
@ -327,7 +327,8 @@ parse_config_file(struct hesiod_p *ctx, const char *filename) {
nother at all. */
ctx->classes[0] = C_IN;
ctx->classes[1] = C_HS;
} else if (n == 1)
} else if (n == 1
|| ctx->classes[0] == ctx->classes[1])
ctx->classes[1] = 0;
}
}