x2go-commits November 2012

x2go-commits@lists.x2go.org

1 participants
327 discussions

libpam-x2go.git - master (branch) updated: 09b23464dc7aea0221a261eaa8fabb087296eaff
by git-admin＠x2go.org 09 Nov '12

09 Nov '12

The branch, master has been updated via 09b23464dc7aea0221a261eaa8fabb087296eaff (commit) from dee7606722b244c7496a5684866279f49d0b3d58 (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 ----------------------------------------------------------------- commit 09b23464dc7aea0221a261eaa8fabb087296eaff Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Nov 9 13:27:44 2012 +0100 fix missing type ----------------------------------------------------------------------- Summary of changes: src/x2go-auth-check.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/src/x2go-auth-check.c b/src/x2go-auth-check.c index 524d424..4f30848 100644 --- a/src/x2go-auth-check.c +++ b/src/x2go-auth-check.c @@ -41,7 +41,7 @@ main (int argc, char * argv[]) ssh_options_set ( auth_check_ssh_session, SSH_OPTIONS_HOST, argv[1]; ); ssh_options_set ( auth_check_ssh_session, SSH_OPTIONS_USER, argv[2]; ); - rc = ssh_connect (ssh_session); + int rc = ssh_connect (ssh_session); char * colonloc = strstr(argv[1], ":"); if (colonloc != 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)).

1 0

libpam-x2go.git - master (branch) updated: dee7606722b244c7496a5684866279f49d0b3d58
by git-admin＠x2go.org 09 Nov '12

09 Nov '12

The branch, master has been updated via dee7606722b244c7496a5684866279f49d0b3d58 (commit) via 27a9e7a61771ef52c05de510ca092014c9bdc406 (commit) from 7e4ca5240d975d9d93198bf835c0cde27a4d5f0d (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 ----------------------------------------------------------------- commit dee7606722b244c7496a5684866279f49d0b3d58 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Nov 9 13:24:48 2012 +0100 remove remnants of libpam-freerdp commit 27a9e7a61771ef52c05de510ca092014c9bdc406 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Nov 9 13:24:05 2012 +0100 fix /debian/watch file ----------------------------------------------------------------------- Summary of changes: debian/watch | 2 +- src/pam-x2go-children.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/watch b/debian/watch index 63615b4..282ce0a 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,2 @@ version=3 -http://launchpad.net/libpam-freerdp/+download .*/libpam-freerdp-(.+)\.tar\.gz +http://code.x2go.org/releases/source/libpam-x2go/libpam-x2go-(.+)\.tar\.gz diff --git a/src/pam-x2go-children.c b/src/pam-x2go-children.c index 51cf048..75ec1d3 100644 --- a/src/pam-x2go-children.c +++ b/src/pam-x2go-children.c @@ -34,7 +34,7 @@ #include <security/pam_modutil.h> #include <security/pam_appl.h> -#include "pam-freerdp-children.h" +#include "pam-x2go-children.h" #include "auth-check-path.h" void 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)).

1 0

libpam-x2go.git - master (branch) updated: 7e4ca5240d975d9d93198bf835c0cde27a4d5f0d
by git-admin＠x2go.org 09 Nov '12

09 Nov '12

The branch, master has been updated via 7e4ca5240d975d9d93198bf835c0cde27a4d5f0d (commit) from 8012c81c7224c3b6215e54c77af15470a6c362d9 (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 ----------------------------------------------------------------- commit 7e4ca5240d975d9d93198bf835c0cde27a4d5f0d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Nov 9 13:22:00 2012 +0100 /debian/control: Depend on dh-autoreconf. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ debian/control | 1 + debian/rules | 1 + 3 files changed, 4 insertions(+) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 380aade..fd415c7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,5 +6,7 @@ libpam-x2go (0.0.0.1-0~x2go1) UNRELEASED; urgency=low server). * /debian/rules: - Override auto_build with our own automake mechanism. + * /debian/control: + - Depend on dh-autoreconf. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 09 Nov 2012 01:10:25 +0100 diff --git a/debian/control b/debian/control index 5206a93..9a7abe2 100644 --- a/debian/control +++ b/debian/control @@ -11,6 +11,7 @@ Build-Depends: libssh-dev, pkg-config, cdbs, + dh-autoreconf, Standards-Version: 3.9.3 Homepage: http://wiki.x2go.org Vcs-Git: git://code.x2go.org/libpam-x2go.git diff --git a/debian/rules b/debian/rules index c19b8ef..4edf62f 100755 --- a/debian/rules +++ b/debian/rules @@ -1,4 +1,5 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/autoreconf.mk include /usr/share/cdbs/1/class/autotools.mk 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)).

1 0

libpam-x2go.git - master (branch) updated: 8012c81c7224c3b6215e54c77af15470a6c362d9
by git-admin＠x2go.org 09 Nov '12

09 Nov '12

The branch, master has been updated via 8012c81c7224c3b6215e54c77af15470a6c362d9 (commit) from 90c35a1243dd941fb655827ee518918b388c356c (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 ----------------------------------------------------------------- commit 8012c81c7224c3b6215e54c77af15470a6c362d9 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Nov 9 12:52:30 2012 +0100 check for libssh .pc (pkg-config) file ----------------------------------------------------------------------- Summary of changes: configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/configure.ac b/configure.ac index b3e9ea5..4cbd43d 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ if test "x$have_pam" = "xno"; then fi ########################### -# X2Go +# LIBSSH ########################### PKG_CHECK_MODULES(LIBSSH, libssh) 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)).

1 0

libpam-x2go.git - master (branch) updated: 90c35a1243dd941fb655827ee518918b388c356c
by git-admin＠x2go.org 09 Nov '12

09 Nov '12

The branch, master has been updated via 90c35a1243dd941fb655827ee518918b388c356c (commit) from 1e3ac9dba105f937eaefe2357ca1aafebb63e721 (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 ----------------------------------------------------------------- commit 90c35a1243dd941fb655827ee518918b388c356c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Nov 9 12:42:23 2012 +0100 depende on cdbs ----------------------------------------------------------------------- Summary of changes: debian/control | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) The diff of changes is: diff --git a/debian/control b/debian/control index 8e53327..5206a93 100644 --- a/debian/control +++ b/debian/control @@ -10,9 +10,7 @@ Build-Depends: libpam0g-dev, libssh-dev, pkg-config, - automake, - autotools-dev, - libtool, + cdbs, Standards-Version: 3.9.3 Homepage: http://wiki.x2go.org Vcs-Git: git://code.x2go.org/libpam-x2go.git 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)).

1 0

libpam-x2go.git - master (branch) updated: 1e3ac9dba105f937eaefe2357ca1aafebb63e721
by git-admin＠x2go.org 09 Nov '12

09 Nov '12

The branch, master has been updated via 1e3ac9dba105f937eaefe2357ca1aafebb63e721 (commit) from d2097c196710ce26e8f845ec528a2eded8107396 (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 ----------------------------------------------------------------- commit 1e3ac9dba105f937eaefe2357ca1aafebb63e721 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Nov 9 12:41:31 2012 +0100 change-over to CDBS ----------------------------------------------------------------------- Summary of changes: configure.ac | 2 +- debian/rules | 13 ++----------- 2 files changed, 3 insertions(+), 12 deletions(-) The diff of changes is: diff --git a/configure.ac b/configure.ac index 2f729c2..b3e9ea5 100644 --- a/configure.ac +++ b/configure.ac @@ -25,7 +25,7 @@ fi # X2Go ########################### -PKG_CHECK_MODULES(X2GO, x2go) +PKG_CHECK_MODULES(LIBSSH, libssh) ########################### # Local Install diff --git a/debian/rules b/debian/rules index 47a9b64..c19b8ef 100755 --- a/debian/rules +++ b/debian/rules @@ -1,13 +1,4 @@ #!/usr/bin/make -f -%: - dh $@ - -override_dh_auto_configure: - aclocal && automake --add-missing - ./configure $(shell dpkg-buildflags --export=configure) - -override_dh_install: - dh_install - find debian/libpam-x2go -name '*.a' -delete - find debian/libpam-x2go -name '*.la' -delete +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk 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)).

1 0

libpam-x2go.git - master (branch) updated: d2097c196710ce26e8f845ec528a2eded8107396
by git-admin＠x2go.org 09 Nov '12

09 Nov '12

The branch, master has been updated via d2097c196710ce26e8f845ec528a2eded8107396 (commit) from dafaacc2c12d341124d43a1df8713b11d2e2d4b4 (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 ----------------------------------------------------------------- commit d2097c196710ce26e8f845ec528a2eded8107396 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Nov 9 12:19:33 2012 +0100 replace dh-autoreconf dependency by autotools-dev, automake and libtool ----------------------------------------------------------------------- Summary of changes: debian/control | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/control b/debian/control index fd04615..8e53327 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,9 @@ Build-Depends: libpam0g-dev, libssh-dev, pkg-config, - dh-autoreconf, + automake, + autotools-dev, + libtool, Standards-Version: 3.9.3 Homepage: http://wiki.x2go.org Vcs-Git: git://code.x2go.org/libpam-x2go.git 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)).

1 0

libpam-x2go.git - master (branch) updated: dafaacc2c12d341124d43a1df8713b11d2e2d4b4
by git-admin＠x2go.org 09 Nov '12

09 Nov '12

The branch, master has been updated via dafaacc2c12d341124d43a1df8713b11d2e2d4b4 (commit) via 1c24fc65e44cd793f67c065fab2a77f81b52913f (commit) from 05d95fb0cce001c862e65233793157f5c1033570 (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 ----------------------------------------------------------------- commit dafaacc2c12d341124d43a1df8713b11d2e2d4b4 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Nov 9 12:18:17 2012 +0100 Override auto_build with our own automake mechanism. commit 1c24fc65e44cd793f67c065fab2a77f81b52913f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Nov 9 12:17:40 2012 +0100 wrap too-long-changelog-line ----------------------------------------------------------------------- Summary of changes: debian/changelog | 5 +++-- debian/rules | 6 +++++- 2 files changed, 8 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index beabd44..380aade 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,9 @@ libpam-x2go (0.0.0.1-0~x2go1) UNRELEASED; urgency=low * Initial upstream release. Forked from libpam-freerdp. * Adaptations of the forked original to work with X2Go: - - Check the authentication token via libssh (ssh login to the remote server). + - Check the authentication token via libssh (ssh login to the remote + server). * /debian/rules: - - Use dh-autoreconf with debhelper. + - Override auto_build with our own automake mechanism. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 09 Nov 2012 01:10:25 +0100 diff --git a/debian/rules b/debian/rules index a69e88d..47a9b64 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,11 @@ #!/usr/bin/make -f %: - dh $@ --with-autoreconf + dh $@ + +override_dh_auto_configure: + aclocal && automake --add-missing + ./configure $(shell dpkg-buildflags --export=configure) override_dh_install: dh_install 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)).

1 0

libpam-x2go.git - master (branch) updated: 05d95fb0cce001c862e65233793157f5c1033570
by git-admin＠x2go.org 09 Nov '12

09 Nov '12

The branch, master has been updated via 05d95fb0cce001c862e65233793157f5c1033570 (commit) from edd14a06a92de3b1275f4aeb377d8fa3852f823e (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 ----------------------------------------------------------------- commit 05d95fb0cce001c862e65233793157f5c1033570 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Nov 9 12:08:58 2012 +0100 /debian/rules: Use dh-autoreconf with debhelper. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ debian/control | 1 + debian/rules | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index d11de31..beabd44 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,5 +3,7 @@ libpam-x2go (0.0.0.1-0~x2go1) UNRELEASED; urgency=low * Initial upstream release. Forked from libpam-freerdp. * Adaptations of the forked original to work with X2Go: - Check the authentication token via libssh (ssh login to the remote server). + * /debian/rules: + - Use dh-autoreconf with debhelper. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 09 Nov 2012 01:10:25 +0100 diff --git a/debian/control b/debian/control index a66b106..fd04615 100644 --- a/debian/control +++ b/debian/control @@ -10,6 +10,7 @@ Build-Depends: libpam0g-dev, libssh-dev, pkg-config, + dh-autoreconf, Standards-Version: 3.9.3 Homepage: http://wiki.x2go.org Vcs-Git: git://code.x2go.org/libpam-x2go.git diff --git a/debian/rules b/debian/rules index a438aed..a69e88d 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f %: - dh $@ + dh $@ --with-autoreconf override_dh_install: dh_install 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)).

1 0

libpam-x2go.git - master (branch) updated: edd14a06a92de3b1275f4aeb377d8fa3852f823e
by git-admin＠x2go.org 09 Nov '12

09 Nov '12

The branch, master has been updated via edd14a06a92de3b1275f4aeb377d8fa3852f823e (commit) from 42b8b279e62e6e2f5a7455e30bb0a211763ee187 (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 ----------------------------------------------------------------- commit edd14a06a92de3b1275f4aeb377d8fa3852f823e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Nov 9 12:04:48 2012 +0100 Adaptations of the forked original to work with X2Go: Check the authentication token via libssh (ssh login to the remote server). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ debian/control | 1 + src/pam-x2go-children.c | 2 +- src/pam-x2go-children.h | 6 ++--- src/pam-x2go.c | 22 ++++------------- src/x2go-auth-check.c | 60 ++++++++++------------------------------------- 6 files changed, 25 insertions(+), 68 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index b9e0630..d11de31 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,7 @@ libpam-x2go (0.0.0.1-0~x2go1) UNRELEASED; urgency=low * Initial upstream release. Forked from libpam-freerdp. + * Adaptations of the forked original to work with X2Go: + - Check the authentication token via libssh (ssh login to the remote server). -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 09 Nov 2012 01:10:25 +0100 diff --git a/debian/control b/debian/control index d3fe23c..a66b106 100644 --- a/debian/control +++ b/debian/control @@ -8,6 +8,7 @@ Build-Depends: debhelper (>= 9), libgtest-dev, libpam0g-dev, + libssh-dev, pkg-config, Standards-Version: 3.9.3 Homepage: http://wiki.x2go.org diff --git a/src/pam-x2go-children.c b/src/pam-x2go-children.c index ea29c14..51cf048 100644 --- a/src/pam-x2go-children.c +++ b/src/pam-x2go-children.c @@ -172,7 +172,7 @@ session_socket_handler (struct passwd * pwdent, int readypipe, const char * ruse memset(&socket_addr, 0, sizeof(struct sockaddr_un)); socket_addr.sun_family = AF_UNIX; strncpy(socket_addr.sun_path, pwdent->pw_dir, sizeof(socket_addr.sun_path) - 1); - strncpy(socket_addr.sun_path + strlen(pwdent->pw_dir), "/.freerdp-socket", (sizeof(socket_addr.sun_path) - strlen(pwdent->pw_dir)) - 1); + strncpy(socket_addr.sun_path + strlen(pwdent->pw_dir), "/.x2go-socket", (sizeof(socket_addr.sun_path) - strlen(pwdent->pw_dir)) - 1); /* We bind the socket before forking so that we ensure that there isn't a race condition to get to it. Things will block diff --git a/src/pam-x2go-children.h b/src/pam-x2go-children.h index cb36312..d300d46 100644 --- a/src/pam-x2go-children.h +++ b/src/pam-x2go-children.h @@ -16,8 +16,8 @@ * Author: Ted Gould <ted(a)canonical.com> */ -#ifndef _PAM_FREERDP_CHILDREN_H_ -#define _PAM_FREERDP_CHILDREN_H_ +#ifndef _PAM_X2GO_CHILDREN_H_ +#define _PAM_X2GO_CHILDREN_H_ #define PAM_TYPE_DOMAIN 1234 #define ALL_GOOD_SIGNAL "Ar, ready to authenticate cap'n" @@ -27,4 +27,4 @@ pam_sm_authenticate_helper (int *stdinpipe, const char* username, const char* rh int session_socket_handler (struct passwd * pwdent, int readypipe, const char * ruser, const char * rhost, const char * rdomain, const char * password); -#endif //_PAM_FREERDP_CHILDREN_H_ +#endif //_PAM_X2GO_CHILDREN_H_ diff --git a/src/pam-x2go.c b/src/pam-x2go.c index 8979e6e..8ca5147 100644 --- a/src/pam-x2go.c +++ b/src/pam-x2go.c @@ -34,7 +34,7 @@ #include <security/pam_modutil.h> #include <security/pam_appl.h> -#include "pam-freerdp-children.h" +#include "pam-x2go-children.h" #include "auth-check-path.h" static int unpriveleged_kill (struct passwd * pwdent); @@ -126,18 +126,6 @@ get_item (pam_handle_t * pamh, int type) } } - /* The way that xfreerdp does parsing means that we can't handle - spaces in the username. Let's block them as early as possible. - Though, if the xfreerdp part gets fixed, we want this to disappear - http://launchpad.net/bugs/1053102 - */ - if (type == PAM_RUSER) { - if (strstr(promptval, " ") != NULL) { - free(promptval); - return NULL; - } - } - if (type == PAM_RHOST) { char * subloc = strstr(promptval, "://"); if (subloc != NULL) { @@ -205,7 +193,7 @@ get_item (pam_handle_t * pamh, int type) } /* Authenticate. We need to make sure we have a user account, that - there are remote accounts and then verify them with FreeRDP */ + there are remote accounts and then verify them with X2Go */ PAM_EXTERN int pam_sm_authenticate (pam_handle_t *pamh, int flags, int argc, const char **argv) { @@ -270,7 +258,7 @@ done: 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 - xfreerdp viewer for the login */ + PyHoca (X2Go) client for the login */ PAM_EXTERN int pam_sm_open_session (pam_handle_t *pamh, int flags, int argc, const char ** argv) { @@ -426,8 +414,8 @@ pam_sm_setcred (pam_handle_t *pamh, int flags, int argc, const char ** argv) #ifdef PAM_STATIC -struct pam_module _pam_freerdp_modstruct = { - "pam_freerdp", +struct pam_module _pam_x2go_modstruct = { + "pam_x2go", pam_sm_authenticate, pam_sm_setcred, NULL, diff --git a/src/x2go-auth-check.c b/src/x2go-auth-check.c index e5e9d13..524d424 100644 --- a/src/x2go-auth-check.c +++ b/src/x2go-auth-check.c @@ -16,37 +16,9 @@ * Author: Ted Gould <ted(a)canonical.com> */ -#include <freerdp/freerdp.h> -#include <freerdp/channels/channels.h> +#include <libssh/libssh.h> #include <string.h> -void -auth_context_new (freerdp * instance, rdpContext * context) -{ - context->channels = freerdp_channels_new(); - return; -} - -void -auth_context_free (freerdp * instance, rdpContext * context) -{ - return; -} - -boolean -auth_pre_connect (freerdp * instance) -{ - freerdp_channels_pre_connect(instance->context->channels, instance); - return true; -} - -boolean -auth_post_connect (freerdp * instance) -{ - freerdp_channels_post_connect(instance->context->channels, instance); - return true; -} - int main (int argc, char * argv[]) { @@ -64,23 +36,12 @@ main (int argc, char * argv[]) return -1; } - freerdp_channels_global_init(); - - freerdp * instance = freerdp_new(); + auth_check_ssh_session = ssh_new(); - instance->PreConnect = auth_pre_connect; - instance->PostConnect = auth_post_connect; + ssh_options_set ( auth_check_ssh_session, SSH_OPTIONS_HOST, argv[1]; ); + ssh_options_set ( auth_check_ssh_session, SSH_OPTIONS_USER, argv[2]; ); - instance->context_size = sizeof(rdpContext); - instance->ContextNew = auth_context_new; - instance->ContextFree = auth_context_free; - - freerdp_context_new(instance); - - instance->settings->hostname = argv[1]; - instance->settings->username = argv[2]; - instance->settings->domain = argv[3]; - instance->settings->password = password; + rc = ssh_connect (ssh_session); char * colonloc = strstr(argv[1], ":"); if (colonloc != NULL) { @@ -88,12 +49,17 @@ main (int argc, char * argv[]) colonloc[0] = '\0'; colonloc++; - instance->settings->port = strtoul(colonloc, NULL, 10); + ssh_options_set ( auth_check_ssh_session, SSH_OPTIONS_PORT, strtoul(colonloc, NULL, 10); ); + } + + if (ssh_connect (ssh_session)) { + int rc = ssh_userauth_password ( auth_check_ssh_session, NULL, password ); + ssh_disconnect(ssh_session); } int retval = -1; - if (freerdp_connect(instance)) { - freerdp_disconnect(instance); + if ( rc == SSH_AUTH_SUCCESS ) + { retval = 0; } 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)).

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
33
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits November 2012