m_info: Correct description of general::client_exit like in example confs.

[solanum.git] / modules / m_resv.c

diff --git a/modules/m_resv.c b/modules/m_resv.c
index cdcaecbbce2af01ed30a1d7e7643acd6fa66b7f6..98e61fb4a4750cb2026ab5e29f5c86844c80dab8 100644 (file)
--- a/modules/m_resv.c
+++ b/modules/m_resv.c
@@ -219,12 +219,6 @@ parse_resv(struct Client *source_p, const char *name, const char *reason, int te
                        return;
                }
 
-               if(strchr(reason, '"'))
-               {
-                       sendto_one_notice(source_p, ":Invalid character '\"' in comment");
-                       return;
-               }
-
                aconf = make_conf();
                aconf->status = CONF_RESV_CHANNEL;
                aconf->port = 0;
@@ -293,12 +287,6 @@ parse_resv(struct Client *source_p, const char *name, const char *reason, int te
                        return;
                }
 
-               if(strchr(reason, '"'))
-               {
-                       sendto_one_notice(source_p, ":Invalid character '\"' in comment");
-                       return;
-               }
-
                if(!valid_wild_card_simple(name))
                {
                        sendto_one_notice(source_p,
@@ -373,6 +361,7 @@ parse_resv(struct Client *source_p, const char *name, const char *reason, int te
                }
 
                rb_dlinkAddAlloc(aconf, &resv_conf_list);
+               resv_nick_fnc(aconf->host, aconf->passwd, temp_time);
        }
        else
                sendto_one_notice(source_p, ":You have specified an invalid resv: [%s]", name);
@@ -530,7 +519,7 @@ remove_resv(struct Client *source_p, const char *name, int propagated)
                if((aconf = hash_find_resv(name)) == NULL)
                {
                        if(propagated && rb_dlink_list_length(&cluster_conf_list))
-                               cluster_generic(source_p, "UNXLINE", SHARED_UNXLINE, CAP_CLUSTER, "%s", name);
+                               cluster_generic(source_p, "UNRESV", SHARED_UNRESV, CAP_CLUSTER, "%s", name);
 
                        sendto_one_notice(source_p, ":No RESV for %s", name);
                        return;
@@ -603,7 +592,7 @@ remove_resv(struct Client *source_p, const char *name, int propagated)
                if(aconf == NULL)
                {
                        if(propagated && rb_dlink_list_length(&cluster_conf_list))
-                               cluster_generic(source_p, "UNXLINE", SHARED_UNXLINE, CAP_CLUSTER, "%s", name);
+                               cluster_generic(source_p, "UNRESV", SHARED_UNRESV, CAP_CLUSTER, "%s", name);
 
                        sendto_one_notice(source_p, ":No RESV for %s", name);
                        return;
@@ -644,15 +633,20 @@ remove_resv(struct Client *source_p, const char *name, int propagated)
                else if(propagated && rb_dlink_list_length(&cluster_conf_list) > 0)
                        cluster_generic(source_p, "UNRESV", SHARED_UNRESV, CAP_CLUSTER, "%s", name);
 
+               sendto_one_notice(source_p, ":RESV for [%s] is removed", name);
+               ilog(L_KLINE, "UR %s %s", get_oper_name(source_p), name);
                if(!aconf->hold)
+               {
                        bandb_del(BANDB_RESV, aconf->host, NULL);
+                       sendto_realops_snomask(SNO_GENERAL, L_ALL,
+                                              "%s has removed the RESV for: [%s]",
+                                              get_oper_name(source_p), name);
+               }
                else
                {
-                       sendto_one_notice(source_p, ":RESV for [%s] is removed", name);
                        sendto_realops_snomask(SNO_GENERAL, L_ALL,
-                                              "%s has removed the RESV for: [%s]",
+                                              "%s has removed the temporary RESV for: [%s]",
                                               get_oper_name(source_p), name);
-                       ilog(L_KLINE, "UR %s %s", get_oper_name(source_p), name);
                }
                /* already have ptr from the loop above.. */
                rb_dlinkDestroy(ptr, &resv_conf_list);