diff --git a/Cargo.lock b/Cargo.lock index 7faaff0..1cc4b53 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -427,7 +427,7 @@ dependencies = [ [[package]] name = "distant" -version = "0.15.0-alpha.18" +version = "0.15.0-alpha.20" dependencies = [ "assert_cmd", "assert_fs", @@ -451,7 +451,7 @@ dependencies = [ [[package]] name = "distant-core" -version = "0.15.0-alpha.18" +version = "0.15.0-alpha.20" dependencies = [ "assert_fs", "bytes", @@ -476,7 +476,7 @@ dependencies = [ [[package]] name = "distant-lua" -version = "0.15.0-alpha.18" +version = "0.15.0-alpha.20" dependencies = [ "distant-core", "distant-ssh2", @@ -510,7 +510,7 @@ dependencies = [ [[package]] name = "distant-ssh2" -version = "0.15.0-alpha.18" +version = "0.15.0-alpha.20" dependencies = [ "assert_cmd", "assert_fs", diff --git a/Cargo.toml b/Cargo.toml index d5ffa2f..ba093bd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ name = "distant" description = "Operate on a remote computer through file and process manipulation" categories = ["command-line-utilities"] keywords = ["cli"] -version = "0.15.0-alpha.19" +version = "0.15.0-alpha.20" authors = ["Chip Senkbeil "] edition = "2018" homepage = "https://github.com/chipsenkbeil/distant" @@ -25,7 +25,7 @@ ssh2 = ["distant-ssh2"] [dependencies] derive_more = { version = "0.99.16", default-features = false, features = ["display", "from", "error", "is_variant"] } -distant-core = { version = "=0.15.0-alpha.19", path = "distant-core", features = ["structopt"] } +distant-core = { version = "=0.15.0-alpha.20", path = "distant-core", features = ["structopt"] } flexi_logger = "0.18.0" log = "0.4.14" once_cell = "1.8.0" @@ -37,7 +37,7 @@ strum = { version = "0.21.0", features = ["derive"] } whoami = "1.1.2" # Optional native SSH functionality -distant-ssh2 = { version = "=0.15.0-alpha.19", path = "distant-ssh2", optional = true } +distant-ssh2 = { version = "=0.15.0-alpha.20", path = "distant-ssh2", optional = true } [target.'cfg(unix)'.dependencies] fork = "0.1.18" diff --git a/distant-core/Cargo.toml b/distant-core/Cargo.toml index f03747e..763a4ec 100644 --- a/distant-core/Cargo.toml +++ b/distant-core/Cargo.toml @@ -3,7 +3,7 @@ name = "distant-core" description = "Core library for distant, enabling operation on a remote computer through file and process manipulation" categories = ["network-programming"] keywords = ["api", "async"] -version = "0.15.0-alpha.19" +version = "0.15.0-alpha.20" authors = ["Chip Senkbeil "] edition = "2018" homepage = "https://github.com/chipsenkbeil/distant" diff --git a/distant-lua/Cargo.toml b/distant-lua/Cargo.toml index 379e8ce..3fdba34 100644 --- a/distant-lua/Cargo.toml +++ b/distant-lua/Cargo.toml @@ -3,7 +3,7 @@ name = "distant-lua" description = "Lua bindings to the distant Rust crates" categories = ["api-bindings", "network-programming"] keywords = ["api", "async"] -version = "0.15.0-alpha.19" +version = "0.15.0-alpha.20" authors = ["Chip Senkbeil "] edition = "2018" homepage = "https://github.com/chipsenkbeil/distant" @@ -24,8 +24,8 @@ luajit = ["mlua/luajit"] vendored = ["mlua/vendored"] [dependencies] -distant-core = { version = "=0.15.0-alpha.19", path = "../distant-core" } -distant-ssh2 = { version = "=0.15.0-alpha.19", features = ["serde"], path = "../distant-ssh2" } +distant-core = { version = "=0.15.0-alpha.20", path = "../distant-core" } +distant-ssh2 = { version = "=0.15.0-alpha.20", features = ["serde"], path = "../distant-ssh2" } futures = "0.3.17" log = "0.4.14" mlua = { version = "0.6.6", features = ["async", "macros", "module", "serialize"] } diff --git a/distant-ssh2/Cargo.toml b/distant-ssh2/Cargo.toml index 7d772b4..0d53701 100644 --- a/distant-ssh2/Cargo.toml +++ b/distant-ssh2/Cargo.toml @@ -2,7 +2,7 @@ name = "distant-ssh2" description = "Library to enable native ssh-2 protocol for use with distant sessions" categories = ["network-programming"] -version = "0.15.0-alpha.19" +version = "0.15.0-alpha.20" authors = ["Chip Senkbeil "] edition = "2018" homepage = "https://github.com/chipsenkbeil/distant" @@ -12,7 +12,7 @@ license = "MIT OR Apache-2.0" [dependencies] async-compat = "0.2.1" -distant-core = { version = "=0.15.0-alpha.19", path = "../distant-core" } +distant-core = { version = "=0.15.0-alpha.20", path = "../distant-core" } futures = "0.3.16" log = "0.4.14" rand = { version = "0.8.4", features = ["getrandom"] } diff --git a/distant-ssh2/src/lib.rs b/distant-ssh2/src/lib.rs index 5179107..abd4b41 100644 --- a/distant-ssh2/src/lib.rs +++ b/distant-ssh2/src/lib.rs @@ -369,8 +369,12 @@ impl Ssh2Session { // Turn our ssh connection into a client session so we can use it to spawn our server let mut session = self.into_ssh_client_session().await?; - // Build arguments for distant - let mut args = vec![String::from("listen")]; + // Build arguments for distant to execute listen subcommand + let mut args = vec![ + String::from("listen"), + String::from("--host"), + String::from("ssh"), + ]; args.extend( shell_words::split(&opts.args) .map_err(|x| io::Error::new(io::ErrorKind::InvalidInput, x))?,