diff options
| author | rburchell <rburchell@5417fbe8-f217-4b02-8779-1006273d7864> | 2009-02-15 22:29:18 +0000 |
|---|---|---|
| committer | rburchell <rburchell@5417fbe8-f217-4b02-8779-1006273d7864> | 2009-02-15 22:29:18 +0000 |
| commit | d1611b640bcd27e1a91a99ef32127bc722e50a36 (patch) | |
| tree | b18c77b07b74b70f5613b106aa2a81baa6227f35 /src/operserv.c | |
| parent | 0e5b71923b25d908167e7ef9d07c6c217827e901 (diff) | |
Remove User::na, use User::nc everywhere. Will probably break everything, but opens the door to decoupling NC from NA, and means commands can now be run without bothering about changinc nick :)
More tweaking for na/nc usage.
It compiles, but it's still a work in progress.
Again, this compiles, but I *bet* there's no chance in hell it'll work. :)
Slightly better.
Set User::nc correctly.
Fix crash with unregistered nicks in core and ns_access.
Fix glist to work when you're not on that particular nick.
Fix ns_set to not crash and burn horribly.
Fix ns_set and ns_logout to not do bad things.
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2076 5417fbe8-f217-4b02-8779-1006273d7864
Diffstat (limited to 'src/operserv.c')
| -rw-r--r-- | src/operserv.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/operserv.c b/src/operserv.c index 714a12f11..b0e0d0f0c 100644 --- a/src/operserv.c +++ b/src/operserv.c @@ -352,7 +352,7 @@ int is_services_root(User * u) if ((NSStrictPrivileges && !is_oper(u)) || (!nick_identified(u))) return 0; - if ((u->na->nc->flags & NI_SERVICES_ROOT)) + if ((u->nc->flags & NI_SERVICES_ROOT)) return 1; return 0; } @@ -366,7 +366,7 @@ int is_services_admin(User * u) if ((NSStrictPrivileges && !is_oper(u)) || (!nick_identified(u))) return 0; - if ((u->na->nc->flags & (NI_SERVICES_ADMIN | NI_SERVICES_ROOT))) + if ((u->nc->flags & (NI_SERVICES_ADMIN | NI_SERVICES_ROOT))) return 1; return 0; } @@ -380,7 +380,7 @@ int is_services_oper(User * u) if ((NSStrictPrivileges && !is_oper(u)) || (!nick_identified(u))) return 0; - if ((u->na->nc-> + if ((u->nc-> flags & (NI_SERVICES_OPER | NI_SERVICES_ADMIN | NI_SERVICES_ROOT))) return 1; @@ -1355,13 +1355,13 @@ void resetDefCon(int level) send_event(EVENT_DEFCON_LEVEL, 1, strLevel); alog("Defcon level timeout, returning to lvl %d", level); ircdproto->SendGlobops(s_OperServ, - getstring2(NULL, OPER_DEFCON_WALL), + getstring(OPER_DEFCON_WALL), s_OperServ, level); if (GlobalOnDefcon) { if (DefConOffMessage) { oper_global(NULL, "%s", DefConOffMessage); } else { - oper_global(NULL, getstring(NULL, DEFCON_GLOBAL), + oper_global(NULL, getstring(DEFCON_GLOBAL), DefConLevel); } } |