Allow lock mechanism to be bypassed via force

nbdd0121 · Jan 25, 2021 · f758bd4 · f758bd4
1 parent bae4579
commit f758bd4
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/client/src/config.rs b/client/src/config.rs
@@ -48,12 +48,16 @@ fn default_display() -> u32 {
 pub struct X11Config {
     #[serde(default = "default_display")]
     pub display: u32,
+
+    #[serde(default)]
+    pub force: bool,
 }
 
 impl Default for X11Config {
     fn default() -> Self {
         X11Config {
             display: default_display(),
+            force: false,
         }
     }
 }
diff --git a/client/src/x11.rs b/client/src/x11.rs
@@ -34,7 +34,7 @@ async fn handle_stream(stream: UnixStream) -> std::io::Result<()> {
 }
 
 pub async fn x11_forward(config: &'static X11Config) -> std::io::Result<()> {
-    let lock = X11Lock::acquire(config.display)?;
+    let lock = X11Lock::acquire(config.display, config.force)?;
     let listener = lock.bind()?;
 
     loop {

diff --git a/client/src/x11socket.rs b/client/src/x11socket.rs
@@ -13,7 +13,7 @@ impl Drop for X11Lock {
 }
 
 impl X11Lock {
-    pub fn acquire(display: u32) -> Result<Self> {
+    pub fn acquire(display: u32, force: bool) -> Result<Self> {
         let name = format!("/tmp/.X{}-lock", display);
 
         loop {
@@ -49,7 +49,7 @@ impl X11Lock {
                             != libc::ESRCH;
 
                     // The process is still alive
-                    if alive {
+                    if alive && !force {
                         return Err(Error::new(
                             std::io::ErrorKind::AddrInUse,
                             format!("X{} is current in use", display),