Changes to support non-NameServer-capable slaves on Linux