seatd: Remove SOCK_PATH and improve cleanup

SOCK_PATH is made redundant by the -s command-line argument added in
a98e0c4ce90347d37370f2debcbed8ae9678a990. Support was originally left
behind for short-term compatibility, but it should be fine to remove.

Previous socket cleanup is changed to run unconditionally. The cleanup
now fails if the existing file is not a socket.

1 files changed, 9 insertions, 6 deletions

diff --git a/seatd/seatd.c b/seatd/seatd.c
index 053d44b..8480350 100644
--- a/seatd/seatd.c
+++ b/seatd/seatd.c
@@ -84,7 +84,7 @@ int main(int argc, char *argv[]) {
 	int c;
 	int uid = -1, gid = -1;
 	int readiness = -1;
-	const char *socket_path = getenv("SEATD_SOCK");
+	const char *socket_path = SEATD_DEFAULTPATH;
 	while ((c = getopt(argc, argv, "vhn:s:g:u:")) != -1) {
 		switch (c) {
 		case 'n':
@@ -131,11 +131,14 @@ int main(int argc, char *argv[]) {
 		}
 	}
 
-	if (socket_path == NULL) {
-		socket_path = SEATD_DEFAULTPATH;
-		struct stat st;
-		if (stat(socket_path, &st) == 0) {
-			log_info("Removing leftover seatd socket");
+	struct stat st;
+	if (stat(socket_path, &st) == 0) {
+		if (!S_ISSOCK(st.st_mode)) {
+			log_errorf("Non-socket file found at socket path %s, refusing to start",
+				   socket_path);
+			return 1;
+		} else {
+			log_infof("Removing leftover socket at %s", socket_path);
 			unlink(socket_path);
 		}
 	}