This commit is contained in:
Nick Bebout 2011-03-12 02:44:31 +00:00
parent 9cb7c657c7
commit ab2854d584
8 changed files with 108 additions and 15 deletions

View file

@ -7,7 +7,7 @@ tool. Synchronise mailboxes between two imap servers. Good
at IMAP migration. More than 25 different IMAP server softwares
supported with success.
$Revision: 1.200 $
$Revision: 1.201 $
=head1 INSTALL
@ -353,7 +353,7 @@ Gilles LAMIRAL earn his living writing, installing,
configuring and teaching free open and gratis
softwares. Don't hesitate to pay him for that services.
$Id: imapsync,v 1.200 2007/01/02 08:27:04 gilles Exp $
$Id: imapsync,v 1.201 2007/01/03 23:49:10 gilles Exp $
=cut
@ -410,7 +410,7 @@ my(
use vars qw ($opt_G); # missing code for this will be option.
$rcs = ' $Id: imapsync,v 1.200 2007/01/02 08:27:04 gilles Exp $ ';
$rcs = ' $Id: imapsync,v 1.201 2007/01/03 23:49:10 gilles Exp $ ';
$rcs =~ m/,v (\d+\.\d+)/;
$VERSION = ($1) ? $1 : "UNKNOWN";
@ -447,8 +447,8 @@ $error=0;
my $banner = join("",
'$RCSfile: imapsync,v $ ',
'$Revision: 1.200 $ ',
'$Date: 2007/01/02 08:27:04 $ ',
'$Revision: 1.201 $ ',
'$Date: 2007/01/03 23:49:10 $ ',
"\n",
"Mail::IMAPClient version used here is ",
$VERSION_IMAPClient,"\n"
@ -642,7 +642,7 @@ sub login_imap {
$imap->User($user);
$imap->Authuser($authuser);
$imap->Password($password);
$imap->login() or die "Error login : [$host] with user [$user] : $@";
$imap->login2() or die "Error login : [$host] with user [$user] : $@";
return($imap);
}
@ -1669,6 +1669,30 @@ sub fetch_hash2 {
# From IMAPClient.pm
sub login2 {
my $self = shift;
return $self->authenticate($self->Authmechanism,$self->Authcallback)
if $self->{Authmechanism};
my $id = $self->User;
my $has_quotes = $id =~ /^".*"$/ ? 1 : 0;
my $string = "Login " . ( $has_quotes ? $id : qq("$id") ) .
" " . $self->Password . "\r\n";
$self->_imap_command($string)
and $self->State(Authenticated);
# $self->folders and $self->separator unless $self->NoAutoList;
unless ( $self->IsAuthenticated) {
my($carp) = $self->LastError;
$carp =~ s/^[\S]+ ([^\x0d\x0a]*)\x0d?\x0a/$1/;
carp $carp unless defined wantarray;
return undef;
}
return $self;
}
# From IMAPClient.pm
sub parse_headers2 {
my($self,$msgspec_all,@fields) = @_;
my(%fieldmap) = map { ( lc($_),$_ ) } @fields;