Skip to content

Commit cd7c8e6

Browse files
committed
mingw: try to create symlinks without elevated permissions
With Windows 10 Build 14972 in Developer Mode, a new flag is supported by CreateSymbolicLink() to create symbolic links even when running outside of an elevated session (which was previously required). This new flag is called SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE and has the numeric value 0x02. Previous Windows 10 versions will not understand that flag and return an ERROR_INVALID_PARAMETER, therefore we have to be careful to try passing that flag only when the build number indicates that it is supported. For more information about the new flag, see this blog post: https://blogs.windows.com/buildingapps/2016/12/02/symlinks-windows-10/ This patch is loosely based on the patch submitted by Samuel D. Leslie as #1184. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 010cab8 commit cd7c8e6

File tree

1 file changed

+24
-2
lines changed

1 file changed

+24
-2
lines changed

compat/mingw.c

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,7 @@ int mingw_core_config(const char *var, const char *value, void *cb)
271271
return 0;
272272
}
273273

274+
static DWORD symlink_file_flags = 0, symlink_directory_flags = 1;
274275
DECLARE_PROC_ADDR(kernel32.dll, BOOLEAN, CreateSymbolicLinkW, LPCWSTR, LPCWSTR, DWORD);
275276

276277
enum phantom_symlink_result {
@@ -315,7 +316,8 @@ static enum phantom_symlink_result process_phantom_symlink(
315316
return PHANTOM_SYMLINK_DONE;
316317

317318
/* otherwise recreate the symlink with directory flag */
318-
if (DeleteFileW(wlink) && CreateSymbolicLinkW(wlink, wtarget, 1))
319+
if (DeleteFileW(wlink) &&
320+
CreateSymbolicLinkW(wlink, wtarget, symlink_directory_flags))
319321
return PHANTOM_SYMLINK_DIRECTORY;
320322

321323
errno = err_win_to_posix(GetLastError());
@@ -2578,7 +2580,7 @@ int symlink(const char *target, const char *link)
25782580
wtarget[len] = '\\';
25792581

25802582
/* create file symlink */
2581-
if (!CreateSymbolicLinkW(wlink, wtarget, 0)) {
2583+
if (!CreateSymbolicLinkW(wlink, wtarget, symlink_file_flags)) {
25822584
errno = err_win_to_posix(GetLastError());
25832585
return -1;
25842586
}
@@ -3100,6 +3102,24 @@ static void maybe_redirect_std_handles(void)
31003102
GENERIC_WRITE, FILE_FLAG_NO_BUFFERING);
31013103
}
31023104

3105+
static void adjust_symlink_flags(void)
3106+
{
3107+
/*
3108+
* Starting with Windows 10 Build 14972, symbolic links can be created
3109+
* using CreateSymbolicLink() without elevation by passing the flag
3110+
* SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE (0x02) as last
3111+
* parameter, provided the Developer Mode has been enabled. Some
3112+
* earlier Windows versions complain about this flag with an
3113+
* ERROR_INVALID_PARAMETER, hence we have to test the build number
3114+
* specifically.
3115+
*/
3116+
if (GetVersion() >= 14972 << 16) {
3117+
symlink_file_flags |= 2;
3118+
symlink_directory_flags |= 2;
3119+
}
3120+
3121+
}
3122+
31033123
#if defined(_MSC_VER)
31043124

31053125
#ifdef _DEBUG
@@ -3139,6 +3159,7 @@ int msc_startup(int argc, wchar_t **w_argv, wchar_t **w_env)
31393159
#endif
31403160

31413161
maybe_redirect_std_handles();
3162+
adjust_symlink_flags();
31423163

31433164
/* determine size of argv conversion buffer */
31443165
maxlen = wcslen(_wpgmptr);
@@ -3205,6 +3226,7 @@ void mingw_startup(void)
32053226
_startupinfo si;
32063227

32073228
maybe_redirect_std_handles();
3229+
adjust_symlink_flags();
32083230

32093231
/* get wide char arguments and environment */
32103232
si.newmode = 0;

0 commit comments

Comments
 (0)