r10455: merging privilege fix from SAMBA_3_0