Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
ISC Open Source Projects
BIND
Commits
7539c231
Commit
7539c231
authored
Jan 27, 2008
by
Mark Andrews
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
2323. [port] tru64: namespace clash. [RT #17547]
parent
29d01916
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
10 deletions
+12
-10
CHANGES
CHANGES
+2
-0
lib/bind/resolv/res_send.c
lib/bind/resolv/res_send.c
+7
-7
lib/isc/unix/socket.c
lib/isc/unix/socket.c
+3
-3
No files found.
CHANGES
View file @
7539c231
2323. [port] tru64: namespace clash. [RT #17547]
2322. [port] MacOS: work around the limitation of setrlimit()
for RLIMIT_NOFILE. [RT #17526]
...
...
lib/bind/resolv/res_send.c
View file @
7539c231
...
...
@@ -70,7 +70,7 @@
#if defined(LIBC_SCCS) && !defined(lint)
static
const
char
sccsid
[]
=
"@(#)res_send.c 8.1 (Berkeley) 6/4/93"
;
static
const
char
rcsid
[]
=
"$Id: res_send.c,v 1.1
8
200
7/12/14
0
3
:5
2:40
marka Exp $"
;
static
const
char
rcsid
[]
=
"$Id: res_send.c,v 1.1
9
200
8/01/27
0
1
:5
8:19
marka Exp $"
;
#endif
/* LIBC_SCCS and not lint */
/*! \file
...
...
@@ -293,7 +293,7 @@ int
res_nsend
(
res_state
statp
,
const
u_char
*
buf
,
int
buflen
,
u_char
*
ans
,
int
anssiz
)
{
int
gotsomewhere
,
terrno
,
tr
y
,
v_circuit
,
resplen
,
ns
,
n
;
int
gotsomewhere
,
terrno
,
tr
ies
,
v_circuit
,
resplen
,
ns
,
n
;
char
abuf
[
NI_MAXHOST
];
#ifdef USE_POLL
...
...
@@ -405,7 +405,7 @@ res_nsend(res_state statp,
/*
* Send request, RETRY times, or until successful.
*/
for
(
tr
y
=
0
;
tr
y
<
statp
->
retry
;
tr
y
++
)
{
for
(
tr
ies
=
0
;
tr
ies
<
statp
->
retry
;
tr
ies
++
)
{
for
(
ns
=
0
;
ns
<
statp
->
nscount
;
ns
++
)
{
struct
sockaddr
*
nsap
;
int
nsaplen
;
...
...
@@ -453,7 +453,7 @@ res_nsend(res_state statp,
if
(
v_circuit
)
{
/* Use VC; at most one attempt per server. */
tr
y
=
statp
->
retry
;
tr
ies
=
statp
->
retry
;
n
=
send_vc
(
statp
,
buf
,
buflen
,
ans
,
anssiz
,
&
terrno
,
ns
);
if
(
n
<
0
)
...
...
@@ -464,7 +464,7 @@ res_nsend(res_state statp,
}
else
{
/* Use datagrams. */
n
=
send_dg
(
statp
,
buf
,
buflen
,
ans
,
anssiz
,
&
terrno
,
ns
,
tr
y
,
&
v_circuit
,
&
gotsomewhere
);
ns
,
tr
ies
,
&
v_circuit
,
&
gotsomewhere
);
if
(
n
<
0
)
goto
fail
;
if
(
n
==
0
)
...
...
@@ -787,7 +787,7 @@ send_vc(res_state statp,
static
int
send_dg
(
res_state
statp
,
const
u_char
*
buf
,
int
buflen
,
u_char
*
ans
,
int
anssiz
,
int
*
terrno
,
int
ns
,
int
tr
y
,
int
*
v_circuit
,
int
anssiz
,
int
*
terrno
,
int
ns
,
int
tr
ies
,
int
*
v_circuit
,
int
*
gotsomewhere
)
{
const
HEADER
*
hp
=
(
const
HEADER
*
)
buf
;
...
...
@@ -869,7 +869,7 @@ send_dg(res_state statp, const u_char *buf, int buflen, u_char *ans,
/*
* Wait for reply.
*/
seconds
=
(
statp
->
retrans
<<
tr
y
);
seconds
=
(
statp
->
retrans
<<
tr
ies
);
if
(
ns
>
0
)
seconds
/=
statp
->
nscount
;
if
(
seconds
<=
0
)
...
...
lib/isc/unix/socket.c
View file @
7539c231
...
...
@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: socket.c,v 1.27
8
2008/01/2
2
01:
06:33
marka Exp $ */
/* $Id: socket.c,v 1.27
9
2008/01/2
7
01:
58:19
marka Exp $ */
/*! \file */
...
...
@@ -1475,7 +1475,7 @@ isc_socket_create(isc_socketmgr_t *manager, int pf, isc_sockettype_t type,
#endif
char
strbuf
[
ISC_STRERRORSIZE
];
const
char
*
err
=
"socket"
;
int
tr
y
=
0
;
int
tr
ies
=
0
;
REQUIRE
(
VALID_MANAGER
(
manager
));
REQUIRE
(
socketp
!=
NULL
&&
*
socketp
==
NULL
);
...
...
@@ -1500,7 +1500,7 @@ isc_socket_create(isc_socketmgr_t *manager, int pf, isc_sockettype_t type,
INSIST
(
type
!=
isc_sockettype_fdwatch
);
break
;
}
if
(
sock
->
fd
==
-
1
&&
errno
==
EINTR
&&
tr
y
++
<
42
)
if
(
sock
->
fd
==
-
1
&&
errno
==
EINTR
&&
tr
ies
++
<
42
)
goto
again
;
#ifdef F_DUPFD
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment