@@ -129,7 +129,7 @@ static int nc_connect(int s, struct CP_ENTRY *cpe) {

 	    close(s);

 	    return -1;

 	}

-	if(getsockopt(s, SOL_SOCKET, SO_ERROR, &s_err, &s_len) || s_err) {

+	if(getsockopt(s, SOL_SOCKET, SO_ERROR, &s_err, (socklen_t *)&s_len) || s_err) {

 	    logg("*Failed to establish a connection to clamd\n");

 	    close(s);

 	    return -1;

@@ -427,7 +427,7 @@ int scanstream(int odesc, unsigned long int *scanned, const struct cl_engine *en

 	if((sockfd = socket(AF_INET, SOCK_STREAM, 0)) == -1)

 	    continue;

-	if(bind(sockfd, (struct sockaddr *) &server, sizeof(struct sockaddr_in)) == -1)

+	if(bind(sockfd, (struct sockaddr *) &server, (socklen_t)sizeof(struct sockaddr_in)) == -1)

 	    closesocket(sockfd);

 	else {

 	    bound = 1;

@@ -444,7 +444,11 @@ int scanstream(int odesc, unsigned long int *scanned, const struct cl_engine *en

 	mdprintf(odesc, "Can't find any free port. ERROR%c", term);

 	return -1;

     } else {

-	listen(sockfd, 1);

+	if (listen(sockfd, 1) == -1) {

+        logg("!ScanStream: listen() error on socket. Error returned is %s.\n", strerror(errno));

+        closesocket(sockfd);

+        return -1;

+    }

 	if(mdprintf(odesc, "PORT %u%c", port, term) <= 0) {

 	    logg("!ScanStream: error transmitting port.\n");

 	    closesocket(sockfd);

@@ -462,7 +466,7 @@ int scanstream(int odesc, unsigned long int *scanned, const struct cl_engine *en

     }

     addrlen = sizeof(peer);

-    if((acceptd = accept(sockfd, (struct sockaddr *) &peer, &addrlen)) == -1) {

+    if((acceptd = accept(sockfd, (struct sockaddr *) &peer, (socklen_t *)&addrlen)) == -1) {

 	closesocket(sockfd);

 	mdprintf(odesc, "accept() ERROR%c", term);

 	logg("!ScanStream %u: accept() failed.\n", port);

@@ -68,7 +68,7 @@ int tcpserver(const struct optstruct *opts)

 	logg("!TCP: setsocktopt(SO_REUSEADDR) error: %s\n", strerror(errno));

     }

-    if(bind(sockfd, (struct sockaddr *) &server, sizeof(struct sockaddr_in)) == -1) {

+    if(bind(sockfd, (struct sockaddr *) &server, (socklen_t)sizeof(struct sockaddr_in)) == -1) {

 	estr = strerror(errno);

 	logg("!TCP: bind() error: %s\n", estr);

 	closesocket(sockfd);

@@ -113,7 +113,7 @@ static int isremote(const struct optstruct *opts) {

       mainsa = NULL;

       return 0;

     }

-    ret = (bind(s, (struct sockaddr *)&testsock, sizeof(testsock)) != 0);

+    ret = (bind(s, (struct sockaddr *)&testsock, (socklen_t)sizeof(testsock)) != 0);

     closesocket(s);

     return ret;

 }

@@ -561,7 +561,7 @@ static int make_connection_real(const char *soname, conn_t *conn)

 		server.sin_port = htons(port);

 		server.sin_addr.s_addr = ((struct in_addr*)(hp->h_addr))->s_addr;

 		print_con_info(conn, "Connecting to: %s:%u\n", inet_ntoa(server.sin_addr), port);

-		if (connect(s, (struct sockaddr *)&server, sizeof(server))) {

+		if (connect(s, (struct sockaddr *)&server, (socklen_t)sizeof(server))) {

 			perror("connect");

             close(s);

 			return -1;

@@ -171,7 +171,7 @@ getclientsock (const char *localip, int prot)

         {

             char ipaddr[46];

-            if (bind (socketfd, res->ai_addr, res->ai_addrlen) != 0)

+            if (bind (socketfd, res->ai_addr, (socklen_t)res->ai_addrlen) != 0)

             {

                 logg ("!Could not bind to local ip address '%s': %s\n",

                       localip, strerror (errno));

@@ -214,7 +214,7 @@ getclientsock (const char *localip, int prot)

             client.sin_addr = *(struct in_addr *) he->h_addr_list[0];

             if (bind

                 (socketfd, (struct sockaddr *) &client,

-                 sizeof (struct sockaddr_in)) != 0)

+                 (socklen_t)sizeof (struct sockaddr_in)) != 0)

             {

                 logg ("!Could not bind to local ip address '%s': %s\n",

                       localip, strerror (errno));

@@ -2095,7 +2095,7 @@ updatedb (const char *dbname, const char *hostname, char *ip, int *signo,

             return FCE_FAILEDUPDATE;

         }

-        if (pt = cli_strtok (dnsreply, field, ":"))

+        if ((pt = cli_strtok (dnsreply, field, ":")))

         {

             if (!cli_isnumber (pt))

             {

@@ -76,7 +76,7 @@ connect_error (int sock)

     socklen_t optlen;

     optlen = sizeof (optval);

-    getsockopt (sock, SOL_SOCKET, SO_ERROR, &optval, &optlen);

+    getsockopt (sock, SOL_SOCKET, SO_ERROR, &optval, (socklen_t *)&optlen);

     if (optval)

     {

@@ -68,7 +68,7 @@ static void conn_setup_mayfail(int may)

 	return;

     fail_unless_fmt(sockd != -1, "Unable to create socket: %s\n", strerror(errno));

-    rc = connect(sockd, (struct sockaddr *)&nixsock, sizeof(nixsock));

+    rc = connect(sockd, (struct sockaddr *)&nixsock, (socklen_t)sizeof(nixsock));

     fail_unless_fmt(rc != -1, "Unable to connect(): %s\n", strerror(errno));

     signal(SIGPIPE, SIG_IGN);

@@ -91,7 +91,7 @@ static int conn_tcp(int port)

     server.sin_port = htons(port);

     server.sin_addr.s_addr = inet_addr("127.0.0.1");

-    rc = connect(sd, (struct sockaddr *)&server, sizeof(server));

+    rc = connect(sd, (struct sockaddr *)&server, (socklen_t)sizeof(server));

     fail_unless_fmt(rc != -1, "Unable to connect(): %s\n", strerror(errno));

     return sd;

 }