tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

buildsys: drop double-build hack to avoid linkage issues

Browse Source 
basically a (semantic) revert of commit
991be99c37 "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 <t.lamprecht@proxmox.com>
Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Dietmar Maurer 2021-09-21 07:58:53 +02:00 committed by Thomas Lamprecht
parent 6523588c8d
commit e678a50ea1
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -171,12 +171,11 @@ cargo-build:
$(COMPILED_BINS) $(COMPILEDIR)/dump-catalog-shell-cli $(COMPILEDIR)/docgen: .do-cargo-build $(COMPILED_BINS) $(COMPILEDIR)/dump-catalog-shell-cli $(COMPILEDIR)/docgen: .do-cargo-build
.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-api \
--bin proxmox-backup-proxy \ --bin proxmox-backup-proxy \
--bin proxmox-backup-manager \ --bin proxmox-backup-manager \
--bin docgen --bin docgen \
$(CARGO) build $(CARGO_BUILD_ARGS) \
--package proxmox-backup-banner \ --package proxmox-backup-banner \
--bin proxmox-backup-banner \ --bin proxmox-backup-banner \
--package proxmox-backup-client \ --package proxmox-backup-client \

12
src/api2/access/mod.rs
View File

@ -27,13 +27,11 @@ use crate::config::tfa::TfaChallenge;
pub mod acl; pub mod acl;
pub mod domain; pub mod domain;
pub mod openid;
pub mod role; pub mod role;
pub mod tfa; pub mod tfa;
pub mod user; pub mod user;
#[cfg(openid)]
pub mod openid;
#[allow(clippy::large_enum_variant)] #[allow(clippy::large_enum_variant)]
enum AuthResult { enum AuthResult {
/// Successful authentication which does not require a new ticket. /// Successful authentication which does not require a new ticket.
@ -413,12 +411,6 @@ pub fn list_permissions(
Ok(map) Ok(map)
} }
#[cfg(openid)]
const OPENID_ROUTER: &Router = &openid::ROUTER;
#[cfg(not(openid))]
const OPENID_ROUTER: &Router = &Router::new();
#[sortable] #[sortable]
const SUBDIRS: SubdirMap = &sorted!([ const SUBDIRS: SubdirMap = &sorted!([
("acl", &acl::ROUTER), ("acl", &acl::ROUTER),
@ -428,7 +420,7 @@ const SUBDIRS: SubdirMap = &sorted!([
&Router::new().get(&API_METHOD_LIST_PERMISSIONS) &Router::new().get(&API_METHOD_LIST_PERMISSIONS)
), ),
("ticket", &Router::new().post(&API_METHOD_CREATE_TICKET)), ("ticket", &Router::new().post(&API_METHOD_CREATE_TICKET)),
("openid", &OPENID_ROUTER), ("openid", &openid::ROUTER),
("domains", &domain::ROUTER), ("domains", &domain::ROUTER),
("roles", &role::ROUTER), ("roles", &role::ROUTER),
("users", &user::ROUTER), ("users", &user::ROUTER),