aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2012-08-30 09:55:15 -0500
committerTed Gould <ted@gould.cx>2012-08-30 09:55:15 -0500
commitadc34c5dfa6a012b868c3b368dad325074a0f61a (patch)
tree561e77e621df61a2922794945f7fc5814f360126
parentf80b38d61ce1b138c119a57cda951ea8b6c66cc1 (diff)
downloadlibpam-x2go-adc34c5dfa6a012b868c3b368dad325074a0f61a.tar.gz
libpam-x2go-adc34c5dfa6a012b868c3b368dad325074a0f61a.tar.bz2
libpam-x2go-adc34c5dfa6a012b868c3b368dad325074a0f61a.zip
Refactor to pull the long running stuff out of the if statement and into a function
-rw-r--r--src/pam-freerdp.c69
1 files changed, 40 insertions, 29 deletions
diff --git a/src/pam-freerdp.c b/src/pam-freerdp.c
index 7770970..4e43ec4 100644
--- a/src/pam-freerdp.c
+++ b/src/pam-freerdp.c
@@ -249,6 +249,43 @@ done:
return retval;
}
+static int
+session_socket_handler (const char * buffer, int buffer_len, struct passwd * pwdent, int socketfd)
+{
+ /* Locks to carry over */
+ mlock(buffer, buffer_len);
+
+ if (setgid(pwdent->pw_gid) < 0 || setuid(pwdent->pw_uid) < 0 ||
+ setegid(pwdent->pw_gid) < 0 || seteuid(pwdent->pw_uid) < 0) {
+ return EXIT_FAILURE;
+ }
+
+ if (listen(socketfd, 1) < 0) {
+ return EXIT_FAILURE;
+ }
+
+ socklen_t connected_addr_size;
+ int connectfd;
+ struct sockaddr_un connected_addr;
+
+ connected_addr_size = sizeof(struct sockaddr_un);
+ connectfd = accept(socketfd, (struct sockaddr *)&connected_addr, &connected_addr_size);
+ if (connectfd < 0) {
+ return EXIT_FAILURE;
+ }
+
+ int writedata;
+ writedata = write(connectfd, buffer, buffer_len);
+
+ close(connectfd);
+
+ if (writedata == buffer_len) {
+ return 0;
+ }
+
+ return EXIT_FAILURE;
+}
+
pid_t session_pid = 0;
/* Open Session. Here we need to fork a little process so that we can
give the credentials to the session itself so that it can startup the
@@ -330,40 +367,14 @@ pam_sm_open_session (pam_handle_t *pamh, int flags, int argc, const char ** argv
pid_t pid = fork();
if (pid == 0) {
- /* Locks to carry over */
- mlock(buffer, buffer_len);
+ int retval = 0;
- if (setgid(pwdent->pw_gid) < 0 || setuid(pwdent->pw_uid) < 0 ||
- setegid(pwdent->pw_gid) < 0 || seteuid(pwdent->pw_uid) < 0) {
- _exit(EXIT_FAILURE);
- }
-
- if (listen(socketfd, 1) < 0) {
- _exit(EXIT_FAILURE);
- }
-
- socklen_t connected_addr_size;
- int connectfd;
- struct sockaddr_un connected_addr;
+ retval = session_socket_handler(buffer, buffer_len, pwdent, socketfd);
- connected_addr_size = sizeof(struct sockaddr_un);
- connectfd = accept(socketfd, (struct sockaddr *)&connected_addr, &connected_addr_size);
- if (connectfd < 0) {
- _exit(EXIT_FAILURE);
- }
-
- int writedata;
- writedata = write(connectfd, buffer, buffer_len);
-
- close(connectfd);
close(socketfd);
free(buffer);
- if (writedata == buffer_len) {
- _exit(0);
- } else {
- _exit(EXIT_FAILURE);
- }
+ _exit(retval);
} else if (pid < 0) {
retval = PAM_SYSTEM_ERR;
close(socketfd);