Skip to content

Commit 0a7741d

Browse files
committed
Additional logging in ssh-agent
1 parent 071b0d4 commit 0a7741d

File tree

1 file changed

+18
-16
lines changed

1 file changed

+18
-16
lines changed

contrib/win32/win32compat/ssh-agent/authagent-request.c

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -138,21 +138,23 @@ generate_user_token(wchar_t* user) {
138138
if (AllocateLocallyUniqueId(&sourceContext.SourceIdentifier) != TRUE)
139139
goto done;
140140

141-
if (ret = LsaLogonUser(lsa_handle,
142-
&originName,
143-
Network,
144-
auth_package_id,
145-
logon_info,
146-
logon_info_size,
147-
NULL,
148-
&sourceContext,
149-
(PVOID*)&pProfile,
150-
&cbProfile,
151-
&logonId,
152-
&token,
153-
&quotas,
154-
&subStatus) != STATUS_SUCCESS)
141+
if (ret = LsaLogonUser(lsa_handle,
142+
&originName,
143+
Network,
144+
auth_package_id,
145+
logon_info,
146+
logon_info_size,
147+
NULL,
148+
&sourceContext,
149+
(PVOID*)&pProfile,
150+
&cbProfile,
151+
&logonId,
152+
&token,
153+
&quotas,
154+
&subStatus) != STATUS_SUCCESS) {
155+
debug("LsaRegisterLogonProcess failed");
155156
goto done;
157+
}
156158

157159
done:
158160
if (lsa_handle)
@@ -193,13 +195,13 @@ int process_authagent_request(struct sshbuf* request, struct sshbuf* response, s
193195

194196
if (MultiByteToWideChar(CP_UTF8, 0, user, user_len + 1, wuser, MAX_USER_NAME_LEN) == 0 ||
195197
(token = generate_user_token(wuser)) == 0) {
196-
debug("unable to generate user token");
198+
debug("unable to generate token for user %ls", wuser);
197199
goto done;
198200
}
199201

200202
if (SHGetKnownFolderPath(&FOLDERID_Profile, 0, token, &wuser_home) != S_OK ||
201203
pubkey_allowed(key, wuser, wuser_home) != 1) {
202-
debug("given public key is not mapped to user %ls", wuser);
204+
debug("given public key is not mapped to user %ls (profile:%ls)", wuser, wuser_home);
203205
goto done;
204206
}
205207

0 commit comments

Comments
 (0)