feat: support two-argument $INCLUDE per RFC 1035 §5.1 #127

tobez commented 2026年05月18日 11:21:03 +02:00

validns rejected the optional argument of $INCLUDE with "garbage after valid $INCLUDE directive", even though RFC 1035 §5.1 specifies $INCLUDE <file-name> [<domain-name>] [<comment>].

process_directive now parses the optional domain-name with extract_name() so a relative name is qualified against the current origin at the $INCLUDE point, then overrides $ORIGIN for the included file by setting file_info->current_origin on the just-pushed file_info. The parent's current_origin is untouched, so the override reverts naturally when the included file ends. Man-page corrected to no longer claim $INCLUDE is missing support.

Fixes #122

validns rejected the optional <domain-name> argument of $INCLUDE with "garbage after valid $INCLUDE directive", even though RFC 1035 §5.1 specifies `$INCLUDE <file-name> [<domain-name>] [<comment>]`. process_directive now parses the optional domain-name with extract_name() so a relative name is qualified against the current origin at the $INCLUDE point, then overrides $ORIGIN for the included file by setting file_info->current_origin on the just-pushed file_info. The parent's current_origin is untouched, so the override reverts naturally when the included file ends. Man-page corrected to no longer claim $INCLUDE is missing <domain-name> support. Fixes #122

jelu commented 2026年05月18日 11:24:53 +02:00

(削除) Why error out on comment instead of just ignoring it and supporting $INCLUDE fully? (削除ここまで)

My bad

~~Why error out on comment instead of just ignoring it and supporting `$INCLUDE` fully?~~ My bad