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 aa719b9c95393adac70f97a596712d0374cc6c5b..df9ec224ef8053659f5a7889a2c1da7519006132 100644 (file)
--- 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 90abab819ccf8be3dce704881852c7f3f38d3e28..794179073736873240ea350c48f10f8d90a9c163 100644 (file)
--- 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;