projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #1806 from rubenk/network-plugin-size_t
[collectd.git]
/
src
/
unixsock.c
diff --git
a/src/unixsock.c
b/src/unixsock.c
index
664c018
..
d4bf004
100644
(file)
--- a/
src/unixsock.c
+++ b/
src/unixsock.c
@@
-36,10
+36,6
@@
#include "utils_cmd_putval.h"
#include "utils_cmd_putnotif.h"
#include "utils_cmd_putval.h"
#include "utils_cmd_putnotif.h"
-/* Folks without pthread will need to disable this plugin. */
-#include <pthread.h>
-
-#include <sys/socket.h>
#include <sys/stat.h>
#include <sys/un.h>
#include <sys/stat.h>
#include <sys/un.h>
@@
-128,7
+124,16
@@
static int us_open_socket (void)
return (-1);
}
return (-1);
}
- chmod (sa.sun_path, sock_perms);
+ status = chmod (sa.sun_path, sock_perms);
+ if (status == -1)
+ {
+ char errbuf[1024];
+ ERROR ("unixsock plugin: chmod failed: %s",
+ sstrerror (errno, errbuf, sizeof (errbuf)));
+ close (sock_fd);
+ sock_fd = -1;
+ return (-1);
+ }
status = listen (sock_fd, 8);
if (status != 0)
status = listen (sock_fd, 8);
if (status != 0)
@@
-143,7
+148,7
@@
static int us_open_socket (void)
do
{
do
{
- char *grpname;
+ c
onst c
har *grpname;
struct group *g;
struct group sg;
char grbuf[2048];
struct group *g;
struct group sg;
char grbuf[2048];
@@
-360,7
+365,7
@@
static void *us_server_thread (void __attribute__((unused)) *arg)
pthread_exit ((void *) 1);
}
pthread_exit ((void *) 1);
}
- remote_fd =
(int *) malloc (sizeof (int
));
+ remote_fd =
malloc (sizeof (*remote_fd
));
if (remote_fd == NULL)
{
char errbuf[1024];
if (remote_fd == NULL)
{
char errbuf[1024];