diff options
| author | dane dane@31f1291d-b8d6-0310-a050-a5561fc1590b <dane dane@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864> | 2004-09-07 17:29:07 +0000 |
|---|---|---|
| committer | dane dane@31f1291d-b8d6-0310-a050-a5561fc1590b <dane dane@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864> | 2004-09-07 17:29:07 +0000 |
| commit | b0c19c6702c281fd3604356c2533329777b2702c (patch) | |
| tree | b20c40a9b164e257ff12a4817fc583a9432268ea /src/channels.c | |
| parent | eb0d83719b0e43b198d18af2885a378f90822c83 (diff) | |
BUILD : 1.7.5 (340) BUGS : none NOTES : Applied patch 830 provided by Trystan to resolve several issues.
git-svn-id: svn://svn.anope.org/anope/trunk@340 31f1291d-b8d6-0310-a050-a5561fc1590b
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@216 5417fbe8-f217-4b02-8779-1006273d7864
Diffstat (limited to 'src/channels.c')
| -rw-r--r-- | src/channels.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/channels.c b/src/channels.c index 9e32629e3..ebee50403 100644 --- a/src/channels.c +++ b/src/channels.c @@ -143,8 +143,7 @@ int chan_has_user_status(Channel * chan, User * user, int16 status) for (uc = user->chans; uc; uc = uc->next) { if (uc->chan == chan) { if (debug) { - alog("chan_has_user_status wanted %d the user is %d", - status, uc->status); + alog("debug: chan_has_user_status wanted %d the user is %d", status, uc->status); } return (uc->status & status); } @@ -874,6 +873,8 @@ void chan_adduser2(User * user, Channel * c) chan_set_user_status(c, user, CUS_OWNER | CUS_OP); } else if (ircd->protect && check_should_protect(user, chan)) { chan_set_user_status(c, user, CUS_PROTECT | CUS_OP); + } else if (ircd->admin && check_should_protect(user, chan)) { + chan_set_user_status(c, user, CUS_PROTECT | CUS_OP); } else if (check_should_op(user, chan)) { chan_set_user_status(c, user, CUS_OP); } else if (ircd->halfop && check_should_halfop(user, chan)) { |