[pmg-devel] applied: [PATCH pmg-api] api: upload costum certificate: actually return info

Stoiko Ivanov s.ivanov at proxmox.com
Wed Apr 28 11:13:23 CEST 2021


On Wed, 28 Apr 2021 10:22:50 +0200
Fabian Ebner <f.ebner at proxmox.com> wrote:

> Signed-off-by: Fabian Ebner <f.ebner at proxmox.com>
> ---
>  src/PMG/API2/Certificates.pm | 8 +++++---
>  1 file changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/src/PMG/API2/Certificates.pm b/src/PMG/API2/Certificates.pm
> index c08deb6..1db4a90 100644
> --- a/src/PMG/API2/Certificates.pm
> +++ b/src/PMG/API2/Certificates.pm
> @@ -57,11 +57,13 @@ my sub update_cert : prototype($$$$$) {
>      my ($type, $cert_path, $certificate, $force, $restart) = @_;
>      my $code = sub {
>  	print "Setting custom certificate file $cert_path\n";
> -	PMG::CertHelpers::set_cert_file($certificate, $cert_path, $force);
> +	my $info = PMG::CertHelpers::set_cert_file($certificate, $cert_path, $force);
>  
>  	restart_after_cert_update($type) if $restart;
> +
> +	return $info;
>      };
> -    PMG::CertHelpers::cert_lock(10, $code);
> +    return PMG::CertHelpers::cert_lock(10, $code);
>  };
>  
>  my sub set_smtp : prototype($$) {
> @@ -250,7 +252,7 @@ __PACKAGE__->register_method ({
>  	my $info;
>  
>  	PMG::CertHelpers::cert_lock(10, sub {
> -	    update_cert($type, $cert_path, $certs, $param->{force}, $param->{restart});
> +	    $info = update_cert($type, $cert_path, $certs, $param->{force}, $param->{restart});
>  	});
>  
>  	if ($type eq 'smtp') {

Huge thanks for tracking this down and providing the patch!!
gave it a quick spin and applied it





More information about the pmg-devel mailing list