the following files are from appropriate cvs points, in case anyone wants to double-check that the update from the main cvs branch has been correctly (manually) merged into the parallel branch, BRANCH_NTDOM - smb-ntdom-split-point.tgz. roughly corresponds to 1.9.18alpha11/12. the point at which i diverged to BRANCH_NTDOM - smb-1-24dec.tgz roughly corresponds to 1.9.18alpha14. the current, main cvs branch, to date. - smb-d-24dec.tgz the nt domain code just before the update - smb-d2-28-dec.tgz the nt domain code just after the merge.