Hi Anatoliy, What do you thing about a patch to refactor construct_msds_isrodc_with_computer_dn a little bit as we have a convenience function to do the job? Last patch in this brach: http://git.samba.org/?p=kamenim/samba.git;a=shortlog;h=refs/heads/master-push -- CU, Kamen Mazdrashki