diff options
| author | trystan trystan@31f1291d-b8d6-0310-a050-a5561fc1590b <trystan trystan@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864> | 2004-11-24 03:54:03 +0000 |
|---|---|---|
| committer | trystan trystan@31f1291d-b8d6-0310-a050-a5561fc1590b <trystan trystan@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864> | 2004-11-24 03:54:03 +0000 |
| commit | 9233f879d14728673ca82b1a7d16341e79d609df (patch) | |
| tree | 5f352da2ffe6ba00acea5afcbf435420ccca7f69 /src | |
| parent | a82bbfb6a129e55b9e8bacf72189e053c261c0d4 (diff) | |
BUILD : 1.7.6 (461) BUGS : 230 NOTES : 1. Moving Services Operators to Services Admins and vice-versa (230), 2. PTlink anope_cmd_server() had a minor issue thats now fixed
git-svn-id: svn://svn.anope.org/anope/trunk@461 31f1291d-b8d6-0310-a050-a5561fc1590b
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@315 5417fbe8-f217-4b02-8779-1006273d7864
Diffstat (limited to 'src')
| -rw-r--r-- | src/main.c | 1 | ||||
| -rw-r--r-- | src/operserv.c | 22 | ||||
| -rw-r--r-- | src/ptlink.c | 6 |
3 files changed, 22 insertions, 7 deletions
diff --git a/src/main.c b/src/main.c index ebcbe22fd..46d03a0ab 100644 --- a/src/main.c +++ b/src/main.c @@ -77,6 +77,7 @@ char **my_av, **my_envp; /* Moved here from version.h */ const char version_number[] = VERSION_STRING; +const char version_number_dotted[] = VERSION_STRING_DOTTED; const char version_build[] = "build #" BUILD ", compiled " __DATE__ " " __TIME__; /* the space is needed cause if you build with nothing it will complain */ diff --git a/src/operserv.c b/src/operserv.c index 739ea2685..025005d44 100644 --- a/src/operserv.c +++ b/src/operserv.c @@ -4040,8 +4040,15 @@ static int do_admin(User * u) notice_lang(s_OperServ, u, OPER_ADMIN_REACHED_LIMIT, nick); return MOD_CONT; } else { - na->nc->flags |= NI_SERVICES_ADMIN; - notice_lang(s_OperServ, u, OPER_ADMIN_ADDED, nick); + if (na->nc->flags & NI_SERVICES_OPER + && (res = slist_indexof(&servopers, na->nc)) != -1) { + slist_delete(&servopers, res); + na->nc->flags |= NI_SERVICES_ADMIN; + notice_lang(s_OperServ, u, OPER_ADMIN_MOVED, nick); + } else { + na->nc->flags |= NI_SERVICES_ADMIN; + notice_lang(s_OperServ, u, OPER_ADMIN_ADDED, nick); + } } if (readonly) @@ -4329,8 +4336,15 @@ static int do_oper(User * u) notice_lang(s_OperServ, u, OPER_OPER_REACHED_LIMIT, nick); return MOD_CONT; } else { - na->nc->flags |= NI_SERVICES_OPER; - notice_lang(s_OperServ, u, OPER_OPER_ADDED, nick); + if (na->nc->flags & NI_SERVICES_ADMIN + && (res = slist_indexof(&servadmins, na->nc)) != -1) { + slist_delete(&servadmins, res); + na->nc->flags |= NI_SERVICES_OPER; + notice_lang(s_OperServ, u, OPER_OPER_MOVED, nick); + } else { + na->nc->flags |= NI_SERVICES_OPER; + notice_lang(s_OperServ, u, OPER_OPER_ADDED, nick); + } } if (readonly) diff --git a/src/ptlink.c b/src/ptlink.c index f4744b2e4..5f6ea4220 100644 --- a/src/ptlink.c +++ b/src/ptlink.c @@ -16,7 +16,7 @@ #ifdef IRC_PTLINK -const char version_protocol[] = "PTlink 6.14.5+"; +const char version_protocol[] = "PTlink 6.15.*+"; /* Not all ircds use +f for their flood/join throttle system */ const char flood_mode_char_set[] = "+f"; /* mode char for FLOOD mode on set */ @@ -24,7 +24,7 @@ const char flood_mode_char_remove[] = "-f"; /* mode char for FLOOD mode on r int UseTSMODE = 0; IRCDVar ircd[] = { - {"PTlinkIRCd 6.14.*", /* ircd name */ + {"PTlink 6.15.*+", /* ircd name */ "+o", /* nickserv mode */ "+o", /* chanserv mode */ "+o", /* memoserv mode */ @@ -789,7 +789,7 @@ void anope_cmd_capab() void anope_cmd_server(char *servname, int hop, char *descript) { send_cmd(NULL, "SERVER %s %d Anope.Services%s :%s", servname, hop, - version_number, descript); + version_number_dotted, descript); } int anope_event_privmsg(char *source, int ac, char **av) |