Merge pull request #1139 from jmaas/master

Fix silly mistake in name_server_search validation.