From c377a83657c5b9e5c21874c5cea073de048ab2cf Mon Sep 17 00:00:00 2001 From: Travis McArthur Date: Sun, 5 Jul 2015 10:57:49 -0700 Subject: [PATCH 1/2] Update ignore file for SSL & tags --- .gitignore | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.gitignore b/.gitignore index 6e5115038..19e3bf96a 100644 --- a/.gitignore +++ b/.gitignore @@ -18,6 +18,14 @@ src/modules/Makefile unrealircd include/setup.h +# Ignore tags file +tags + +# Ignore SSL Stuff +server.cert.pem +server.key.pem +server.req.pem +ssl.rnd # Ignores for platform stuff .DS_Store From 95667ca9b857ebfe60147c0ec3c41869c8929131 Mon Sep 17 00:00:00 2001 From: Travis McArthur Date: Sun, 5 Jul 2015 10:57:58 -0700 Subject: [PATCH 2/2] Add short-circuit for remotes and U:lines --- src/operclass.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/operclass.c b/src/operclass.c index ed321d89a..9e07a448c 100644 --- a/src/operclass.c +++ b/src/operclass.c @@ -302,6 +302,10 @@ OperPermission OperClass_evaluateACLPath(char* path, aClient *sptr, aClient *vic OperClassACLPath *operPath; OperClassACL *acl; + // Trust U:Line or remote users + if (IsULine(sptr) || !MyClient(sptr)) + return OPER_ALLOW; + if (!IsOper(sptr)) return OPER_DENY;