sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-08 04:58:40 +03:00
Code

r23420: try to make the IBM checker happy

Browse Source 
metze
(This used to be commit 96f1a0dfaa18a432fca4b5432d929d8daed0abb1)
This commit is contained in:
Stefan Metzmacher 2007-06-11 14:41:14 +00:00 committed by Gerald (Jerry) Carter
parent 64b985bc16
commit ac00b6517e
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source4/lib/socket_wrapper/socket_wrapper.c
View File

@ -174,7 +174,7 @@ static void set_port(int family, int prt, struct sockaddr *addr)
}
}
static int socket_length(int family)
static size_t socket_length(int family)
{
switch (family) {
case AF_INET:
@ -184,7 +184,7 @@ static int socket_length(int family)
return sizeof(struct sockaddr_in6);
#endif
}
return -1;
return 0;
}
@ -788,6 +788,9 @@ static struct swrap_packet *swrap_packet_init(struct timeval *tval,
wire_hdr_len = sizeof(packet->ip.hdr) + sizeof(packet->ip.p.udp);
wire_len = wire_hdr_len + payload_len;
break;
default:
return NULL;
}
if (unreachable) {
@ -1231,10 +1234,12 @@ _PUBLIC_ int swrap_socket(int family, int type, int protocol)
if (type == SOCK_STREAM) {
break;
}
/*fall through*/
case 17:
if (type == SOCK_DGRAM) {
break;
}
/*fall through*/
default:
errno = EPROTONOSUPPORT;
return -1;
@ -1278,7 +1283,7 @@ _PUBLIC_ int swrap_accept(int s, struct sockaddr *addr, socklen_t *addrlen)
* socket family
*/
my_addrlen = socket_length(parent_si->family);
if (my_addrlen < 0) {
if (my_addrlen <= 0) {
errno = EINVAL;
return -1;
}