From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.org/gmane.linux.lib.musl.general/11283 Path: news.gmane.org!.POSTED!not-for-mail From: Stefan Sedich Newsgroups: gmane.linux.lib.musl.general Subject: [PATCH] Add RES_OPTIONS support for resolv.conf options overriding Date: Mon, 24 Apr 2017 19:21:22 -0700 Message-ID: <20170425022122.27281-1-stefan.sedich@gmail.com> Reply-To: musl@lists.openwall.com NNTP-Posting-Host: blaine.gmane.org X-Trace: blaine.gmane.org 1493086917 17410 195.159.176.226 (25 Apr 2017 02:21:57 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Tue, 25 Apr 2017 02:21:57 +0000 (UTC) Cc: Stefan Sedich To: musl@lists.openwall.com Original-X-From: musl-return-11298-gllmg-musl=m.gmane.org@lists.openwall.com Tue Apr 25 04:21:52 2017 Return-path: Envelope-to: gllmg-musl@m.gmane.org Original-Received: from mother.openwall.net ([195.42.179.200]) by blaine.gmane.org with smtp (Exim 4.84_2) (envelope-from ) id 1d2q6x-0004PV-IT for gllmg-musl@m.gmane.org; Tue, 25 Apr 2017 04:21:51 +0200 Original-Received: (qmail 11672 invoked by uid 550); 25 Apr 2017 02:21:54 -0000 Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Original-Received: (qmail 11640 invoked from network); 25 Apr 2017 02:21:52 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=wT0pYHlI9AqPNObQgd26C1uIHudZ2VQKmEBDYHSSTCM=; b=CwZFCiUfLA01HsdAYUYRKi04/6RWtUW9gD+y2dYPlaXvzaI/fsezgOVm2bNGaD1P/X AFkfMP6XIA5BodMjjMvKgA22KGyHvZjsNImSBM6rjwJhD84xC2inSHy/bRW2XvP9ULEU OJUCREB2+81COcLwnM4xPVx9IwAP55tfM9XkbWQNnYSe/YTTt2/rN/6mVhYNx8S5NWGt pySsEHQvKLd0h2Jsbu/GeVKMJrjrt82jIOhg9kH1fCVWzPzaWfyCfcfvzq1y0AcGSRak fOBvSWLVNpECBcg/hqFHbkHp+5iugGVFpru/7o0WP4ShBmGN9yqyYJsV3mqGo80vVJ83 aT4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=wT0pYHlI9AqPNObQgd26C1uIHudZ2VQKmEBDYHSSTCM=; b=rUBniobSC9cIHV9zJfpXZB2PvyjpEKCIj9iIB27xrcjec02EXfBmSEmQLFZOzKhjqN cbB/ca7pNB89VcIEFs5PCJVRHlhIJABHpkqcK9LAZjXWVk1cZlsbzBsgL/kXxhjmM62B abcYNH6P0NWrtF9OheZsICX0wse4JVkcTzAp1zqEo5JYyi97GnPL1iSKJNDqn5+BwtWc pJ5QizoTPM2gHlD8R9kzXdCYCe456fC1w7RzApMr3PUhevtQs/MMy9IWd6p+ynNPQ0WF ykSIr+83Sob4MDbU3rc+lYff5P3Q7iKqd4dIjAY0zU2FaIcvzEPXSyQqTNrzoAhQ86W7 1aFQ== X-Gm-Message-State: AN3rC/4CrKGnDwqH4gpbRTGG6bu5D2svd01/57iZi8Ue6wA7TGeLis1y 26U7EExGFxdJKpLAiV4= X-Received: by 10.107.183.200 with SMTP id h191mr10828001iof.105.1493086900819; Mon, 24 Apr 2017 19:21:40 -0700 (PDT) X-Mailer: git-send-email 2.11.0 Xref: news.gmane.org gmane.linux.lib.musl.general:11283 Archived-At: Currently glibc supports using the RES_OPTIONS environment variable to customize the resolv.conf options on a per-process basis, this adds the same support to musl --- src/network/resolvconf.c | 48 ++++++++++++++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 18 deletions(-) diff --git a/src/network/resolvconf.c b/src/network/resolvconf.c index 4c3e4c4b..c759ff61 100644 --- a/src/network/resolvconf.c +++ b/src/network/resolvconf.c @@ -5,6 +5,30 @@ #include #include +void __parse_resolv_opts(struct resolvconf *conf, char *opts) +{ + char *p, *z; + + p = strstr(opts, "ndots:"); + if (p && isdigit(p[6])) { + p += 6; + unsigned long x = strtoul(p, &z, 10); + if (z != p) conf->ndots = x > 15 ? 15 : x; + } + p = strstr(opts, "attempts:"); + if (p && isdigit(p[9])) { + p += 9; + unsigned long x = strtoul(p, &z, 10); + if (z != p) conf->attempts = x > 10 ? 10 : x; + } + p = strstr(opts, "timeout:"); + if (p && (isdigit(p[8]) || p[8]=='.')) { + p += 8; + unsigned long x = strtoul(p, &z, 10); + if (z != p) conf->timeout = x > 60 ? 60 : x; + } +} + int __get_resolv_conf(struct resolvconf *conf, char *search, size_t search_sz) { char line[256]; @@ -38,24 +62,7 @@ int __get_resolv_conf(struct resolvconf *conf, char *search, size_t search_sz) continue; } if (!strncmp(line, "options", 7) && isspace(line[7])) { - p = strstr(line, "ndots:"); - if (p && isdigit(p[6])) { - p += 6; - unsigned long x = strtoul(p, &z, 10); - if (z != p) conf->ndots = x > 15 ? 15 : x; - } - p = strstr(line, "attempts:"); - if (p && isdigit(p[9])) { - p += 9; - unsigned long x = strtoul(p, &z, 10); - if (z != p) conf->attempts = x > 10 ? 10 : x; - } - p = strstr(line, "timeout:"); - if (p && (isdigit(p[8]) || p[8]=='.')) { - p += 8; - unsigned long x = strtoul(p, &z, 10); - if (z != p) conf->timeout = x > 60 ? 60 : x; - } + __parse_resolv_opts(conf, line); continue; } if (!strncmp(line, "nameserver", 10) && isspace(line[10])) { @@ -79,6 +86,11 @@ int __get_resolv_conf(struct resolvconf *conf, char *search, size_t search_sz) memcpy(search, p, l+1); } + char *res_opts_env; + if ((res_opts_env = getenv("RES_OPTIONS")) != NULL) { + __parse_resolv_opts(conf, res_opts_env); + } + __fclose_ca(f); no_resolv_conf: -- 2.11.0