- UNRESV should be logged as well

- Improved logging. Fixed inconsistent use of
  get_oper_name() vs. source_p->name


git-svn-id: svn://svn.ircd-hybrid.org/svnroot/ircd-hybrid/branches/8.1.x@2339 82007160-df01-0410-b94d-b575c5fd34c7

6 files changed, 17 insertions, 14 deletions

diff --git a/modules/m_dline.c b/modules/m_dline.c
index b1d4ab4..08591b0 100644
--- a/modules/m_dline.c
+++ b/modules/m_dline.c
@@ -480,7 +480,7 @@ me_undline(struct Client *client_p, struct Client *source_p,
       sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
                            "%s has removed the D-Line for: [%s]",
                            get_oper_name(source_p), addr);
-      ilog(LOG_TYPE_DLINE, "%s removed temporary D-Line for [%s]",
+      ilog(LOG_TYPE_DLINE, "%s removed D-Line for [%s]",
            get_oper_name(source_p), addr);
     }
     else
diff --git a/modules/m_gline.c b/modules/m_gline.c
index 2bec753..7e0ed6b 100644
--- a/modules/m_gline.c
+++ b/modules/m_gline.c
@@ -312,7 +312,7 @@ do_sgline(struct Client *source_p, int parc, char *parv[], int prop)
                           "%s requesting G-Line for [%s@%s] [%s]",
                           get_oper_name(source_p),
                           user, host, reason);
-     ilog(LOG_TYPE_GLINE, "#gline for %s@%s [%s] requested by %s",
+     ilog(LOG_TYPE_GLINE, "G-Line for [%s@%s] [%s] requested by %s",
           user, host, reason, get_oper_name(source_p));
   }
 }
@@ -390,9 +390,8 @@ mo_gline(struct Client *client_p, struct Client *source_p,
                        "%s requesting G-Line for [%s@%s] [%s]",
                        get_oper_name(source_p),
                        user, host, reason);
-  ilog(LOG_TYPE_GLINE, "#gline for %s@%s [%s] requested by %s!%s@%s",
-       user, host, reason, source_p->name, source_p->username,
-       source_p->host);
+  ilog(LOG_TYPE_GLINE, "G-Line for [%s@%s] [%s] requested by %s",
+       user, host, reason, get_oper_name(source_p));
 
   /* 4 param version for hyb-7 servers */
   sendto_server(NULL, CAP_GLN|CAP_TS6, NOCAPS,
@@ -442,7 +441,7 @@ do_sungline(struct Client *source_p, const char *user,
   sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
                        "%s requesting UNG-Line for [%s@%s] [%s]",
                        get_oper_name(source_p), user, host, reason);
-  ilog(LOG_TYPE_GLINE, "#ungline for %s@%s [%s] requested by %s",
+  ilog(LOG_TYPE_GLINE, "UNG-Line for [%s@%s] [%s] requested by %s",
        user, host, reason, get_oper_name(source_p));
 
   /* If at least 3 opers agree this user should be un G lined then do it */
diff --git a/modules/m_kline.c b/modules/m_kline.c
index b41e21c..1956d20 100644
--- a/modules/m_kline.c
+++ b/modules/m_kline.c
@@ -217,7 +217,7 @@ m_kline_add_kline(struct Client *source_p, struct MaskItem *conf,
                MyConnect(source_p) ? me.name : ID_or_name(&me, source_p->from),
                source_p->name, tkline_time/60, conf->user, conf->host);
     ilog(LOG_TYPE_KLINE, "%s added temporary %d min. K-Line for [%s@%s] [%s]",
-         source_p->name, tkline_time/60,
+         get_oper_name(source_p), tkline_time/60,
          conf->user, conf->host, conf->reason);
   }
   else
@@ -230,7 +230,7 @@ m_kline_add_kline(struct Client *source_p, struct MaskItem *conf,
                MyConnect(source_p) ? me.name : ID_or_name(&me, source_p->from),
                  source_p->name, conf->user, conf->host);
     ilog(LOG_TYPE_KLINE, "%s added K-Line for [%s@%s] [%s]",
-         source_p->name, conf->user, conf->host, conf->reason);
+         get_oper_name(source_p), conf->user, conf->host, conf->reason);
   }
 
   conf->setat = CurrentTime;
@@ -347,7 +347,7 @@ mo_unkline(struct Client *client_p,struct Client *source_p,
                          "%s has removed the K-Line for: [%s@%s]",
                          get_oper_name(source_p), user, host);
     ilog(LOG_TYPE_KLINE, "%s removed K-Line for [%s@%s]",
-         source_p->name, user, host);
+         get_oper_name(source_p), user, host);
   }
   else
     sendto_one(source_p, ":%s NOTICE %s :No K-Line for [%s@%s] found", 
@@ -393,7 +393,7 @@ me_unkline(struct Client *client_p, struct Client *source_p,
                            "%s has removed the K-Line for: [%s@%s]",
                            get_oper_name(source_p), kuser, khost);
       ilog(LOG_TYPE_KLINE, "%s removed K-Line for [%s@%s]",
-           source_p->name, kuser, khost);
+           get_oper_name(source_p), kuser, khost);
     }
     else
       sendto_one(source_p, ":%s NOTICE %s :No K-Line for [%s@%s] found",
diff --git a/modules/m_rehash.c b/modules/m_rehash.c
index 8eebf1c..d039def 100644
--- a/modules/m_rehash.c
+++ b/modules/m_rehash.c
@@ -78,7 +78,7 @@ mo_rehash(struct Client *client_p, struct Client *source_p,
     if (found)
     {
       ilog(LOG_TYPE_IRCD, "REHASH %s From %s",
-           parv[1], get_client_name(source_p, HIDE_IP));
+           parv[1], get_oper_name(source_p));
       return;
     }
     else
@@ -96,8 +96,8 @@ mo_rehash(struct Client *client_p, struct Client *source_p,
     sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
                          "%s is rehashing server config file",
                          get_oper_name(source_p));
-    ilog(LOG_TYPE_IRCD, "REHASH From %s[%s]",
-         get_oper_name(source_p), source_p->sockhost);
+    ilog(LOG_TYPE_IRCD, "REHASH From %s",
+         get_oper_name(source_p));
     rehash(0);
   }
 }
diff --git a/modules/m_resv.c b/modules/m_resv.c
index 11eee50..945bee0 100644
--- a/modules/m_resv.c
+++ b/modules/m_resv.c
@@ -357,6 +357,8 @@ remove_resv(struct Client *source_p, const char *name)
     sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
                          "%s has removed the RESV for channel: %s",
                          get_oper_name(source_p), name);
+    ilog(LOG_TYPE_RESV, "%s removed RESV for [%s]",
+         get_oper_name(source_p), name);
   }
   else
   {
@@ -381,6 +383,8 @@ remove_resv(struct Client *source_p, const char *name)
     sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
                          "%s has removed the RESV for nick: %s",
                          get_oper_name(source_p), name);
+    ilog(LOG_TYPE_RESV, "%s removed RESV for [%s]",
+         get_oper_name(source_p), name);
   }
 }
 
diff --git a/modules/m_xline.c b/modules/m_xline.c
index f8d55b2..1c3e53e 100644
--- a/modules/m_xline.c
+++ b/modules/m_xline.c
@@ -374,7 +374,7 @@ remove_xline(struct Client *source_p, char *gecos)
                          "%s has removed the X-Line for: [%s]",
                          get_oper_name(source_p), gecos);
     ilog(LOG_TYPE_XLINE, "%s removed X-Line for [%s]",
-         source_p->name, gecos);
+         get_oper_name(source_p), gecos);
   }
   else
     sendto_one(source_p, ":%s NOTICE %s :No X-Line for %s",