rc.c, openrc-pam.c: move lockfile code into pam module

since we now assure that XDG_RUNTIME_DIR is set in the pam environment,
we can handle the lock file in there instead, which makes way more sense
for me at least.

Signed-off-by: Anna (navi) Figueiredo Gomes <navi@vlhl.dev>

2 files changed, 60 insertions, 87 deletions

diff --git a/src/openrc-pam/openrc-pam.c b/src/openrc-pam/openrc-pam.c
index 40b9a6dc..0a2cde11 100644
--- a/src/openrc-pam/openrc-pam.c
+++ b/src/openrc-pam/openrc-pam.c
@@ -6,12 +6,56 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <syslog.h>
+#include <sys/file.h>
 #include <unistd.h>
 #include <string.h>
 
 #include "einfo.h"
 #include "queue.h"
 
+static int
+inc_dec_lockfile(pam_handle_t *pamh, int val)
+{
+	char *lockfile_path = NULL;
+	FILE *lockfile = NULL;
+
+	int locknum = 0;
+
+	pam_syslog(pamh, LOG_INFO, "locking lockfile");
+
+	xasprintf(&lockfile_path, "%s/openrc/%s", pam_getenv(pamh, "XDG_RUNTIME_DIR"), "lock");
+	lockfile = fopen(lockfile_path, "r+");
+	if (!lockfile) {
+		lockfile = fopen(lockfile_path, "w+");
+		if (!lockfile)
+			eerrorx("fopen: failed to open file %s, %s", lockfile_path, strerror(errno));
+		if (flock(fileno(lockfile), LOCK_EX) != 0) {
+			eerrorx("flock: %s", strerror(errno));
+		}
+		locknum = 1;
+	} else {
+		if (flock(fileno(lockfile), LOCK_EX) != 0) {
+			eerrorx("flock: %s", strerror(errno));
+		}
+		fscanf(lockfile, "%d", &locknum);
+		locknum += val;
+		rewind(lockfile);
+	}
+
+	free(lockfile_path);
+
+	fprintf(lockfile, "%d", locknum);
+
+	if (flock(fileno(lockfile), LOCK_UN)) {
+		eerrorx("flock: %s", strerror(errno));
+	}
+	fclose(lockfile);
+
+	pam_syslog(pamh, LOG_INFO, "unlocking lockfile");
+
+	return locknum;
+}
+
 static void load_envs_from_file(const char *path, RC_STRINGLIST *out) {
 	FILE *fp = NULL;
 	char *line = NULL;
@@ -151,6 +195,7 @@ static char *create_xdg_runtime_dir(struct passwd *pw) {
 }
 
 static bool exec_openrc(pam_handle_t *pamh, const char *runlevel, bool lock) {
+	int lockval;
 	char *cmd = NULL;
 	const char *username;
 	struct passwd *pw = NULL;
@@ -182,11 +227,21 @@ static bool exec_openrc(pam_handle_t *pamh, const char *runlevel, bool lock) {
 
 	envlist = pam_getenvlist(pamh);
 
-	xasprintf(&cmd, "openrc --user %s %s", lock ? "--lock" : "--unlock", runlevel);
-	pam_syslog(pamh, LOG_INFO, "Executing %s for user %s", cmd, username);
-	exec_user_cmd(pw, cmd, envlist);
+	xasprintf(&cmd, "openrc --user %s", runlevel);
+
+	/* if we are locking, reduce the count by 1,
+	 * because we don't want to count ourselves */
+	lockval = inc_dec_lockfile(pamh, lock ? 1 : -1) - lock == true ? 1 : 0;
 
-	set_user_env(pamh);
+	if (lockval == 0) {
+		pam_syslog(pamh, LOG_INFO, "Executing %s for user %s", cmd, username);
+		exec_user_cmd(pw, cmd, envlist);
+	}
+
+	if (lock) {
+		pam_syslog(pamh, LOG_INFO, "Setting the user's environment");
+		set_user_env(pamh);
+	}
 
 	for (env = envlist; *env; env++)
 		free(*env);
diff --git a/src/openrc/rc.c b/src/openrc/rc.c
index e1625887..58164f91 100644
--- a/src/openrc/rc.c
+++ b/src/openrc/rc.c
@@ -50,7 +50,7 @@
 #include "helpers.h"
 
 const char *extraopts = NULL;
-const char getoptstring[] = "a:no:s:Slu" getoptstring_COMMON
+const char getoptstring[] = "a:no:s:S" getoptstring_COMMON
 #ifdef RC_USER_SERVICES
 getoptstring_USER_SERVICES
 #endif
@@ -61,8 +61,6 @@ const struct option longopts[] = {
 	{ "override",    1, NULL, 'o' },
 	{ "service",     1, NULL, 's' },
 	{ "sys",         0, NULL, 'S' },
-	{ "lock",        0, NULL, 'l' },
-	{ "unlock",      0, NULL, 'u' },
 #ifdef RC_USER_SERVICES
 	longopts_USER_SERVICES
 #endif
@@ -786,60 +784,6 @@ handle_bad_signal(int sig)
 }
 #endif
 
-#ifdef RC_USER_SERVICES
-
-static int
-inc_dec_lockfile(int val)
-{
-	char *svcdir = NULL;
-	char *lockfile_path = NULL;
-	FILE *lockfile = NULL;
-
-	int locknum = 0;
-
-	einfov("locking lockfile");
-
-	svcdir = rc_svcdir();
-
-	if (mkdir(svcdir, 0700) != 0 && errno != EEXIST)
-		eerrorx("mkdir: %s, %s", svcdir, strerror(errno));
-
-	xasprintf(&lockfile_path, "%s/%s", svcdir, "lock");
-	lockfile = fopen(lockfile_path, "r+");
-	if (!lockfile) {
-		lockfile = fopen(lockfile_path, "w+");
-		if (!lockfile)
-			eerrorx("fopen: failed to open file %s, %s", lockfile_path, strerror(errno));
-		if (flock(fileno(lockfile), LOCK_EX) != 0) {
-			eerrorx("flock: %s", strerror(errno));
-		}
-		locknum = 1;
-	} else {
-		if (flock(fileno(lockfile), LOCK_EX) != 0) {
-			eerrorx("flock: %s", strerror(errno));
-		}
-		fscanf(lockfile, "%d", &locknum);
-		locknum += val;
-		rewind(lockfile);
-	}
-
-	free(lockfile_path);
-	free(svcdir);
-
-	fprintf(lockfile, "%d", locknum);
-
-	if (flock(fileno(lockfile), LOCK_UN)) {
-		eerrorx("flock: %s", strerror(errno));
-	}
-	fclose(lockfile);
-
-	einfov("unlocking lockfile");
-
-	return locknum;
-}
-
-#endif
-
 int main(int argc, char **argv)
 {
 	const char *bootlevel = NULL;
@@ -859,11 +803,6 @@ int main(int argc, char **argv)
 	int regen = 0;
 	bool nostop = false;
 	char *svcdir = NULL;
-#ifdef RC_USER_SERVICES
-	int locknum = 0;
-	int lockval = 0;
-	bool lock = false;
-#endif
 #ifdef __linux__
 	char *proc;
 	char *p;
@@ -934,14 +873,6 @@ int main(int argc, char **argv)
 				printf("%s\n", systype);
 			exit(EXIT_SUCCESS);
 			/* NOTREACHED */
-		case 'l':
-			lock = true;
-			lockval = 1;
-			break;
-		case 'u':
-			lock = true;
-			lockval = -1;
-			break;
 #ifdef RC_USER_SERVICES
 		case_RC_USER_SERVICES
 #endif
@@ -975,19 +906,6 @@ int main(int argc, char **argv)
 	setenv("RC_PID", pidstr, 1);
 	free(pidstr);
 
-#ifdef RC_USER_SERVICES
-	if (rc_is_user() && lock) {
-		/* if we are locking, reduce the count by 1,
-		 * because we don't want to count ourselves */
-		locknum = inc_dec_lockfile(lockval) - lockval > 0 ? 1 : 0;
-
-		if (locknum > 0) {
-			einfov("Lock set, skipping");
-			return EXIT_SUCCESS;
-		}
-	}
-#endif
-
 	svcdir = rc_svcdir();
 	xasprintf(&rc_stopping, "%s/%s", svcdir, RC_STOPPING_FOLDER);
 	xasprintf(&rc_starting, "%s/%s", svcdir, RC_STARTING_FOLDER);