From c9a20c4a331696b5836004c86a192ed787812aff Mon Sep 17 00:00:00 2001 From: Wouter Wijngaards Date: Fri, 23 Jan 2015 16:00:33 +0000 Subject: [PATCH] Fixup control socket test for OSX. git-svn-id: file:///svn/unbound/trunk@3320 be551aaa-1e26-0410-a405-d3ace91eadb9 --- services/listen_dnsport.c | 1 + testdata/ctrl_pipe.tpkg | Bin 5808 -> 6451 bytes 2 files changed, 1 insertion(+) diff --git a/services/listen_dnsport.c b/services/listen_dnsport.c index ef9a4acf5..44a28a60b 100644 --- a/services/listen_dnsport.c +++ b/services/listen_dnsport.c @@ -600,6 +600,7 @@ create_local_accept_sock(const char *path, int* noproto) int s; struct sockaddr_un sun; + verbose(VERB_ALGO, "creating unix socket %s", path); #ifdef HAVE_STRUCT_SOCKADDR_UN_SUN_LEN /* this member exists on BSDs, not Linux */ sun.sun_len = (socklen_t)sizeof(sun); diff --git a/testdata/ctrl_pipe.tpkg b/testdata/ctrl_pipe.tpkg index 06695e8200773dab73a1ed383fa6ae9b8344ad97..877fcf9010d9a442ac161b59fd79e4c509a2b737 100644 GIT binary patch literal 6451 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 IuQ)jW5AM-KU;qFB literal 5808 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