]> git.ipfire.org Git - thirdparty/lxc.git/commitdiff
af_unix: replace log_error_errno()
authorChristian Brauner <christian.brauner@ubuntu.com>
Fri, 15 Oct 2021 07:59:28 +0000 (09:59 +0200)
committerChristian Brauner <christian.brauner@ubuntu.com>
Tue, 19 Oct 2021 15:13:34 +0000 (17:13 +0200)
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
src/lxc/af_unix.c

index 97f9ac6760f0fddaa53f5547fa6a41884afd3a8e..6dbc08acefdcf12847f9702b4512e270d8b451b4 100644 (file)
@@ -464,9 +464,7 @@ int lxc_abstract_unix_rcv_credential(int fd, void *data, size_t size)
                memcpy(&cred, CMSG_DATA(cmsg), sizeof(cred));
 
                if (cred.uid && (cred.uid != getuid() || cred.gid != getgid()))
-                       return log_error_errno(-1, EACCES,
-                                              "Message denied for '%d/%d'",
-                                              cred.uid, cred.gid);
+                       return syserror_set(-EACCES, "Message denied for '%d/%d'", cred.uid, cred.gid);
        }
 
        return ret;
@@ -508,8 +506,7 @@ int lxc_unix_connect_type(struct sockaddr_un *addr, int type)
 
        fd = socket(AF_UNIX, type | SOCK_CLOEXEC, 0);
        if (fd < 0)
-               return log_error_errno(-1, errno,
-                                      "Failed to open new AF_UNIX socket");
+               return syserror("Failed to open new AF_UNIX socket");
 
        if (addr->sun_path[0] == '\0')
                len = strlen(&addr->sun_path[1]);
@@ -519,8 +516,7 @@ int lxc_unix_connect_type(struct sockaddr_un *addr, int type)
        ret = connect(fd, (struct sockaddr *)addr,
                      offsetof(struct sockaddr_un, sun_path) + len);
        if (ret < 0)
-               return log_error_errno(-1, errno,
-                                      "Failed to bind new AF_UNIX socket");
+               return syserror("Failed to bind new AF_UNIX socket");
 
        return move_fd(fd);
 }