Just to make sure I'm not fighting any windmills here: M1: raise ldb_map, fight the samba3sam tests M2: lots of samba4 <-> samba3 mappings, evaluate ejs for defining them Reasonable? Cheers, Martin