Re: [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"

Re: [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"

[Dietmar Maurer]

Oh, there is a missing backspace in the Makefile:

diff --git a/Makefile b/Makefile
index 212c3c24..ff0f73b4 100644
--- a/Makefile
+++ b/Makefile
@@ -175,7 +175,7 @@ $(COMPILED_BINS) $(COMPILEDIR)/dump-catalog-shell-cli $(COMPILEDIR)/docgen: .do-
            --bin proxmox-backup-api \
            --bin proxmox-backup-proxy \
            --bin proxmox-backup-manager \
-           --bin docgen
+           --bin docgen \
            --package proxmox-backup-banner \
            --bin proxmox-backup-banner \
            --package proxmox-backup-client \


> On 09/20/2021 9:38 AM Dietmar Maurer <dietmar@proxmox.com> wrote:
> 
>  
> This is no longer required because we moved proxmox_restore_daemon
> code into extra crate (commit 8d99394228939e9f8180efaa06672ecd696d1913)
> 
> Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
> Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
> ---
>  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

[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"

[Dietmar Maurer]

This is no longer required because we moved proxmox_restore_daemon
code into extra crate (commit 8d99394228939e9f8180efaa06672ecd696d1913)

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
---
 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