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 error message mentioning wrong file #1961

Merged
merged 1 commit into from
May 17, 2024

Conversation

jacklul
Copy link

@jacklul jacklul commented May 17, 2024

While browsing through the code I noticed this:

// Add /etc/pihole/dhcp.lease to the ZIP archive if it exists
file_comment = "DHCP leases file";
file_path = "/etc/pihole/dhcp.leases";
if(file_exists(file_path) && !mz_zip_writer_add_file(zip, file_path+1, file_path, file_comment, (uint16_t)strlen(file_comment), MZ_BEST_COMPRESSION))
{
	mz_zip_writer_end(zip);
	return "Failed to add /etc/hosts to heap ZIP archive!"; // <--- definitely should not mention /etc/hosts here
}

This might lead to user confusion one day so it's better to correct it.


What does this PR aim to accomplish?:

Corrects error message mentioning /etc/hosts instead of /etc/pihole/dhcp.leases in teleporter.c:184.

How does this PR accomplish the above?:

I edited it.


By submitting this pull request, I confirm the following:

  1. I have read and understood the contributors guide, as well as this entire template. I understand which branch to base my commits and Pull Requests against.
  2. I have commented my proposed changes within the code and I have tested my changes.
  3. I am willing to help maintain this change if there are issues with it later.
  4. It is compatible with the EUPL 1.2 license
  5. I have squashed any insignificant commits. (git rebase)
  6. I have checked that another pull request for this purpose does not exist.
  7. I have considered, and confirmed that this submission will be valuable to others.
  8. I accept that this submission may not be used, and the pull request closed at the will of the maintainer.
  9. I give this submission freely, and claim no ownership to its content.

  • I have read the above and my PR is ready for review. Check this box to confirm

Signed-off-by: Jack'lul <jacklulcat@gmail.com>
@DL6ER
Copy link
Member

DL6ER commented May 17, 2024

Thank you!

@DL6ER DL6ER merged commit 12bebfb into pi-hole:development-v6 May 17, 2024
9 checks passed
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.

None yet

2 participants