tdb: port trivial differences across from SAMBA