lib/libssh2
1
0
Fork 0
mirror of https://github.com/libssh2/libssh2.git synced 2025-08-05 20:55:47 +03:00
Code Activity

tests: teach to use the USERNAME envvar on Windows

Browse Source 
Necessary to pick the correct local username when run on Windows.

Cherry-picked from #1017
This commit is contained in:
Viktor Szakats
2023-04-30 00:03:16 +00:00
parent 3f3236eb08
commit cda41f7cb8
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/session_fixture.c
View File

@@ -438,8 +438,13 @@ int test_auth_pubkey(LIBSSH2_SESSION *session, int flags,
const char *userauth_list; const char *userauth_list;
/* Ignore our hard-wired Dockerfile user when not running under Docker */ /* Ignore our hard-wired Dockerfile user when not running under Docker */
if(!openssh_fixture_have_docker() && strcmp(username, "libssh2") == 0) if(!openssh_fixture_have_docker() && strcmp(username, "libssh2") == 0) {
username = getenv("USER"); username = getenv("USER");
#ifdef WIN32
if(!username)
username = getenv("USERNAME");
#endif
}
userauth_list = libssh2_userauth_list(session, username, userauth_list = libssh2_userauth_list(session, username,
(unsigned int)strlen(username)); (unsigned int)strlen(username));

4
tests/test_ssh2.c
View File

@@ -63,6 +63,10 @@ int main(int argc, char *argv[])
if(getenv("USER")) if(getenv("USER"))
username = getenv("USER"); username = getenv("USER");
#ifdef WIN32
else if(getenv("USERNAME"))
username = getenv("USERNAME");
#endif
if(getenv("PRIVKEY")) if(getenv("PRIVKEY"))
privkey = getenv("PRIVKEY"); privkey = getenv("PRIVKEY");