Merge pull request #1130 from r00t0v3rr1d3/master

fix defunct processes on nix
2026-11-09 01:49:40 -10:00 · 2023-03-05 11:41:33 -06:00 · 2023-03-05 11:02:30 -05:00 · 2023-03-03 13:10:24 -08:00 · 2023-03-03 11:53:56 -08:00 · 2023-02-28 20:10:02 -08:00
2 changed files with 8 additions and 4 deletions
@@ -69,10 +69,13 @@ func SSHCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 		con.PrintErrorf("You must specify a keytab file with the --kerberos-keytab flag\n")
 		return
 	}
-	kerberosKeytab, err := os.ReadFile(kerberosKeytabFile)
-	if err != nil {
-		con.PrintErrorf("%s\n", err)
-		return
+	kerberosKeytab := []byte{}
+	if kerberosKeytabFile != "" {
+		kerberosKeytab, err = os.ReadFile(kerberosKeytabFile)
+		if err != nil {
+			con.PrintErrorf("%s\n", err)
+			return
+		}
 	}

 	if password == "" && len(privKey) == 0 && !ctx.Flags.Bool("skip-loot") {
@@ -607,6 +607,7 @@ func executeHandler(data []byte, resp RPCResponse) {
 		}
 	} else {
 		err = cmd.Start()
+		cmd.Wait()
 		if err != nil {
 			execResp.Response = &commonpb.Response{
 				Err: fmt.Sprintf("%s", err),
Author	SHA1	Message	Date
Joe	1756fdfb62	Merge pull request #1130 from r00t0v3rr1d3/master fix defunct processes on nix	2023-03-05 11:41:33 -06:00
Chris Shields	12e6f9a73d	fix defunct processes on nix	2023-03-05 11:02:30 -05:00
Ronan Kervella	b0a917ce41	Merge pull request #1128 from BishopFox/fix/ssh-kerberos Fix `ssh` command	2023-03-03 13:10:24 -08:00
rkervella	e3a2ff81ab	Only try to read keytab if it was supplied as an argument	2023-03-03 11:53:56 -08:00
Ronan Kervella	71f94928bf	Merge pull request #1122 from BishopFox/stage Update go-clr, merge master	2023-02-28 20:10:02 -08:00