Attachment 113847 Details for Bug 22343 – Bug 22343: (follow-up) Correctly handle password on editing

[patch] Bug 22343: (follow-up) Correctly handle password on editing

Bug-22343-follow-up-Correctly-handle-password-on-e.patch (text/plain), 1.38 KB, created by Tomás Cohen Arazi (tcohen) on 2020-11-19 19:01:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomás Cohen Arazi (tcohen)

Created: 2020-11-19 19:01:47 UTC

Size: 1.38 KB

patch

obsolete

>From 4c21a6d46b3a07ec198a14376b227bf2e93ace0b Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Thu, 19 Nov 2020 17:15:32 +0100
>Subject: [PATCH] Bug 22343: (follow-up) Correctly handle password on editing
>
>Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
>---
> admin/smtp_servers.pl | 7 ++-----
> 1 file changed, 2 insertions(+), 5 deletions(-)
>
>diff --git a/admin/smtp_servers.pl b/admin/smtp_servers.pl
>index 9423404dea2..19458a23a42 100755
>--- a/admin/smtp_servers.pl
>+++ b/admin/smtp_servers.pl
>@@ -123,12 +123,10 @@ elsif ( $op eq 'edit_save' ) {
>         my $password   = $input->param('smtp_password') || undef;
>         my $debug      = ( scalar $input->param('smtp_debug_mode') ) ? 1 : 0;
> 
>-        $password = undef
>-            if defined $password and $password eq '****';
>-
>         try {
>             $smtp_server->password( $password )
>-                if $password;
>+                if defined $password and $password ne '****'
>+                    or not defined $password;
> 
>             $smtp_server->set(
>                 {
>@@ -138,7 +136,6 @@ elsif ( $op eq 'edit_save' ) {
>                     timeout   => $timeout,
>                     ssl_mode  => $ssl_mode,
>                     user_name => $user_name,
>-                    password  => $password,
>                     debug     => $debug
>                 }
>             )->store;
>-- 
>2.29.2

Actions: View | Diff | Splinter Review

Attachments on bug 22343: 107598 | 107599 | 107600 | 107601 | 107602 | 107603 | 107604 | 107605 | 107987 | 107988 | 107989 | 107990 | 107991 | 107992 | 107993 | 107994 | 107995 | 107996 | 107997 | 107998 | 107999 | 108009 | 108107 | 108108 | 108109 | 108110 | 108111 | 108112 | 108113 | 108114 | 108115 | 108116 | 108117 | 108118 | 108119 | 108131 | 108132 | 108133 | 108134 | 108135 | 108136 | 108137 | 108138 | 108139 | 108140 | 108141 | 108142 | 108143 | 108529 | 108537 | 108538 | 108539 | 108540 | 108541 | 108542 | 108543 | 108544 | 108545 | 108546 | 108547 | 108548 | 108549 | 108609 | 108638 | 108642 | 108643 | 108644 | 108645 | 108646 | 108647 | 108648 | 108649 | 108650 | 108651 | 108652 | 108653 | 108654 | 108655 | 108656 | 108715 | 108716 | 109003 | 109004 | 109005 | 109006 | 109007 | 109008 | 109009 | 109010 | 109011 | 109012 | 109013 | 109014 | 109015 | 109016 | 109017 | 109018 | 109155 | 109156 | 109157 | 109158 | 109159 | 109160 | 109161 | 109162 | 109163 | 109164 | 109165 | 109166 | 109167 | 109168 | 109169 | 109170 | 109601 | 109602 | 109603 | 109604 | 109605 | 109606 | 109607 | 109608 | 109609 | 109610 | 109611 | 109612 | 109613 | 109614 | 109615 | 109616 | 109723 | 109724 | 109725 | 109726 | 109727 | 109728 | 109729 | 109730 | 109731 | 109732 | 109733 | 109734 | 109735 | 109736 | 109737 | 109738 | 109739 | 109740 | 109787 | 109788 | 111048 | 111087 | 111088 | 111089 | 111090 | 111154 | 111165 | 111166 | 111175 | 111176 | 111213 | 111215 | 111216 | 111442 | 111482 | 113240 | 113827 | 113847