oidentd and fix
merge