Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ISC Open Source Projects
BIND
Commits
16764086
Commit
16764086
authored
Mar 18, 2004
by
Mark Andrews
Browse files
pullup silence compiler fixes
ifconfig.sh for Solaris 9 README updates
parent
ca9a8f6d
Changes
71
Hide whitespace changes
Inline
Side-by-side
README
View file @
16764086
...
...
@@ -48,12 +48,35 @@ BIND 9.3.0
BIND 9.3.0 has a number of new features over 9.2,
including:
DNSSEC is now DS based.
See doc/draft/draft-ietf-dnsext-dnssec-*
DNSSEC lookaside validation.
check-names is now implemented.
rrset-order in more complete.
IPv4/IPv6 transition support, dual-stack-servers.
IXFR deltas can now be generated when loading master files,
ixfr-from-differences.
It is now possible to specify the size of a journal, max-journal-size.
It is now possible to define a named set of master servers to be
used in masters clause, masters.
The advertised EDNS UDP size can now be set, edns-udp-size.
allow-v6-synthesis has been obsoleted.
NOTE:
* Zones containing MD and MF will now be rejected.
* dig, nslookup name. now report "Not Implemented" as
NOTIMP rather than NOTIMPL. This will have impact on scripts
that are looking for NOTIMPL.
libbind: corresponds to that from BIND 8.4.5.
BIND 9.2.0
...
...
bin/tests/system/ifconfig.sh
View file @
16764086
...
...
@@ -15,7 +15,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: ifconfig.sh,v 1.4
5
2004/03/1
0
02:
19
:5
2
marka Exp $
# $Id: ifconfig.sh,v 1.4
6
2004/03/1
8
02:
57
:5
4
marka Exp $
#
# Set up interface aliases for bind9 system tests.
...
...
@@ -72,9 +72,9 @@ case "$1" in
*
-sun-solaris2
.[6-7]
)
ifconfig lo0:
$int
10.53.0.
$ns
netmask 0xffffffff up
;;
*
-
*
-solaris2
.
8
)
ifconfig lo0:
$int
plumb
ifconfig lo0:
$int
10.53.0.
$ns
up
*
-
*
-solaris2
.
[8-9]
)
/sbin/
ifconfig lo0:
$int
plumb
/sbin/
ifconfig lo0:
$int
10.53.0.
$ns
up
;;
*
-
*
-linux
*
)
ifconfig lo:
$int
10.53.0.
$ns
up netmask 255.255.255.0
...
...
doc/dev/release
View file @
16764086
...
...
@@ -2,7 +2,7 @@ Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
Copyright (C) 2000-2003 Internet Software Consortium.
See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
$Id: release,v 1.
59
2004/03/1
3
0
4:08:07 sr
a Exp $
$Id: release,v 1.
60
2004/03/1
8
0
2:57:55 mark
a Exp $
Preparing a bind9 release
...
...
@@ -136,7 +136,7 @@ release.
$ CFLAGS=-I/usr/local/include ./configure '--with-iconv=-L/usr/local/lib -liconv'
[ Sample on freebsd -- formerly used giconv, now uses iconv ]
./configure --with-iconv-include=/usr/local/include \
./configure --with-iconv-include=/usr/local/include \
'--with-iconv=-L/usr/local/lib -liconv'
$ make
...
...
lib/bind/dst/dst_internal.h
View file @
16764086
...
...
@@ -73,7 +73,7 @@ typedef struct dst_key {
#ifndef SAFE_FREE
#define SAFE_FREE(a) \
do{if(a != NULL){memset(a,0, sizeof(*a)); free(a); a=NULL;}} while (0)
#define SAFE_FREE2(a,s) if (a != NULL && s > 0){memset(a,0, s);free(a); a=NULL;}
#define SAFE_FREE2(a,s) if (a != NULL &&
(long)
s > 0){memset(a,0, s);free(a); a=NULL;}
#endif
typedef
struct
dst_func
{
...
...
lib/bind/dst/md5_dgst.c
View file @
16764086
...
...
@@ -99,7 +99,7 @@ unsigned long len;
int
sw
,
sc
;
ULONG
l
;
if
(
len
==
0
)
return
;
if
(
len
==
0
U
)
return
;
l
=
(
c
->
Nl
+
(
len
<<
3
))
&
0xffffffffL
;
/* 95-05-24 eay Fixed a bug with the overflow handling, thanks to
...
...
@@ -115,7 +115,7 @@ unsigned long len;
sw
=
c
->
num
>>
2
;
sc
=
c
->
num
&
0x03
;
if
((
c
->
num
+
len
)
>=
MD5_CBLOCK
)
if
((
c
->
num
+
len
)
>=
(
size_t
)
MD5_CBLOCK
)
{
l
=
p
[
sw
];
p_c2l
(
data
,
l
,
sc
);
...
...
@@ -136,7 +136,7 @@ unsigned long len;
int
ew
,
ec
;
c
->
num
+=
(
int
)
len
;
if
((
sc
+
len
)
<
4
)
/* ugly, add char's to a word */
if
((
sc
+
len
)
<
4
U
)
/* ugly, add char's to a word */
{
l
=
p
[
sw
];
p_c2l_p
(
data
,
l
,
sc
,
len
);
...
...
@@ -163,7 +163,7 @@ unsigned long len;
/* we now can process the input data in blocks of MD5_CBLOCK
* chars and save the leftovers to c->data. */
p
=
c
->
data
;
while
(
len
>=
MD5_CBLOCK
)
while
(
len
>=
(
size_t
)
MD5_CBLOCK
)
{
#if defined(L_ENDIAN) || defined(B_ENDIAN)
memcpy
(
p
,
data
,
MD5_CBLOCK
);
...
...
lib/bind/dst/md5_locl.h
View file @
16764086
...
...
@@ -101,9 +101,9 @@
switch (sc) \
{ \
case 0: l =((unsigned long)(*((c)++))); \
if (--len == 0) break; \
if (--len == 0
U
) break; \
case 1: l|=((unsigned long)(*((c)++)))<< 8; \
if (--len == 0) break; \
if (--len == 0
U
) break; \
case 2: l|=((unsigned long)(*((c)++)))<<16; \
} \
}
...
...
lib/bind/inet/inet_addr.c
View file @
16764086
...
...
@@ -70,7 +70,7 @@
#if defined(LIBC_SCCS) && !defined(lint)
static
const
char
sccsid
[]
=
"@(#)inet_addr.c 8.1 (Berkeley) 6/17/93"
;
static
const
char
rcsid
[]
=
"$Id: inet_addr.c,v 1.
3
2004/03/
09 06:29
:56 marka Exp $"
;
static
const
char
rcsid
[]
=
"$Id: inet_addr.c,v 1.
4
2004/03/
18 02:57
:56 marka Exp $"
;
#endif
/* LIBC_SCCS and not lint */
#include "port_before.h"
...
...
@@ -156,7 +156,7 @@ inet_aton(const char *cp, struct in_addr *addr) {
* a.b.c (with c treated as 16 bits)
* a.b (with b treated as 24 bits)
*/
if
(
pp
>=
parts
+
3
||
val
>
0xff
)
if
(
pp
>=
parts
+
3
||
val
>
0xff
U
)
return
(
0
);
*
pp
++
=
val
;
c
=
*++
cp
;
...
...
@@ -183,19 +183,19 @@ inet_aton(const char *cp, struct in_addr *addr) {
break
;
case
2
:
/* a.b -- 8.24 bits */
if
(
val
>
0xffffff
)
if
(
val
>
0xffffff
U
)
return
(
0
);
val
|=
parts
[
0
]
<<
24
;
break
;
case
3
:
/* a.b.c -- 8.8.16 bits */
if
(
val
>
0xffff
)
if
(
val
>
0xffff
U
)
return
(
0
);
val
|=
(
parts
[
0
]
<<
24
)
|
(
parts
[
1
]
<<
16
);
break
;
case
4
:
/* a.b.c.d -- 8.8.8.8 bits */
if
(
val
>
0xff
)
if
(
val
>
0xff
U
)
return
(
0
);
val
|=
(
parts
[
0
]
<<
24
)
|
(
parts
[
1
]
<<
16
)
|
(
parts
[
2
]
<<
8
);
break
;
...
...
lib/bind/inet/inet_cidr_ntop.c
View file @
16764086
...
...
@@ -16,7 +16,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
static
const
char
rcsid
[]
=
"$Id: inet_cidr_ntop.c,v 1.
3
2004/03/
09 06:29:57
marka Exp $"
;
static
const
char
rcsid
[]
=
"$Id: inet_cidr_ntop.c,v 1.
4
2004/03/
18 02:57:56
marka Exp $"
;
#endif
#include "port_before.h"
...
...
@@ -121,7 +121,7 @@ inet_cidr_ntop_ipv4(const u_char *src, int bits, char *dst, size_t size) {
if
(
bits
==
-
1
)
len
=
4
;
else
for
(
len
=
1
,
b
=
1
;
b
<
4
;
b
++
)
for
(
len
=
1
,
b
=
1
;
b
<
4
U
;
b
++
)
if
(
*
(
src
+
b
))
len
=
b
+
1
;
...
...
@@ -130,7 +130,7 @@ inet_cidr_ntop_ipv4(const u_char *src, int bits, char *dst, size_t size) {
if
(
len
>
bytes
)
bytes
=
len
;
b
=
decoct
(
src
,
bytes
,
dst
,
size
);
if
(
b
==
0
)
if
(
b
==
0
U
)
goto
emsgsize
;
dst
+=
b
;
size
-=
b
;
...
...
lib/bind/inet/inet_cidr_pton.c
View file @
16764086
...
...
@@ -16,7 +16,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
static
const
char
rcsid
[]
=
"$Id: inet_cidr_pton.c,v 1.
4
2004/03/
09 06:29
:57 marka Exp $"
;
static
const
char
rcsid
[]
=
"$Id: inet_cidr_pton.c,v 1.
5
2004/03/
18 02:57
:57 marka Exp $"
;
#endif
#include "port_before.h"
...
...
@@ -98,7 +98,7 @@ inet_cidr_pton_ipv4(const char *src, u_char *dst, int *pbits, int ipv6) {
if
(
tmp
>
255
)
goto
enoent
;
}
while
((
ch
=
*
src
++
)
!=
'\0'
&&
isascii
(
ch
)
&&
isdigit
(
ch
));
if
(
size
--
==
0
)
if
(
size
--
==
0
U
)
goto
emsgsize
;
*
dst
++
=
(
u_char
)
tmp
;
if
(
ch
==
'\0'
||
ch
==
'/'
)
...
...
@@ -133,7 +133,7 @@ inet_cidr_pton_ipv4(const char *src, u_char *dst, int *pbits, int ipv6) {
goto
enoent
;
/* Extend address to four octets. */
while
(
size
--
>
0
)
while
(
size
--
>
0
U
)
*
dst
++
=
0
;
*
pbits
=
bits
;
...
...
lib/bind/inet/inet_makeaddr.c
View file @
16764086
...
...
@@ -53,9 +53,9 @@ inet_makeaddr(net, host)
{
u_long
addr
;
if
(
net
<
128
)
if
(
net
<
128
U
)
addr
=
(
net
<<
IN_CLASSA_NSHIFT
)
|
(
host
&
IN_CLASSA_HOST
);
else
if
(
net
<
65536
)
else
if
(
net
<
65536
U
)
addr
=
(
net
<<
IN_CLASSB_NSHIFT
)
|
(
host
&
IN_CLASSB_HOST
);
else
if
(
net
<
16777216L
)
addr
=
(
net
<<
IN_CLASSC_NSHIFT
)
|
(
host
&
IN_CLASSC_HOST
);
...
...
lib/bind/inet/inet_net_pton.c
View file @
16764086
...
...
@@ -16,7 +16,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
static
const
char
rcsid
[]
=
"$Id: inet_net_pton.c,v 1.
6
2004/03/
09 06:29
:57 marka Exp $"
;
static
const
char
rcsid
[]
=
"$Id: inet_net_pton.c,v 1.
7
2004/03/
18 02:57
:57 marka Exp $"
;
#endif
#include "port_before.h"
...
...
@@ -70,7 +70,7 @@ inet_net_pton_ipv4(const char *src, u_char *dst, size_t size) {
&&
isascii
((
unsigned
char
)(
src
[
1
]))
&&
isxdigit
((
unsigned
char
)(
src
[
1
])))
{
/* Hexadecimal: Eat nybble string. */
if
(
size
<=
0
)
if
(
size
<=
0
U
)
goto
emsgsize
;
dirty
=
0
;
src
++
;
/* skip x or X. */
...
...
@@ -84,14 +84,14 @@ inet_net_pton_ipv4(const char *src, u_char *dst, size_t size) {
else
tmp
=
(
tmp
<<
4
)
|
n
;
if
(
++
dirty
==
2
)
{
if
(
size
--
<=
0
)
if
(
size
--
<=
0
U
)
goto
emsgsize
;
*
dst
++
=
(
u_char
)
tmp
;
dirty
=
0
;
}
}
if
(
dirty
)
{
/* Odd trailing nybble? */
if
(
size
--
<=
0
)
if
(
size
--
<=
0
U
)
goto
emsgsize
;
*
dst
++
=
(
u_char
)
(
tmp
<<
4
);
}
...
...
@@ -108,7 +108,7 @@ inet_net_pton_ipv4(const char *src, u_char *dst, size_t size) {
goto
enoent
;
}
while
((
ch
=
*
src
++
)
!=
'\0'
&&
isascii
(
ch
)
&&
isdigit
(
ch
));
if
(
size
--
<=
0
)
if
(
size
--
<=
0
U
)
goto
emsgsize
;
*
dst
++
=
(
u_char
)
tmp
;
if
(
ch
==
'\0'
||
ch
==
'/'
)
...
...
@@ -171,7 +171,7 @@ inet_net_pton_ipv4(const char *src, u_char *dst, size_t size) {
}
/* Extend network to cover the actual mask. */
while
(
bits
>
((
dst
-
odst
)
*
8
))
{
if
(
size
--
<=
0
)
if
(
size
--
<=
0
U
)
goto
emsgsize
;
*
dst
++
=
'\0'
;
}
...
...
lib/bind/inet/inet_network.c
View file @
16764086
...
...
@@ -66,14 +66,14 @@ again:
base
=
16
,
cp
++
;
while
((
c
=
*
cp
)
!=
0
)
{
if
(
isdigit
((
unsigned
char
)
c
))
{
if
(
base
==
8
&&
(
c
==
'8'
||
c
==
'9'
))
if
(
base
==
8
U
&&
(
c
==
'8'
||
c
==
'9'
))
return
(
INADDR_NONE
);
val
=
(
val
*
base
)
+
(
c
-
'0'
);
cp
++
;
digit
=
1
;
continue
;
}
if
(
base
==
16
&&
isxdigit
((
unsigned
char
)
c
))
{
if
(
base
==
16
U
&&
isxdigit
((
unsigned
char
)
c
))
{
val
=
(
val
<<
4
)
+
(
c
+
10
-
(
islower
((
unsigned
char
)
c
)
?
'a'
:
'A'
));
cp
++
;
...
...
@@ -85,7 +85,7 @@ again:
if
(
!
digit
)
return
(
INADDR_NONE
);
if
(
*
cp
==
'.'
)
{
if
(
pp
>=
parts
+
4
||
val
>
0xff
)
if
(
pp
>=
parts
+
4
||
val
>
0xff
U
)
return
(
INADDR_NONE
);
*
pp
++
=
val
,
cp
++
;
goto
again
;
...
...
@@ -94,7 +94,7 @@ again:
return
(
INADDR_NONE
);
*
pp
++
=
val
;
n
=
pp
-
parts
;
if
(
n
>
4
)
if
(
n
>
4
U
)
return
(
INADDR_NONE
);
for
(
val
=
0
,
i
=
0
;
i
<
n
;
i
++
)
{
val
<<=
8
;
...
...
lib/bind/irs/dns.c
View file @
16764086
...
...
@@ -16,7 +16,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
static
const
char
rcsid
[]
=
"$Id: dns.c,v 1.
2
2004/03/
09 06:29
:5
9
marka Exp $"
;
static
const
char
rcsid
[]
=
"$Id: dns.c,v 1.
3
2004/03/
18 02:57
:5
8
marka Exp $"
;
#endif
/*
...
...
@@ -118,7 +118,7 @@ dns_res_get(struct irs_acc *this) {
dns_res_set
(
this
,
res
,
free
);
}
if
((
dns
->
res
->
options
&
RES_INIT
)
==
0
&&
if
((
dns
->
res
->
options
&
RES_INIT
)
==
0
U
&&
res_ninit
(
dns
->
res
)
<
0
)
return
(
NULL
);
...
...
lib/bind/irs/dns_ho.c
View file @
16764086
...
...
@@ -52,7 +52,7 @@
/* BIND Id: gethnamaddr.c,v 8.15 1996/05/22 04:56:30 vixie Exp $ */
#if defined(LIBC_SCCS) && !defined(lint)
static
const
char
rcsid
[]
=
"$Id: dns_ho.c,v 1.1
3
2004/03/
09 06:29
:5
9
marka Exp $"
;
static
const
char
rcsid
[]
=
"$Id: dns_ho.c,v 1.1
4
2004/03/
18 02:57
:5
8
marka Exp $"
;
#endif
/* LIBC_SCCS and not lint */
/* Imports. */
...
...
@@ -386,7 +386,7 @@ ho_byaddr(struct irs_ho *this, const void *addr, int len, int af)
q2
->
qtype
=
T_PTR
;
q2
->
answer
=
q2
->
qbuf
.
buf
;
q2
->
anslen
=
sizeof
(
q2
->
qbuf
);
if
((
pvt
->
res
->
options
&
RES_NO_NIBBLE2
)
!=
0
)
if
((
pvt
->
res
->
options
&
RES_NO_NIBBLE2
)
!=
0
U
)
q2
->
action
=
RESTGT_IGNORE
;
else
q2
->
action
=
RESTGT_AFTERFAILURE
;
...
...
@@ -838,7 +838,7 @@ gethostans(struct irs_ho *this,
}
cp
+=
n
;
#ifdef RES_USE_DNAME
if
((
pvt
->
res
->
options
&
RES_USE_DNAME
)
!=
0
)
if
((
pvt
->
res
->
options
&
RES_USE_DNAME
)
!=
0
U
)
#endif
{
/*
...
...
@@ -1149,7 +1149,7 @@ init(struct irs_ho *this) {
if
(
!
pvt
->
res
&&
!
ho_res_get
(
this
))
return
(
-
1
);
if
(((
pvt
->
res
->
options
&
RES_INIT
)
==
0
)
&&
if
(((
pvt
->
res
->
options
&
RES_INIT
)
==
0
U
)
&&
res_ninit
(
pvt
->
res
)
==
-
1
)
return
(
-
1
);
return
(
0
);
...
...
lib/bind/irs/dns_nw.c
View file @
16764086
...
...
@@ -16,7 +16,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
static
const
char
rcsid
[]
=
"$Id: dns_nw.c,v 1.
8
2004/03/
09 06:29
:5
9
marka Exp $"
;
static
const
char
rcsid
[]
=
"$Id: dns_nw.c,v 1.
9
2004/03/
18 02:57
:5
8
marka Exp $"
;
#endif
/* LIBC_SCCS and not lint */
/* Imports. */
...
...
@@ -587,7 +587,7 @@ init(struct irs_nw *this) {
if
(
!
pvt
->
res
&&
!
nw_res_get
(
this
))
return
(
-
1
);
if
(((
pvt
->
res
->
options
&
RES_INIT
)
==
0
)
&&
if
(((
pvt
->
res
->
options
&
RES_INIT
)
==
0
U
)
&&
res_ninit
(
pvt
->
res
)
==
-
1
)
return
(
-
1
);
return
(
0
);
...
...
lib/bind/irs/dns_p.h
View file @
16764086
...
...
@@ -16,13 +16,13 @@
*/
/*
* $Id: dns_p.h,v 1.
2
2004/03/
09 06:29
:5
9
marka Exp $
* $Id: dns_p.h,v 1.
3
2004/03/
18 02:57
:5
8
marka Exp $
*/
#ifndef _DNS_P_H_INCLUDED
#define _DNS_P_H_INCLUDED
#define maybe_ok(res, nm, ok) (((res)->options & RES_NOCHECKNAME) != 0 || \
#define maybe_ok(res, nm, ok) (((res)->options & RES_NOCHECKNAME) != 0
U
|| \
(ok)(nm) != 0)
#define maybe_hnok(res, hn) maybe_ok((res), (hn), res_hnok)
#define maybe_dnok(res, dn) maybe_ok((res), (dn), res_dnok)
...
...
lib/bind/irs/gen.c
View file @
16764086
...
...
@@ -16,7 +16,7 @@
*/
#if !defined(LINT) && !defined(CODECENTER)
static
const
char
rcsid
[]
=
"$Id: gen.c,v 1.
4
2004/03/
09 06:30:00
marka Exp $"
;
static
const
char
rcsid
[]
=
"$Id: gen.c,v 1.
5
2004/03/
18 02:57:58
marka Exp $"
;
#endif
/*
...
...
@@ -175,7 +175,7 @@ gen_res_get(struct irs_acc *this) {
gen_res_set
(
this
,
res
,
free
);
}
if
(((
irs
->
res
->
options
&
RES_INIT
)
==
0
)
&&
res_ninit
(
irs
->
res
)
<
0
)
if
(((
irs
->
res
->
options
&
RES_INIT
)
==
0
U
)
&&
res_ninit
(
irs
->
res
)
<
0
)
return
(
NULL
);
return
(
irs
->
res
);
...
...
lib/bind/irs/gen_ho.c
View file @
16764086
...
...
@@ -16,7 +16,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
static
const
char
rcsid
[]
=
"$Id: gen_ho.c,v 1.
2
2004/03/
09 06:30:00
marka Exp $"
;
static
const
char
rcsid
[]
=
"$Id: gen_ho.c,v 1.
3
2004/03/
18 02:57:58
marka Exp $"
;
#endif
/* LIBC_SCCS and not lint */
/* Imports */
...
...
@@ -383,7 +383,7 @@ init(struct irs_ho *this) {
if
(
!
pvt
->
res
&&
!
ho_res_get
(
this
))
return
(
-
1
);
if
(((
pvt
->
res
->
options
&
RES_INIT
)
==
0
)
&&
if
(((
pvt
->
res
->
options
&
RES_INIT
)
==
0
U
)
&&
(
res_ninit
(
pvt
->
res
)
==
-
1
))
return
(
-
1
);
...
...
lib/bind/irs/gen_nw.c
View file @
16764086
...
...
@@ -16,7 +16,7 @@
*/
#if !defined(LINT) && !defined(CODECENTER)
static
const
char
rcsid
[]
=
"$Id: gen_nw.c,v 1.
2
2004/03/
09 06:30:00
marka Exp $"
;
static
const
char
rcsid
[]
=
"$Id: gen_nw.c,v 1.
3
2004/03/
18 02:57:58
marka Exp $"
;
#endif
/* Imports */
...
...
@@ -255,7 +255,7 @@ init(struct irs_nw *this) {
if
(
!
pvt
->
res
&&
!
nw_res_get
(
this
))
return
(
-
1
);
if
(((
pvt
->
res
->
options
&
RES_INIT
)
==
0
)
&&
if
(((
pvt
->
res
->
options
&
RES_INIT
)
==
0
U
)
&&
res_ninit
(
pvt
->
res
)
==
-
1
)
return
(
-
1
);
return
(
0
);
...
...
lib/bind/irs/gethostent.c
View file @
16764086
...
...
@@ -16,7 +16,7 @@
*/
#if !defined(LINT) && !defined(CODECENTER)
static
const
char
rcsid
[]
=
"$Id: gethostent.c,v 1.
5
2004/03/
09 06:30:01
marka Exp $"
;
static
const
char
rcsid
[]
=
"$Id: gethostent.c,v 1.
6
2004/03/
18 02:57:59
marka Exp $"
;
#endif
/* Imports */
...
...
@@ -187,7 +187,7 @@ gethostent_p(struct net_data *net_data) {
return
(
NULL
);
while
((
hp
=
(
*
ho
->
next
)(
ho
))
!=
NULL
&&
hp
->
h_addrtype
==
AF_INET6
&&
(
net_data
->
res
->
options
&
RES_USE_INET6
)
==
0
)
(
net_data
->
res
->
options
&
RES_USE_INET6
)
==
0
U
)
continue
;
net_data
->
ho_last
=
hp
;
return
(
net_data
->
ho_last
);
...
...
@@ -356,13 +356,13 @@ getipnodebyaddr(const void *src, size_t len, int af, int *error_num) {
switch
(
af
)
{
case
AF_INET
:
if
(
len
!=
INADDRSZ
)
{
if
(
len
!=
(
size_t
)
INADDRSZ
)
{
*
error_num
=
NO_RECOVERY
;
return
(
NULL
);
}
break
;
case
AF_INET6
:
if
(
len
!=
IN6ADDRSZ
)
{
if
(
len
!=
(
size_t
)
IN6ADDRSZ
)
{
*
error_num
=
NO_RECOVERY
;
return
(
NULL
);
}
...
...
@@ -1007,7 +1007,7 @@ fakeaddr(const char *name, int af, struct net_data *net_data) {
}
strncpy
(
pvt
->
name
,
name
,
NS_MAXDNAME
);
pvt
->
name
[
NS_MAXDNAME
]
=
'\0'
;
if
(
af
==
AF_INET
&&
(
net_data
->
res
->
options
&
RES_USE_INET6
)
!=
0
)
{
if
(
af
==
AF_INET
&&
(
net_data
->
res
->
options
&
RES_USE_INET6
)
!=
0
U
)
{
map_v4v6_address
(
pvt
->
addr
,
pvt
->
addr
);
af
=
AF_INET6
;
}
...
...
Prev
1
2
3
4
Next
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