CF message with an empty or no value will delete the configuration entry for the specified key.

Author: MrIron-no

include/ircd_netconf.h

@@ -33,6 +33,7 @@ struct StatDesc;
 #define CONFIG_CREATED        0  /**< New entry created */
 #define CONFIG_TIMESTAMP      1  /**< Timestamp updated, same value */
 #define CONFIG_CHANGED        2  /**< Value actually changed */
+#define CONFIG_DELETED        3  /**< Entry deleted */
 
 /** Configuration entry structure */
 struct ConfigEntry {

ircd/ircd_netconf.c

@@ -125,6 +125,27 @@ int config_set(const char *key, const char *value, time_t timestamp)
 
   entry = config_find(key);
 
+  if (value[0] == '\0') {
+    /* Delete the entry if it exists and timestamp is newer */
+    if (entry && timestamp > entry->timestamp) {
+      DupString(old_value, entry->value);
+      /* Remove from list */
+      struct ConfigEntry **p = &config_list;
+      while (*p && *p != entry) p = &(*p)->next;
+      if (*p == entry) {
+        *p = entry->next;
+        MyFree(entry->key);
+        MyFree(entry->value);
+        MyFree(entry);
+      }
+      config_call_callbacks(key, old_value, NULL);
+      if (old_value) MyFree(old_value);
+      return CONFIG_DELETED;
+    } else {
+      return CONFIG_REJECTED;
+    }
+  }
+
   if (entry) {
     /* Only update if timestamp is newer */
     if (timestamp <= entry->timestamp)

ircd/m_config.c

@@ -49,29 +49,34 @@ int ms_config(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
   const char *key, *value;
   const char *old_value;
   int result;
-  
-  if (parc < 4)
-    return need_more_params(sptr, "CF");
 
-  timestamp = atol(parv[1]);
-  key = parv[2];
-  value = parv[3];
+    if (parc < 3)
+      return need_more_params(sptr, "CF");
+
+    timestamp = atol(parv[1]);
+    key = parv[2];
+    value = (parc >= 4) ? parv[3] : "";
 
-  /* Get the old value for comparison */
-  old_value = config_get(key);
-  char *old_value_copy = NULL;
-  if (old_value)
-    DupString(old_value_copy, old_value);
+    /* Get the old value for comparison */
+    old_value = config_get(key);
+    char *old_value_copy = NULL;
+    if (old_value)
+      DupString(old_value_copy, old_value);
 
   /* Try to set the configuration */
   result = config_set(key, value, timestamp);
-  
+
   if (result != CONFIG_REJECTED) {
-    /* Configuration was set or updated, propagate to other servers */
-    sendcmdto_serv_butone(sptr, CMD_CONFIG, cptr, "%Tu %s :%s",
-                          timestamp, key, value);
-    
-    /* Send notification to operators based on what actually happened */
+    /* Propagate to other servers */
+    if (value[0] != '\0') {
+      sendcmdto_serv_butone(sptr, CMD_CONFIG, cptr, "%Tu %s :%s",
+                            timestamp, key, value);
+    } else {
+      sendcmdto_serv_butone(sptr, CMD_CONFIG, cptr, "%Tu %s",
+                            timestamp, key);
+    }
+
+    /* Notify operators */
     if (result == CONFIG_CREATED) {
       sendto_opmask_butone(0, SNO_NETWORK,
                           "Network configuration set: %s = %s",
@@ -80,10 +85,16 @@ int ms_config(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
       sendto_opmask_butone(0, SNO_NETWORK,
                           "Network configuration updated: %s = %s (was: %s)",
                           key, value, old_value_copy ? old_value_copy : "(unset)");
+    } else if (result == CONFIG_DELETED) {
+      sendto_opmask_butone(0, SNO_NETWORK,
+                          "Network configuration deleted: %s (was: %s)",
+                          key, old_value_copy ? old_value_copy : "(unset)");
+      Debug((DEBUG_DEBUG, "NETCONF: %s deleted %s (timestamp: %Tu)",
+             cli_name(sptr), key, timestamp));
+    } else {
+      Debug((DEBUG_DEBUG, "NETCONF: %s set %s = %s (timestamp: %Tu)",
+             cli_name(sptr), key, value, timestamp));
     }
-    
-    Debug((DEBUG_DEBUG, "NETCONF: %s set %s = %s (timestamp: %Tu)",
-           cli_name(sptr), key, value, timestamp));
   }
 
   /* Clean up the copied old value */