rpearce/grichards: Make cname resolution use existing resolve