diff options
Diffstat (limited to 'lib/Config/ClawsMail/Account.pm')
-rw-r--r-- | lib/Config/ClawsMail/Account.pm | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/lib/Config/ClawsMail/Account.pm b/lib/Config/ClawsMail/Account.pm index 4f51273..6cd291f 100644 --- a/lib/Config/ClawsMail/Account.pm +++ b/lib/Config/ClawsMail/Account.pm @@ -21,8 +21,8 @@ has [qw(imap smtp)] => ( my @ssl_string=qw(no ssl starttls); sub new_from_config { - my ($class,$config) = @_; - die "unhandled protocol" unless $config->{protocol} eq '3'; + my ($class,$config,$password) = @_; + die "unhandled protocol" unless $config->{protocol} eq '1'; my $imap_server = Config::ClawsMail::Server->new({ host => $config->{receive_server}, @@ -34,7 +34,8 @@ sub new_from_config { : scalar getservbyname('imap','tcp') ), ssl => $ssl_string[$config->{ssl_imap}], - %{$config}{qw(user_id password)}, + %{$config}{qw(user_id)}, + password => $password->{recv}, }); my $smtp_server = Config::ClawsMail::Server->new({ @@ -49,11 +50,7 @@ sub new_from_config { ssl => $ssl_string[$config->{ssl_smtp}], ( $config->{use_smtp_auth} ? ( user_id => $config->{smtp_user_id} || $config->{user_id}, - password => ( - $config->{smtp_password} eq '!' - ? $config->{password} - : $config->{smtp_password} - ), + password => $password->{send} || $password->{recv}, ) : () ), }); |