8597553f96
- Support an arbitrary number of search domains (#168253) - Detect and apply /etc/resolv.conf changes in libresolv (#1374239) - CVE-2015-5180: DNS stub resolver crash with crafted record type (#1251403)
47 lines
1.5 KiB
Diff
47 lines
1.5 KiB
Diff
commit b606c6ce66d4772068bfe3e410c28a247633ee24
|
|
Author: Florian Weimer <fweimer@redhat.com>
|
|
Date: Fri Jun 30 11:32:19 2017 +0200
|
|
|
|
resolv: Remove source argument fron res_options
|
|
|
|
diff --git a/resolv/res_init.c b/resolv/res_init.c
|
|
index 821f06061b4c3fb1..5d8b2c994d8e6f04 100644
|
|
--- a/resolv/res_init.c
|
|
+++ b/resolv/res_init.c
|
|
@@ -103,7 +103,7 @@
|
|
#include <inet/net-internal.h>
|
|
#include <errno.h>
|
|
|
|
-static void res_setoptions (res_state, const char *, const char *);
|
|
+static void res_setoptions (res_state, const char *);
|
|
static uint32_t net_mask (struct in_addr);
|
|
|
|
unsigned long long int __res_initstamp;
|
|
@@ -381,7 +381,7 @@ res_vinit_1 (res_state statp, bool preinit, FILE *fp, char **buffer)
|
|
}
|
|
if (MATCH (*buffer, "options"))
|
|
{
|
|
- res_setoptions (statp, *buffer + sizeof ("options") - 1, "conf");
|
|
+ res_setoptions (statp, *buffer + sizeof ("options") - 1);
|
|
continue;
|
|
}
|
|
}
|
|
@@ -417,7 +417,7 @@ res_vinit_1 (res_state statp, bool preinit, FILE *fp, char **buffer)
|
|
}
|
|
|
|
if ((cp = getenv ("RES_OPTIONS")) != NULL)
|
|
- res_setoptions (statp, cp, "env");
|
|
+ res_setoptions (statp, cp);
|
|
statp->options |= RES_INIT;
|
|
return true;
|
|
}
|
|
@@ -469,7 +469,7 @@ __res_vinit (res_state statp, int preinit)
|
|
}
|
|
|
|
static void
|
|
-res_setoptions (res_state statp, const char *options, const char *source)
|
|
+res_setoptions (res_state statp, const char *options)
|
|
{
|
|
const char *cp = options;
|
|
|