The branch, x2gosession has been updated discards e2dbf52d86c5c6e1734c7df1b17d8ced9589e82a (commit) discards 0b41e3977e41d07997f008a8344f9ab70e4d213d (commit) via 817ff829b60891959d4b947fbd79c7bd3e2e67dd (commit) via 645af42abcb4b3ac922705751d134d31d8959912 (commit) via edbe36fbccacebc2de6d15d0bfa3d480dd69a135 (commit) via 48df96792e41ff14f101fbb9829a059b0cdd3879 (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (e2dbf52d86c5c6e1734c7df1b17d8ced9589e82a) \ N -- N -- N (817ff829b60891959d4b947fbd79c7bd3e2e67dd) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. 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 | 48 ++++++++++++++++++++++++++++++++++-------------- 1 file changed, 34 insertions(+), 14 deletions(-) The diff of changes is: diff --git a/src/pam-freerdp.c b/src/pam-freerdp.c index 9774bfb..e284619 100644 --- a/src/pam-freerdp.c +++ b/src/pam-freerdp.c @@ -32,6 +32,13 @@ #define PAM_TYPE_DOMAIN 1234 +static char * global_domain = NULL; +/* FIXME? This is a work around to the fact that PAM seems to be clearing + the auth token between authorize and open_session. Which then requires + us to save it. Seems like we're the wrong people to do it, but we have + no choice */ +static char * global_password = NULL; + /* Either grab a value or prompt for it */ static char * get_item (pam_handle_t * pamh, int type) @@ -43,6 +50,13 @@ get_item (pam_handle_t * pamh, int type) if (pam_get_item(pamh, type, (const void **)&value) == PAM_SUCCESS && value != NULL) { return strdup(value); } + if (type == PAM_AUTHTOK && global_password != NULL) { + return strdup(global_password); + } + } else { + if (global_domain != NULL) { + return strdup(global_domain); + } } /* Now we need to prompt */ @@ -80,7 +94,7 @@ get_item (pam_handle_t * pamh, int type) } struct pam_response * responses = NULL; - if (conv->conv(1, &pmessage, &responses, conv->appdata_ptr) != PAM_SUCCESS) { + if (conv->conv(1, &pmessage, &responses, conv->appdata_ptr) != PAM_SUCCESS || responses == NULL) { return NULL; } @@ -103,6 +117,23 @@ get_item (pam_handle_t * pamh, int type) } } + if (retval != NULL) { /* Can't believe it really would be at this point, but let's be sure */ + if (type != PAM_TYPE_DOMAIN) { + pam_set_item(pamh, type, (const void *)retval); + } else { + if (global_domain != NULL) { + free(global_domain); + } + global_domain = strdup(retval); + } + if (type == PAM_AUTHTOK) { + if (global_password != NULL) { + free(global_password); + } + global_password = strdup(retval); + } + } + return retval; } @@ -112,9 +143,6 @@ get_item (pam_handle_t * pamh, int type) goto done; \ } -/* TODO: Make this a build thing */ -#define XFREERDP "/usr/bin/xfreerdp" - /* Authenticate. We need to make sure we have a user account, that there are remote accounts and then verify them with FreeRDP */ PAM_EXTERN int @@ -337,20 +365,12 @@ pam_sm_close_session (pam_handle_t *pamh, int flags, int argc, const char **argv return PAM_IGNORE; } -/* LightDM likes to have this function around, but we don't need it as we - don't have a token hanging around. */ -PAM_EXTERN int -pam_sm_setcred (pam_handle_t *pamh, int flags, int argc, const char ** argv) -{ - return PAM_SUCCESS; -} - #ifdef PAM_STATIC struct pam_module _pam_freerdp_modstruct = { - "pam_freerdp", + "pam-freerdp", pam_sm_authenticate, - pam_sm_setcred, + NULL, NULL, pam_sm_open_session, pam_sm_close_session, 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)).