x2go-commits April 2013

x2go-commits@lists.x2go.org

2 participants
1376 discussions

libpam-x2go.git - build-main (branch) updated: 8312e8df8682ebf7b8499b641c56844e617aeb9b
by git-admin＠x2go.org 27 Apr '13

27 Apr '13

The branch, build-main has been updated via 8312e8df8682ebf7b8499b641c56844e617aeb9b (commit) from 09cc9a1f35d8a4b847e9982745c65c7408f72999 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: .bzrignore … [View More]

1 0

libpam-x2go.git - build-main (branch) updated: 35dc28b34f75794f4e88add4298032d236b167e1
by git-admin＠x2go.org 27 Apr '13

27 Apr '13

The branch, build-main has been updated via 35dc28b34f75794f4e88add4298032d236b167e1 (commit) from 09706973403a6ae0934f55780ac81159bf8d6200 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: src/pam-… [View More]freerdp.c | 38 +++++++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 11 deletions(-) The diff of changes is: diff --git a/src/pam-freerdp.c b/src/pam-freerdp.c index bf533c4..d8c6703 100644 --- a/src/pam-freerdp.c +++ b/src/pam-freerdp.c @@ -1,4 +1,5 @@ #include <stdlib.h> +#include <stdio.h> #include <string.h> #include <unistd.h> #include <sys/wait.h> @@ -95,27 +96,29 @@ pam_sm_authenticate (pam_handle_t *pamh, int flags, int argc, const char **argv) GET_ITEM(rdomain, PAM_TYPE_DOMAIN); GET_ITEM(password, PAM_AUTHTOK); + int stdinpipe[2]; + if (pipe(stdinpipe) != 0) { + retval = PAM_SYSTEM_ERR; + goto done; + } + /* At this point we should have the values, let's check the auth */ pid_t pid; switch (pid = fork()) { case 0: { /* child */ - char * args[13]; + dup2(stdinpipe[0], 0); + + char * args[8]; + args[0] = XFREERDP; args[1] = "--plugin"; args[2] = "rdpsnd.so"; args[3] = "--no-nla"; args[4] = "-f"; args[5] = "--ignore-certificate"; /* TODO: Change when we set the home directory properly */ + args[6] = "--from-stdin"; - /* TODO: Use stdin */ - args[6] = "-u"; - args[7] = ruser; - args[8] = "-p"; - args[9] = password; - args[10] = "-d"; - args[11] = rdomain; - - args[12] = NULL; + args[7] = NULL; /* TODO: Drop privs */ /* TODO: Home directory environment to user's home */ @@ -129,7 +132,20 @@ pam_sm_authenticate (pam_handle_t *pamh, int flags, int argc, const char **argv) } default: { int forkret = 0; - if (waitpid(pid, &forkret, 0) < 0) { + int bytesout = 0; + + bytesout += write(stdinpipe[1], ruser, strlen(ruser)); + bytesout += write(stdinpipe[1], " ", 1); + bytesout += write(stdinpipe[1], password, strlen(password)); + bytesout += write(stdinpipe[1], " ", 1); + bytesout += write(stdinpipe[1], rdomain, strlen(rdomain)); + bytesout += write(stdinpipe[1], " ", 1); + bytesout += write(stdinpipe[1], rhost, strlen(rhost)); + bytesout += write(stdinpipe[1], " ", 1); + + close(stdinpipe[1]); + + if (waitpid(pid, &forkret, 0) < 0 || bytesout == 0) { retval = PAM_SYSTEM_ERR; } else if (forkret == 0) { retval = PAM_SUCCESS; hooks/post-receive -- libpam-x2go.git (Remote login session via X2Go (PAM module)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "libpam-x2go.git" (Remote login session via X2Go (PAM module)). [View Less]

1 0

libpam-x2go.git - build-main (branch) updated: dfbd12d4d9e5af664330aff4bd31443f271d444c
by git-admin＠x2go.org 27 Apr '13

27 Apr '13

The branch, build-main has been updated via dfbd12d4d9e5af664330aff4bd31443f271d444c (commit) from 65f877d10b3da172a4bef124b2184db9f2d1cf4c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: configure.ac … [View More]

1 0

libpam-x2go.git - build-main (branch) updated: 65f877d10b3da172a4bef124b2184db9f2d1cf4c
by git-admin＠x2go.org 27 Apr '13

27 Apr '13

The branch, build-main has been updated via 65f877d10b3da172a4bef124b2184db9f2d1cf4c (commit) from 05eabb5092b8d0d2e71045e8e838985dcabd5457 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: The diff of … [View More]

1 0

libpam-x2go.git - build-main (branch) updated: fb842c6866ce962d332b2a17d3e070de1fd6f119
by git-admin＠x2go.org 27 Apr '13

27 Apr '13

The branch, build-main has been updated via fb842c6866ce962d332b2a17d3e070de1fd6f119 (commit) from 8312e8df8682ebf7b8499b641c56844e617aeb9b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: configure.ac … [View More]

1 0

libpam-x2go.git - build-main (branch) updated: 09706973403a6ae0934f55780ac81159bf8d6200
by git-admin＠x2go.org 27 Apr '13

27 Apr '13

The branch, build-main has been updated via 09706973403a6ae0934f55780ac81159bf8d6200 (commit) from ec14991fdc6915a88cd213e37ab776b6e28ce738 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: src/pam-… [View More]freerdp.c | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) The diff of changes is: diff --git a/src/pam-freerdp.c b/src/pam-freerdp.c index a1e2bfa..bf533c4 100644 --- a/src/pam-freerdp.c +++ b/src/pam-freerdp.c @@ -16,45 +16,48 @@ get_item (pam_handle_t * pamh, int type) /* Check to see if we just have the value. If we do, great let's dup it some we're consitently allocating memory */ if (type != PAM_TYPE_DOMAIN) { - char * value; - if (pam_get_item(pamh, type, (const void **)&value) == PAM_SUCCESS) { + char * value = NULL; + if (pam_get_item(pamh, type, (const void **)&value) == PAM_SUCCESS && value != NULL) { return strdup(value); } } /* Now we need to prompt */ /* Build up the message we're prompting for */ - struct pam_message message[1]; - message[0].msg_style = PAM_PROMPT_ECHO_ON; + struct pam_message message; + const struct pam_message * pmessage = &message; + + message.msg = NULL; + message.msg_style = PAM_PROMPT_ECHO_ON; switch (type) { case PAM_USER: - message[0].msg = "login:"; + message.msg = "login:"; break; case PAM_RUSER: - message[0].msg = "remote login:"; + message.msg = "remote login:"; break; case PAM_RHOST: - message[0].msg = "remote host:"; + message.msg = "remote host:"; break; case PAM_AUTHTOK: - message[0].msg = "password:"; - message[0].msg_style = PAM_PROMPT_ECHO_OFF; + message.msg = "password:"; + message.msg_style = PAM_PROMPT_ECHO_OFF; break; case PAM_TYPE_DOMAIN: - message[0].msg = "domain:"; + message.msg = "domain:"; break; default: return NULL; } - struct pam_conv * conv; - if (pam_get_item(pamh, PAM_CONV, (const void **)&conv) != PAM_SUCCESS) { + struct pam_conv * conv = NULL; + if (pam_get_item(pamh, PAM_CONV, (const void **)&conv) != PAM_SUCCESS || conv == NULL || conv->conv == NULL) { return NULL; } struct pam_response * responses = NULL; - if (conv->conv(1, (const struct pam_message **)&message, &responses, conv->appdata_ptr) != PAM_SUCCESS) { + if (conv->conv(1, &pmessage, &responses, conv->appdata_ptr) != PAM_SUCCESS) { return NULL; } @@ -166,7 +169,7 @@ pam_sm_close_session (pam_handle_t *pamh, int flags, int argc, const char **argv #ifdef PAM_STATIC -struct pam_module _pam_temp_account_modstruct = { +struct pam_module _pam_freerdp_modstruct = { "pam-freerdp", pam_sm_authenticate, NULL, hooks/post-receive -- libpam-x2go.git (Remote login session via X2Go (PAM module)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "libpam-x2go.git" (Remote login session via X2Go (PAM module)). [View Less]

1 0

libpam-x2go.git - build-main (branch) updated: 09cc9a1f35d8a4b847e9982745c65c7408f72999
by git-admin＠x2go.org 27 Apr '13

27 Apr '13

The branch, build-main has been updated via 09cc9a1f35d8a4b847e9982745c65c7408f72999 (commit) from dfbd12d4d9e5af664330aff4bd31443f271d444c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: configure.ac … [View More]

1 0

libpam-x2go.git - build-main (branch) updated: 200ccab9283410f1ddf65cce7d0f1b77dc5dcbcf
by git-admin＠x2go.org 27 Apr '13

27 Apr '13

The branch, build-main has been updated via 200ccab9283410f1ddf65cce7d0f1b77dc5dcbcf (commit) from 35dc28b34f75794f4e88add4298032d236b167e1 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: src/pam-… [View More]

1 0

libpam-x2go.git - build-main (branch) updated: ec14991fdc6915a88cd213e37ab776b6e28ce738
by git-admin＠x2go.org 27 Apr '13

27 Apr '13

The branch, build-main has been updated via ec14991fdc6915a88cd213e37ab776b6e28ce738 (commit) from fb842c6866ce962d332b2a17d3e070de1fd6f119 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: src/pam-… [View More]

1 0

libpam-x2go.git - build-main (branch) created: 6b8fc6c1845aa0df788c37d997a7e11a7fdabba9
by git-admin＠x2go.org 27 Apr '13

27 Apr '13

The branch, build-main has been created at 6b8fc6c1845aa0df788c37d997a7e11a7fdabba9 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- hooks/post-receive -- libpam-x2go.git (Remote login session via X2Go (PAM module)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "libpam-… [View More]

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits April 2013