CHANSERV: remove accidental sendemail from SETEMAIL command.

[irc/quakenet/newserv.git] / miscreply / privs.c

diff --git a/miscreply/privs.c b/miscreply/privs.c
index fc6ccdfa3742a5f05168fb9c5a1b96c027d0d006..516399887940c791bbb86c0c7bfe404e55b2c71d 100644 (file)
--- a/miscreply/privs.c
+++ b/miscreply/privs.c
@@ -1,12 +1,8 @@
 /* privs.c */
 
 #include "miscreply.h"
-#include "numeric.h"
 #include "../irc/irc.h"
 #include "../core/error.h"
-#include "../nick/nick.h"
-
-#include <string.h>
 
 
 
@@ -21,12 +17,11 @@
  */
 int handleprivsmsg(void *source, int cargc, char **cargv) {
 
-  nick *snick;                                                  /* struct nick for source nick */
-  nick *tnick;                                                  /* struct nick for target nick */
-
-  char *sourcenum = (char *)source;                             /* source user numeric */
-  char *targetnum = getmynumeric();                             /* target server numeric */
-  char *privs = "IDDQD IDKFA IDCLIP IDDT IDCHOPPERS";           /* privileges */
+  nick *snick;                                          /* struct nick for source nick */
+  nick *tnick;                                          /* struct nick for target nick */
+  char *sourcenum = (char *)source;                     /* source user numeric */
+  char *targetnum;                                      /* target user numeric */
+  char *privs = "IDDQD IDKFA IDCLIP IDDT IDCHOPPERS";   /* privileges */
 
   /*
    * cheat codes from DOOM I & II
@@ -49,10 +44,6 @@ int handleprivsmsg(void *source, int cargc, char **cargv) {
   /* get the parameter */
   targetnum = cargv[0];
 
-  /* from a server? */
-  if (IsServer(sourcenum))
-    return CMD_OK;
-
   /* find source user */ 
   if (!(snick = miscreply_finduser(sourcenum, "PRIVS")))
     return CMD_OK;
@@ -65,9 +56,6 @@ int handleprivsmsg(void *source, int cargc, char **cargv) {
     return CMD_OK;
   }
 
-  /* get numeric of target's server */
-  targetnum = longtonumeric(homeserver((tnick)->numeric), 2);
-
   if (!IsOper(tnick))
     privs = "";
 
@@ -76,7 +64,7 @@ int handleprivsmsg(void *source, int cargc, char **cargv) {
    * 270 RPL_PRIVS "source 270 target nick :privs"
    *               "irc.netsplit.net 270 foobar barfoo :CHAN_LIMIT SHOW_INVIS SHOW_ALL_INVIS KILL"
    */
-  send_reply(targetnum, RPL_PRIVS, sourcenum, "%s :%s", tnick->nick, privs);
+  irc_send("%s 270 %s %s :%s", getmynumeric(), sourcenum, tnick->nick, privs);
 
   return CMD_OK;
 }