From e77ebaf26bb3bd0049c2ade5122ae908d38ae149 Mon Sep 17 00:00:00 2001
From: Bram Matthys <syzop@vulnscan.org>
Date: Fri, 30 Oct 2015 09:19:11 +0100
Subject: [PATCH] Add 'map' to default operclass privileges so opers see ulines
 and the real map (not flat-map). Reported by blank (#4441).

---
 doc/conf/operclass.default.conf | 4 ++++
 src/modules/m_links.c           | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/doc/conf/operclass.default.conf b/doc/conf/operclass.default.conf
index b641fc017..b252e1249 100644
--- a/doc/conf/operclass.default.conf
+++ b/doc/conf/operclass.default.conf
@@ -34,6 +34,7 @@ operclass locop {
 			zline { local; };
 		};
 		trace { local; invisible-users; };
+		map;
 	};
 };
 
@@ -54,6 +55,7 @@ operclass globop {
 		trace;
 		who;
 		override { see; };
+		map;
 	};
 };
 
@@ -75,6 +77,7 @@ operclass admin {
 		trace;
 		who;
 		override { see; };
+		map;
 	};
 };
 
@@ -124,6 +127,7 @@ operclass netadmin {
 		samode;
 		servicebot { deop; kill; };
 		override { see; };
+		map;
 	};
 };
 
diff --git a/src/modules/m_links.c b/src/modules/m_links.c
index 8ee35954b..455457b94 100644
--- a/src/modules/m_links.c
+++ b/src/modules/m_links.c
@@ -79,7 +79,7 @@ CMD_FUNC(m_links)
 	list_for_each_entry(acptr, &global_server_list, client_node)
 	{
 		/* Some checks */
-		if (HIDE_ULINES && IsULine(acptr) && !IsOper(sptr))
+		if (HIDE_ULINES && IsULine(acptr) && !ValidatePermissionsForPath("map:ulines",cptr,NULL,NULL,NULL))
 			continue;
 		if (flat)
 			sendto_one(sptr, rpl_str(RPL_LINKS),