Merge pull request #5 from shazow/env

progrium · progrium · commit 46e94bdf663e · 2015-06-12T11:57:59.000-05:00
Include full host environ vars with -e flag.
diff --git a/execd.go b/execd.go
@@ -312,7 +312,9 @@ func handleChannel(conn *ssh.ServerConn, newChan ssh.NewChannel, execHandler []s
 				}
 				cmd = exec.Command(execHandler[0], append(execHandler[1:], cmdargs...)...)
 			}
-			if !*env {
+			if *env {
+				cmd.Env = os.Environ()
+			} else {
 				cmd.Env = []string{}
 			}
 			if conn.Permissions != nil {
@@ -347,7 +349,9 @@ func handleChannel(conn *ssh.ServerConn, newChan ssh.NewChannel, execHandler []s
 			} else {
 				cmd = exec.Command(execHandler[0], execHandler[1:]...)
 			}
-			if !*env {
+			if *env {
+				cmd.Env = os.Environ()
+			} else {
 				cmd.Env = []string{}
 			}
 			if conn.Permissions != nil {

Original file line number	Diff line number	Diff line change
`@@ -312,7 +312,9 @@ func handleChannel(conn *ssh.ServerConn, newChan ssh.NewChannel, execHandler []s`
`312`	`312`	`}`
`313`	`313`	`cmd = exec.Command(execHandler[0], append(execHandler[1:], cmdargs...)...)`
`314`	`314`	`}`
`315`		`- if !*env {`
	`315`	`+ if *env {`
	`316`	`+ cmd.Env = os.Environ()`
	`317`	`+ } else {`
`316`	`318`	`cmd.Env = []string{}`
`317`	`319`	`}`
`318`	`320`	`if conn.Permissions != nil {`
`@@ -347,7 +349,9 @@ func handleChannel(conn *ssh.ServerConn, newChan ssh.NewChannel, execHandler []s`
`347`	`349`	`} else {`
`348`	`350`	`cmd = exec.Command(execHandler[0], execHandler[1:]...)`
`349`	`351`	`}`
`350`		`- if !*env {`
	`352`	`+ if *env {`
	`353`	`+ cmd.Env = os.Environ()`
	`354`	`+ } else {`
`351`	`355`	`cmd.Env = []string{}`
`352`	`356`	`}`
`353`	`357`	`if conn.Permissions != nil {`