From 2a9dcfde4e423c4414f975a4b0b77cb08d08e782 Mon Sep 17 00:00:00 2001
From: Thorvald Natvig <slicer@users.sourceforge.net>
Date: Thu, 19 Feb 2009 18:44:30 +0000
Subject: [PATCH] Allow modification of ACL if you have Write on parent
 channel.

git-svn-id: https://mumble.svn.sourceforge.net/svnroot/mumble/trunk@1558 05730e5d-ab1b-0410-a4ac-84af385074fa
---
 src/murmur/Messages.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/murmur/Messages.cpp b/src/murmur/Messages.cpp
index e8fa857f9..3ed1444ee 100644
--- a/src/murmur/Messages.cpp
+++ b/src/murmur/Messages.cpp
@@ -713,7 +713,7 @@ void Server::msgEditACL(Connection *cCon, MessageEditACL *msg) {
 	if (!c)
 		return;
 
-	if (! hasPermission(uSource, c, ChanACL::Write)) {
+	if (! hasPermission(uSource, c, ChanACL::Write) && !(c->cParent && hasPermission(uSource, c->cParent, ChanACL::Write))) {
 		PERM_DENIED(uSource, c, ChanACL::Write);
 		return;
 	}