diff options
| author | Florian Weimer <fweimer@redhat.com> | 2022-08-30 10:02:49 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2022-08-30 10:02:49 +0200 |
| commit | c79327bf00a4be6d60259227acc78ef80ead3622 (patch) | |
| tree | d686c63b5defeb5fb9d9d56550963f0e57d46d5a /resolv | |
| parent | 87aa98aa80627553a66bdcad2701fd6307723645 (diff) | |
| download | glibc-c79327bf00a4be6d60259227acc78ef80ead3622.zip glibc-c79327bf00a4be6d60259227acc78ef80ead3622.tar.gz glibc-c79327bf00a4be6d60259227acc78ef80ead3622.tar.bz2 | |
resolv: Add internal __res_binary_hnok function
During package parsing, only the binary representation is available,
and it is convenient to check that directly for conformance with host
name requirements.
Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
Diffstat (limited to 'resolv')
| -rw-r--r-- | resolv/res-name-checking.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/resolv/res-name-checking.c b/resolv/res-name-checking.c index 07a412d..213edce 100644 --- a/resolv/res-name-checking.c +++ b/resolv/res-name-checking.c @@ -138,6 +138,12 @@ binary_leading_dash (const unsigned char *dn) return dn[0] > 0 && dn[1] == '-'; } +bool +__res_binary_hnok (const unsigned char *dn) +{ + return !binary_leading_dash (dn) && binary_hnok (dn); +} + /* Return 1 if res_hnok is a valid host name. Labels must only contain [0-9a-zA-Z_-] characters, and the name must not start with a '-'. The latter is to avoid confusion with program options. */ @@ -145,11 +151,9 @@ int ___res_hnok (const char *dn) { unsigned char buf[NS_MAXCDNAME]; - if (!printable_string (dn) - || __ns_name_pton (dn, buf, sizeof (buf)) < 0 - || binary_leading_dash (buf)) - return 0; - return binary_hnok (buf); + return (printable_string (dn) + && __ns_name_pton (dn, buf, sizeof (buf)) >= 0 + && __res_binary_hnok (buf)); } versioned_symbol (libc, ___res_hnok, res_hnok, GLIBC_2_34); versioned_symbol (libc, ___res_hnok, __libc_res_hnok, GLIBC_PRIVATE); |