-#if HEAD_IN_SAND_REMOTE
- /* If remote queries are disabled, then use the *second* parameter of
- * of whois, so /whois nick nick still works.
- */
- acptr = FindUser(parv[2]);
-#else
- acptr = FindUser(parv[1]);
-#endif
- if (acptr)
- parv[1] = cli_name(cli_user(acptr)->server);
+ if (feature_int(FEAT_HIS_REMOTE))
+ {
+ /* If remote queries are disabled, then use the *second* parameter of
+ * of whois, so /whois nick nick still works.
+ */
+ if (!IsAnOper(sptr))
+ {
+ if (!FindUser(parv[2]))
+ {
+ send_reply(sptr, ERR_NOSUCHNICK, parv[2]);
+ send_reply(sptr, RPL_ENDOFWHOIS, parv[2]);
+ return 0;
+ }
+ parv[1] = parv[2];
+ }
+ }
+