s4:samdb.py - further rework