Skip to content

Commit 9291dde

Browse files
rayhayesrayhayes
committed
Merge with PowerShell\L1-Prod.
1 parent 30b28c1 commit 9291dde

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+647
-1092
lines changed

‎auth.c

Lines changed: 2 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -379,78 +379,6 @@ auth_root_allowed(const char *method)
379379
* This returns a buffer allocated by xmalloc.
380380
*/
381381

382-
/*
383-
* Win32 implementation uses UTF16 names.
384-
*/
385-
386-
#ifdef WIN32_FIXME
387-
388-
wchar_t *expand_authorized_keys(const wchar_t *filename, struct passwd *pw)
389-
{
390-
wchar_t *file_w, ret[MAXPATHLEN], pw_name_w[MAXPATHLEN], filename_w[MAXPATHLEN];
391-
392-
int i;
393-
394-
wchar_t *slash;
395-
396-
i = MultiByteToWideChar(CP_UTF8, 0, filename, -1, filename_w, MAXPATHLEN);
397-
398-
if (i == 0)
399-
{
400-
fatal("expand_authorized_keys: unable to convert path to UTF-16");
401-
}
402-
403-
MultiByteToWideChar(CP_UTF8, 0, pw -> pw_name, -1, pw_name_w, MAXPATHLEN);
404-
405-
if (i == 0)
406-
{
407-
fatal("expand_authorized_keys: unable to convert path to UTF-16");
408-
}
409-
410-
file_w = percent_expand_w(filename_w, L"h", pw -> pw_dir,
411-
L"u", pw_name_w, (char *) NULL);
412-
413-
/*
414-
* Replace '/' with '\'
415-
*/
416-
417-
slash = file_w;
418-
419-
while ((slash = wcschr(slash, L'/')))
420-
{
421-
*slash = L'\\';
422-
}
423-
424-
/*
425-
* Absolute path given.
426-
*/
427-
428-
if (wcschr(file_w, ':'))
429-
{
430-
i = _snwprintf(ret, sizeof(ret), L"%ls", file_w);
431-
}
432-
433-
/*
434-
* Relative path given. Expand to user homedir.
435-
*/
436-
437-
else
438-
{
439-
i = _snwprintf(ret, sizeof(ret), L"%ls\\%ls", pw->pw_dir, file_w);
440-
}
441-
442-
if (i < 0 || (size_t) i >= sizeof(ret))
443-
{
444-
fatal("expand_authorized_keys: path too long");
445-
}
446-
447-
free(file_w);
448-
449-
return (_wcsdup(ret));
450-
}
451-
452-
#else /* WIN32_FIXME */
453-
454382
char *
455383
expand_authorized_keys(const char *filename, struct passwd *pw)
456384
{
@@ -473,7 +401,6 @@ expand_authorized_keys(const char *filename, struct passwd *pw)
473401
free(file);
474402
return (xstrdup(ret));
475403
}
476-
#endif /* WIN32_FIXME */
477404

478405
char *
479406
authorized_principals_file(struct passwd *pw)
@@ -639,23 +566,15 @@ auth_openfile(const char *file, struct passwd *pw, int strict_modes,
639566
FILE *f;
640567

641568
#ifdef WIN32_FIXME
642-
if ((fd = _wopen(file, O_RDONLY|O_NONBLOCK)) == -1) {
569+
if ((f = fopen(file, "r")) == NULL)
570+
return NULL;
643571
#else
644572
if ((fd = open(file, O_RDONLY|O_NONBLOCK)) == -1) {
645-
#endif
646573
if (log_missing || errno != ENOENT)
647574
debug("Could not open %s '%s': %s", file_type, file,
648575
strerror(errno));
649576
return NULL;
650577
}
651-
652-
#ifdef WIN32_FIXME
653-
if ((f = _fdopen(fd, "r")) == NULL) {
654-
_close(fd);
655-
return NULL;
656-
}
657-
658-
#else
659578
if (fstat(fd, &st) < 0) {
660579
close(fd);
661580
return NULL;

‎auth.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -196,11 +196,7 @@ char *get_challenge(Authctxt *);
196196
int verify_response(Authctxt *, const char *);
197197
void abandon_challenge_response(Authctxt *);
198198

199-
#ifndef WIN32_FIXME
200199
char *expand_authorized_keys(const char *, struct passwd *pw);
201-
#else
202-
wchar_t *expand_authorized_keys(const wchar_t *filename, struct passwd *pw);
203-
#endif
204200

205201
char *authorized_principals_file(struct passwd *);
206202

‎authfile.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ sshkey_perm_ok(int fd, const char *filename)
183183
if (check_ntsec(filename))
184184
#endif
185185

186-
#ifndef WIN32_FIXME//R
186+
#ifndef WINDOWS /*TODO - implement permission checks on Windows*/
187187
if ((st.st_uid == getuid()) && (st.st_mode & 077) != 0) {
188188
error("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@");
189189
error("@ WARNING: UNPROTECTED PRIVATE KEY FILE! @");

‎channels.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1997,7 +1997,7 @@ channel_post_mux_listener(Channel *c, fd_set *readset, fd_set *writeset)
19971997
c->notbefore = monotime() + 1;
19981998
return;
19991999
}
2000-
2000+
#ifndef WINDOWS /*TODO - implement user check for Windows*/
20012001
if (getpeereid(newsock, &euid, &egid) < 0) {
20022002
error("%s getpeereid failed: %s", __func__,
20032003
strerror(errno));
@@ -2010,6 +2010,7 @@ channel_post_mux_listener(Channel *c, fd_set *readset, fd_set *writeset)
20102010
close(newsock);
20112011
return;
20122012
}
2013+
#endif
20132014
nc = channel_new("multiplex client", SSH_CHANNEL_MUX_CLIENT,
20142015
newsock, newsock, -1, c->local_window_max,
20152016
c->local_maxpacket, 0, "mux-control", 1);

‎contrib/win32/openssh/keygen.vcxproj

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,8 @@
110110
<Link>
111111
<SubSystem>Console</SubSystem>
112112
<GenerateDebugInformation>true</GenerateDebugInformation>
113-
<AdditionalDependencies>win32iocompat.lib;bcrypt.lib;Userenv.lib;Ws2_32.lib;Secur32.lib;Shlwapi.lib;openbsd_compat.lib;libssh.lib;win32compat.lib;libeay32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
113+
<AdditionalDependencies>win32iocompat.lib;bcrypt.lib;Netapi32.lib;Userenv.lib;Ws2_32.lib;Secur32.lib;Shlwapi.lib;openbsd_compat.lib;libssh.lib;win32compat.lib;libeay32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
114+
114115
<AdditionalLibraryDirectories>$(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(OpenSSL-Win32-Debug-Path)lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
115116
<EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
116117
</Link>
@@ -130,7 +131,8 @@
130131
<Link>
131132
<SubSystem>Console</SubSystem>
132133
<GenerateDebugInformation>true</GenerateDebugInformation>
133-
<AdditionalDependencies>win32iocompat.lib;bcrypt.lib;Userenv.lib;Ws2_32.lib;Secur32.lib;Shlwapi.lib;openbsd_compat.lib;libssh.lib;win32compat.lib;libeay32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
134+
<AdditionalDependencies>win32iocompat.lib;bcrypt.lib;Netapi32.lib;Userenv.lib;Ws2_32.lib;Secur32.lib;Shlwapi.lib;openbsd_compat.lib;libssh.lib;win32compat.lib;libeay32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
135+
134136
<AdditionalLibraryDirectories>$(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(OpenSSL-x64-Debug-Path)lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
135137
<EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
136138
</Link>
@@ -153,7 +155,8 @@
153155
<GenerateDebugInformation>No</GenerateDebugInformation>
154156
<EnableCOMDATFolding>true</EnableCOMDATFolding>
155157
<OptimizeReferences>true</OptimizeReferences>
156-
<AdditionalDependencies>win32iocompat.lib;bcrypt.lib;Userenv.lib;Ws2_32.lib;Secur32.lib;Shlwapi.lib;openbsd_compat.lib;libssh.lib;win32compat.lib;libeay32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
158+
<AdditionalDependencies>win32iocompat.lib;bcrypt.lib;Netapi32.lib;Userenv.lib;Ws2_32.lib;Secur32.lib;Shlwapi.lib;openbsd_compat.lib;libssh.lib;win32compat.lib;libeay32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
159+
157160
<AdditionalLibraryDirectories>$(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(OpenSSL-Win32-Release-Path)lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
158161
<EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
159162
</Link>
@@ -176,14 +179,14 @@
176179
<GenerateDebugInformation>No</GenerateDebugInformation>
177180
<EnableCOMDATFolding>true</EnableCOMDATFolding>
178181
<OptimizeReferences>true</OptimizeReferences>
179-
<AdditionalDependencies>win32iocompat.lib;bcrypt.lib;Userenv.lib;Ws2_32.lib;Secur32.lib;Shlwapi.lib;openbsd_compat.lib;libssh.lib;win32compat.lib;libeay32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
182+
<AdditionalDependencies>win32iocompat.lib;bcrypt.lib;Netapi32.lib;Userenv.lib;Ws2_32.lib;Secur32.lib;Shlwapi.lib;openbsd_compat.lib;libssh.lib;win32compat.lib;libeay32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
183+
180184
<AdditionalLibraryDirectories>$(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(OpenSSL-x64-Release-Path)lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
181185
<EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
182186
</Link>
183187
</ItemDefinitionGroup>
184188
<ItemGroup>
185189
<ClCompile Include="$(OpenSSH-Src-Path)ssh-keygen.c" />
186-
<ClCompile Include="$(OpenSSH-Src-Path)contrib\win32\win32compat\wmain.c" />
187190
</ItemGroup>
188191
<ItemGroup>
189192
<ResourceCompile Include="version.rc" />

‎contrib/win32/openssh/keygen.vcxproj.filters

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@
1818
<ClCompile Include="$(OpenSSH-Src-Path)ssh-keygen.c">
1919
<Filter>Source Files</Filter>
2020
</ClCompile>
21-
<ClCompile Include="$(OpenSSH-Src-Path)contrib\win32\win32compat\wmain.c">
22-
<Filter>Source Files</Filter>
23-
</ClCompile>
2421
</ItemGroup>
2522
<ItemGroup>
2623
<ResourceCompile Include="version.rc">

‎contrib/win32/openssh/scp.vcxproj

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
</ItemGroup>
2222
<ItemGroup>
2323
<ClCompile Include="$(OpenSSH-Src-Path)scp.c" />
24-
<ClCompile Include="$(OpenSSH-Src-Path)contrib\win32\win32compat\wmain.c" />
24+
<ClCompile Include="$(OpenSSH-Src-Path)win32_dirent.c" />
2525
</ItemGroup>
2626
<ItemGroup>
2727
<ResourceCompile Include="version.rc" />
@@ -116,7 +116,8 @@
116116
<Link>
117117
<SubSystem>Console</SubSystem>
118118
<GenerateDebugInformation>true</GenerateDebugInformation>
119-
<AdditionalDependencies>win32iocompat.lib;bcrypt.lib;Userenv.lib;Ws2_32.lib;Secur32.lib;Shlwapi.lib;openbsd_compat.lib;libssh.lib;win32compat.lib;libeay32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
119+
<AdditionalDependencies>Netapi32.lib;win32iocompat.lib;bcrypt.lib;Userenv.lib;Ws2_32.lib;Secur32.lib;Shlwapi.lib;openbsd_compat.lib;libssh.lib;win32compat.lib;libeay32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
120+
120121
<AdditionalLibraryDirectories>$(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(OpenSSL-Win32-Debug-Path)lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
121122
<EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
122123
</Link>
@@ -135,7 +136,8 @@
135136
<Link>
136137
<SubSystem>Console</SubSystem>
137138
<GenerateDebugInformation>true</GenerateDebugInformation>
138-
<AdditionalDependencies>win32iocompat.lib;bcrypt.lib;Userenv.lib;Ws2_32.lib;Secur32.lib;Shlwapi.lib;openbsd_compat.lib;libssh.lib;win32compat.lib;libeay32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
139+
<AdditionalDependencies>Netapi32.lib;win32iocompat.lib;bcrypt.lib;Userenv.lib;Ws2_32.lib;Secur32.lib;Shlwapi.lib;openbsd_compat.lib;libssh.lib;win32compat.lib;libeay32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
140+
139141
<AdditionalLibraryDirectories>$(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(OpenSSL-x64-Debug-Path)lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
140142
<EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
141143
</Link>
@@ -158,7 +160,8 @@
158160
<GenerateDebugInformation>No</GenerateDebugInformation>
159161
<EnableCOMDATFolding>true</EnableCOMDATFolding>
160162
<OptimizeReferences>true</OptimizeReferences>
161-
<AdditionalDependencies>win32iocompat.lib;bcrypt.lib;Userenv.lib;Ws2_32.lib;Secur32.lib;Shlwapi.lib;openbsd_compat.lib;libssh.lib;win32compat.lib;libeay32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
163+
<AdditionalDependencies>Netapi32.lib;win32iocompat.lib;bcrypt.lib;Userenv.lib;Ws2_32.lib;Secur32.lib;Shlwapi.lib;openbsd_compat.lib;libssh.lib;win32compat.lib;libeay32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
164+
162165
<AdditionalLibraryDirectories>$(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(OpenSSL-Win32-Release-Path)lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
163166
<EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
164167
</Link>
@@ -181,7 +184,8 @@
181184
<GenerateDebugInformation>No</GenerateDebugInformation>
182185
<EnableCOMDATFolding>true</EnableCOMDATFolding>
183186
<OptimizeReferences>true</OptimizeReferences>
184-
<AdditionalDependencies>win32iocompat.lib;bcrypt.lib;Userenv.lib;Ws2_32.lib;Secur32.lib;Shlwapi.lib;openbsd_compat.lib;libssh.lib;win32compat.lib;libeay32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
187+
<AdditionalDependencies>Netapi32.lib;win32iocompat.lib;bcrypt.lib;Userenv.lib;Ws2_32.lib;Secur32.lib;Shlwapi.lib;openbsd_compat.lib;libssh.lib;win32compat.lib;libeay32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
188+
185189
<AdditionalLibraryDirectories>$(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(OpenSSL-x64-Release-Path)lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
186190
<EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
187191
</Link>

‎contrib/win32/openssh/scp.vcxproj.filters

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<ClCompile Include="$(OpenSSH-Src-Path)scp.c">
1919
<Filter>Source Files</Filter>
2020
</ClCompile>
21-
<ClCompile Include="..\win32compat\wmain.c">
21+
<ClCompile Include="$(OpenSSH-Src-Path)win32_dirent.c">
2222
<Filter>Source Files</Filter>
2323
</ClCompile>
2424
</ItemGroup>

‎contrib/win32/openssh/sftp-server.vcxproj

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<ClCompile Include="$(OpenSSH-Src-Path)sftp-common.c" />
2424
<ClCompile Include="$(OpenSSH-Src-Path)sftp-server-main.c" />
2525
<ClCompile Include="$(OpenSSH-Src-Path)sftp-server.c" />
26-
<ClCompile Include="$(OpenSSH-Src-Path)contrib\win32\win32compat\wmain.c" />
26+
<ClCompile Include="$(OpenSSH-Src-Path)win32_dirent.c" />
2727
</ItemGroup>
2828
<ItemGroup>
2929
<ResourceCompile Include="version.rc" />
@@ -119,7 +119,8 @@
119119
<Link>
120120
<SubSystem>Console</SubSystem>
121121
<GenerateDebugInformation>true</GenerateDebugInformation>
122-
<AdditionalDependencies>win32iocompat.lib;bcrypt.lib;Userenv.lib;Ws2_32.lib;Secur32.lib;Shlwapi.lib;openbsd_compat.lib;libssh.lib;win32compat.lib;libeay32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
122+
<AdditionalDependencies>Netapi32.lib;win32iocompat.lib;bcrypt.lib;Userenv.lib;Ws2_32.lib;Secur32.lib;Shlwapi.lib;openbsd_compat.lib;libssh.lib;win32compat.lib;libeay32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
123+
123124
<AdditionalLibraryDirectories>$(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(OpenSSL-Win32-Debug-Path)lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
124125
<EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
125126
</Link>
@@ -139,7 +140,7 @@
139140
<Link>
140141
<SubSystem>Console</SubSystem>
141142
<GenerateDebugInformation>true</GenerateDebugInformation>
142-
<AdditionalDependencies>win32iocompat.lib;bcrypt.lib;Userenv.lib;Ws2_32.lib;Secur32.lib;Shlwapi.lib;openbsd_compat.lib;libssh.lib;win32compat.lib;libeay32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
143+
<AdditionalDependencies>Netapi32.lib;win32iocompat.lib;bcrypt.lib;Userenv.lib;Ws2_32.lib;Secur32.lib;Shlwapi.lib;openbsd_compat.lib;libssh.lib;win32compat.lib;libeay32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
143144
<AdditionalLibraryDirectories>$(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(OpenSSL-x64-Debug-Path)lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
144145
<EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
145146
</Link>
@@ -162,7 +163,7 @@
162163
<GenerateDebugInformation>true</GenerateDebugInformation>
163164
<EnableCOMDATFolding>true</EnableCOMDATFolding>
164165
<OptimizeReferences>true</OptimizeReferences>
165-
<AdditionalDependencies>win32iocompat.lib;bcrypt.lib;Userenv.lib;Ws2_32.lib;Secur32.lib;Shlwapi.lib;openbsd_compat.lib;libssh.lib;win32compat.lib;libeay32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
166+
<AdditionalDependencies>Netapi32.lib;win32iocompat.lib;bcrypt.lib;Userenv.lib;Ws2_32.lib;Secur32.lib;Shlwapi.lib;openbsd_compat.lib;libssh.lib;win32compat.lib;libeay32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
166167
<AdditionalLibraryDirectories>$(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(OpenSSL-Win32-Release-Path)lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
167168
<EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
168169
</Link>
@@ -185,7 +186,7 @@
185186
<GenerateDebugInformation>true</GenerateDebugInformation>
186187
<EnableCOMDATFolding>true</EnableCOMDATFolding>
187188
<OptimizeReferences>true</OptimizeReferences>
188-
<AdditionalDependencies>win32iocompat.lib;bcrypt.lib;Userenv.lib;Ws2_32.lib;Secur32.lib;Shlwapi.lib;openbsd_compat.lib;libssh.lib;win32compat.lib;libeay32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
189+
<AdditionalDependencies>Netapi32.lib;win32iocompat.lib;bcrypt.lib;Userenv.lib;Ws2_32.lib;Secur32.lib;Shlwapi.lib;openbsd_compat.lib;libssh.lib;win32compat.lib;libeay32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
189190
<AdditionalLibraryDirectories>$(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(OpenSSL-x64-Release-Path)lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
190191
<EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
191192
</Link>

‎contrib/win32/openssh/sftp-server.vcxproj.filters

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<ClCompile Include="$(OpenSSH-Src-Path)sftp-server.c">
2525
<Filter>Source Files</Filter>
2626
</ClCompile>
27-
<ClCompile Include="..\win32compat\wmain.c">
27+
<ClCompile Include="$(OpenSSH-Src-Path)win32_dirent.c">
2828
<Filter>Source Files</Filter>
2929
</ClCompile>
3030
</ItemGroup>

0 commit comments

Comments
 (0)