email, exec and unixsock plugins: fix error handling

Diff from Jeremie Courreges-Anglas, via Daniel Jakots

diff --git a/src/email.c b/src/email.c
index 849b7f932a98f4faf147ae4fb7592ebf4309c166..1da2633ab39612be6bd6b9a28310d494cffd9f37 100644 (file)
--- a/src/email.c
+++ b/src/email.c
@@ -411,7 +411,7 @@ static void *open_connection(void __attribute__((unused)) * arg) {
     if (status != 0) {
       char errbuf[1024];
       log_warn("getgrnam_r (%s) failed: %s", group,
-               sstrerror(errno, errbuf, sizeof(errbuf)));
+               sstrerror(status, errbuf, sizeof(errbuf)));
     } else if (grp == NULL) {
       log_warn("No such group: `%s'", group);
     } else {

diff --git a/src/exec.c b/src/exec.c
index c84c1c7b63463440dd99aa71dd78f26c9c8a2b1a..b728654c893e6c5830a4b38d84dff876bb5a9aab 100644 (file)
--- a/src/exec.c
+++ b/src/exec.c
@@ -382,7 +382,7 @@ static int fork_child(program_list_t *pl, int *fd_in, int *fd_out,
   status = getpwnam_r(pl->user, &sp, nambuf, sizeof(nambuf), &sp_ptr);
   if (status != 0) {
     ERROR("exec plugin: Failed to get user information for user ``%s'': %s",
-          pl->user, sstrerror(errno, errbuf, sizeof(errbuf)));
+          pl->user, sstrerror(status, errbuf, sizeof(errbuf)));
     goto failed;
   }
 
@@ -410,7 +410,7 @@ static int fork_child(program_list_t *pl, int *fd_in, int *fd_out,
       if (0 != status) {
         ERROR("exec plugin: Failed to get group information "
               "for group ``%s'': %s",
-              pl->group, sstrerror(errno, errbuf, sizeof(errbuf)));
+              pl->group, sstrerror(status, errbuf, sizeof(errbuf)));
         goto failed;
       }
       if (NULL == gr_ptr) {

diff --git a/src/unixsock.c b/src/unixsock.c
index aa3451e9bc6cf7419bb23ab1feb2ce4b4bf64fbd..b3fa6a37860ee8246f2184cf6557a3cb21e65ec7 100644 (file)
--- a/src/unixsock.c
+++ b/src/unixsock.c
@@ -143,7 +143,7 @@ static int us_open_socket(void) {
     if (status != 0) {
       char errbuf[1024];
       WARNING("unixsock plugin: getgrnam_r (%s) failed: %s", grpname,
-              sstrerror(errno, errbuf, sizeof(errbuf)));
+              sstrerror(status, errbuf, sizeof(errbuf)));
       break;
     }
     if (g == NULL) {