From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id CF5DB6B171 for ; Mon, 20 Sep 2021 09:38:22 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1CED71C46A for ; Mon, 20 Sep 2021 09:38:22 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 997F61C39A for ; Mon, 20 Sep 2021 09:38:18 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 66D58449AB; Mon, 20 Sep 2021 09:38:18 +0200 (CEST) From: Dietmar Maurer To: pbs-devel@lists.proxmox.com Cc: Dietmar Maurer , Thomas Lamprecht Date: Mon, 20 Sep 2021 09:38:13 +0200 Message-Id: <20210920073813.3178009-15-dietmar@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210920073813.3178009-1-dietmar@proxmox.com> References: <20210920073813.3178009-1-dietmar@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.447 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% ENA_SUBJ_LONG_WORD 2.2 Subject has a very long word KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pbs-devel] [PATCH proxmox-backup 15/15] basically a (semantic) revert of commit 991be99c37c6f55f43a3d9a2c54edb2a8dc6d4f2 "buildsys: workaround linkage issues from openid/curl build server stuff separate" X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Sep 2021 07:38:22 -0000 This is no longer required because we moved proxmox_restore_daemon code into extra crate (commit 8d99394228939e9f8180efaa06672ecd696d1913) Signed-off-by: Thomas Lamprecht Signed-off-by: Dietmar Maurer --- Makefile | 3 +-- src/api2/access/mod.rs | 12 ++---------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 79e2dd7c..212c3c24 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) \ --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 0d247288..ad898614 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), -- 2.30.2