From e678a50ea1dd46275bfb4f696a5f84e942dc4890 Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Tue, 21 Sep 2021 07:58:53 +0200 Subject: [PATCH] buildsys: drop double-build hack to avoid linkage issues basically a (semantic) revert of commit 991be99c37c6f55f43a3d9a2c54edb2a8dc6d4f2 "buildsys: workaround linkage issues from openid/curl build server stuff separate" This is no longer required because we moved proxmox_restore_daemon code into extra crate (previous commit) Originally-by: Thomas Lamprecht Signed-off-by: Dietmar Maurer Signed-off-by: Thomas Lamprecht --- Makefile | 5 ++--- src/api2/access/mod.rs | 12 ++---------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index 279f0523..8a304469 100644 --- a/Makefile +++ b/Makefile @@ -171,12 +171,11 @@ cargo-build: $(COMPILED_BINS) $(COMPILEDIR)/dump-catalog-shell-cli $(COMPILEDIR)/docgen: .do-cargo-build .do-cargo-build: - RUSTFLAGS="--cfg openid" $(CARGO) build $(CARGO_BUILD_ARGS) \ + $(CARGO) build $(CARGO_BUILD_ARGS) \ --bin proxmox-backup-api \ --bin proxmox-backup-proxy \ --bin proxmox-backup-manager \ - --bin docgen - $(CARGO) build $(CARGO_BUILD_ARGS) \ + --bin docgen \ --package proxmox-backup-banner \ --bin proxmox-backup-banner \ --package proxmox-backup-client \ diff --git a/src/api2/access/mod.rs b/src/api2/access/mod.rs index 48a90d1b..52963d3c 100644 --- a/src/api2/access/mod.rs +++ b/src/api2/access/mod.rs @@ -27,13 +27,11 @@ use crate::config::tfa::TfaChallenge; pub mod acl; pub mod domain; +pub mod openid; pub mod role; pub mod tfa; pub mod user; -#[cfg(openid)] -pub mod openid; - #[allow(clippy::large_enum_variant)] enum AuthResult { /// Successful authentication which does not require a new ticket. @@ -413,12 +411,6 @@ pub fn list_permissions( Ok(map) } -#[cfg(openid)] -const OPENID_ROUTER: &Router = &openid::ROUTER; - -#[cfg(not(openid))] -const OPENID_ROUTER: &Router = &Router::new(); - #[sortable] const SUBDIRS: SubdirMap = &sorted!([ ("acl", &acl::ROUTER), @@ -428,7 +420,7 @@ const SUBDIRS: SubdirMap = &sorted!([ &Router::new().get(&API_METHOD_LIST_PERMISSIONS) ), ("ticket", &Router::new().post(&API_METHOD_CREATE_TICKET)), - ("openid", &OPENID_ROUTER), + ("openid", &openid::ROUTER), ("domains", &domain::ROUTER), ("roles", &role::ROUTER), ("users", &user::ROUTER),