Ok... Yet another round of fixes for smbmount and autofs.