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

X2Go dev team git-admin at x2go.org
Sat Apr 27 13:45:40 CEST 2013


The branch, build-main has been updated
       via  55a7c6b26d599459cb8d62638cddc137906d0536 (commit)
      from  5667bd031dbd9fedfdd5066050b1e5188819ac9c (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/x2go-auth-check.c |   25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

The diff of changes is:
diff --git a/src/x2go-auth-check.c b/src/x2go-auth-check.c
index 5bd6c1a..8a3fb01 100644
--- a/src/x2go-auth-check.c
+++ b/src/x2go-auth-check.c
@@ -18,6 +18,10 @@
 
 #include <libssh/libssh.h>
 #include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/mman.h>
+
 
 int
 main (int argc, char * argv[])
@@ -28,18 +32,27 @@ main (int argc, char * argv[])
 		return -1;
 	}
 
+	printf ("1\n");
+
 	if (scanf("%511s", password) != 1) {
 		return -1;
 	}
 
+	printf ("2\n");
+
 	if (mlock(password, sizeof(password)) != 0) {
 		return -1;
 	}
 
+	printf ("3\n");
+
 	ssh_session auth_check_ssh_session = ssh_new();
 
-	ssh_options_set ( auth_check_ssh_session, SSH_OPTIONS_HOST, argv[1] );
-	ssh_options_set ( auth_check_ssh_session, SSH_OPTIONS_USER, argv[2] );
+	ssh_options_set ( auth_check_ssh_session, SSH_OPTIONS_HOST, &argv[1] );
+	ssh_options_set ( auth_check_ssh_session, SSH_OPTIONS_USER, &argv[2] );
+
+	printf ("host: %s\n", argv[1]);
+	printf ("user: %s\n", argv[2]);
 
 	char * colonloc = strstr(argv[1], ":");
 	if (colonloc != NULL) {
@@ -47,9 +60,13 @@ main (int argc, char * argv[])
 		colonloc[0] = '\0';
 		colonloc++;
 
-		ssh_options_set ( auth_check_ssh_session, SSH_OPTIONS_PORT, strtoul(colonloc, NULL, 10) );
+		long port = strtoul(colonloc, NULL, 10);
+		ssh_options_set ( auth_check_ssh_session, SSH_OPTIONS_PORT, &port );
+		printf ("port: %i\n", port);
 	}
 
+	printf ("4\n");
+
 	int rc = -1;
 	if (ssh_connect (auth_check_ssh_session)) {
 		rc = ssh_userauth_password ( auth_check_ssh_session, NULL, password );
@@ -57,6 +74,8 @@ main (int argc, char * argv[])
 	}
 	ssh_free(auth_check_ssh_session);
 
+	printf ("5\n");
+
 	int retval = -1;
 	if ( rc == SSH_AUTH_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)).




More information about the x2go-commits mailing list