Merge pull request #121 from nneonneo/namelen-patch

Allow longer nameservers.
This commit is contained in:
Erik Ekman
2025-08-25 09:15:38 +02:00
committed by GitHub

View File

@@ -21,10 +21,10 @@
char *get_resolvconf_addr(void) char *get_resolvconf_addr(void)
{ {
static char addr[16]; static char addr[257];
char *rv = NULL; char *rv = NULL;
#ifndef WINDOWS32 #ifndef WINDOWS32
char buf[80]; char buf[257];
FILE *fp; FILE *fp;
#ifdef ANDROID #ifdef ANDROID
fp = popen("getprop net.dns1", "r"); fp = popen("getprop net.dns1", "r");
@@ -32,7 +32,7 @@ char *get_resolvconf_addr(void)
err(1, "getprop net.dns1 failed"); err(1, "getprop net.dns1 failed");
if (fgets(buf, sizeof(buf), fp) == NULL) if (fgets(buf, sizeof(buf), fp) == NULL)
err(1, "read getprop net.dns1 failed"); err(1, "read getprop net.dns1 failed");
if (sscanf(buf, "%15s", addr) == 1) if (sscanf(buf, "%256s", addr) == 1)
rv = addr; rv = addr;
pclose(fp); pclose(fp);
#else #else
@@ -42,7 +42,7 @@ char *get_resolvconf_addr(void)
while (feof(fp) == 0) { while (feof(fp) == 0) {
fgets(buf, sizeof(buf), fp); fgets(buf, sizeof(buf), fp);
if (sscanf(buf, "nameserver %15s", addr) == 1) { if (sscanf(buf, "nameserver %256s", addr) == 1) {
rv = addr; rv = addr;
break; break;
} }