{"id":810216,"url":"http://patchwork.ozlabs.org/api/patches/810216/?format=json","web_url":"http://patchwork.ozlabs.org/project/glibc/patch/20170905160530.19525-4-stlman@poczta.fm/","project":{"id":41,"url":"http://patchwork.ozlabs.org/api/projects/41/?format=json","name":"GNU C Library","link_name":"glibc","list_id":"libc-alpha.sourceware.org","list_email":"libc-alpha@sourceware.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170905160530.19525-4-stlman@poczta.fm>","list_archive_url":null,"date":"2017-09-05T16:05:29","name":"[RFC,3/4,BZ,17083] NSS: Introduce gethostbyname5_r function","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"6445e1005eb8cac7d66c4b32e90b111b7bd257b4","submitter":{"id":72297,"url":"http://patchwork.ozlabs.org/api/people/72297/?format=json","name":"Łukasz Stelmach","email":"stlman@poczta.fm"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/glibc/patch/20170905160530.19525-4-stlman@poczta.fm/mbox/","series":[{"id":1605,"url":"http://patchwork.ozlabs.org/api/series/1605/?format=json","web_url":"http://patchwork.ozlabs.org/project/glibc/list/?series=1605","date":"2017-09-05T16:05:26","name":"Make getaddrinfo(3) return zone id from /etc/hosts for link-local IPv6 addresses","version":1,"mbox":"http://patchwork.ozlabs.org/series/1605/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/810216/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/810216/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":["patchwork-incoming@bilbo.ozlabs.org","mailing list libc-alpha@sourceware.org"],"Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=sourceware.org\n\t(client-ip=209.132.180.131; helo=sourceware.org;\n\tenvelope-from=libc-alpha-return-84194-incoming=patchwork.ozlabs.org@sourceware.org;\n\treceiver=)","ozlabs.org; dkim=pass (1024-bit key;\n\tsecure) header.d=sourceware.org header.i=@sourceware.org\n\theader.b=\"kjgi/jUh\"; dkim-atps=neutral","sourceware.org; auth=none"],"Received":["from sourceware.org (server1.sourceware.org [209.132.180.131])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xms6N2Wq3z9ryk\n\tfor ;\n\tWed, 6 Sep 2017 02:06:52 +1000 (AEST)","(qmail 118266 invoked by alias); 5 Sep 2017 16:06:20 -0000","(qmail 118214 invoked by uid 89); 5 Sep 2017 16:06:20 -0000"],"DomainKey-Signature":"a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id\n\t:list-unsubscribe:list-subscribe:list-archive:list-post\n\t:list-help:sender:from:to:cc:subject:date:message-id:in-reply-to\n\t:references:mime-version:content-type:content-transfer-encoding;\n\tq=dns; s=default; b=ei51AYKVQqOcLtLhWzpLwpo4MUkSTMxvt0oO+vGX8DO\n\tdObI6+Fj8Tppzt64O1ke2cI0W16EOCz0kXL1fjEiEaCk90Jn0OnSMoxMvPJ0ctvH\n\tgIsJhGBCduba2773URqoiTP1M3daD8/L8a8EteUcZtNQ7IVUpZIGnwbQ76037f00\n\t=","DKIM-Signature":"v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id\n\t:list-unsubscribe:list-subscribe:list-archive:list-post\n\t:list-help:sender:from:to:cc:subject:date:message-id:in-reply-to\n\t:references:mime-version:content-type:content-transfer-encoding;\n\ts=default; bh=ojimxtpv1GGVbbROBH5aKgT9Isg=; b=kjgi/jUhK0EgAK2mE\n\tyrGXd6xuBAblVhBaoGDQXtmJztf8iMpjW5hw6ozI1x2BUJBuvzTu+tCMFFArdZXX\n\tPbrJ49WaKjRRApgZAZiwYXrKtmEDewSYGxbeihPhxiBmQ91tpYF0FxiVvYYy61Ko\n\thsBUqoxplaRk39liQaEet8ClqM=","Mailing-List":"contact libc-alpha-help@sourceware.org; run by ezmlm","Precedence":"bulk","List-Id":"","List-Unsubscribe":"","List-Subscribe":"","List-Archive":"","List-Post":"","List-Help":",\n\t","Sender":"libc-alpha-owner@sourceware.org","X-Virus-Found":"No","X-Spam-SWARE-Status":"No, score=-26.4 required=5.0 tests=AWL, BAYES_00,\n\tFREEMAIL_FROM, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2,\n\tGIT_PATCH_3, SPF_PASS autolearn=ham version=3.3.2 spammy=t_a,\n\tT_A","X-HELO":"smtpo.poczta.interia.pl","X-Interia-R":"Interia","X-Interia-R-IP":"89.64.33.181","X-Interia-R-Helo":"","From":"=?utf-8?q?=C5=81ukasz_Stelmach?= ","To":"libc-alpha@sourceware.org","Cc":"=?utf-8?q?=C5=81ukasz_Stelmach?= ","Subject":"[RFC][PATCH 3/4][BZ 17083] NSS: Introduce gethostbyname5_r function","Date":"Tue, 5 Sep 2017 18:05:29 +0200","Message-Id":"<20170905160530.19525-4-stlman@poczta.fm>","In-Reply-To":"<20170905160530.19525-1-stlman@poczta.fm>","References":"<20170905160530.19525-1-stlman@poczta.fm>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","X-Interia-Antivirus":"OK","X-IPL-POID":"4","X-IPL-SAS-SPAS":"-0.6","X-IPL-SAS-UREP":"0","X-IPL-SAS-UREP-PRIV":"0","X-IPL-Envelope-To":"stlman@poczta.fm"},"content":"Add af (address family) to the list of arguments of gethostbyname4_r\nfunction in files, dns, nis and nisplus module and rename the function to\ngethostbyname5_r. Pass the af value to the underlying parsing functions.\nDefine gethostbyname4_r as a wrapper for the former passing af set\nto AF_UNSPEC.\n\nSigned-off-by: Łukasz Stelmach \n---\n nis/Versions | 3 ++-\n nis/nss_nis/nis-hosts.c | 13 +++++++++++--\n nis/nss_nisplus/nisplus-hosts.c | 13 +++++++++++--\n nss/Versions | 1 +\n nss/nss_files/files-hosts.c | 13 +++++++++++--\n resolv/Versions | 2 +-\n resolv/nss_dns/dns-host.c | 32 ++++++++++++++++++++++++++++++--\n 7 files changed, 67 insertions(+), 10 deletions(-)","diff":"diff --git a/nis/Versions b/nis/Versions\nindex ef9a512417..537f0aa3c0 100644\n--- a/nis/Versions\n+++ b/nis/Versions\n@@ -96,6 +96,7 @@ libnss_nis {\n _nss_nis_setnetgrent; _nss_nis_setprotoent; _nss_nis_setpwent;\n _nss_nis_setrpcent; _nss_nis_setservent; _nss_nis_setspent;\n _nss_nis_initgroups_dyn; _nss_nis_gethostbyname4_r;\n+ _nss_nis_gethostbyname5_r;\n }\n }\n \n@@ -126,6 +127,6 @@ libnss_nisplus {\n _nss_nisplus_setnetent; _nss_nisplus_setnetgrent; _nss_nisplus_setprotoent;\n _nss_nisplus_setpwent; _nss_nisplus_setrpcent; _nss_nisplus_setservent;\n _nss_nisplus_setspent; _nss_nisplus_initgroups_dyn;\n- _nss_nisplus_gethostbyname4_r;\n+ _nss_nisplus_gethostbyname4_r; _nss_nisplus_gethostbyname5_r;\n }\n }\ndiff --git a/nis/nss_nis/nis-hosts.c b/nis/nss_nis/nis-hosts.c\nindex f64dbdaecb..3a156aa7ee 100644\n--- a/nis/nss_nis/nis-hosts.c\n+++ b/nis/nss_nis/nis-hosts.c\n@@ -454,7 +454,7 @@ _nss_nis_gethostbyaddr_r (const void *addr, socklen_t addrlen, int af,\n \n \n enum nss_status\n-_nss_nis_gethostbyname4_r (const char *name, struct gaih_addrtuple **pat,\n+_nss_nis_gethostbyname5_r (const char *name, int af, struct gaih_addrtuple **pat,\n \t\t\t char *buffer, size_t buflen, int *errnop,\n \t\t\t int *herrnop, int32_t *ttlp)\n {\n@@ -530,7 +530,7 @@ _nss_nis_gethostbyname4_r (const char *name, struct gaih_addrtuple **pat,\n buflen -= pad;\n \n struct hostent host;\n- int parse_res = parse_line (result, &host, data, buflen, errnop, AF_UNSPEC,\n+ int parse_res = parse_line (result, &host, data, buflen, errnop, af,\n \t\t\t 0);\n if (__glibc_unlikely (parse_res < 1))\n {\n@@ -565,3 +565,12 @@ _nss_nis_gethostbyname4_r (const char *name, struct gaih_addrtuple **pat,\n \n return NSS_STATUS_SUCCESS;\n }\n+\n+enum nss_status\n+_nss_nis_gethostbyname4_r (const char *name, struct gaih_addrtuple **pat,\n+\t\t\t char *buffer, size_t buflen, int *errnop,\n+\t\t\t int *herrnop, int32_t *ttlp)\n+{\n+ return _nss_nis_gethostbyname5_r (name, AF_UNSPEC, pat, buffer, buflen,\n+\t\t\t\t errnop, herrnop, ttlp);\n+}\ndiff --git a/nis/nss_nisplus/nisplus-hosts.c b/nis/nss_nisplus/nisplus-hosts.c\nindex 31dfd31fbd..d9c5d7a974 100644\n--- a/nis/nss_nisplus/nisplus-hosts.c\n+++ b/nis/nss_nisplus/nisplus-hosts.c\n@@ -579,13 +579,13 @@ _nss_nisplus_gethostbyaddr_r (const void *addr, socklen_t addrlen, int af,\n \n \n enum nss_status\n-_nss_nisplus_gethostbyname4_r (const char *name, struct gaih_addrtuple **pat,\n+_nss_nisplus_gethostbyname5_r (const char *name, int af, struct gaih_addrtuple **pat,\n \t\t\t char *buffer, size_t buflen, int *errnop,\n \t\t\t int *herrnop, int32_t *ttlp)\n {\n struct hostent host;\n \n- enum nss_status status = internal_gethostbyname2_r (name, AF_UNSPEC, &host,\n+ enum nss_status status = internal_gethostbyname2_r (name, af, &host,\n \t\t\t\t\t\t buffer, buflen,\n \t\t\t\t\t\t errnop, herrnop, 0);\n if (__glibc_likely (status == NSS_STATUS_SUCCESS))\n@@ -617,3 +617,12 @@ _nss_nisplus_gethostbyname4_r (const char *name, struct gaih_addrtuple **pat,\n \n return status;\n }\n+\n+enum nss_status\n+_nss_nisplus_gethostbyname4_r (const char *name, struct gaih_addrtuple **pat,\n+\t\t\t char *buffer, size_t buflen, int *errnop,\n+\t\t\t int *herrnop, int32_t *ttlp)\n+{\n+ return _nss_nisplus_gethostbyname5_r (name, AF_UNSPEC, pat, buffer,\n+\t\t\t\t\tbuflen, errnop, herrnop, ttlp);\n+}\ndiff --git a/nss/Versions b/nss/Versions\nindex 50268ed9b5..72adf4c806 100644\n--- a/nss/Versions\n+++ b/nss/Versions\n@@ -44,6 +44,7 @@ libnss_files {\n _nss_files_gethostbyname2_r;\n _nss_files_gethostbyname3_r;\n _nss_files_gethostbyname4_r;\n+ _nss_files_gethostbyname5_r;\n _nss_files_gethostbyname_r;\n _nss_files_gethostent_r;\n \ndiff --git a/nss/nss_files/files-hosts.c b/nss/nss_files/files-hosts.c\nindex 28eb73fb2d..c6067cc641 100644\n--- a/nss/nss_files/files-hosts.c\n+++ b/nss/nss_files/files-hosts.c\n@@ -404,7 +404,7 @@ _nss_files_gethostbyname2_r (const char *name, int af, struct hostent *result,\n }\n \n enum nss_status\n-_nss_files_gethostbyname4_r (const char *name, struct gaih_addrtuple **pat,\n+_nss_files_gethostbyname5_r (const char *name, int af, struct gaih_addrtuple **pat,\n \t\t\t char *buffer, size_t buflen, int *errnop,\n \t\t\t int *herrnop, int32_t *ttlp)\n {\n@@ -428,7 +428,7 @@ _nss_files_gethostbyname4_r (const char *name, struct gaih_addrtuple **pat,\n \n \t struct hostent result;\n \t status = internal_getent (stream, &result, buffer, buflen, errnop,\n-\t\t\t\t herrnop, AF_UNSPEC, 0, &in6_zone_id);\n+\t\t\t\t herrnop, af, 0, &in6_zone_id);\n \t if (status != NSS_STATUS_SUCCESS)\n \t break;\n \n@@ -518,3 +518,12 @@ _nss_files_gethostbyname4_r (const char *name, struct gaih_addrtuple **pat,\n \n return status;\n }\n+\n+enum nss_status\n+_nss_files_gethostbyname4_r (const char *name, struct gaih_addrtuple **pat,\n+\t\t\t char *buffer, size_t buflen, int *errnop,\n+\t\t\t int *herrnop, int32_t *ttlp)\n+{\n+ return _nss_files_gethostbyname5_r (name, AF_UNSPEC, pat, buffer, buflen,\n+\t\t\t\t errnop, herrnop, ttlp);\n+}\ndiff --git a/resolv/Versions b/resolv/Versions\nindex b05778d965..2ae1048908 100644\n--- a/resolv/Versions\n+++ b/resolv/Versions\n@@ -96,7 +96,7 @@ libnss_dns {\n _nss_dns_gethostbyname_r; _nss_dns_getnetbyaddr_r;\n _nss_dns_getnetbyname_r; _nss_dns_getcanonname_r;\n _nss_dns_gethostbyaddr2_r;\n- _nss_dns_gethostbyname4_r;\n+ _nss_dns_gethostbyname4_r; _nss_dns_gethostbyname5_r;\n }\n }\n \ndiff --git a/resolv/nss_dns/dns-host.c b/resolv/nss_dns/dns-host.c\nindex 7cd54ab504..dddb8f4bef 100644\n--- a/resolv/nss_dns/dns-host.c\n+++ b/resolv/nss_dns/dns-host.c\n@@ -308,7 +308,7 @@ _nss_dns_gethostbyname_r (const char *name, struct hostent *result,\n \n \n enum nss_status\n-_nss_dns_gethostbyname4_r (const char *name, struct gaih_addrtuple **pat,\n+_nss_dns_gethostbyname5_r (const char *name, int af, struct gaih_addrtuple **pat,\n \t\t\t char *buffer, size_t buflen, int *errnop,\n \t\t\t int *herrnop, int32_t *ttlp)\n {\n@@ -344,10 +344,28 @@ _nss_dns_gethostbyname4_r (const char *name, struct gaih_addrtuple **pat,\n int nans2p = 0;\n int resplen2 = 0;\n int ans2p_malloced = 0;\n+ int type;\n \n int olderr = errno;\n enum nss_status status;\n- int n = __res_context_search (ctx, name, C_IN, T_QUERY_A_AND_AAAA,\n+\n+ switch (af) {\n+ case AF_UNSPEC:\n+ type = T_QUERY_A_AND_AAAA;\n+ break;\n+ case AF_INET:\n+ type = T_A;\n+ break;\n+ case AF_INET6:\n+ type = T_AAAA;\n+ break;\n+ default:\n+ *herrnop = NO_DATA;\n+ *errnop = EAFNOSUPPORT;\n+ return NSS_STATUS_UNAVAIL;\n+ }\n+\n+ int n = __res_context_search (ctx, name, C_IN, type,\n \t\t\t\thost_buffer.buf->buf, 2048, &host_buffer.ptr,\n \t\t\t\t&ans2p, &nans2p, &resplen2, &ans2p_malloced);\n if (n >= 0)\n@@ -397,6 +415,16 @@ _nss_dns_gethostbyname4_r (const char *name, struct gaih_addrtuple **pat,\n }\n \n \n+enum nss_status\n+_nss_dns_gethostbyname4_r (const char *name, struct gaih_addrtuple **pat,\n+\t\t\t char *buffer, size_t buflen, int *errnop,\n+\t\t\t int *herrnop, int32_t *ttlp)\n+{\n+ return _nss_dns_gethostbyname5_r (name, AF_UNSPEC, pat, buffer, buflen,\n+\t\t\t\t errnop, herrnop,ttlp);\n+}\n+\n+\n extern enum nss_status _nss_dns_gethostbyaddr2_r (const void *addr,\n \t\t\t\t\t\t socklen_t len, int af,\n \t\t\t\t\t\t struct hostent *result,\n","prefixes":["RFC","3/4","BZ","17083"]}