ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/svn/ircd-hybrid/trunk/src/conf_parser.y
(Generate patch)

Comparing ircd-hybrid-8/src/conf_parser.y (file contents):
Revision 1519 by michael, Wed Sep 5 12:02:04 2012 UTC vs.
Revision 1520 by michael, Wed Sep 5 15:50:02 2012 UTC

# Line 113 | Line 113 | free_collect_item(struct CollectItem *it
113   }
114  
115   %token  ACCEPT_PASSWORD
116 %token  ACTION
116   %token  ADMIN
117   %token  AFTYPE
119 %token  T_ALLOW
118   %token  ANTI_NICK_FLOOD
119   %token  ANTI_SPAM_EXIT_MESSAGE_TIME
120   %token  AUTOCONN
121 < %token  T_BLOCK
124 < %token  BYTES KBYTES MBYTES GBYTES TBYTES
121 > %token  BYTES KBYTES MBYTES
122   %token  CALLER_ID_WAIT
123   %token  CAN_FLOOD
124   %token  CHANNEL
# Line 140 | Line 137 | free_collect_item(struct CollectItem *it
137   %token  DISABLE_FAKE_CHANNELS
138   %token  DISABLE_REMOTE_COMMANDS
139   %token  DOTS_IN_IDENT
143 %token  DURATION
140   %token  EGDPOOL_PATH
141   %token  EMAIL
146 %token  ENABLE
142   %token  ENCRYPTED
143   %token  EXCEED_LIMIT
144   %token  EXEMPT
# Line 156 | Line 151 | free_collect_item(struct CollectItem *it
151   %token  GLINE_DURATION
152   %token  GLINE_ENABLE
153   %token  GLINE_EXEMPT
159 %token  GLINE_TIME
154   %token  GLINE_REQUEST_DURATION
155   %token  GLINE_MIN_CIDR
156   %token  GLINE_MIN_CIDR6
# Line 215 | Line 209 | free_collect_item(struct CollectItem *it
209   %token  NO_OPER_FLOOD
210   %token  NO_TILDE
211   %token  NUMBER
218 %token  NUMBER_PER_IDENT
212   %token  NUMBER_PER_CIDR
213   %token  NUMBER_PER_IP
221 %token  NUMBER_PER_IP_GLOBAL
214   %token  OPERATOR
215   %token  OPERS_BYPASS_CALLERID
216   %token  OPER_ONLY_UMODES
# Line 246 | Line 238 | free_collect_item(struct CollectItem *it
238   %token  REMOTE
239   %token  REMOTEBAN
240   %token  RESTRICT_CHANNELS
249 %token  RESTRICTED
241   %token  RSA_PRIVATE_KEY_FILE
242   %token  RSA_PUBLIC_KEY_FILE
243   %token  SSL_CERTIFICATE_FILE
# Line 268 | Line 259 | free_collect_item(struct CollectItem *it
259   %token  T_CLUSTER
260   %token  TYPE
261   %token  SHORT_MOTD
271 %token  SILENT
262   %token  SPOOF
263   %token  SPOOF_NOTICE
264   %token  STATS_E_DISABLED
# Line 278 | Line 268 | free_collect_item(struct CollectItem *it
268   %token  STATS_P_OPER_ONLY
269   %token  TBOOL
270   %token  TMASKED
281 %token  T_REJECT
271   %token  TS_MAX_DELTA
272   %token  TS_WARN_DELTA
273   %token  TWODOTS
# Line 292 | Line 281 | free_collect_item(struct CollectItem *it
281   %token  T_DEAF
282   %token  T_DEBUG
283   %token  T_DLINE
295 %token  T_DRONE
284   %token  T_EXTERNAL
285   %token  T_FULL
286   %token  T_INVISIBLE
# Line 323 | Line 311 | free_collect_item(struct CollectItem *it
311   %token  T_SERVICES_NAME
312   %token  THROTTLE_TIME
313   %token  TRUE_NO_OPER_FLOOD
326 %token  TKLINE
327 %token  TXLINE
328 %token  TRESV
314   %token  UNKLINE
315   %token  USER
316   %token  USE_EGD
# Line 334 | Line 319 | free_collect_item(struct CollectItem *it
319   %token  VHOST
320   %token  VHOST6
321   %token  XLINE
337 %token  WARN
322   %token  WARN_NO_NLINE
323   %token  T_SIZE
324   %token  T_FILE

Diff Legend

Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)