Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix relative include #208

Merged
merged 6 commits into from
Jul 15, 2024
Merged

Fix relative include #208

merged 6 commits into from
Jul 15, 2024

Conversation

wcawijngaards
Copy link
Member

This fixes relative includes in the zone file. The name should be resolved relative to the working directory. And not relative to the zone file name. This makes the resolve_path function superfluous.

There is a unit test for it in nsd. Fixes NLnetLabs/nsd#343 .

@wcawijngaards wcawijngaards self-assigned this Jun 24, 2024
Standard input is used if the input file is "-". Unlike normal files,
the FILE handle is not opened. Leave it open for consistency.
Copy link
Contributor

@k0ekk0ek k0ekk0ek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code looks fine 👍 Added that stdin is not closed (as it is not opened either).

@wcawijngaards wcawijngaards merged commit dc65dd8 into main Jul 15, 2024
11 checks passed
@k0ekk0ek k0ekk0ek deleted the fix-rel-include branch July 19, 2024 09:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

zonefile with $include relative path stopped working
2 participants