Commit 7ebda349 7ebda3496ee47c3b5821375f11bd0833da2e14e4 by Sergey Poznyakoff

movemail: bugfix.

* movemail/movemail.c (guess_mbox_owner): Fix setting GID
with --owner=set-id.
(main): Don't attempt to expunge source mailbox if preserve_mail
is set.
1 parent ff95af18
...@@ -606,6 +606,8 @@ guess_mbox_owner (mu_mailbox_t mbox, struct user_id *id) ...@@ -606,6 +606,8 @@ guess_mbox_owner (mu_mailbox_t mbox, struct user_id *id)
606 rc = 1; 606 rc = 1;
607 } 607 }
608 } 608 }
609 else
610 id->gid = meth->owner.id.gid;
609 break; 611 break;
610 612
611 case set_owner_name: 613 case set_owner_name:
...@@ -891,7 +893,7 @@ main (int argc, char **argv) ...@@ -891,7 +893,7 @@ main (int argc, char **argv)
891 mu_mailbox_destroy (&dest); 893 mu_mailbox_destroy (&dest);
892 if (rc) 894 if (rc)
893 mu_error (_("cannot close destination mailbox: %s"), mu_strerror (rc)); 895 mu_error (_("cannot close destination mailbox: %s"), mu_strerror (rc));
894 else 896 else if (!preserve_mail)
895 mu_mailbox_flush (source, 1); 897 mu_mailbox_flush (source, 1);
896 898
897 mu_mailbox_close (source); 899 mu_mailbox_close (source);
......