merge smbtar fix from 2.2