updated diff to work with all current Samba 4.0.x versions