r17952: merge changes from samba3