From 1ecdc2ed721fbfcf67dacaa500da2bafc63f30c5 Mon Sep 17 00:00:00 2001
From: Dietmar Maurer <dietmar@proxmox.com>
Date: Fri, 25 Jun 2021 11:05:56 +0200
Subject: [PATCH] use one lock file per realm

---
 debian/control    | 14 ++++++--------
 src/auth_state.rs |  2 +-
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/debian/control b/debian/control
index baf536e3..f775d056 100644
--- a/debian/control
+++ b/debian/control
@@ -11,8 +11,7 @@ Build-Depends: debhelper (>= 12),
  librust-http-0.2+default-dev <!nocheck>,
  librust-nix-0.19+default-dev (>= 0.19.1-~~) <!nocheck>,
  librust-openidconnect-2+curl-dev <!nocheck>,
- librust-proxmox-0.11+api-macro-dev (>= 0.11.5-~~) <!nocheck>,
- librust-proxmox-0.11+sortable-macro-dev (>= 0.11.5-~~) <!nocheck>,
+ librust-proxmox-0.11-dev (>= 0.11.5-~~) <!nocheck>,
  librust-serde-1+default-dev <!nocheck>,
  librust-serde-1+derive-dev <!nocheck>,
  librust-serde-json-1+default-dev <!nocheck>,
@@ -33,8 +32,7 @@ Depends:
  librust-http-0.2+default-dev,
  librust-nix-0.19+default-dev (>= 0.19.1-~~),
  librust-openidconnect-2+curl-dev,
- librust-proxmox-0.11+api-macro-dev (>= 0.11.5-~~),
- librust-proxmox-0.11+sortable-macro-dev (>= 0.11.5-~~),
+ librust-proxmox-0.11-dev (>= 0.11.5-~~),
  librust-serde-1+default-dev,
  librust-serde-1+derive-dev,
  librust-serde-json-1+default-dev,
@@ -43,10 +41,10 @@ Provides:
  librust-proxmox-openid+default-dev (= ${binary:Version}),
  librust-proxmox-openid-0-dev (= ${binary:Version}),
  librust-proxmox-openid-0+default-dev (= ${binary:Version}),
- librust-proxmox-openid-0.4-dev (= ${binary:Version}),
- librust-proxmox-openid-0.4+default-dev (= ${binary:Version}),
- librust-proxmox-openid-0.4.0-dev (= ${binary:Version}),
- librust-proxmox-openid-0.4.0+default-dev (= ${binary:Version})
+ librust-proxmox-openid-0.5-dev (= ${binary:Version}),
+ librust-proxmox-openid-0.5+default-dev (= ${binary:Version}),
+ librust-proxmox-openid-0.5.0-dev (= ${binary:Version}),
+ librust-proxmox-openid-0.5.0+default-dev (= ${binary:Version})
 Description: Rust crate "proxmox-openid" - Rust source code
  This package contains the source for the Rust proxmox-openid crate, packaged by
  debcargo for use with cargo and dh-cargo.
diff --git a/src/auth_state.rs b/src/auth_state.rs
index 087127e0..acadaf9a 100644
--- a/src/auth_state.rs
+++ b/src/auth_state.rs
@@ -22,7 +22,7 @@ fn load_auth_state_locked(
 ) -> Result<(PathBuf, std::fs::File, Vec<Value>), Error> {
 
     let mut lock_path = state_dir.to_owned();
-    lock_path.push("proxmox-openid-auth-state.lock");
+    lock_path.push(format!("proxmox-openid-auth-state-{}.lck", realm));
 
     let lock = open_file_locked(
         lock_path,