Author: Isomer <isomer@coders.net>

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

diff --git a/ircd/ircd_reply.c b/ircd/ircd_reply.c
index aa448881afae75fd142e74303a97ccbab6845c34..39d651459d14f66db927fc590afab098b307c5cd 100644 (file)
--- a/ircd/ircd_reply.c
+++ b/ircd/ircd_reply.c
@@ -51,7 +51,7 @@ int protocol_violation(struct Client* cptr, const char* pattern, ...)
   va_start(vd.vd_args, pattern);
 
   sendcmdto_flag_butone(&me, CMD_DESYNCH, NULL, FLAGS_DEBUG,
-                       ":Protocol Violation from %s: %v", cptr->name, &vd);
+                       ":Protocol Violation from %s: %v", cli_name(cptr), &vd);
 
   va_end(vd.vd_args);
   return 0;
@@ -59,8 +59,16 @@ int protocol_violation(struct Client* cptr, const char* pattern, ...)
 
 int need_more_params(struct Client* cptr, const char* cmd)
 {
+#if 0
+  /*
+   * XXX - bug
+   * shouldn't try to do more than one thing at a time,
+   * call protocol_violation explicitly where it's needed and
+   * context is available.
+   */
   if (!MyUser(cptr))
-    protocol_violation(cptr,"Not enough parameters for %s",cmd);
+    protocol_violation(cptr, "Not enough parameters for %s",cmd);
+#endif
   send_reply(cptr, ERR_NEEDMOREPARAMS, cmd);
   return 0;
 }
@@ -86,7 +94,7 @@ int send_reply(struct Client *to, int reply, ...)
   assert(0 != vd.vd_format);
 
   /* build buffer */
-  mb = msgq_make(to->from, "%:#C %s %C %v", &me, num->str, to, &vd);
+  mb = msgq_make(cli_from(to), "%:#C %s %C %v", &me, num->str, to, &vd);
 
   va_end(vd.vd_args);
 
@@ -98,16 +106,5 @@ int send_reply(struct Client *to, int reply, ...)
   return 0; /* convenience return */
 }
 
-int send_admin_info(struct Client* sptr)
-{
-  const struct LocalConf* admin = conf_get_local();
-  assert(0 != sptr);
-
-  send_reply(sptr, RPL_ADMINME,    me.name);
-  send_reply(sptr, RPL_ADMINLOC1,  admin->location1);
-  send_reply(sptr, RPL_ADMINLOC2,  admin->location2);
-  send_reply(sptr, RPL_ADMINEMAIL, admin->contact);
-  return 0;
-}