Improve the clean-up of outdated IAuth instances on rehash (SF bug #2789656).

[ircu2.10.12-pk.git] / ircd / m_admin.c

diff --git a/ircd/m_admin.c b/ircd/m_admin.c
index dd8d0f4b4a3674759feb871e9736d4555df99c57..8c4908ec8d59c3ec14af3042a1ffdd001bad409e 100644 (file)
--- a/ircd/m_admin.c
+++ b/ircd/m_admin.c
@@ -85,14 +85,16 @@
 #include "hash.h"
 #include "ircd.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)
 {
@@ -115,12 +117,10 @@ static int send_admin_info(struct Client* sptr)
  */
 int m_admin(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
 {
-  struct Client *acptr;
-
   assert(0 != cptr);
   assert(cptr == sptr);
 
-  if (parc > 1  && (!(acptr = find_match_server(parv[1])) || !IsMe(acptr)))
+  if (parc > 1  && match(parv[1], cli_name(&me)))
     return send_reply(sptr, ERR_NOPRIVILEGES);
 
   return send_admin_info(sptr);