- Cast sun_len sizeof to socklen_t.

git-svn-id: file:///svn/unbound/trunk@3312 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/doc/Changelog b/doc/Changelog
index fab6058a3f38c2b5dd946cd88432b3d5a0f93ae1..b2465feada4dc57e610f8e71aa5090d188b65d21 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+12 January 2015: Wouter
+       - Cast sun_len sizeof to socklen_t.
+
 7 January 2015: Wouter
        - Fix warnings in pythonmod changes.
 

diff --git a/services/listen_dnsport.c b/services/listen_dnsport.c
index b9114d29624c3e9bbc1f1492cd1aea19686afaae..fc0085a54036934840540bc672a8c120b79487f0 100644 (file)
--- a/services/listen_dnsport.c
+++ b/services/listen_dnsport.c
@@ -602,7 +602,7 @@ create_local_accept_sock(const char *path, int* noproto)
 
 #ifdef HAVE_STRUCT_SOCKADDR_UN_SUN_LEN
        /* this member exists on BSDs, not Linux */
-       sun.sun_len = (sa_family_t)sizeof(sun);
+       sun.sun_len = (socklen_t)sizeof(sun);
 #endif
        sun.sun_family = AF_LOCAL;
        /* length is 92-108, 104 on FreeBSD */

diff --git a/smallapp/unbound-control.c b/smallapp/unbound-control.c
index ac8d96857d475e3008f2bdd05a15a9bfc5e96b23..09dc4087086d733b82d9be5f2cf2ee94984d7340 100644 (file)
--- a/smallapp/unbound-control.c
+++ b/smallapp/unbound-control.c
@@ -207,7 +207,7 @@ contact_server(const char* svr, struct config_file* cfg, int statuscmd)
                struct sockaddr_un* sun = (struct sockaddr_un *) &addr;
                sun->sun_family = AF_LOCAL;
 #ifdef HAVE_STRUCT_SOCKADDR_UN_SUN_LEN
-               sun->sun_len = (sa_family_t)sizeof(sun);
+               sun->sun_len = (socklen_t)sizeof(sun);
 #endif
                (void)strlcpy(sun->sun_path, svr, sizeof(sun->sun_path));
                addrlen = (socklen_t)sizeof(struct sockaddr_un);