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

Update inet_aton.c from FreeBSD uptream removes advertising clause #967

Merged
merged 3 commits into from
Jun 18, 2022

Conversation

michaelortmann
Copy link
Member

@michaelortmann michaelortmann commented Apr 5, 2020

Found by: michaelortmann
Patch by: michaelortmann
Fixes:

One-line summary:
The new https://github.com/freebsd/freebsd/blob/455de2f90f71a495eb5068b060c17de9bfcffda6/lib/libc/inet/inet_addr.c removes advertising clause from license.

Additional description (if needed):
The only user of inet_aton() within eggdrop is one function in dns module. I tested this function and enhanced its logging. But you cant see the DNS: Valid dns-server message, because #948 is not merged yet. egg_inet_aton() now uses isdigit(), islower(), isspace() instead of egg_*() due to all of them being posix 2001.
Removal of the advertising clause helps with #226 see #226 (comment)_

Test cases demonstrating functionality (if applicable):

$ grep INET_ATON config.h
#define HAVE_INET_ATON 1
$ nm eggdrop|grep aton
                 U inet_aton@@GLIBC_2.2.5

$ grep INET_ATON config.h
/* #define HAVE_INET_ATON 1 */
$ nm eggdrop|grep aton
00000000000589c0 T egg_inet_aton

@michaelortmann michaelortmann changed the title Update inet_aton.c from FreeBSD uptream and enhance DNS Log Update inet_aton.c from FreeBSD uptream removes advertising clause Apr 5, 2020
Copy link
Member

@vanosg vanosg left a comment

Choose a reason for hiding this comment

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

Please test the cases that are affected by these changes and show code equivalency

src/compat/inet_aton.c Outdated Show resolved Hide resolved
@vanosg
Copy link
Member

vanosg commented Sep 6, 2020

This is more than just removing the advertisement, there are some semi-significant updates to the code being run. This would require some extensive testing to validate- please provide test cases for the new code in use. Thanks!

@michaelortmann
Copy link
Member Author

vanosg: As we spoke, the multi line fix is committed and thus this PR is ready for review again.

@vanosg vanosg added this to the v1.9.3 milestone Jun 6, 2022
@vanosg vanosg merged commit 9569113 into eggheads:develop Jun 18, 2022
@michaelortmann michaelortmann deleted the inet_aton branch June 20, 2022 00:37
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.

2 participants