diff options
author | James Peach <jpeach@samba.org> | 2007-12-22 14:01:44 -0800 |
---|---|---|
committer | James Peach <jpeach@samba.org> | 2007-12-22 14:01:44 -0800 |
commit | bf2269a04e5af056037c392fb7f29014b62d1bb2 (patch) | |
tree | 38a2c68c2835bb65725003dd479a3a6fdbee1a51 /source3/lib/socket_wrapper/socket_wrapper.c | |
parent | 1176e04c76e28d9ee9ab355c5e9edcd1b627ac03 (diff) | |
parent | a000fa4ee5491ae32c60881b28b3536e88e82e27 (diff) | |
download | samba-bf2269a04e5af056037c392fb7f29014b62d1bb2.tar.gz samba-bf2269a04e5af056037c392fb7f29014b62d1bb2.tar.bz2 samba-bf2269a04e5af056037c392fb7f29014b62d1bb2.zip |
Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
(This used to be commit 30cb2d215f1a4a440d5ecaab3f898daa714eee2b)
Diffstat (limited to 'source3/lib/socket_wrapper/socket_wrapper.c')
-rw-r--r-- | source3/lib/socket_wrapper/socket_wrapper.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/lib/socket_wrapper/socket_wrapper.c b/source3/lib/socket_wrapper/socket_wrapper.c index 3a72c5a74a..5b8052e5ed 100644 --- a/source3/lib/socket_wrapper/socket_wrapper.c +++ b/source3/lib/socket_wrapper/socket_wrapper.c @@ -571,8 +571,8 @@ static const char *socket_wrapper_pcap_file(void) { static int initialized = 0; static const char *s = NULL; - static const struct swrap_file_hdr h; - static const struct swrap_packet p; + static const struct swrap_file_hdr h = { 0, }; + static const struct swrap_packet p = { { 0, }, { { 0, }, { { 0, } } } }; if (initialized == 1) { return s; |