Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions cmd/client/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ func printHelp() {
fmt.Println("\t\t--connect-timeout\tDuration to wait for initial connection seconds, default 180, set to 0 to wait indefinitely")

if runtime.GOOS == "windows" {
fmt.Println("\t\t--host-kerberos\tUse kerberos authentication on proxy server (if proxy server specified)")
fmt.Println("\t\t--use-kerberos\tUse kerberos authentication on proxy server (if proxy server specified)")
}
}

Expand Down Expand Up @@ -189,8 +189,8 @@ func main() {

userSpecifiedNTLMCreds, err := line.GetArgString("ntlm-proxy-creds")
if err == nil {
if line.IsSet("host-kerberos") {
log.Fatal("You cannot use both the host kerberos credentials and static ntlm proxy credentials at once. --host-kerberos and --ntlm-proxy-creds")
if line.IsSet("use-kerberos") {
log.Fatal("You cannot use both the use kerberos credentials and static ntlm proxy credentials at once. --use-kerberos and --ntlm-proxy-creds")
}

err = settings.SetNTLMProxyCreds(userSpecifiedNTLMCreds)
Expand All @@ -199,7 +199,7 @@ func main() {
}
}

if line.IsSet("host-kerberos") {
if line.IsSet("use-kerberos") {
settings.ProxyUseHostKerberos = true
}

Expand Down
6 changes: 3 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ require (
golang.org/x/net v0.47.0
golang.org/x/sys v0.38.0
gorm.io/gorm v1.31.1
gvisor.dev/gvisor v0.0.0-20251119165104-50811d98dcb5
gvisor.dev/gvisor v0.0.0-20251201192414-f717cbac4761
)

require (
Expand All @@ -34,11 +34,11 @@ require (
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/ncruces/go-strftime v1.0.0 // indirect
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
golang.org/x/exp v0.0.0-20251113190631-e25ba8c21ef6 // indirect
golang.org/x/exp v0.0.0-20251125195548-87e1e737ad39 // indirect
golang.org/x/sync v0.18.0 // indirect
golang.org/x/text v0.31.0 // indirect
golang.org/x/time v0.14.0 // indirect
modernc.org/libc v1.67.0 // indirect
modernc.org/libc v1.67.1 // indirect
modernc.org/mathutil v1.7.1 // indirect
modernc.org/memory v1.11.0 // indirect
modernc.org/sqlite v1.40.1 // indirect
Expand Down
8 changes: 8 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546 h1:mgKeJMpvi0yx/sU5GsxQ7p6s2
golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546/go.mod h1:j/pmGrbnkbPtQfxEe5D0VQhZC6qKbfKifgD0oM7sR70=
golang.org/x/exp v0.0.0-20251113190631-e25ba8c21ef6 h1:zfMcR1Cs4KNuomFFgGefv5N0czO2XZpUbxGUy8i8ug0=
golang.org/x/exp v0.0.0-20251113190631-e25ba8c21ef6/go.mod h1:46edojNIoXTNOhySWIWdix628clX9ODXwPsQuG6hsK0=
golang.org/x/exp v0.0.0-20251125195548-87e1e737ad39 h1:DHNhtq3sNNzrvduZZIiFyXWOL9IWaDPHqTnLJp+rCBY=
golang.org/x/exp v0.0.0-20251125195548-87e1e737ad39/go.mod h1:46edojNIoXTNOhySWIWdix628clX9ODXwPsQuG6hsK0=
golang.org/x/mod v0.29.0 h1:HV8lRxZC4l2cr3Zq1LvtOsi/ThTgWnUk/y64QSs8GwA=
golang.org/x/mod v0.29.0/go.mod h1:NyhrlYXJ2H4eJiRy/WDBO6HMqZQ6q9nk4JzS3NuCK+w=
golang.org/x/mod v0.30.0 h1:fDEXFVZ/fmCKProc/yAXXUijritrDzahmwwefnjoPFk=
Expand Down Expand Up @@ -102,6 +104,10 @@ gvisor.dev/gvisor v0.0.0-20251119165104-50811d98dcb5 h1:p6wLwS3GX63SNUwSZHBvFIWY
gvisor.dev/gvisor v0.0.0-20251119165104-50811d98dcb5/go.mod h1:W1ZgZ/Dh85TgSZWH67l2jKVpDE5bjIaut7rjwwOiHzQ=
gvisor.dev/gvisor v0.0.0-20251120022328-daef357270bd h1:5iNQcz/GeLP61deVkWotJqbZDcT60d+1LVIWGCCeSJ0=
gvisor.dev/gvisor v0.0.0-20251120022328-daef357270bd/go.mod h1:W1ZgZ/Dh85TgSZWH67l2jKVpDE5bjIaut7rjwwOiHzQ=
gvisor.dev/gvisor v0.0.0-20251201191621-5ebe823d4504 h1:FFf4lT/wsWCmY91Go2ywbgYZGtwdBa+lMYJyYXa7VzE=
gvisor.dev/gvisor v0.0.0-20251201191621-5ebe823d4504/go.mod h1:W1ZgZ/Dh85TgSZWH67l2jKVpDE5bjIaut7rjwwOiHzQ=
gvisor.dev/gvisor v0.0.0-20251201192414-f717cbac4761 h1:aAosnm8hsaF2BDgCGsXh2njrRksvlTOGSsvJAwA8BAM=
gvisor.dev/gvisor v0.0.0-20251201192414-f717cbac4761/go.mod h1:W1ZgZ/Dh85TgSZWH67l2jKVpDE5bjIaut7rjwwOiHzQ=
modernc.org/cc/v4 v4.26.5 h1:xM3bX7Mve6G8K8b+T11ReenJOT+BmVqQj0FY5T4+5Y4=
modernc.org/cc/v4 v4.26.5/go.mod h1:uVtb5OGqUKpoLWhqwNQo/8LwvoiEBLvZXIQ/SmO6mL0=
modernc.org/cc/v4 v4.27.1 h1:9W30zRlYrefrDV2JE2O8VDtJ1yPGownxciz5rrbQZis=
Expand All @@ -118,6 +124,8 @@ modernc.org/libc v1.66.10 h1:yZkb3YeLx4oynyR+iUsXsybsX4Ubx7MQlSYEw4yj59A=
modernc.org/libc v1.66.10/go.mod h1:8vGSEwvoUoltr4dlywvHqjtAqHBaw0j1jI7iFBTAr2I=
modernc.org/libc v1.67.0 h1:QzL4IrKab2OFmxA3/vRYl0tLXrIamwrhD6CKD4WBVjQ=
modernc.org/libc v1.67.0/go.mod h1:QvvnnJ5P7aitu0ReNpVIEyesuhmDLQ8kaEoyMjIFZJA=
modernc.org/libc v1.67.1 h1:bFaqOaa5/zbWYJo8aW0tXPX21hXsngG2M7mckCnFSVk=
modernc.org/libc v1.67.1/go.mod h1:QvvnnJ5P7aitu0ReNpVIEyesuhmDLQ8kaEoyMjIFZJA=
modernc.org/mathutil v1.7.1 h1:GCZVGXdaN8gTqB1Mf/usp1Y/hSqgI2vAGGP4jZMCxOU=
modernc.org/mathutil v1.7.1/go.mod h1:4p5IwJITfppl0G4sUEDtCr4DthTaT47/N3aT6MhfgJg=
modernc.org/memory v1.11.0 h1:o4QC8aMQzmcwCK3t3Ux/ZHmwFPzE6hf2Y5LbkRs+hbI=
Expand Down
5 changes: 4 additions & 1 deletion internal/terminal/terminal.go
Original file line number Diff line number Diff line change
Expand Up @@ -1182,7 +1182,10 @@ func (t *Terminal) readLine() (line string, err error) {
t.historyIndex = -1
line2 := strings.TrimSpace(line)
if line2 != "" {
t.history.Add(line2)
previous, ok := t.history.NthPreviousEntry(0)
if !ok || previous != line2 {
t.history.Add(line2)
}
}
}
if lineIsPasted {
Expand Down