r19185: merge comment from samba4