diff options
-rw-r--r-- | include/services.h | 10 | ||||
-rw-r--r-- | src/core/bs_bot.c | 4 | ||||
-rw-r--r-- | src/init.c | 2 | ||||
-rw-r--r-- | src/protocol/bahamut.c | 12 | ||||
-rw-r--r-- | src/protocol/charybdis.c | 12 | ||||
-rw-r--r-- | src/protocol/inspircd11.c | 10 | ||||
-rw-r--r-- | src/protocol/inspircd12.cpp | 10 | ||||
-rw-r--r-- | src/protocol/ratbox.c | 10 |
8 files changed, 11 insertions, 59 deletions
diff --git a/include/services.h b/include/services.h index 691252778..7ff9f1b0b 100644 --- a/include/services.h +++ b/include/services.h @@ -238,15 +238,7 @@ typedef struct ircdcapab_ IRCDCAPAB; struct ircdvars_ { const char *name; /* Name of the IRCd command */ - const char *nickservmode; /* Mode used by NickServ */ - const char *chanservmode; /* Mode used by ChanServ */ - const char *memoservmode; /* Mode used by MemoServ */ - const char *hostservmode; /* Mode used by HostServ */ - const char *operservmode; /* Mode used by OperServ */ - const char *botservmode; /* Mode used by BotServ */ - const char *helpservmode; /* Mode used by HelpServ */ - const char *globalmode; /* Mode used by Global */ - const char *botserv_bot_mode; /* Mode used by BotServ Bots */ + const char *pseudoclient_mode; /* Mode used by BotServ Bots */ int max_symbols; /* Chan Max Symbols */ const char *modestoremove; /* Channel Modes to remove */ const char *botchanumode; /* Modes set when botserv joins a channel */ diff --git a/src/core/bs_bot.c b/src/core/bs_bot.c index e518315f5..0a69cc971 100644 --- a/src/core/bs_bot.c +++ b/src/core/bs_bot.c @@ -165,7 +165,7 @@ int do_bot(User * u) /* We make the bot online, ready to serve */ ircdproto->SendClientIntroduction(bi->nick, bi->user, bi->host, bi->real, - ircd->botserv_bot_mode, bi->uid.c_str()); + ircd->pseudoclient_mode, bi->uid.c_str()); notice_lang(s_BotServ, u, BOT_BOT_ADDED, bi->nick, bi->user, bi->host, bi->real); @@ -300,7 +300,7 @@ int do_bot(User * u) ircdproto->SendQuit(bi, "Quit: Be right back"); ircdproto->SendClientIntroduction(bi->nick, bi->user, bi->host, bi->real, - ircd->botserv_bot_mode, bi->uid.c_str()); + ircd->pseudoclient_mode, bi->uid.c_str()); bi->RejoinAll(); } diff --git a/src/init.c b/src/init.c index 4d31551bb..162758a6f 100644 --- a/src/init.c +++ b/src/init.c @@ -42,7 +42,7 @@ void introduce_user(const char *user) for (bi = botlists[i]; bi; bi = bi->next) { if (!user || !stricmp(user, bi->nick)) - ircdproto->SendClientIntroduction(bi->nick, bi->user, bi->host, bi->real, ircd->botserv_bot_mode, bi->uid.c_str()); + ircdproto->SendClientIntroduction(bi->nick, bi->user, bi->host, bi->real, ircd->pseudoclient_mode, bi->uid.c_str()); } } } diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c index e5070b1cd..24b2f0c96 100644 --- a/src/protocol/bahamut.c +++ b/src/protocol/bahamut.c @@ -63,16 +63,8 @@ IRCDVar myIrcd[] = { - {"BahamutIRCd 1.4.*/1.8.*", /* ircd name */ - "+o", /* nickserv mode */ - "+o", /* chanserv mode */ - "+o", /* memoserv mode */ - "+", /* hostserv mode */ - "+io", /* operserv mode */ - "+o", /* botserv mode */ - "+h", /* helpserv mode */ - "+io", /* Global mode */ - "+", /* Used by BotServ Bots */ + {"Bahamut 1.8.x", /* ircd name */ + "+", /* Modes used by pseudoclients */ 2, /* Chan Max Symbols */ "-cilmnpstOR", /* Modes to Remove */ "+o", /* Channel Umode used by Botserv bots */ diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c index 400cccbe0..acc9e0066 100644 --- a/src/protocol/charybdis.c +++ b/src/protocol/charybdis.c @@ -49,16 +49,8 @@ #define DEFAULT_MLOCK CMODE_n | CMODE_t IRCDVar myIrcd[] = { - {"Charybdis 1.0+", /* ircd name */ - "+oiS", /* nickserv mode */ - "+oiS", /* chanserv mode */ - "+oiS", /* memoserv mode */ - "+oiS", /* hostserv mode */ - "+oaiS", /* operserv mode */ - "+oiS", /* botserv mode */ - "+oiS", /* helpserv mode */ - "+oiS", /* Global mode */ - "+oiS", /* Used by BotServ Bots */ + {"Charybdis 1.0+", /* ircd name */ + "+oiS", /* Modes used by pseudoclients */ 2, /* Chan Max Symbols */ "-cilmnpstrgzQF", /* Modes to Remove */ "+o", /* Channel Umode used by Botserv bots */ diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c index 36083fa13..dce9b1f41 100644 --- a/src/protocol/inspircd11.c +++ b/src/protocol/inspircd11.c @@ -72,15 +72,7 @@ int inet_aton(const char *name, struct in_addr *addr) IRCDVar myIrcd[] = { {"InspIRCd 1.1", /* ircd name */ - "+oI", /* nickserv mode */ - "+oI", /* chanserv mode */ - "+oI", /* memoserv mode */ - "+oI", /* hostserv mode */ - "+ioI", /* operserv mode */ - "+oI", /* botserv mode */ - "+oI", /* helpserv mode */ - "+ioI", /* Global mode */ - "+sI", /* Used by BotServ Bots */ + "+I", /* Modes used by pseudoclients */ 5, /* Chan Max Symbols */ "-cilmnpstuzACGHKNOQRSV", /* Modes to Remove */ "+ao", /* Channel Umode used by Botserv bots */ diff --git a/src/protocol/inspircd12.cpp b/src/protocol/inspircd12.cpp index 3a2d5a8de..5c2490f55 100644 --- a/src/protocol/inspircd12.cpp +++ b/src/protocol/inspircd12.cpp @@ -72,15 +72,7 @@ int inet_aton(const char *name, struct in_addr *addr) IRCDVar myIrcd[] = { {"InspIRCd 1.1", /* ircd name */ - "+oI", /* nickserv mode */ - "+oI", /* chanserv mode */ - "+oI", /* memoserv mode */ - "+oI", /* hostserv mode */ - "+ioI", /* operserv mode */ - "+oI", /* botserv mode */ - "+oI", /* helpserv mode */ - "+ioI", /* Global mode */ - "+I", /* Used by BotServ Bots */ + "+I", /* Modes used by pseudoclients */ 5, /* Chan Max Symbols */ "-cilmnpstuzACGHKNOQRSV", /* Modes to Remove */ "+ao", /* Channel Umode used by Botserv bots */ diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c index 967c2fec0..954e67a81 100644 --- a/src/protocol/ratbox.c +++ b/src/protocol/ratbox.c @@ -49,15 +49,7 @@ IRCDVar myIrcd[] = { {"Ratbox 2.0+", /* ircd name */ - "+oi", /* nickserv mode */ - "+oi", /* chanserv mode */ - "+oi", /* memoserv mode */ - "+oi", /* hostserv mode */ - "+oai", /* operserv mode */ - "+oi", /* botserv mode */ - "+oi", /* helpserv mode */ - "+oi", /* Global mode */ - "+oi", /* Used by BotServ Bots */ + "+oi", /* Modes used by pseudoclients */ 2, /* Chan Max Symbols */ "-acilmnpst", /* Modes to Remove */ "+o", /* Channel Umode used by Botserv bots */ |