domi/forgejo-domi
1
0
Fork 0
forked from forgejo/forgejo
Code Pull requests Activity

Fix SSH server on Windows when running as service

Browse source 
Closes #680
This commit is contained in:
Andrey Nering 2017-01-23 20:44:23 -02:00
parent 44d4863ecf
commit fda4476061
3 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/ssh/ssh.go
View file

@ -67,7 +67,11 @@ func handleServerConn(keyID string, chans <-chan ssh.NewChannel) {
args := []string{"serv", "key-" + keyID, "--config=" + setting.CustomConf}
log.Trace("SSH: Arguments: %v", args)
cmd := exec.Command(setting.AppPath, args...)
cmd.Env = append(os.Environ(), "SSH_ORIGINAL_COMMAND="+cmdName)
cmd.Env = append(
os.Environ(),
"SSH_ORIGINAL_COMMAND="+cmdName,
"SKIP_MINWINSVC=1",
)
stdout, err := cmd.StdoutPipe()
if err != nil {