diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/config.c | 105 | ||||
| -rw-r--r-- | src/init.c | 39 | ||||
| -rw-r--r-- | src/messages.c | 35 | ||||
| -rw-r--r-- | src/misc.c | 21 | ||||
| -rw-r--r-- | src/protocol/bahamut.c | 9 | ||||
| -rw-r--r-- | src/protocol/charybdis.c | 9 | ||||
| -rw-r--r-- | src/protocol/inspircd11.c | 9 | ||||
| -rw-r--r-- | src/protocol/ratbox.c | 9 | ||||
| -rw-r--r-- | src/protocol/unreal32.c | 9 |
9 files changed, 7 insertions, 238 deletions
diff --git a/src/config.c b/src/config.c index ddced7ed9..639cfae12 100644 --- a/src/config.c +++ b/src/config.c @@ -59,7 +59,6 @@ char *s_BotServ; char *s_HelpServ; char *s_OperServ; char *s_GlobalNoticer; -char *s_DevNull; char *desc_NickServ; char *desc_ChanServ; char *desc_MemoServ; @@ -67,31 +66,11 @@ char *desc_BotServ; char *desc_HelpServ; char *desc_OperServ; char *desc_GlobalNoticer; -char *desc_DevNull; char *HostDBName; /* Name of HostServ DB File */ char *s_HostServ; /* HostServ Name */ char *desc_HostServ; /* HostServ Description */ -char *s_NickServAlias; -char *s_ChanServAlias; -char *s_MemoServAlias; -char *s_BotServAlias; -char *s_HelpServAlias; -char *s_OperServAlias; -char *s_GlobalNoticerAlias; -char *s_DevNullAlias; -char *s_HostServAlias; -char *desc_NickServAlias; -char *desc_ChanServAlias; -char *desc_MemoServAlias; -char *desc_BotServAlias; -char *desc_HelpServAlias; -char *desc_OperServAlias; -char *desc_GlobalNoticerAlias; -char *desc_DevNullAlias; -char *desc_HostServAlias; - char *PIDFilename; char *MOTDFilename; char *NickDBName; @@ -1136,8 +1115,6 @@ Directive directives[] = { {"BotServDB", {{PARAM_STRING, PARAM_RELOAD, &BotDBName}}}, {"BotServName", {{PARAM_STRING, 0, &s_BotServ}, {PARAM_STRING, 0, &desc_BotServ}}}, - {"BotServAlias", {{PARAM_STRING, 0, &s_BotServAlias}, - {PARAM_STRING, 0, &desc_BotServAlias}}}, {"BSBadWordsMax", {{PARAM_POSINT, PARAM_RELOAD, &BSBadWordsMax}}}, {"BSDefDontKickOps", {{PARAM_SET, PARAM_RELOAD, &BSDefDontKickOps}}}, {"BSDefDontKickVoices", @@ -1159,8 +1136,6 @@ Directive directives[] = { {"ChanServDB", {{PARAM_STRING, PARAM_RELOAD, &ChanDBName}}}, {"ChanServName", {{PARAM_STRING, 0, &s_ChanServ}, {PARAM_STRING, 0, &desc_ChanServ}}}, - {"ChanServAlias", {{PARAM_STRING, 0, &s_ChanServAlias}, - {PARAM_STRING, 0, &desc_ChanServAlias}}}, {"CSAccessMax", {{PARAM_POSINT, PARAM_RELOAD, &CSAccessMax}}}, {"CSAutokickMax", {{PARAM_POSINT, PARAM_RELOAD, &CSAutokickMax}}}, {"CSAutokickReason", @@ -1189,10 +1164,6 @@ Directive directives[] = { {"CSRestrictGetPass", {{PARAM_SET, PARAM_RELOAD, &CSRestrictGetPass}}}, {"CSOpersOnly", {{PARAM_SET, PARAM_RELOAD, &CSOpersOnly}}}, {"DefSessionLimit", {{PARAM_POSINT, 0, &DefSessionLimit}}}, - {"DevNullName", {{PARAM_STRING, 0, &s_DevNull}, - {PARAM_STRING, 0, &desc_DevNull}}}, - {"DevNullAlias", {{PARAM_STRING, 0, &s_DevNullAlias}, - {PARAM_STRING, 0, &desc_DevNullAlias}}}, {"DisableRaw", {{PARAM_SET, PARAM_RELOAD, &DisableRaw}}}, {"DontQuoteAddresses", {{PARAM_SET, PARAM_RELOAD, &DontQuoteAddresses}}}, @@ -1218,20 +1189,14 @@ Directive directives[] = { {"ForceForbidReason", {{PARAM_SET, PARAM_RELOAD, &ForceForbidReason}}}, {"GlobalName", {{PARAM_STRING, 0, &s_GlobalNoticer}, {PARAM_STRING, 0, &desc_GlobalNoticer}}}, - {"GlobalAlias", {{PARAM_STRING, 0, &s_GlobalNoticerAlias}, - {PARAM_STRING, 0, &desc_GlobalNoticerAlias}}}, {"HelpCoreModules", {{PARAM_STRING, PARAM_RELOAD, &HelpCoreModules}}}, {"HelpChannel", {{PARAM_STRING, PARAM_RELOAD, &HelpChannel}}}, {"HostCoreModules", {{PARAM_STRING, PARAM_RELOAD, &HostCoreModules}}}, - {"HostServAlias", {{PARAM_STRING, 0, &s_HostServAlias}, - {PARAM_STRING, 0, &desc_HostServAlias}}}, {"HostSetters", {{PARAM_STRING, PARAM_RELOAD, &HostSetter}}}, {"LogChannel", {{PARAM_STRING, PARAM_RELOAD, &LogChannel}}}, {"LogBot", {{PARAM_SET, PARAM_RELOAD, &LogBot}}}, {"HelpServName", {{PARAM_STRING, 0, &s_HelpServ}, {PARAM_STRING, 0, &desc_HelpServ}}}, - {"HelpServAlias", {{PARAM_STRING, 0, &s_HelpServAlias}, - {PARAM_STRING, 0, &desc_HelpServAlias}}}, {"KeepBackups", {{PARAM_INT, PARAM_RELOAD, &KeepBackups}}}, {"KeepLogs", {{PARAM_INT, PARAM_RELOAD, &KeepLogs}}}, {"KillonSGline", {{PARAM_SET, PARAM_RELOAD, &KillonSGline}}}, @@ -1249,8 +1214,6 @@ Directive directives[] = { {"MemoCoreModules", {{PARAM_STRING, PARAM_RELOAD, &MemoCoreModules}}}, {"MemoServName", {{PARAM_STRING, 0, &s_MemoServ}, {PARAM_STRING, 0, &desc_MemoServ}}}, - {"MemoServAlias", {{PARAM_STRING, 0, &s_MemoServAlias}, - {PARAM_STRING, 0, &desc_MemoServAlias}}}, {"MysqlHost", {{PARAM_STRING, PARAM_RELOAD, &MysqlHost}}}, {"MysqlUser", {{PARAM_STRING, PARAM_RELOAD, &MysqlUser}}}, {"MysqlPass", {{PARAM_STRING, PARAM_RELOAD, &MysqlPass}}}, @@ -1279,8 +1242,6 @@ Directive directives[] = { {"NSEmailReg", {{PARAM_SET, PARAM_RELOAD, &NSEmailReg}}}, {"NickCoreModules", {{PARAM_STRING, PARAM_RELOAD, &NickCoreModules}}}, {"NickRegDelay", {{PARAM_POSINT, PARAM_RELOAD, &NickRegDelay}}}, - {"NickServAlias", {{PARAM_STRING, 0, &s_NickServAlias}, - {PARAM_STRING, 0, &desc_NickServAlias}}}, {"NoBackupOkay", {{PARAM_SET, PARAM_RELOAD, &NoBackupOkay}}}, {"NSAccessMax", {{PARAM_POSINT, PARAM_RELOAD, &NSAccessMax}}}, {"NSAllowKillImmed", {{PARAM_SET, 0, &NSAllowKillImmed}}}, @@ -1321,8 +1282,6 @@ Directive directives[] = { {"OperServDB", {{PARAM_STRING, PARAM_RELOAD, &OperDBName}}}, {"OperServName", {{PARAM_STRING, 0, &s_OperServ}, {PARAM_STRING, 0, &desc_OperServ}}}, - {"OperServAlias", {{PARAM_STRING, 0, &s_OperServAlias}, - {PARAM_STRING, 0, &desc_OperServAlias}}}, {"PIDFile", {{PARAM_STRING, 0, &PIDFilename}}}, {"ReadTimeout", {{PARAM_TIME, PARAM_RELOAD, &ReadTimeout}}}, {"RemoteServer2", {{PARAM_STRING, 0, &RemoteServer2}, @@ -1742,55 +1701,6 @@ int read_config(int reload) CHEK2(PIDFilename, PIDFile); } - if (s_ChanServAlias) { - if (!stricmp(s_ChanServ, s_ChanServAlias)) { - printf - ("\n*** ChanServ and ChanServ Alias are the same, this will cause errors\n"); - retval = 0; - } - } - - if (s_NickServAlias) { - if (!stricmp(s_NickServ, s_NickServAlias)) { - printf - ("\n*** NickServ and NickServ Alias are the same, this will cause errors\n"); - retval = 0; - } - } - - if (s_OperServAlias) { - if (!stricmp(s_OperServ, s_OperServAlias)) { - printf - ("\n*** OperServ and OperServ Alias are the same, this will cause errors\n"); - retval = 0; - } - } - - if (s_MemoServAlias) { - if (!stricmp(s_MemoServ, s_MemoServAlias)) { - printf - ("\n*** MemoServ and MemoServ Alias are the same, this will cause errors\n"); - retval = 0; - } - } - - if (s_HelpServAlias) { - if (!stricmp(s_HelpServ, s_HelpServAlias)) { - printf - ("\n*** HelpServ and HelpServ Alias are the same, this will cause errors\n"); - retval = 0; - } - } - - if (s_GlobalNoticerAlias) { - if (!stricmp(s_GlobalNoticer, s_GlobalNoticerAlias)) { - printf - ("\n*** GlobalNoticer and GlobalNoticer Alias are the same, this will cause errors\n"); - retval = 0; - } - } - - CHEK2(MOTDFilename, MOTDFile); if (!reload) { CHEK2(NickDBName, NickServDB); @@ -2071,13 +1981,6 @@ int read_config(int reload) CHECK(BSBadWordsMax); CHECK(BSMinUsers); CHECK(BSKeepData); - if (s_BotServAlias) { - if (!stricmp(s_BotServ, s_BotServAlias)) { - printf - ("\n*** BotServ and BotServ Alias are the same, this will cause errors\n"); - retval = 0; - } - } if (!BSFantasyCharacter) BSFantasyCharacter = sstrdup("!"); if (BSFantasyCharacter && (strlen(BSFantasyCharacter) > 1)) { @@ -2091,14 +1994,6 @@ int read_config(int reload) if (s_HostServ) { CHEK2(s_HostServ, HostServName); CHEK2(HostDBName, HostServDB); - - if (s_HostServAlias) { - if (!stricmp(s_HostServ, s_HostServAlias)) { - printf - ("\n*** HostServ and HostServ Alias are the same, this will cause errors\n"); - retval = 0; - } - } } if (UseMail) { diff --git a/src/init.c b/src/init.c index 109aad9e3..38f7b0c7d 100644 --- a/src/init.c +++ b/src/init.c @@ -32,43 +32,6 @@ void introduce_user(const char *user) memmove(lasttimes, lasttimes + 1, sizeof(lasttimes) - sizeof(int)); lasttimes[LTSIZE - 1] = time(NULL); #undef LTSIZE - /* We make aliases go online */ - if (s_NickServAlias && (!user || stricmp(user, s_NickServAlias) == 0)) { - ircdproto->SendClientIntroduction(s_NickServAlias, ServiceUser, ServiceHost, desc_NickServAlias, ircd->nickservaliasmode); - } - - if (s_ChanServAlias && (!user || stricmp(user, s_ChanServAlias) == 0)) { - ircdproto->SendClientIntroduction(s_ChanServAlias, ServiceUser, ServiceHost, desc_ChanServAlias, ircd->chanservaliasmode); - } - - if (s_MemoServAlias && (!user || stricmp(user, s_MemoServAlias) == 0)) { - ircdproto->SendClientIntroduction(s_MemoServAlias, ServiceUser, ServiceHost, desc_MemoServAlias, ircd->memoservaliasmode); - } - - if (s_BotServAlias && (!user || stricmp(user, s_BotServAlias) == 0)) { - ircdproto->SendClientIntroduction(s_BotServAlias, ServiceUser, ServiceHost, desc_BotServAlias, ircd->botservaliasmode); - } - - if (s_HelpServAlias && (!user || stricmp(user, s_HelpServAlias) == 0)) { - ircdproto->SendClientIntroduction(s_HelpServAlias, ServiceUser, ServiceHost, desc_HelpServAlias, ircd->helpservaliasmode); - } - - if (s_OperServAlias && (!user || stricmp(user, s_OperServAlias) == 0)) { - ircdproto->SendClientIntroduction(s_OperServAlias, ServiceUser, ServiceHost, desc_OperServAlias, ircd->operservaliasmode); - } - - if (s_DevNullAlias && (!user || stricmp(user, s_DevNullAlias) == 0)) { - ircdproto->SendClientIntroduction(s_DevNullAlias, ServiceUser, ServiceHost, desc_DevNullAlias, ircd->devnullvaliasmode); - } - if (s_HostServAlias && ircd->vhost - && (!user || stricmp(user, s_HostServAlias) == 0)) { - ircdproto->SendClientIntroduction(s_HostServAlias, ServiceUser, ServiceHost, desc_HostServAlias, ircd->hostservaliasmode); - } - if (s_GlobalNoticerAlias - && (!user || stricmp(user, s_GlobalNoticerAlias) == 0)) { - ircdproto->SendClientIntroduction(s_GlobalNoticerAlias, ServiceUser, ServiceHost, desc_GlobalNoticerAlias, ircd->globalaliasmode); - } - /* We make the bots go online */ BotInfo *bi; int i; @@ -658,8 +621,6 @@ int init_secondary(int ac, char **av) bi = new BotInfo(s_BotServ, ServiceUser, ServiceHost, desc_BotServ); if (s_HelpServ) bi = new BotInfo(s_HelpServ, ServiceUser, ServiceHost, desc_HelpServ); - if (s_DevNull) - bi = new BotInfo(s_DevNull, ServiceUser, ServiceHost, desc_DevNull); if (s_GlobalNoticer) bi = new BotInfo(s_GlobalNoticer, ServiceUser, ServiceHost, desc_GlobalNoticer); } diff --git a/src/messages.c b/src/messages.c index 4b3f2bb94..7351de915 100644 --- a/src/messages.c +++ b/src/messages.c @@ -164,9 +164,7 @@ int m_privmsg(const char *source, const char *receiver, const char *msg) starttime = time(NULL); - if ((stricmp(receiver, s_OperServ) == 0) - || (s_OperServAlias - && (stricmp(receiver, s_OperServAlias) == 0))) { + if (!stricmp(receiver, s_OperServ)) { if (!is_oper(u) && OSOpersOnly) { notice_lang(s_OperServ, u, ACCESS_DENIED); if (WallBadOS) @@ -177,37 +175,20 @@ int m_privmsg(const char *source, const char *receiver, const char *msg) } else { operserv(u, (char *)msg); // XXX Unsafe cast, this needs reviewing -- CyberBotX } - } else if ((stricmp(receiver, s_NickServ) == 0) - || (s_NickServAlias - && (stricmp(receiver, s_NickServAlias) == 0))) { + } else if (!stricmp(receiver, s_NickServ)) { nickserv(u, (char *)msg); // XXX Unsafe cast, this needs reviewing -- CyberBotX - } else if ((stricmp(receiver, s_ChanServ) == 0) - || (s_ChanServAlias - && (stricmp(receiver, s_ChanServAlias) == 0))) { + } else if (!stricmp(receiver, s_ChanServ)) { if (!is_oper(u) && CSOpersOnly) notice_lang(s_ChanServ, u, ACCESS_DENIED); else chanserv(u, (char *)msg); // XXX Unsafe cast, this needs reviewing -- CyberBotX - } else if ((stricmp(receiver, s_MemoServ) == 0) - || (s_MemoServAlias - && (stricmp(receiver, s_MemoServAlias) == 0))) { + } else if (!stricmp(receiver, s_MemoServ)) { memoserv(u, (char *)msg); // XXX Unsafe cast, this needs reviewing -- CyberBotX - } else if (s_HostServ && ((stricmp(receiver, s_HostServ) == 0) - || (s_HostServAlias - && - (stricmp(receiver, s_HostServAlias) - == 0)))) { + } else if (s_HostServ && !stricmp(receiver, s_HostServ)) { hostserv(u, (char *)msg); // XXX Unsafe cast, this needs reviewing -- CyberBotX - } else if (s_HelpServ && ((stricmp(receiver, s_HelpServ) == 0) - || (s_HelpServAlias - && - (stricmp(receiver, s_HelpServAlias) - == 0)))) { + } else if (s_HelpServ && !stricmp(receiver, s_HelpServ)) { helpserv(u, (char *)msg); // XXX Unsafe cast, this needs reviewing -- CyberBotX - } else if (s_BotServ && ((stricmp(receiver, s_BotServ) == 0) - || (s_BotServAlias - && (stricmp(receiver, s_BotServAlias) - == 0)))) { + } else if (s_BotServ && !stricmp(receiver, s_BotServ)) { botserv(u, (char *)msg); // XXX Unsafe cast, this needs reviewing -- CyberBotX } else if (s_BotServ && (bi = findbot(receiver))) { botmsgs(u, bi, (char *)msg); // XXX Unsafe cast, this needs reviewing -- CyberBotX @@ -329,8 +310,6 @@ int m_whois(const char *source, const char *who) clientdesc = desc_OperServ; else if (stricmp(who, s_GlobalNoticer) == 0) clientdesc = desc_GlobalNoticer; - else if (s_DevNull && stricmp(who, s_DevNull) == 0) - clientdesc = desc_DevNull; else if (s_BotServ && (bi = findbot(who))) { /* Bots are handled separately */ ircdproto->SendNumeric(ServerName, 311, source, "%s %s %s * :%s", bi->nick, bi->user, bi->host, bi->real); diff --git a/src/misc.c b/src/misc.c index 7d2c28d0f..d8ef83f27 100644 --- a/src/misc.c +++ b/src/misc.c @@ -883,29 +883,8 @@ int nickIsServices(const char *tempnick, int bot) found++; else if (s_OperServ && (stricmp(nick, s_OperServ) == 0)) found++; - else if (s_DevNull && (stricmp(nick, s_DevNull) == 0)) - found++; else if (s_GlobalNoticer && (stricmp(nick, s_GlobalNoticer) == 0)) found++; - else if (s_NickServAlias && (stricmp(nick, s_NickServAlias) == 0)) - found++; - else if (s_ChanServAlias && (stricmp(nick, s_ChanServAlias) == 0)) - found++; - else if (s_MemoServAlias && (stricmp(nick, s_MemoServAlias) == 0)) - found++; - else if (s_BotServAlias && (stricmp(nick, s_BotServAlias) == 0)) - found++; - else if (s_HelpServAlias && (stricmp(nick, s_HelpServAlias) == 0)) - found++; - else if (s_OperServAlias && (stricmp(nick, s_OperServAlias) == 0)) - found++; - else if (s_DevNullAlias && (stricmp(nick, s_DevNullAlias) == 0)) - found++; - else if (s_HostServAlias && (stricmp(nick, s_HostServAlias) == 0)) - found++; - else if (s_GlobalNoticerAlias - && (stricmp(nick, s_GlobalNoticerAlias) == 0)) - found++; else if (s_BotServ && bot) { BotInfo *bi; int i; diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c index 3ff2e7b89..ad489f101 100644 --- a/src/protocol/bahamut.c +++ b/src/protocol/bahamut.c @@ -73,15 +73,6 @@ IRCDVar myIrcd[] = { "+h", /* helpserv mode */ "+i", /* Dev/Null mode */ "+io", /* Global mode */ - "+o", /* nickserv alias mode */ - "+o", /* chanserv alias mode */ - "+o", /* memoserv alias mode */ - "+", /* hostserv alias mode */ - "+io", /* operserv alias mode */ - "+o", /* botserv alias mode */ - "+h", /* helpserv alias mode */ - "+i", /* Dev/Null alias mode */ - "+io", /* Global alias mode */ "+", /* Used by BotServ Bots */ 2, /* Chan Max Symbols */ "-cilmnpstOR", /* Modes to Remove */ diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c index 04731a76a..2d1d8fb2f 100644 --- a/src/protocol/charybdis.c +++ b/src/protocol/charybdis.c @@ -59,15 +59,6 @@ IRCDVar myIrcd[] = { "+oiS", /* helpserv mode */ "+oiS", /* Dev/Null mode */ "+oiS", /* Global mode */ - "+oiS", /* nickserv alias mode */ - "+oiS", /* chanserv alias mode */ - "+oiS", /* memoserv alias mode */ - "+oiS", /* hostserv alias mode */ - "+oaiS", /* operserv alias mode */ - "+oiS", /* botserv alias mode */ - "+oiS", /* helpserv alias mode */ - "+oiS", /* Dev/Null alias mode */ - "+oiS", /* Global alias mode */ "+oiS", /* Used by BotServ Bots */ 2, /* Chan Max Symbols */ "-cilmnpstrgzQF", /* Modes to Remove */ diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c index 0dc7a11d6..d085df49e 100644 --- a/src/protocol/inspircd11.c +++ b/src/protocol/inspircd11.c @@ -81,15 +81,6 @@ IRCDVar myIrcd[] = { "+oI", /* helpserv mode */ "+iI", /* Dev/Null mode */ "+ioI", /* Global mode */ - "+oI", /* nickserv alias mode */ - "+oI", /* chanserv alias mode */ - "+oI", /* memoserv alias mode */ - "+ioI", /* hostserv alias mode */ - "+ioI", /* operserv alias mode */ - "+oI", /* botserv alias mode */ - "+oI", /* helpserv alias mode */ - "+iI", /* Dev/Null alias mode */ - "+ioI", /* Global alias mode */ "+sI", /* Used by BotServ Bots */ 5, /* Chan Max Symbols */ "-cilmnpstuzACGHKNOQRSV", /* Modes to Remove */ diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c index 582a3a6c6..859324490 100644 --- a/src/protocol/ratbox.c +++ b/src/protocol/ratbox.c @@ -58,15 +58,6 @@ IRCDVar myIrcd[] = { "+oi", /* helpserv mode */ "+oi", /* Dev/Null mode */ "+oi", /* Global mode */ - "+oi", /* nickserv alias mode */ - "+oi", /* chanserv alias mode */ - "+oi", /* memoserv alias mode */ - "+oi", /* hostserv alias mode */ - "+oai", /* operserv alias mode */ - "+oi", /* botserv alias mode */ - "+oi", /* helpserv alias mode */ - "+oi", /* Dev/Null alias mode */ - "+oi", /* Global alias mode */ "+oi", /* Used by BotServ Bots */ 2, /* Chan Max Symbols */ "-acilmnpst", /* Modes to Remove */ diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c index 9e27ec7c6..c51da8a0b 100644 --- a/src/protocol/unreal32.c +++ b/src/protocol/unreal32.c @@ -95,15 +95,6 @@ IRCDVar myIrcd[] = { "+oS", /* helpserv mode */ "+iS", /* Dev/Null mode */ "+ioS", /* Global mode */ - "+oS", /* nickserv alias mode */ - "+oS", /* chanserv alias mode */ - "+oS", /* memoserv alias mode */ - "+ioS", /* hostserv alias mode */ - "+ioS", /* operserv alias mode */ - "+oS", /* botserv alias mode */ - "+oS", /* helpserv alias mode */ - "+iS", /* Dev/Null alias mode */ - "+ioS", /* Global alias mode */ "+qS", /* Used by BotServ Bots */ 5, /* Chan Max Symbols */ "-cilmnpstuzACGHKMNOQRSTV", /* Modes to Remove */ |