pam_openrc: add aditional logging

Author: navi-desu

src/openrc-user/openrc-user.c

@@ -84,8 +84,6 @@ int main(int argc, char **argv) {
 	setenv("EINFO_LOG", log, true);
 	free(log);
 
-	elog(LOG_INFO, "uid %ud, gid %ud, euid %ud, egid %ud.", getuid(), getgid(), geteuid(), getegid());
-
 #ifdef HAVE_PAM
 	if ((rc = pam_start("openrc-user", user->pw_name, &conv, &pamh)) != PAM_SUCCESS)
 		elog(LOG_ERR, "Failed to start pam: %s", pam_strerror(pamh, rc));
@@ -107,8 +105,6 @@ int main(int argc, char **argv) {
 	}
 #endif
 
-	elog(LOG_INFO, "uid %ud, gid %ud, euid %ud, egid %ud.", getuid(), getgid(), geteuid(), getegid());
-
 	if (!spawn_openrc(user, true)) {
 		ret = -1;
 		goto out;

src/pam_openrc/pam_openrc.c

@@ -16,24 +16,35 @@ static int
 exec_openrc(pam_handle_t *pamh, bool opening)
 {
 	char *svc_name, *pam_lock, *logins, *script = NULL;
-	const char *username, *session;
+	const char *username = NULL, *session = NULL;
 	RC_SERVICE service_status;
 	int count = 0, fd, status;
 	int ret = PAM_SUCCESS;
 	struct passwd *user;
 	pid_t pid = -1;
 
-	if (pam_get_item(pamh, PAM_SERVICE, (const void **)&session) != PAM_SUCCESS)
+	setenv("EINFO_LOG", "pam_openrc", true);
+
+	if (pam_get_item(pamh, PAM_SERVICE, (const void **)&session) != PAM_SUCCESS) {
+		elog(LOG_ERR, "Failed to get PAM_SERVICE");
 		return PAM_SESSION_ERR;
+	}
 
 	if (session && strcmp(session, "openrc-user") == 0)
 		return PAM_SUCCESS;
 
 	if (pam_get_item(pamh, PAM_USER, (const void **)&username) != PAM_SUCCESS)
 		return PAM_SESSION_ERR;
 
-	if (!username || !(user = getpwnam(username)))
+	if (!username) {
+		elog(LOG_ERR, "PAM_USER unset.");
+		return PAM_SESSION_ERR;
+	}
+
+	if (!(user = getpwnam(username))) {
+		elog(LOG_ERR, "User '%s' not found.", username);
 		return PAM_SESSION_ERR;
+	}
 
 	if (user->pw_uid == 0)
 		return PAM_SUCCESS;