tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added / Fixed Debug Messages (#323) 

Fixed debug messages in user token utilities.
This commit is contained in:
Bryan Berns 2018-06-12 13:18:42 -04:00 committed by Manoj Ampalam
parent 9369d870ad
commit 4be3dd9647
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
auth-passwd.c
View File

@ -296,13 +296,15 @@ sys_auth_passwd(struct ssh *ssh, const char *password)
if (backslash != NULL) {
/* attempt to format into upn format as this is preferred for login */
if (pTranslateNameW(user_utf16, NameSamCompatible, NameUserPrincipal, domain_upn, &domain_upn_len) != 0) {
debug3("%s: Successfully discovered principal name: '%ls'=>'%ls'",
__FUNCTION__, user_utf16, domain_upn);
unam_utf16 = domain_upn;
udom_utf16 = NULL;
}
/* user likely does not have upn so just use SamCompatibleName */
else {
debug3("%s: Unable to discover upn for user '%s': %d",
debug3("%s: Unable to discover principal name for user '%ls': %d",
__FUNCTION__, user_utf16, GetLastError());
*backslash = '\0';
unam_utf16 = backslash + 1;
@ -321,7 +323,8 @@ sys_auth_passwd(struct ssh *ssh, const char *password)
*/
error("password for user %s has expired", authctxt->pw->pw_name);
else {
debug("Windows authentication failed for user: %ls domain: %ls error:%d", unam_utf16, udom_utf16, GetLastError());
debug("Windows authentication failed for user: %ls domain: %ls error: %d",
unam_utf16, udom_utf16, GetLastError());
/* If LSA authentication package is configured then it will return the auth_token */
sys_auth_passwd_lsa(authctxt, password);

10
contrib/win32/win32compat/win32_usertoken_utils.c
View File

@ -139,10 +139,12 @@ generate_s4u_user_token(wchar_t* user_cpn, int impersonation) {
if (pTranslateNameW(user_cpn, NameSamCompatible, NameUserPrincipal, domain_upn, &domain_upn_len) == 0) {
/* upn lookup failed so resort to attempting samcompatiblename */
debug3("%s: Unable to discover upn for user '%s': %d",
debug3("%s: Unable to discover principal name for user '%ls': %d",
__FUNCTION__, user_cpn, GetLastError());
wcscpy_s(domain_upn, ARRAYSIZE(domain_upn), user_cpn);
}
else
debug3("%s: Successfully discovered principal name: '%ls'=>'%ls'", user_cpn, domain_upn);
KERB_S4U_LOGON *s4u_logon;
logon_info_size = sizeof(KERB_S4U_LOGON);
@ -204,7 +206,8 @@ generate_s4u_user_token(wchar_t* user_cpn, int impersonation) {
if ((ret = LsaLogonUser(lsa_handle, &origin_name, Network, auth_package_id,
logon_info, (ULONG)logon_info_size, NULL, &source_context,
(PVOID*)&profile, &profile_size, &logon_id, &token, &quotas, &subStatus)) != STATUS_SUCCESS) {
debug("%s: LsaLogonUser() failed: %d SubStatus %d.", __FUNCTION__, ret, subStatus);
debug("%s: LsaLogonUser() failed. User '%ls' Status: 0x%08X SubStatus %d.",
__FUNCTION__, user_cpn, ret, subStatus);
goto done;
}
@ -284,7 +287,8 @@ process_custom_lsa_auth(const char* user, const char* pwd, const char* lsa_pkg)
if ((ret = LsaLogonUser(lsa_handle, &origin_name, Network, auth_package_id,
logon_info, (ULONG)logon_info_size, NULL, &source_context,
(PVOID*)&profile, &profile_size, &logon_id, &token, &quotas, &subStatus)) != STATUS_SUCCESS) {
debug("%s: LsaLogonUser() failed: %d SubStatus %d.", __FUNCTION__, ret, subStatus);
debug("%s: LsaLogonUser() failed: User '%s' Status: %08X SubStatus %d.",
__FUNCTION__, user, ret, subStatus);
goto done;
}