From: Michael Poole <mdpoole@troilus.org>
Date: Mon, 8 Jan 2007 04:11:56 +0000 (+0000)
Subject: Fix SourceForge bug #1629748
X-Git-Tag: v1.4.0-rc1~77
X-Git-Url: http://git.pk910.de/?p=srvx.git;a=commitdiff_plain;h=cdc0b5e8f4e66e5679dd61a8be2b4abec0fc3058

Fix SourceForge bug #1629748

src/chanserv.c (cmd_adduser): Include suspended users in check for
    pre-existing channel access for the user being added.
git-archimport-id: srvx@srvx.net--2006/srvx--devo--1.3--patch-79
---

diff --git a/ChangeLog b/ChangeLog
index aa719b9..df9ec22 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,20 @@
 # arch-tag: automatic-ChangeLog--srvx@srvx.net--2006/srvx--devo--1.3
 #
 
+2007-01-08 04:11:56 GMT	Michael Poole <mdpoole@troilus.org>	patch-79
+
+    Summary:
+      Fix SourceForge bug #1629748
+    Revision:
+      srvx--devo--1.3--patch-79
+
+    src/chanserv.c (cmd_adduser): Include suspended users in check for
+        pre-existing channel access for the user being added.
+
+    modified files:
+     ChangeLog src/chanserv.c
+
+
 2006-12-23 05:50:25 GMT	Michael Poole <mdpoole@troilus.org>	patch-78
 
     Summary:
diff --git a/src/chanserv.c b/src/chanserv.c
index 90abab8..7941790 100644
--- a/src/chanserv.c
+++ b/src/chanserv.c
@@ -2248,7 +2248,7 @@ static CHANSERV_FUNC(cmd_adduser)
     if(!(handle = modcmd_get_handle_info(user, argv[1])))
         return 0;
 
-    if((actee = GetChannelAccess(channel->channel_info, handle)))
+    if((actee = GetTrueChannelAccess(channel->channel_info, handle)))
     {
 	reply("CSMSG_USER_EXISTS", handle->handle, channel->name, actee->access);
 	return 0;