Committer : entrope
CVSROOT : /cvsroot/undernet-ircu
Module : ircu2.10
Branch tags: u2_10_12_branch
Commit time: 2006-06-08 02:11:32 UTC
Modified files:
Tag: u2_10_12_branch
ircd/ircd_parser.y ircd/ircd_lexer.l doc/example.conf ChangeLog
Log message:
Allow ircd.conf to control the list_chan privilege.
---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.710.2.108 ircu2.10/ChangeLog:1.710.2.109
--- ircu2.10/ChangeLog:1.710.2.108 Wed Jun 7 18:58:36 2006
+++ ircu2.10/ChangeLog Wed Jun 7 19:11:21 2006
@@ -1,5 +1,13 @@
2006-06-07 Michael Poole <mdpoole@xxxxxxxxxxx>
+ * doc/example.conf: Document the list_chan privilege.
+
+ * ircd/ircd_lexer.l: Recognize the token.
+
+ * ircd/ircd_parser.y: Treat it appropriately.
+
+2006-06-07 Michael Poole <mdpoole@xxxxxxxxxxx>
+
* ircd/s_auth.c (auth_ping_timeout): If the client never had an
auth request, kill them on ping timeout.
Index: ircu2.10/doc/example.conf
diff -u ircu2.10/doc/example.conf:1.61.2.9 ircu2.10/doc/example.conf:1.61.2.10
--- ircu2.10/doc/example.conf:1.61.2.9 Sun May 14 12:12:27 2006
+++ ircu2.10/doc/example.conf Wed Jun 7 19:11:21 2006
@@ -202,6 +202,7 @@
# local_gline (can set a G-line for this server only)
# local_badchan (can set a Gchan for this server only)
# see_chan (can see users in +s channels in /WHO)
+ # list_chan (can see +s channels with /LIST S)
# wide_gline (can use ! to force a wide G-line)
# see_opers (can see opers without DISPLAY privilege)
# local_opmode (can use OPMODE/CLEARMODE on local channels)
Index: ircu2.10/ircd/ircd_lexer.l
diff -u ircu2.10/ircd/ircd_lexer.l:1.21.2.1 ircu2.10/ircd/ircd_lexer.l:1.21.2.2
--- ircu2.10/ircd/ircd_lexer.l:1.21.2.1 Wed Feb 15 19:49:54 2006
+++ ircu2.10/ircd/ircd_lexer.l Wed Jun 7 19:11:21 2006
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
* USA.
- * $Id: ircd_lexer.l,v 1.21.2.1 2006/02/16 03:49:54 entrope Exp $
+ * $Id: ircd_lexer.l,v 1.21.2.2 2006/06/08 02:11:21 entrope Exp $
*/
%{
@@ -119,6 +119,7 @@
{ "gline", TPRIV_GLINE },
{ "kb", KBYTES },
{ "kilobytes", KBYTES },
+ { "list_chan", TPRIV_LIST_CHAN },
{ "local_badchan", TPRIV_LOCAL_BADCHAN },
{ "local_gline", TPRIV_LOCAL_GLINE },
{ "local_jupe", TPRIV_LOCAL_JUPE },
Index: ircu2.10/ircd/ircd_parser.y
diff -u ircu2.10/ircd/ircd_parser.y:1.56.2.4
ircu2.10/ircd/ircd_parser.y:1.56.2.5
--- ircu2.10/ircd/ircd_parser.y:1.56.2.4 Fri Apr 28 19:21:56 2006
+++ ircu2.10/ircd/ircd_parser.y Wed Jun 7 19:11:21 2006
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
* USA.
- * $Id: ircd_parser.y,v 1.56.2.4 2006/04/29 02:21:56 entrope Exp $
+ * $Id: ircd_parser.y,v 1.56.2.5 2006/06/08 02:11:21 entrope Exp $
*/
%{
@@ -165,6 +165,7 @@
%token TPRIV_SEE_CHAN TPRIV_SHOW_INVIS TPRIV_SHOW_ALL_INVIS TPRIV_PROPAGATE
%token TPRIV_UNLIMIT_QUERY TPRIV_DISPLAY TPRIV_SEE_OPERS TPRIV_WIDE_GLINE
%token TPRIV_FORCE_OPMODE TPRIV_FORCE_LOCAL_OPMODE TPRIV_APASS_OPMODE
+%token TPRIV_LIST_CHAN
/* and some types... */
%type <num> sizespec
%type <num> timespec timefactor factoredtimes factoredtime
@@ -616,6 +617,7 @@
TPRIV_DISPLAY { $$ = PRIV_DISPLAY; } |
TPRIV_SEE_OPERS { $$ = PRIV_SEE_OPERS; } |
TPRIV_WIDE_GLINE { $$ = PRIV_WIDE_GLINE; } |
+ TPRIV_LIST_CHAN { $$ = PRIV_LIST_CHAN; } |
LOCAL { $$ = PRIV_PROPAGATE; invert = 1; } |
TPRIV_FORCE_OPMODE { $$ = PRIV_FORCE_OPMODE; } |
TPRIV_FORCE_LOCAL_OPMODE { $$ = PRIV_FORCE_LOCAL_OPMODE; } |
----------------------- End of diff -----------------------
|
