The branch, build-main has been updated via 7bddf376cc1c4b2ffafdf00a3550c04db4e12487 (commit) from 25d86806c68b6eaaf0b84c7ffd1150bbc24d2967 (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/Makefile.am | 5 +-- tests/test-freerdp-auth.c => src/pam-x2go.h | 63 ++++++++++----------------- 2 files changed, 26 insertions(+), 42 deletions(-) copy tests/test-freerdp-auth.c => src/pam-x2go.h (52%) The diff of changes is: diff --git a/src/Makefile.am b/src/Makefile.am index c99396f..960f349 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,3 @@ - pamlibdir = $(PAMMODULEDIR) pamlib_LTLIBRARIES = pam_x2go.la @@ -17,10 +16,10 @@ pam_x2go_la_CFLAGS = \ $(COVERAGE_CFLAGS) pam_x2go_la_LIBADD = \ - $(builddir)/libx2gocore.la + $(builddir)/libssh.a noinst_LTLIBRARIES = \ - libx2gocore.la + libssh.a libx2gocore_la_SOURCES = \ pam-x2go.c \ diff --git a/tests/test-freerdp-auth.c b/src/pam-x2go.h similarity index 52% copy from tests/test-freerdp-auth.c copy to src/pam-x2go.h index a83885e..e471bf7 100644 --- a/tests/test-freerdp-auth.c +++ b/src/pam-x2go.h @@ -16,42 +16,27 @@ * Author: Ted Gould <ted@canonical.com> */ -#include <stdlib.h> -#include <stdio.h> -#include <string.h> - -int -main (int argc, char * argv[]) -{ - char password[512]; - if (argc != 4) { - printf("Not enough params"); - return -1; - } - - if (scanf("%511s", password) != 1) { - return -1; - } - - /* Check username */ - if (strcmp(argv[2], "ruser")) { - return -1; - } - - /* Check password */ - if (strcmp(password, "password")) { - return -1; - } - - /* Check domain */ - if (strcmp(argv[3], "domain")) { - return -1; - } - - /* Check hostname */ - if (strcmp(argv[1], "rhost")) { - return -1; - } - - return 0; -} +#ifndef _PAM_X2GO_H_ +#define _PAM_X2GO_H_ + +static int unpriveleged_kill (struct passwd * pwdent); +static char * global_domain = NULL; +static char * global_password = NULL; +static char * +get_item (pam_handle_t * pamh, int type); + +PAM_EXTERN int +pam_sm_authenticate (pam_handle_t *pamh, int flags, int argc, const char **argv); + +pid_t session_pid = 0; + +PAM_EXTERN int +pam_sm_open_session (pam_handle_t *pamh, int flags, int argc, const char ** argv); + +PAM_EXTERN int +pam_sm_close_session (pam_handle_t *pamh, int flags, int argc, const char **argv); + +PAM_EXTERN int +pam_sm_setcred (pam_handle_t *pamh, int flags, int argc, const char ** argv); + +#endif 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)).