[X2Go-Commits] libpam-x2go.git - build-main (branch) updated: 35dc28b34f75794f4e88add4298032d236b167e1

[X2Go dev team]

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-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)).