mirror of
				https://github.com/moby/moby.git
				synced 2022-11-09 12:21:53 -05:00 
			
		
		
		
	Remove workaround for Nano server TP5
This workaround for golang/go#15286 was added for Nano server TP5 in
fa82c0aa10, and should no longer be
needed
Due to a security fix in Go 1.9.4/1.8.7, loading the .dll is no longer
allowed, and produces an error:
   .\docker_windows.go:9:3: //go:cgo_import_dynamic main.dummy CommandLineToArgvW%2 "shell32.dll" only allowed in cgo-generated code
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
			
			
This commit is contained in:
		
							parent
							
								
									caeab26843
								
							
						
					
					
						commit
						250193387c
					
				
					 1 changed files with 0 additions and 13 deletions
				
			
		| 
						 | 
				
			
			@ -1,18 +1,5 @@
 | 
			
		|||
package main
 | 
			
		||||
 | 
			
		||||
import (
 | 
			
		||||
	"sync/atomic"
 | 
			
		||||
 | 
			
		||||
	_ "github.com/docker/docker/autogen/winresources/dockerd"
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
//go:cgo_import_dynamic main.dummy CommandLineToArgvW%2 "shell32.dll"
 | 
			
		||||
 | 
			
		||||
var dummy uintptr
 | 
			
		||||
 | 
			
		||||
func init() {
 | 
			
		||||
	// Ensure that this import is not removed by the linker. This is used to
 | 
			
		||||
	// ensure that shell32.dll is loaded by the system loader, preventing
 | 
			
		||||
	// go#15286 from triggering on Nano Server TP5.
 | 
			
		||||
	atomic.LoadUintptr(&dummy)
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue