First check if channel has mode "N", then check membership

[ngircd-alex.git] / src / ngircd / irc-channel.c

diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c
index c98176f1f3b6fbb44efc33d00607155cae47457e..4ea25bb044e61d7744e0d427faac7a35fa44e3f8 100644 (file)
--- a/src/ngircd/irc-channel.c
+++ b/src/ngircd/irc-channel.c
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2013 Alexander Barton (alex@barton.de) and Contributors.
+ * Copyright (c)2001-2015 Alexander Barton (alex@barton.de) and Contributors.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -35,6 +35,8 @@
 #include "irc-write.h"
 #include "conf.h"
 
+#include "irc-channel.h"
+
 /**
  * Part from all channels.
  *
@@ -446,7 +448,7 @@ IRC_PART(CLIENT * Client, REQUEST * Req)
 
        while (chan) {
                Channel_Part(target, Client, chan,
-                            Req->argc > 1 ? Req->argv[1] : Client_ID(target));
+                            Req->argc > 1 ? Req->argv[1] : "");
                chan = strtok(NULL, ",");
        }
 
@@ -595,6 +597,10 @@ IRC_LIST( CLIENT *Client, REQUEST *Req )
                }
        }
 
+       /* Send list head */
+       if (!IRC_WriteStrClient(from, RPL_LISTSTART_MSG, Client_ID(from)))
+               return DISCONNECTED;
+
        while (pattern) {
                /* Loop through all the channels */
                if (Req->argc > 0)
@@ -606,9 +612,7 @@ IRC_LIST( CLIENT *Client, REQUEST *Req )
                                /* Gotcha! */
                                if (!Channel_HasMode(chan, 's')
                                    || Channel_IsMemberOf(chan, from)
-                                   || (!Conf_MorePrivacy
-                                       && Client_HasMode(Client, 'o')
-                                       && Client_Conn(Client) > NONE))
+                                   || Client_HasMode(from, 'o'))
                                {
                                        if ((Conf_MaxListSize > 0)
                                            && IRC_CheckListTooBig(from, count,