#include "client.h"
#include "hash.h"
#include "ircd.h"
-#include "ircd_policy.h"
+#include "ircd_features.h"
+#include "ircd_log.h"
#include "ircd_reply.h"
+#include "match.h"
#include "msg.h"
#include "numeric.h"
#include "numnicks.h"
#include "s_conf.h"
#include "s_user.h"
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
static int send_admin_info(struct Client* sptr)
{
assert(0 != cptr);
assert(cptr == sptr);
- if (parc > 1) {
- struct Client *acptr;
- acptr = FindUser(parv[1]);
- if (acptr)
- parv[1] = cli_name(cli_user(acptr)->server);
- else if (!(acptr = find_match_server(parv[1])))
- return send_reply(sptr, ERR_NOSUCHSERVER, parv[1]);
-
- parv[1] = cli_name(acptr);
- if (hunt_server_cmd(sptr, CMD_ADMIN, cptr, HEAD_IN_SAND_REMOTE, ":%C", 1,
- parc, parv) != HUNTED_ISME)
- return 0;
- }
+ if (parc > 1 && match(parv[1], cli_name(&me)))
+ return send_reply(sptr, ERR_NOPRIVILEGES);
+
+ return send_admin_info(sptr);
+}
+
+/*
+ * mo_admin - oper message handler
+ *
+ * parv[0] = sender prefix
+ * parv[1] = servername
+ */
+int mo_admin(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
+{
+ assert(0 != cptr);
+ assert(cptr == sptr);
+
+ if (hunt_server_cmd(sptr, CMD_ADMIN, cptr, feature_int(FEAT_HIS_REMOTE),
+ ":%C", 1, parc, parv) != HUNTED_ISME)
+ return 0;
return send_admin_info(sptr);
}