tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-10-30 19:14:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

remove redundant WINDOWS preprocessor definitions (#697)

Browse Source
This commit is contained in:
Tess Gauthier 2023-10-16 09:56:42 -04:00 committed by GitHub
parent f72324ffa1
commit 0ffb0ceb64
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ssh-pkcs11-client.c
View File

@ -165,20 +165,14 @@ find_helper(void)
char module_path[PATH_MAX + 1]; char module_path[PATH_MAX + 1];
char *ep; char *ep;
DWORD n; DWORD n;
#ifdef WINDOWS
size_t len = 0; size_t len = 0;
_dupenv_s(&helper, &len, "SSH_PKCS11_HELPER"); _dupenv_s(&helper, &len, "SSH_PKCS11_HELPER");
if (helper == NULL || len == 0) { if (helper == NULL || len == 0) {
if ((helper = find_helper_in_module_path()) == NULL) if ((helper = find_helper_in_module_path()) == NULL)
helper = _PATH_SSH_PKCS11_HELPER; helper = _PATH_SSH_PKCS11_HELPER;
} }
#else
if ((helper = getenv("SSH_PKCS11_HELPER")) == NULL || strlen(helper) == 0) {
if ((helper = find_helper_in_module_path()) == NULL)
helper = _PATH_SSH_PKCS11_HELPER;
}
#endif /* WINDOWS */
if (!path_absolute(helper)) { if (!path_absolute(helper)) {
error_f("helper \"%s\" unusable: path not absolute", helper); error_f("helper \"%s\" unusable: path not absolute", helper);
return NULL; return NULL;

10
ssh-sk-client.c
View File

@ -84,20 +84,14 @@ find_helper(void)
char module_path[PATH_MAX + 1]; char module_path[PATH_MAX + 1];
char *ep; char *ep;
DWORD n; DWORD n;
#ifdef WINDOWS
size_t len = 0; size_t len = 0;
_dupenv_s(&helper, &len, "SSH_SK_HELPER"); _dupenv_s(&helper, &len, "SSH_SK_HELPER");
if (helper == NULL || len == 0) { if (helper == NULL || len == 0) {
if ((helper = find_helper_in_module_path()) == NULL) if ((helper = find_helper_in_module_path()) == NULL)
helper = _PATH_SSH_SK_HELPER; helper = _PATH_SSH_SK_HELPER;
} }
#else
if ((helper = getenv("SSH_SK_HELPER")) == NULL || strlen(helper) == 0) {
if ((helper = find_helper_in_module_path()) == NULL)
helper = _PATH_SSH_SK_HELPER;
}
#endif /* WINDOWS */
if (!path_absolute(helper)) { if (!path_absolute(helper)) {
error_f("helper \"%s\" unusable: path not absolute", helper); error_f("helper \"%s\" unusable: path not absolute", helper);
return NULL; return NULL;