-#ifdef HEAD_IN_SAND_WHOIS_SERVERNAME
- if (!IsOper(sptr))
- send_reply(sptr, RPL_WHOISSERVER, temp->name, "*.undernet.org",
- myctime(temp->logoff));
- else
-#endif
- send_reply(sptr, RPL_WHOISSERVER, temp->name, temp->servername,
- myctime(temp->logoff));
+ if (IsAnOper(sptr) && temp->realhost)
+ send_reply(sptr, RPL_WHOISACTUALLY, temp->name, temp->username, temp->realhost, "<untracked>");
+ send_reply(sptr, RPL_WHOISSERVER, temp->name,
+ (feature_bool(FEAT_HIS_WHOIS_SERVERNAME) && !IsOper(sptr)) ?
+ feature_str(FEAT_HIS_SERVERNAME) :
+ temp->servername,
+ myctime(temp->logoff));