Complete the move of xlines and resvs from aconf->name to aconf->host.

[irc/rqf/shadowircd.git] / modules / m_resv.c

diff --git a/modules/m_resv.c b/modules/m_resv.c
index 52d2e63bb79bc4de8d3cf14df6fcb8bc2c07e4bd..75b73c613d95e63cb53d2180cab101e3e5cc3330 100644 (file)
--- a/modules/m_resv.c
+++ b/modules/m_resv.c
@@ -217,9 +217,9 @@ parse_resv(struct Client *source_p, const char *name, const char *reason, int te
                aconf = make_conf();
                aconf->status = CONF_RESV_CHANNEL;
                aconf->port = 0;
-               aconf->name = rb_strdup(name);
+               aconf->host = rb_strdup(name);
                aconf->passwd = rb_strdup(reason);
-               add_to_resv_hash(aconf->name, aconf);
+               add_to_resv_hash(aconf->host, aconf);
 
                if(temp_time > 0)
                {
@@ -235,7 +235,16 @@ parse_resv(struct Client *source_p, const char *name, const char *reason, int te
                                          temp_time / 60, name);
                }
                else
+               {
+                       sendto_realops_snomask(SNO_GENERAL, L_ALL,
+                                              "%s added RESV for [%s] [%s]",
+                                              get_oper_name(source_p), name, reason);
+                       ilog(L_KLINE, "R %s 0 %s %s",
+                            get_oper_name(source_p), name, reason);
+                       sendto_one_notice(source_p, ":Added RESV [%s]", name);
+
                        bandb_add(BANDB_RESV, source_p, aconf->host, NULL, aconf->passwd, NULL, 0);
+               }
        }
        else if(clean_resv_nick(name))
        {
@@ -270,7 +279,7 @@ parse_resv(struct Client *source_p, const char *name, const char *reason, int te
                aconf = make_conf();
                aconf->status = CONF_RESV_NICK;
                aconf->port = 0;
-               aconf->name = rb_strdup(name);
+               aconf->host = rb_strdup(name);
                aconf->passwd = rb_strdup(reason);
                rb_dlinkAddAlloc(aconf, &resv_conf_list);
 
@@ -288,7 +297,16 @@ parse_resv(struct Client *source_p, const char *name, const char *reason, int te
                                          temp_time / 60, name);
                }
                else
+               {
+                       sendto_realops_snomask(SNO_GENERAL, L_ALL,
+                                              "%s added RESV for [%s] [%s]",
+                                              get_oper_name(source_p), name, reason);
+                       ilog(L_KLINE, "R %s 0 %s %s",
+                            get_oper_name(source_p), name, reason);
+                       sendto_one_notice(source_p, ":Added RESV [%s]", name);
+
                        bandb_add(BANDB_RESV, source_p, aconf->host, NULL, aconf->passwd, NULL, 0);
+               }
        }
        else
                sendto_one_notice(source_p, ":You have specified an invalid resv: [%s]", name);
@@ -461,7 +479,7 @@ remove_resv(struct Client *source_p, const char *name)
                {
                        aconf = ptr->data;
 
-                       if(irccmp(aconf->name, name))
+                       if(irccmp(aconf->host, name))
                                aconf = NULL;
                        else
                                break;