diff options
| -rw-r--r-- | Changes | 1 | ||||
| -rw-r--r-- | src/chanserv.c | 56 | ||||
| -rw-r--r-- | src/nickserv.c | 46 | ||||
| -rw-r--r-- | src/operserv.c | 2 | ||||
| -rw-r--r-- | src/users.c | 5 | ||||
| -rw-r--r-- | version.log | 6 |
6 files changed, 54 insertions, 62 deletions
@@ -6,6 +6,7 @@ Provided by Anope Dev. <dev@anope.org> - 2005 02/13 A Internal Event support, see EVENTS in the doc folder for help [ #00] 02/05 A Support for Unreal 3.2 +I channel mode. [ #00] 02/03 A Merged anope-win32 branch into the main, now Win32 ready. [ #00] +03/08 F Display of real host instead of vhost on alog(). [ #00] 03/07 F tolower/toupper compiler errors on Win32. [ #00] 03/06 F Services not remove modes correct in some cases. [#308] 03/06 F Protected Umode users are protected from bans. [#311] diff --git a/src/chanserv.c b/src/chanserv.c index 713aaaf85..801e6c47c 100644 --- a/src/chanserv.c +++ b/src/chanserv.c @@ -1703,7 +1703,7 @@ int check_kick(User * user, char *chan) kick: if (debug) alog("debug: channel: AutoKicking %s!%s@%s from %s", user->nick, - user->username, common_get_vhost(user), chan); + user->username, user->host, chan); /* Remember that the user has not been added to our channel user list * yet, so we check whether the channel does not exist OR has no user @@ -2716,7 +2716,7 @@ static int do_register(User * u) notice_lang(s_ChanServ, u, CHAN_REGISTER_NONE_CHANNEL, chan); } else if ((ci = cs_findchan(chan)) != NULL) { if (ci->flags & CI_VERBOTEN) { - alog("%s: Attempt to register FORBIDden channel %s by %s!%s@%s", s_ChanServ, ci->name, u->nick, u->username, common_get_vhost(u)); + alog("%s: Attempt to register FORBIDden channel %s by %s!%s@%s", s_ChanServ, ci->name, u->nick, u->username, u->host); notice_lang(s_ChanServ, u, CHAN_MAY_NOT_BE_REGISTERED, chan); } else { notice_lang(s_ChanServ, u, CHAN_ALREADY_REGISTERED, chan); @@ -2782,7 +2782,7 @@ static int do_register(User * u) ci->botflags = BSDefFlags; ci->founder->channelcount++; alog("%s: Channel '%s' registered by %s!%s@%s", s_ChanServ, chan, - u->nick, u->username, common_get_vhost(u)); + u->nick, u->username, u->host); notice_lang(s_ChanServ, u, CHAN_REGISTERED, chan, u->nick); #ifndef USE_ENCRYPTION notice_lang(s_ChanServ, u, CHAN_PASSWORD_IS, ci->founderpass); @@ -2841,7 +2841,7 @@ static int do_identify(User * u) u->founder_chans = uc; uc->chan = ci; alog("%s: %s!%s@%s identified for %s", s_ChanServ, u->nick, - u->username, common_get_vhost(u), ci->name); + u->username, u->host, ci->name); } notice_lang(s_ChanServ, u, CHAN_IDENTIFY_SUCCEEDED, chan); @@ -2850,8 +2850,7 @@ static int do_identify(User * u) notice_lang(s_ChanServ, u, CHAN_IDENTIFY_FAILED); } else { alog("%s: Failed IDENTIFY for %s by %s!%s@%s", - s_ChanServ, ci->name, u->nick, u->username, - common_get_vhost(u)); + s_ChanServ, ci->name, u->nick, u->username, u->host); notice_lang(s_ChanServ, u, PASSWORD_INCORRECT); bad_password(u); } @@ -2887,8 +2886,7 @@ static int do_logout(User * u) make_unidentified(u2, ci); notice_lang(s_ChanServ, u, CHAN_LOGOUT_SUCCEEDED, nick, chan); alog("%s: User %s!%s@%s has been logged out of channel %s.", - s_ChanServ, u2->nick, u2->username, common_get_vhost(u2), - chan); + s_ChanServ, u2->nick, u2->username, u2->host, chan); } else { int i; for (i = 0; i < 1024; i++) @@ -2948,8 +2946,7 @@ static int do_drop(User * u) alog("%s: Channel %s dropped by %s!%s@%s (founder: %s)", s_ChanServ, ci->name, u->nick, u->username, - common_get_vhost(u), - (ci->founder ? ci->founder->display : "(none)")); + u->host, (ci->founder ? ci->founder->display : "(none)")); delchan(ci); @@ -3117,7 +3114,7 @@ static int do_set_founder(User * u, ChannelInfo * ci, char *param) alog("%s: Changing founder of %s from %s to %s by %s!%s@%s", s_ChanServ, ci->name, ci->founder->display, nc->display, u->nick, - u->username, common_get_vhost(u)); + u->username, u->host); /* Founder and successor must not be the same group */ if (nc == ci->successor) @@ -3163,8 +3160,7 @@ static int do_set_successor(User * u, ChannelInfo * ci, char *param) alog("%s: Changing successor of %s from %s to %s by %s!%s@%s", s_ChanServ, ci->name, (ci->successor ? ci->successor->display : "none"), - (nc ? nc->display : "none"), u->nick, u->username, - common_get_vhost(u)); + (nc ? nc->display : "none"), u->nick, u->username, u->host); ci->successor = nc; @@ -3214,15 +3210,14 @@ static int do_set_password(User * u, ChannelInfo * ci, char *param) if (get_access(u, ci) < ACCESS_FOUNDER) { alog("%s: %s!%s@%s set password as Services admin for %s", - s_ChanServ, u->nick, u->username, common_get_vhost(u), - ci->name); + s_ChanServ, u->nick, u->username, u->host, ci->name); if (WallSetpass) anope_cmd_global(s_ChanServ, "\2%s\2 set password as Services admin for channel \2%s\2", u->nick, ci->name); } else { alog("%s: %s!%s@%s changed password of %s (founder: %s)", - s_ChanServ, u->nick, u->username, common_get_vhost(u), + s_ChanServ, u->nick, u->username, u->host, ci->name, ci->founder->display); } return MOD_CONT; @@ -3605,13 +3600,13 @@ static int do_set_xop(User * u, ChannelInfo * ci, char *param) } alog("%s: %s!%s@%s enabled XOP for %s", s_ChanServ, u->nick, - u->username, common_get_vhost(u), ci->name); + u->username, u->host, ci->name); notice_lang(s_ChanServ, u, CHAN_SET_XOP_ON); } else if (stricmp(param, "OFF") == 0) { ci->flags &= ~CI_XOP; alog("%s: %s!%s@%s disabled XOP for %s", s_ChanServ, u->nick, - u->username, common_get_vhost(u), ci->name); + u->username, u->host, ci->name); notice_lang(s_ChanServ, u, CHAN_SET_XOP_OFF); } else { syntax_error(s_ChanServ, u, "SET XOP", CHAN_SET_XOP_SYNTAX); @@ -3818,7 +3813,7 @@ static int do_xop(User * u, char *xname, int xlev, int *xmsgs) access->level = xlev; access->last_seen = 0; - alog("%s: %s!%s@%s (level %d) %s access level %d to %s (group %s) on channel %s", s_ChanServ, u->nick, u->username, common_get_vhost(u), ulev, change ? "changed" : "set", access->level, na->nick, nc->display, ci->name); + alog("%s: %s!%s@%s (level %d) %s access level %d to %s (group %s) on channel %s", s_ChanServ, u->nick, u->username, u->host, ulev, change ? "changed" : "set", access->level, na->nick, nc->display, ci->name); if (!change) { notice_lang(s_ChanServ, u, xmsgs[3], access->nc->display, @@ -4146,7 +4141,7 @@ static int do_access(User * u) return MOD_CONT; } access->level = level; - alog("%s: %s!%s@%s (level %d) set access level %d to %s (group %s) on channel %s", s_ChanServ, u->nick, u->username, common_get_vhost(u), ulev, access->level, na->nick, nc->display, ci->name); + alog("%s: %s!%s@%s (level %d) set access level %d to %s (group %s) on channel %s", s_ChanServ, u->nick, u->username, u->host, ulev, access->level, na->nick, nc->display, ci->name); notice_lang(s_ChanServ, u, CHAN_ACCESS_LEVEL_CHANGED, access->nc->display, chan, level); return MOD_CONT; @@ -4176,7 +4171,7 @@ static int do_access(User * u) access->level = level; access->last_seen = 0; - alog("%s: %s!%s@%s (level %d) set access level %d to %s (group %s) on channel %s", s_ChanServ, u->nick, u->username, common_get_vhost(u), ulev, access->level, na->nick, nc->display, ci->name); + alog("%s: %s!%s@%s (level %d) set access level %d to %s (group %s) on channel %s", s_ChanServ, u->nick, u->username, u->host, ulev, access->level, na->nick, nc->display, ci->name); notice_lang(s_ChanServ, u, CHAN_ACCESS_ADDED, nc->display, ci->name, access->level); } else if (stricmp(cmd, "DEL") == 0) { @@ -4236,7 +4231,7 @@ static int do_access(User * u) } else { notice_lang(s_ChanServ, u, CHAN_ACCESS_DELETED, access->nc->display, ci->name); - alog("%s: %s!%s@%s (level %d) deleted access of %s (group %s) on %s", s_ChanServ, u->nick, u->username, common_get_vhost(u), get_access(u, ci), na->nick, access->nc->display, chan); + alog("%s: %s!%s@%s (level %d) deleted access of %s (group %s) on %s", s_ChanServ, u->nick, u->username, u->host, get_access(u, ci), na->nick, access->nc->display, chan); access->nc = NULL; access->in_use = 0; deleted = 1; @@ -4305,7 +4300,7 @@ static int do_access(User * u) notice_lang(s_ChanServ, u, CHAN_ACCESS_CLEAR); alog("%s: %s!%s@%s (level %d) cleared access list on %s", - s_ChanServ, u->nick, u->username, common_get_vhost(u), + s_ChanServ, u->nick, u->username, u->host, get_access(u, ci), chan); } else { @@ -4968,7 +4963,7 @@ static int do_levels(User * u) ci->levels[levelinfo[i].what] = level; alog("%s: %s!%s@%s set level %s on channel %s to %d", - s_ChanServ, u->nick, u->username, common_get_vhost(u), + s_ChanServ, u->nick, u->username, u->host, levelinfo[i].name, ci->name, level); notice_lang(s_ChanServ, u, CHAN_LEVELS_CHANGED, levelinfo[i].name, chan, level); @@ -4984,7 +4979,7 @@ static int do_levels(User * u) ci->levels[levelinfo[i].what] = ACCESS_INVALID; alog("%s: %s!%s@%s disabled level %s on channel %s", - s_ChanServ, u->nick, u->username, common_get_vhost(u), + s_ChanServ, u->nick, u->username, u->host, levelinfo[i].name, ci->name); notice_lang(s_ChanServ, u, CHAN_LEVELS_DISABLED, levelinfo[i].name, chan); @@ -5033,8 +5028,7 @@ static int do_levels(User * u) reset_levels(ci); alog("%s: %s!%s@%s reset levels definitions on channel %s", - s_ChanServ, u->nick, u->username, common_get_vhost(u), - ci->name); + s_ChanServ, u->nick, u->username, u->host, ci->name); notice_lang(s_ChanServ, u, CHAN_LEVELS_RESET, chan); } else { syntax_error(s_ChanServ, u, "LEVELS", CHAN_LEVELS_SYNTAX); @@ -5879,8 +5873,7 @@ static int do_cs_topic(User * u) if (is_services_admin(u) && !check_access(u, ci, CA_TOPIC)) alog("%s: %s!%s@%s changed topic of %s as services admin.", - s_ChanServ, u->nick, u->username, common_get_vhost(u), - c->name); + s_ChanServ, u->nick, u->username, u->host, c->name); if (ircd->join2set) { if (whosends(ci) == s_ChanServ) { anope_cmd_join(s_ChanServ, c->name, time(NULL)); @@ -6275,8 +6268,7 @@ static int do_getpass(User * u) notice_lang(s_ChanServ, u, PERMISSION_DENIED); } else { alog("%s: %s!%s@%s used GETPASS on %s", - s_ChanServ, u->nick, u->username, common_get_vhost(u), - ci->name); + s_ChanServ, u->nick, u->username, u->host, ci->name); if (WallGetpass) { anope_cmd_global(s_ChanServ, "\2%s\2 used GETPASS on channel \2%s\2", @@ -6339,7 +6331,7 @@ static int do_sendpass(User * u) MailEnd(mail); alog("%s: %s!%s@%s used SENDPASS on %s", s_ChanServ, u->nick, - u->username, common_get_vhost(u), chan); + u->username, u->host, chan); notice_lang(s_ChanServ, u, CHAN_SENDPASS_OK, chan); } #endif diff --git a/src/nickserv.c b/src/nickserv.c index 7ee63469e..fd5f3b5e0 100644 --- a/src/nickserv.c +++ b/src/nickserv.c @@ -2069,7 +2069,7 @@ static int do_register(User * u) } else if (u->na) { /* i.e. there's already such a nick regged */ if (u->na->status & NS_VERBOTEN) { alog("%s: %s@%s tried to register FORBIDden nick %s", - s_NickServ, u->username, common_get_vhost(u), u->nick); + s_NickServ, u->username, u->host, u->nick); notice_lang(s_NickServ, u, NICK_CANNOT_BE_REGISTERED, u->nick); } else { notice_lang(s_NickServ, u, NICK_ALREADY_REGISTERED, u->nick); @@ -2302,8 +2302,7 @@ static int do_confirm(User * u) u->na = na; na->u = u; alog("%s: '%s' registered by %s@%s (e-mail: %s)", s_NickServ, - u->nick, u->username, common_get_vhost(u), - (email ? email : "none")); + u->nick, u->username, u->host, (email ? email : "none")); if (NSAddAccessOnReg) notice_lang(s_NickServ, u, NICK_REGISTERED, u->nick, na->nc->access[0]); @@ -2398,7 +2397,7 @@ static int do_group(User * u) notice_lang(s_NickServ, u, NICK_GROUP_PLEASE_WAIT, NSRegDelay); } else if (u->na && (u->na->status & NS_VERBOTEN)) { alog("%s: %s@%s tried to use GROUP from FORBIDden nick %s", - s_NickServ, u->username, common_get_vhost(u), u->nick); + s_NickServ, u->username, u->host, u->nick); notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, u->nick); } else if (u->na && NSNoGroupChange) { notice_lang(s_NickServ, u, NICK_GROUP_CHANGE_DISABLED, s_NickServ); @@ -2416,7 +2415,7 @@ static int do_group(User * u) s_NickServ, s_NickServ); } else if (check_password(pass, target->nc->pass) != 1) { alog("%s: Failed GROUP for %s!%s@%s (invalid password)", - s_NickServ, u->nick, u->username, common_get_vhost(u)); + s_NickServ, u->nick, u->username, u->host); notice_lang(s_NickServ, u, PASSWORD_INCORRECT); bad_password(u); } else { @@ -2473,7 +2472,7 @@ static int do_group(User * u) } #endif send_event(EVENT_GROUP, u->nick); - alog("%s: %s!%s@%s makes %s join group of %s (%s) (e-mail: %s)", s_NickServ, u->nick, u->username, common_get_vhost(u), u->nick, target->nick, target->nc->display, (target->nc->email ? target->nc->email : "none")); + alog("%s: %s!%s@%s makes %s join group of %s (%s) (e-mail: %s)", s_NickServ, u->nick, u->username, u->host, u->nick, target->nick, target->nc->display, (target->nc->email ? target->nc->email : "none")); notice_lang(s_NickServ, u, NICK_GROUP_JOINED, target->nick); u->lastnickreg = time(NULL); @@ -2546,7 +2545,7 @@ static int do_identify(User * u) notice_lang(s_NickServ, u, NICK_ALREADY_IDENTIFIED); } else if (!(res = check_password(pass, na->nc->pass))) { alog("%s: Failed IDENTIFY for %s!%s@%s", s_NickServ, u->nick, - u->username, common_get_vhost(u)); + u->username, u->host); notice_lang(s_NickServ, u, PASSWORD_INCORRECT); bad_password(u); } else if (res == -1) { @@ -2579,7 +2578,7 @@ static int do_identify(User * u) } send_event(EVENT_NICK_IDENTIFY, u->nick); alog("%s: %s!%s@%s identified for nick %s", s_NickServ, u->nick, - u->username, common_get_vhost(u), u->nick); + u->username, u->host, u->nick); notice_lang(s_NickServ, u, NICK_IDENTIFY_SUCCEEDED); if (ircd->vhost) { do_on_id(u); @@ -2730,7 +2729,7 @@ static int do_logout(User * u) u->isSuperAdmin = 0; /* Dont let people logout and remain a SuperAdmin */ alog("%s: %s!%s@%s logged out nickname %s", s_NickServ, u->nick, - u->username, common_get_vhost(u), u2->nick); + u->username, u->host, u2->nick); if (nick) notice_lang(s_NickServ, u, NICK_LOGOUT_X_SUCCEEDED, nick); @@ -2776,7 +2775,7 @@ static int do_drop(User * u) "\2%s\2 used DROP on \2%s\2", u->nick, nick); alog("%s: %s!%s@%s dropped nickname %s (e-mail: %s)", - s_NickServ, u->nick, u->username, common_get_vhost(u), + s_NickServ, u->nick, u->username, u->host, nr->nick, nr->email); delnickrequest(nr); notice_lang(s_NickServ, u, NICK_X_DROPPED, nick); @@ -2808,7 +2807,7 @@ static int do_drop(User * u) } alog("%s: %s!%s@%s dropped nickname %s (group %s) (e-mail: %s)", - s_NickServ, u->nick, u->username, common_get_vhost(u), + s_NickServ, u->nick, u->username, u->host, na->nick, na->nc->display, (na->nc->email ? na->nc->email : "none")); delnick(na); @@ -2977,14 +2976,14 @@ static int do_set_password(User * u, NickCore * nc, char *param) #endif if (u->na && u->na->nc != nc && is_services_admin(u)) { - alog("%s: %s!%s@%s used SET PASSWORD as Services admin on %s (e-mail: %s)", s_NickServ, u->nick, u->username, common_get_vhost(u), nc->display, (nc->email ? nc->email : "none")); + alog("%s: %s!%s@%s used SET PASSWORD as Services admin on %s (e-mail: %s)", s_NickServ, u->nick, u->username, u->host, nc->display, (nc->email ? nc->email : "none")); if (WallSetpass) anope_cmd_global(s_NickServ, "\2%s\2 used SET PASSWORD as Services admin on \2%s\2", u->nick, nc->display); } else { alog("%s: %s!%s@%s (e-mail: %s) changed its password.", s_NickServ, - u->nick, u->username, common_get_vhost(u), + u->nick, u->username, u->host, (nc->email ? nc->email : "none")); } return MOD_CONT; @@ -3047,10 +3046,10 @@ static int do_set_email(User * u, NickCore * nc, char *param) } if (u->na && u->na->nc != nc && is_services_admin(u)) { - alog("%s: %s!%s@%s used SET EMAIL as Services admin on %s (e-mail: %s)", s_NickServ, u->nick, u->username, common_get_vhost(u), nc->display, (nc->email ? nc->email : "none")); + alog("%s: %s!%s@%s used SET EMAIL as Services admin on %s (e-mail: %s)", s_NickServ, u->nick, u->username, u->host, nc->display, (nc->email ? nc->email : "none")); } else { alog("%s: %s!%s@%s (e-mail: %s) changed its e-mail to %s.", - s_NickServ, u->nick, u->username, common_get_vhost(u), + s_NickServ, u->nick, u->username, u->host, (nc->email ? nc->email : "none"), (param ? param : "none")); } if (nc->email) @@ -3954,8 +3953,7 @@ static int do_recover(User * u) notice_lang(s_NickServ, u, ACCESS_DENIED); if (res == 0) { alog("%s: RECOVER: invalid password for %s by %s!%s@%s", - s_NickServ, nick, u->nick, u->username, - common_get_vhost(u)); + s_NickServ, nick, u->nick, u->username, u->host); bad_password(u); } } @@ -3997,8 +3995,7 @@ static int do_release(User * u) notice_lang(s_NickServ, u, ACCESS_DENIED); if (res == 0) { alog("%s: RELEASE: invalid password for %s by %s!%s@%s", - s_NickServ, nick, u->nick, u->username, - common_get_vhost(u)); + s_NickServ, nick, u->nick, u->username, u->host); bad_password(u); } } @@ -4048,8 +4045,7 @@ static int do_ghost(User * u) notice_lang(s_NickServ, u, ACCESS_DENIED); if (res == 0) { alog("%s: GHOST: invalid password for %s by %s!%s@%s", - s_NickServ, nick, u->nick, u->username, - common_get_vhost(u)); + s_NickServ, nick, u->nick, u->username, u->host); bad_password(u); } } @@ -4119,7 +4115,7 @@ static int do_getemail(User * u) return MOD_CONT; } alog("%s: %s!%s@%s used GETEMAIL on %s", s_NickServ, u->nick, - u->username, common_get_vhost(u), email); + u->username, u->host, email); for (i = 0; i < 1024; i++) { for (nc = nclists[i]; nc; nc = nc->next) { if (nc->email) { @@ -4157,7 +4153,7 @@ static int do_getpass(User * u) } else if (!(na = findnick(nick))) { if ((nr = findrequestnick(nick))) { alog("%s: %s!%s@%s used GETPASS on %s", s_NickServ, u->nick, - u->username, common_get_vhost(u), nick); + u->username, u->host, nick); if (WallGetpass) anope_cmd_global(s_NickServ, "\2%s\2 used GETPASS on \2%s\2", u->nick, @@ -4176,7 +4172,7 @@ static int do_getpass(User * u) notice_lang(s_NickServ, u, PERMISSION_DENIED); } else { alog("%s: %s!%s@%s used GETPASS on %s", s_NickServ, u->nick, - u->username, common_get_vhost(u), nick); + u->username, u->host, nick); if (WallGetpass) anope_cmd_global(s_NickServ, "\2%s\2 used GETPASS on \2%s\2", u->nick, nick); @@ -4235,7 +4231,7 @@ static int do_sendpass(User * u) MailEnd(mail); alog("%s: %s!%s@%s used SENDPASS on %s", s_NickServ, u->nick, - u->username, common_get_vhost(u), nick); + u->username, u->host, nick); notice_lang(s_NickServ, u, NICK_SENDPASS_OK, nick); } #endif diff --git a/src/operserv.c b/src/operserv.c index 4f189b560..2f595b038 100644 --- a/src/operserv.c +++ b/src/operserv.c @@ -866,7 +866,7 @@ void check_clones(User * user) "\2WARNING\2 - possible clones detected from %s", common_get_vhost(user)); alog("%s: possible clones detected from %s", s_OperServ, - common_get_vhost(user)); + user->host); i = CLONE_DETECT_SIZE - 1; if (warnings[0].host) free(warnings[0].host); diff --git a/src/users.c b/src/users.c index 9fca93865..8078acc20 100644 --- a/src/users.c +++ b/src/users.c @@ -118,8 +118,7 @@ void update_host(User * user) } if (debug) - alog("debug: %s changes its host to %s", user->nick, - common_get_vhost(user)); + alog("debug: %s changes its host to %s", user->nick, user->host); } @@ -734,7 +733,7 @@ User *do_nick(const char *source, char *nick, char *username, char *host, alog("%s: %s!%s@%s automatically identified for nick %s", s_NickServ, user->nick, user->username, - common_get_vhost(user), user->nick); + user->host, user->nick); } } diff --git a/version.log b/version.log index b90ac6e37..e8f57b6db 100644 --- a/version.log +++ b/version.log @@ -8,10 +8,14 @@ VERSION_MAJOR="1" VERSION_MINOR="7" VERSION_PATCH="8" -VERSION_BUILD="610" +VERSION_BUILD="611" # $Log$ # +# BUILD : 1.7.8 (611) +# BUGS : none +# NOTES : alogs display the real host instead of vhost. +# # BUILD : 1.7.8 (610) # BUGS : # NOTES : Update tools README for one documentation style |