X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fupstream%2Fbackupninja.git;a=blobdiff_plain;f=handlers%2Fmaildir.in;h=d5731be8ca0ec94b6f623a2062f628155a5c64bc;hp=351415315b8f511ef257c07900e2afd588ee965d;hb=a76cc2f57605db3b3079baccd06c89466b6d2d30;hpb=c4f2b1d45ecbd76342d124768b09f9f26a3b6770

diff --git a/handlers/maildir.in b/handlers/maildir.in
index 3514153..d5731be 100644
--- a/handlers/maildir.in
+++ b/handlers/maildir.in
@@ -132,12 +132,12 @@ function do_remove() {
         cd "$srcdir" 
         for userdir in `ls -d1 */`; do
            ls -1 "$srcdir/$userdir" | sort > $tmp1
-           ssh -p $destport $destuser@$desthost ls -1 "$destdir/$userdir" | sort > $tmp2
+           ssh -p $destport -i $destid_file $destuser@$desthost ls -1 "$destdir/$userdir" | sort > $tmp2
 		for deluser in `join -v 2 $tmp1 $tmp2`; do
 			[ "$deluser" != "" ] || continue
                         info "removing $destuser@$desthost:$destdir/$userdir$deluser/"
-                        ssh -p $destport $destuser@$desthost mv "$destdir/$userdir$deluser/" "$destdir/deleted"
-			ssh -p $destport -i $destid_file $destuser@$desthost "date +%c%n%s > '$destdir/$userdir$deluser/deleted_on'"
+                        ssh -p $destport -i $destid_file $destuser@$desthost mv "$destdir/$userdir$deluser/" "$destdir/deleted"
+			ssh -p $destport -i $destid_file $destuser@$desthost "date +%c%n%s > '$destdir/deleted/$deluser/deleted_on'"
 		done
 	done
 	rm $tmp1