aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2012-09-04 08:30:35 -0500
committerTed Gould <ted@gould.cx>2012-09-04 08:30:35 -0500
commite8f32f2832c26092c613d0029a98034bae106af7 (patch)
tree6803ba8a892c303636203e9c6fe6272be896d498
parent2fc0b3787c96832d82ccce9876b97c8bcbf4c6d6 (diff)
downloadlibpam-freerdp2-e8f32f2832c26092c613d0029a98034bae106af7.tar.gz
libpam-freerdp2-e8f32f2832c26092c613d0029a98034bae106af7.tar.bz2
libpam-freerdp2-e8f32f2832c26092c613d0029a98034bae106af7.zip
Moving the kill code into a function
-rw-r--r--src/pam-freerdp.c17
1 files changed, 16 insertions, 1 deletions
diff --git a/src/pam-freerdp.c b/src/pam-freerdp.c
index b271834..17b5996 100644
--- a/src/pam-freerdp.c
+++ b/src/pam-freerdp.c
@@ -37,6 +37,8 @@
#define PAM_TYPE_DOMAIN 1234
#define ALL_GOOD_SIGNAL "Ar, ready to authenticate cap'n"
+static int unpriveleged_kill (struct passwd * pwdent);
+
static char * global_domain = NULL;
/* FIXME? This is a work around to the fact that PAM seems to be clearing
the auth token between authorize and open_session. Which then requires
@@ -523,6 +525,20 @@ pam_sm_close_session (pam_handle_t *pamh, int flags, int argc, const char **argv
goto done;
}
+ retval = unpriveleged_kill(pwdent);
+
+done:
+ return retval;
+}
+
+/* Drop privs and try to kill the process with the PID of session_pid.
+ This ensures that we don't kill something important if there is PID wrap
+ around. */
+static int
+unpriveleged_kill (struct passwd * pwdent)
+{
+ int retval = PAM_SUCCESS;
+
pid_t pid = fork();
if (pid == 0) {
/* Setting groups, but allowing EPERM as if we're not 100% root
@@ -566,7 +582,6 @@ pam_sm_close_session (pam_handle_t *pamh, int flags, int argc, const char **argv
want to try again. We'll just return the error for this time. */
session_pid = 0;
-done:
return retval;
}