Fix bugs; better handle oplevels from ircu2.10.12

[srvx.git] / src / modcmd.c

diff --git a/src/modcmd.c b/src/modcmd.c
index 027c06f94acf2a70424b5c3f1c91f8081e0e1e3b..6e4e59f2a4e93c7100182797e45dbf3fc22caa41 100644 (file)
--- a/src/modcmd.c
+++ b/src/modcmd.c
@@ -1464,7 +1464,7 @@ static MODCMD_FUNC(cmd_god) {
 }
 
 static MODCMD_FUNC(cmd_joiner) {
-    char cmdname[80];
+    char cmdname[MAXLEN];
 
     if (argc < 2) {
         int len = sprintf(cmdname, "%s ", cmd->name);
@@ -1730,7 +1730,7 @@ static MODCMD_FUNC(cmd_service_add) {
         reply("MCMSG_ALREADY_SERVICE", bot->nick);
         return 0;
     }
-    bot = AddService(nick, desc, hostname);
+    bot = AddService(nick, NULL, desc, hostname);
     service_register(bot);
     reply("MCMSG_NEW_SERVICE", bot->nick);
     return 1;
@@ -2024,7 +2024,7 @@ modcmd_expand(const char *variable) {
 }
 
 static void
-modcmd_load_bots(struct dict *db) {
+modcmd_load_bots(struct dict *db, int default_nick) {
     dict_iterator_t it;
 
     for (it = dict_first(db); it; it = iter_next(it)) {
@@ -2038,14 +2038,18 @@ modcmd_load_bots(struct dict *db) {
             continue;
         }
         nick = database_get_data(rd->d.object, "nick", RECDB_QSTRING);
-        if (!nick)
-            continue;
+        if (!nick) {
+            if (default_nick)
+                nick = iter_key(it);
+            else
+                continue;
+        }
         svc = service_find(nick);
         desc = database_get_data(rd->d.object, "description", RECDB_QSTRING);
         hostname = database_get_data(rd->d.object, "hostname", RECDB_QSTRING);
         if (desc) {
             if (!svc)
-                svc = service_register(AddService(nick, desc, hostname));
+                svc = service_register(AddService(nick, NULL, desc, hostname));
             else if (hostname)
                 strcpy(svc->bot->hostname, hostname);
             desc = database_get_data(rd->d.object, "trigger", RECDB_QSTRING);
@@ -2060,7 +2064,7 @@ modcmd_load_bots(struct dict *db) {
 
 static void
 modcmd_conf_read(void) {
-    modcmd_load_bots(conf_get_data("services", RECDB_OBJECT));
+    modcmd_load_bots(conf_get_data("services", RECDB_OBJECT), 0);
 }
 
 void
@@ -2204,7 +2208,7 @@ modcmd_saxdb_read(struct dict *db) {
     struct record_data *rd, *rd2;
     struct service *service;
 
-    modcmd_load_bots(database_get_data(db, "bots", RECDB_OBJECT));
+    modcmd_load_bots(database_get_data(db, "bots", RECDB_OBJECT), 1);
     db2 = database_get_data(db, "services", RECDB_OBJECT);
     if (!db2) {
         log_module(MAIN_LOG, LOG_ERROR, "Missing section 'services' in modcmd db.");