The branch, build-main has been updated via d3eea7ac32b46236e27d337b7a1b712de61dd0d7 (commit) from 0f1fce81e56f13852b79db0ca40879547cb1a6af (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 | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/src/pam-freerdp.c b/src/pam-freerdp.c index 4714165..7770970 100644 --- a/src/pam-freerdp.c +++ b/src/pam-freerdp.c @@ -48,14 +48,20 @@ get_item (pam_handle_t * pamh, int type) /* Check to see if we just have the value. If we do, great let's dup it some we're consitently allocating memory */ if (type != PAM_TYPE_DOMAIN) { + /* If it's not a domain we can use the PAM functions because the PAM + functions don't support the domain */ char * value = NULL; if (pam_get_item(pamh, type, (const void **)&value) == PAM_SUCCESS && value != NULL) { return value; } if (type == PAM_AUTHTOK && global_password != NULL) { + /* If we're looking for a password, we didn't get one, before + prompting see if we've got a global one. */ return global_password; } } else { + /* Here we only have domains, so we can see if the global domain is + useful for us, if we have it */ if (global_domain != NULL) { return global_domain; } @@ -122,10 +128,13 @@ get_item (pam_handle_t * pamh, int type) char * retval = NULL; if (promptval != NULL) { /* Can't believe it really would be at this point, but let's be sure */ if (type != PAM_TYPE_DOMAIN) { + /* We can only use the PAM functions if it's not the domain */ pam_set_item(pamh, type, (const void *)promptval); /* We're returning the value saved by PAM so we can clear promptval */ pam_get_item(pamh, type, (const void **)&retval); - } else { + } + if (type == PAM_TYPE_DOMAIN) { + /* The domain can be saved globally so we can use it for open */ if (global_domain != NULL) { free(global_domain); } @@ -133,6 +142,7 @@ get_item (pam_handle_t * pamh, int type) retval = global_domain; } if (type == PAM_AUTHTOK) { + /* We also save the password globally if we've got one */ if (global_password != NULL) { memset(global_password, 0, strlen(global_password)); munlock(global_password, strlen(global_password)); 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)).