From e1ee78ae3084498708914f27267e8a5a272cd175 Mon Sep 17 00:00:00 2001
From: Elizabeth Jennifer Myers <elizabeth@sporksirc.net>
Date: Wed, 6 Jul 2011 18:14:57 -0400
Subject: [PATCH] Partially revert e794d39a8053005fdd2835d6206a88cc23262f8d.

As jilles pointed out, it is best that the chanserv access list always
remain synced with the grant list. Thus, the ability for clients to set
this is not a good idea unless services knows about the grant, but this
leads to all sorts of messy issues and likely isn't worth it.
---
 modules/m_grant.c | 78 +----------------------------------------------
 1 file changed, 1 insertion(+), 77 deletions(-)

diff --git a/modules/m_grant.c b/modules/m_grant.c
index 30684a323..a24e74ce8 100644
--- a/modules/m_grant.c
+++ b/modules/m_grant.c
@@ -30,12 +30,11 @@ static struct flag_list flaglist[] = {
 	{NULL,		0},
 };
 
-static int m_grant(struct Client *, struct Client *, int, const char **);
 static int me_grant(struct Client *, struct Client *, int, const char **);
 
 struct Message grant_msgtab = {
 	"GRANT", 0, 0, 0, MFLG_SLOW,
-	{mg_unreg, {m_grant, 4}, mg_ignore, mg_ignore, {me_grant, 4}, mg_ignore}
+	{mg_unreg, mg_ignore, mg_ignore, mg_ignore, {me_grant, 4}, mg_ignore}
 };
 
 mapi_clist_av1 grant_clist[] = { &grant_msgtab, NULL };
@@ -80,81 +79,6 @@ apply_flags(struct membership *msptr, const char *flagspec, unsigned int flagmas
 	}
 }
 
-/*
- * m_grant
- *
- * parv[1] = channel
- * parv[2] = target nickname
- * parv[3] = flag spec
- */
-static int
-m_grant(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
-{
-	struct Channel *chptr;
-	struct Client *target_p;
-	struct membership *cmsptr, *tmsptr;
-	char flagspec[BUFSIZE];
-	const char *flagptr;
-
-	if(parc > 4)
-	{
-		int i;
-		char *buf = flagspec;
-
-		flagptr = flagspec;
-
-		for (i = 3; i < parc; i++)
-			/* Rest assured it can't overflow, parv contents will always be < BUFSIZE
-			 * --Elizabeth */
-			buf += rb_sprintf(buf, "%s ", parv[i]);
-
-		*buf = '\0';
-	}
-	else
-		flagptr = parv[3];
-
-	if (!(chptr = find_channel(parv[1])))
-	{
-		sendto_one_numeric(source_p, ERR_NOSUCHCHANNEL, form_str(ERR_NOSUCHCHANNEL), parv[1]);
-		return 0;
-	}
-
-	if(!(cmsptr = find_channel_membership(chptr, client_p)))
-		/* Can't happen */
-		return 0;
-
-	/* Check for grant privilege */
-	if(get_channel_access(source_p, cmsptr, CHANROLE_GRANT) < CHFL_CHANOP)
-	{
-		sendto_one_numeric(source_p, ERR_CHANOPRIVSNEEDED, form_str(ERR_CHANOPRIVSNEEDED),
-				me.name, source_p->name, parv[2]);
-		return 0;
-	}
-
-	if (!(target_p = find_named_person(parv[2])))
-	{
-		sendto_one_numeric(source_p, ERR_NOSUCHNICK, form_str(ERR_NOSUCHNICK), parv[2]);
-		return 0;
-	}
-
-	/* Send it to the server the user is on if not local */
-	if(!MyClient(target_p))
-	{
-		struct Client *cptr = target_p->servptr;
-		sendto_one(cptr, ":%s ENCAP %s GRANT %s %s :%s",
-			get_id(source_p, cptr), cptr->name, chptr->chname,
-			get_id(target_p, cptr), flagptr);
-		return 0;
-	}
-
-	if (!(tmsptr = find_channel_membership(chptr, target_p)))
-		return 0;
-		
-	apply_flags(tmsptr, flagptr, cmsptr->roles);
-
-	return 0;
-}
-
 /*
  * me_grant
  *