diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2015-01-12 07:24:01 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2015-01-12 07:24:01 +0000 |
| commit | 54dd3272da3f4a5fda7dd6ac359b7cf68e21a796 (patch) | |
| tree | 2e005d0e12c15ac2fb234260204fe1baeb3c8bee /smallapp | |
| parent | 3ff5baf8cb6770d63f234c261e9af15848bb939c (diff) | |
| download | src-test2-54dd3272da3f4a5fda7dd6ac359b7cf68e21a796.tar.gz src-test2-54dd3272da3f4a5fda7dd6ac359b7cf68e21a796.zip | |
Notes
Diffstat (limited to 'smallapp')
| -rw-r--r-- | smallapp/unbound-control.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/smallapp/unbound-control.c b/smallapp/unbound-control.c index 37e840bad799..ac8d96857d47 100644 --- a/smallapp/unbound-control.c +++ b/smallapp/unbound-control.c @@ -140,7 +140,7 @@ static void ssl_err(const char* s) static SSL_CTX* setup_ctx(struct config_file* cfg) { - char* s_cert, *c_key, *c_cert; + char* s_cert=NULL, *c_key=NULL, *c_cert=NULL; SSL_CTX* ctx; if(cfg->remote_control_use_cert) { @@ -206,9 +206,11 @@ contact_server(const char* svr, struct config_file* cfg, int statuscmd) } else if(svr[0] == '/') { struct sockaddr_un* sun = (struct sockaddr_un *) &addr; sun->sun_family = AF_LOCAL; - sun->sun_len = sizeof(sun); - strlcpy(sun->sun_path, svr, 104); - addrlen = sizeof(struct sockaddr_un); +#ifdef HAVE_STRUCT_SOCKADDR_UN_SUN_LEN + sun->sun_len = (sa_family_t)sizeof(sun); +#endif + (void)strlcpy(sun->sun_path, svr, sizeof(sun->sun_path)); + addrlen = (socklen_t)sizeof(struct sockaddr_un); addrfamily = AF_LOCAL; #endif } else { |