X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=rpc%2Fdial.go;h=caa34b098fe933ca9fba22d7f0ea35aadb05d33a;hb=35e775270d3df86a5801c4905e98e562d2dd5ec6;hp=945a75ff86c365fd1e251e205a0b68efbd2b3aef;hpb=825f928d824f728088606bcbf112d30d7a76f627;p=safcm%2Fsafcm.git

diff --git a/rpc/dial.go b/rpc/dial.go
index 945a75f..caa34b0 100644
--- a/rpc/dial.go
+++ b/rpc/dial.go
@@ -51,7 +51,7 @@ func (c *Conn) DialSSH(user, host, sshConfig string) error {
 
 	c.sshRemote = remote
 	if sshConfig != "" {
-		c.sshOpts = append(c.sshOpts, "-F", sshConfig)
+		c.sshOpts = []string{"-F", sshConfig}
 	}
 	c.cmd = exec.Command("ssh",
 		append(append([]string{}, c.sshOpts...),
@@ -141,13 +141,13 @@ compat_sha512sum() {
 	//
 	// The target directory must no permit other users to delete our files
 	// or symlink attacks and arbitrary code execution is possible. For
-	// /tmp this is guaranteed by the sticky bit. Make sure it has the
-	// proper permissions.
+	// /tmp this is guaranteed by the sticky bit. The code verifies the
+	// directory has the proper permissions.
 	//
 	// We cannot use `test -f && test -O` because this is open to TOCTOU
 	// attacks. `stat` gives use the full file state. If the file is owned
-	// by us and not a symlink then it's safe to use (assuming sticky or
-	// directory not writable by others).
+	// by us and not a symlink then it's safe to use (assuming sticky
+	// directory or directory not writable by others).
 	//
 	// `test -e` is only used to prevent error messages if the file
 	// doesn't exist. It does not guard against any races.
@@ -177,7 +177,6 @@ f() {
 		tmp="$(mktemp "$x.XXXXXX")"
 		# Report filename for upload
 		echo "$tmp"
-
 		# Wait for upload to complete
 		read unused
 
@@ -264,7 +263,7 @@ f
 				c.sshRemote,
 				fmt.Sprintf("cat > %q", path))...)
 		cmd.Stdin = bytes.NewReader(helper)
-		err = c.handleStderrAsEvents(cmd)
+		err = c.handleStderrAsEvents(cmd) // cmd.Stderr
 		if err != nil {
 			return err
 		}