mherrb/seatd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

seatd: Use path in chmod/chown operations

Browse source 
c8b3a22d4e snuck in a change which
converts chown/chmod to fchown/fchmod using the socket fd. This appears
to succeed under Linux, but fails with EINVAL on FreeBSD. As the error
handling in this area was flawed, CI failed to catch the regression.

Partially revert c8b3a22d4e to fix the
regression on FreeBSD.
This commit is contained in:
Kenny Levinsen 2021-08-08 18:22:17 +02:00
parent 2cfc56d5ed
commit 309650aa4d
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
seatd/seatd.c
View file

@ -40,12 +40,12 @@ static int open_socket(const char *path, int uid, int gid) {
goto error;
}
if (uid != -1 || gid != -1) {
if (fchown(fd, uid, gid) == -1) {
if (chown(path, uid, gid) == -1) {
log_errorf("Could not chown socket to uid %d, gid %d: %s", uid, gid,
strerror(errno));
goto error;
}
if (fchmod(fd, 0770) == -1) {
if (chmod(path, 0770) == -1) {
log_errorf("Could not chmod socket: %s", strerror(errno));
goto error;
}
@ -148,7 +148,7 @@ int main(int argc, char *argv[]) {
int socket_fd = open_socket(socket_path, uid, gid);
if (socket_fd == -1) {
log_errorf("Could not create server socket: %s", strerror(errno));
log_error("Could not create server socket");
server_finish(&server);
return 1;
}