Not sure where the samba-3 patch came from. It's not used here,
but I'll leave it here in case it's needed for Samba 3