mirror of
https://github.com/freebsd/freebsd-src
synced 2024-11-05 18:22:52 +00:00
Back out the changes to set the resolver timeout. All they seem to do
is _break_ dns lookups entirely, and since reading the relevant docs and source code does not enlighten for now, I'll remove this until more basic research has been done into controlling the resolver's timeout values.
This commit is contained in:
parent
e7b89905f0
commit
97564a75d4
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=27819
2 changed files with 0 additions and 50 deletions
|
@ -46,7 +46,6 @@
|
|||
#include <sys/wait.h>
|
||||
#include <netinet/in.h>
|
||||
#include <arpa/inet.h>
|
||||
#include <resolv.h>
|
||||
|
||||
static Boolean got_intr = FALSE;
|
||||
|
||||
|
@ -85,28 +84,6 @@ cdromHook(dialogMenuItem *self)
|
|||
return genericHook(self, DEVICE_TYPE_CDROM);
|
||||
}
|
||||
|
||||
static void
|
||||
kickstart_dns(void)
|
||||
{
|
||||
static Boolean initted = FALSE;
|
||||
int time;
|
||||
char *cp;
|
||||
|
||||
cp = variable_get(VAR_MEDIA_TIMEOUT);
|
||||
if (!cp)
|
||||
time = MEDIA_TIMEOUT;
|
||||
else
|
||||
time = atoi(cp);
|
||||
if (!time)
|
||||
time = 100;
|
||||
if (!initted) {
|
||||
res_init();
|
||||
_res.retry = 2; /* 2 times seems a reasonable number to me */
|
||||
_res.retrans = time / 2; /* so spend half our alloted time on each try */
|
||||
initted = TRUE;
|
||||
}
|
||||
}
|
||||
|
||||
char *
|
||||
cpioVerbosity()
|
||||
{
|
||||
|
@ -385,7 +362,6 @@ mediaSetFTP(dialogMenuItem *self)
|
|||
msgDebug("port # = `%d'\n", FtpPort);
|
||||
}
|
||||
if (variable_get(VAR_NAMESERVER)) {
|
||||
kickstart_dns();
|
||||
if ((inet_addr(hostname) == INADDR_NONE) && (gethostbyname(hostname) == NULL)) {
|
||||
msgConfirm("Cannot resolve hostname `%s'! Are you sure that your\n"
|
||||
"name server, gateway and network interface are correctly configured?", hostname);
|
||||
|
@ -480,7 +456,6 @@ mediaSetNFS(dialogMenuItem *self)
|
|||
msgDebug("mediaSetNFS: Net device init failed\n");
|
||||
}
|
||||
if (variable_get(VAR_NAMESERVER)) {
|
||||
kickstart_dns();
|
||||
if ((inet_addr(hostname) == INADDR_NONE) && (gethostbyname(hostname) == NULL)) {
|
||||
msgConfirm("Cannot resolve hostname `%s'! Are you sure that your\n"
|
||||
"name server, gateway and network interface are correctly configured?", hostname);
|
||||
|
|
|
@ -46,7 +46,6 @@
|
|||
#include <sys/wait.h>
|
||||
#include <netinet/in.h>
|
||||
#include <arpa/inet.h>
|
||||
#include <resolv.h>
|
||||
|
||||
static Boolean got_intr = FALSE;
|
||||
|
||||
|
@ -85,28 +84,6 @@ cdromHook(dialogMenuItem *self)
|
|||
return genericHook(self, DEVICE_TYPE_CDROM);
|
||||
}
|
||||
|
||||
static void
|
||||
kickstart_dns(void)
|
||||
{
|
||||
static Boolean initted = FALSE;
|
||||
int time;
|
||||
char *cp;
|
||||
|
||||
cp = variable_get(VAR_MEDIA_TIMEOUT);
|
||||
if (!cp)
|
||||
time = MEDIA_TIMEOUT;
|
||||
else
|
||||
time = atoi(cp);
|
||||
if (!time)
|
||||
time = 100;
|
||||
if (!initted) {
|
||||
res_init();
|
||||
_res.retry = 2; /* 2 times seems a reasonable number to me */
|
||||
_res.retrans = time / 2; /* so spend half our alloted time on each try */
|
||||
initted = TRUE;
|
||||
}
|
||||
}
|
||||
|
||||
char *
|
||||
cpioVerbosity()
|
||||
{
|
||||
|
@ -385,7 +362,6 @@ mediaSetFTP(dialogMenuItem *self)
|
|||
msgDebug("port # = `%d'\n", FtpPort);
|
||||
}
|
||||
if (variable_get(VAR_NAMESERVER)) {
|
||||
kickstart_dns();
|
||||
if ((inet_addr(hostname) == INADDR_NONE) && (gethostbyname(hostname) == NULL)) {
|
||||
msgConfirm("Cannot resolve hostname `%s'! Are you sure that your\n"
|
||||
"name server, gateway and network interface are correctly configured?", hostname);
|
||||
|
@ -480,7 +456,6 @@ mediaSetNFS(dialogMenuItem *self)
|
|||
msgDebug("mediaSetNFS: Net device init failed\n");
|
||||
}
|
||||
if (variable_get(VAR_NAMESERVER)) {
|
||||
kickstart_dns();
|
||||
if ((inet_addr(hostname) == INADDR_NONE) && (gethostbyname(hostname) == NULL)) {
|
||||
msgConfirm("Cannot resolve hostname `%s'! Are you sure that your\n"
|
||||
"name server, gateway and network interface are correctly configured?", hostname);
|
||||
|
|
Loading…
Reference in a new issue