Fix an off by one error with zipstats processing

[irc/rqf/shadowircd.git] / src / s_newconf.c

diff --git a/src/s_newconf.c b/src/s_newconf.c
index 1c3c019b731b9ee67eb3006c167fa5234151c950..b26be9de6b677fd1c0358d0d086356c801380456 100644 (file)
--- a/src/s_newconf.c
+++ b/src/s_newconf.c
@@ -318,55 +318,6 @@ find_oper_conf(const char *username, const char *host, const char *locip, const
        return NULL;
 }
 
-struct oper_flags
-{
-       int flag;
-       const char *name;
-};
-static struct oper_flags oper_flagtable[] =
-{
-       { OPER_KLINE,           "kline"        },
-       { OPER_XLINE,           "xline"        },
-       { OPER_RESV,            "resv"         },
-       { OPER_GLOBKILL,        "global_kill"  },
-       { OPER_LOCKILL,         "local_kill"   },
-       { OPER_REMOTE,          "remote"       },
-       { OPER_UNKLINE,         "unkline"      },
-       { OPER_REHASH,          "rehash"       },
-       { OPER_DIE,             "die"          },
-       { OPER_ADMIN,           "admin"        },
-        { OPER_HADMIN,          "hidden_admin" },
-       { OPER_NICKS,           "nick_changes" },
-       { OPER_OPERWALL,        "operwall"     },
-       { OPER_SPY,             "spy"          },
-       { OPER_INVIS,           "hidden_oper"  },
-       { OPER_REMOTEBAN,       "remoteban"    },
-       { OPER_MASSNOTICE,      "mass_notice"  },
-       { 0,                    NULL }
-};
-
-const char *
-get_oper_privs(int flags)
-{
-       static char buf[BUFSIZE];
-       char *p;
-       int i;
-
-       p = buf;
-       *p = '\0';
-
-       for(i = 0; oper_flagtable[i].flag; i++)
-               if (flags & oper_flagtable[i].flag)
-               {
-                       if(i)
-                               rb_strlcat(buf, ", ", sizeof(buf));
-
-                       rb_strlcat(buf, oper_flagtable[i].name, sizeof(buf));
-               }
-
-       return buf;
-}
-
 struct server_conf *
 make_server_conf(void)
 {
@@ -507,6 +458,24 @@ set_server_conf_autoconn(struct Client *source_p, const char *name, int newval)
                sendto_one_notice(source_p, ":Can't find %s", name);
 }
 
+void
+disable_server_conf_autoconn(const char *name)
+{
+       struct server_conf *server_p;
+
+       server_p = find_server_conf(name);
+       if(server_p != NULL && server_p->flags & SERVER_AUTOCONN)
+       {
+               server_p->flags &= ~SERVER_AUTOCONN;
+
+               sendto_realops_snomask(SNO_GENERAL, L_ALL,
+                               "Disabling AUTOCONN for %s because of error",
+                               name);
+               ilog(L_SERVER, "Disabling AUTOCONN for %s because of error",
+                               name);
+       }
+}
+
 struct ConfItem *
 find_xline(const char *gecos, int counter)
 {