summaryrefslogtreecommitdiff
path: root/lib/socket_wrapper/socket_wrapper.c
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2009-03-05 11:11:19 +1100
committerAndrew Bartlett <abartlet@samba.org>2009-03-05 11:11:19 +1100
commitebe5b2835331ab259dd32bf6dc574ae999e2d36d (patch)
treeb7ce49ef619de869dd03bfd48b65f0fa175b0f33 /lib/socket_wrapper/socket_wrapper.c
parent5a10d804919af205b027ee519b9fa05519913ebe (diff)
parentf85aa66ca22f29734bdacaa559737990fbe28d8a (diff)
downloadsamba-ebe5b2835331ab259dd32bf6dc574ae999e2d36d.tar.gz
samba-ebe5b2835331ab259dd32bf6dc574ae999e2d36d.tar.bz2
samba-ebe5b2835331ab259dd32bf6dc574ae999e2d36d.zip
Merge branch 'master' of ssh://git.samba.org/data/git/samba into master-devel
Diffstat (limited to 'lib/socket_wrapper/socket_wrapper.c')
-rw-r--r--lib/socket_wrapper/socket_wrapper.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/socket_wrapper/socket_wrapper.c b/lib/socket_wrapper/socket_wrapper.c
index f9ef48e4d6..8ad9e1d93e 100644
--- a/lib/socket_wrapper/socket_wrapper.c
+++ b/lib/socket_wrapper/socket_wrapper.c
@@ -831,11 +831,11 @@ static uint8_t *swrap_packet_init(struct timeval *tval,
size_t icmp_hdr_len = 0;
size_t icmp_truncate_len = 0;
uint8_t protocol = 0, icmp_protocol = 0;
- const struct sockaddr_in *src_in;
- const struct sockaddr_in *dest_in;
+ const struct sockaddr_in *src_in = NULL;
+ const struct sockaddr_in *dest_in = NULL;
#ifdef HAVE_IPV6
- const struct sockaddr_in6 *src_in6;
- const struct sockaddr_in6 *dest_in6;
+ const struct sockaddr_in6 *src_in6 = NULL;
+ const struct sockaddr_in6 *dest_in6 = NULL;
#endif
uint16_t src_port;
uint16_t dest_port;