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

Comparing ircd-hybrid-8/src/ircd_lexer.l (file contents):
Revision 1246 by michael, Fri Sep 30 10:47:53 2011 UTC vs.
Revision 1247 by michael, Sat Oct 1 07:54:24 2011 UTC

# Line 85 | Line 85 | include   \.include{WS}(\<.*\>|\".*\")
85                      {
86                        yylval.string = yytext+1;
87                        if(yylval.string[yyleng-2] != '"')
88 <                        ilog(L_ERROR, "Unterminated character string");
88 >                        ilog(LOG_TYPE_IRCD, "Unterminated character string");
89                        else
90                          {
91                            int i,j;
# Line 108 | Line 108 | include   \.include{WS}(\<.*\>|\".*\")
108                                                                   * happen
109                                                                   */
110                                      {
111 <                                      ilog(L_ERROR,
111 >                                      ilog(LOG_TYPE_IRCD,
112                                             "Unterminated character string");
113                                        break;
114                                      }
# Line 168 | Line 168 | enable         { return ENABLE; }
168   encrypted       { return ENCRYPTED; }
169   exceed_limit    { return EXCEED_LIMIT; }
170   exempt          { return EXEMPT; }
171 + file            { return T_FILE; }
172   flags           { return IRCD_FLAGS; }
173   flatten_links   { return FLATTEN_LINKS; }
173 – fglinelog       { return FGLINELOG; }
174 – fname_glinelog  { return FGLINELOG; }
175 – fkilllog        { return FKILLLOG; }
176 – fioerrlog       { return FIOERRLOG; }
177 – fname_ioerrlog  { return FIOERRLOG; }
178 – fname_killlog   { return FKILLLOG; }
179 – fklinelog       { return FKLINELOG; }
180 – fname_klinelog  { return FKLINELOG; }
181 – ffailed_operlog { return FFAILED_OPERLOG; }
182 – fname_operlog   { return FOPERLOG; }
183 – foperlog        { return FOPERLOG; }
184 – fname_userlog   { return FUSERLOG; }
185 – fuserlog        { return FUSERLOG; }
174   gecos           { return GECOS; }
175   general         { return GENERAL; }
176   gline           { return GLINE; }
# Line 216 | Line 204 | kill           { return KILL; }
204   kill_chase_time_limit { return KILL_CHASE_TIME_LIMIT; }
205   kline           { return KLINE; }
206   kline_exempt    { return KLINE_EXEMPT; }
219 – l_crit          { return T_L_CRIT; }
220 – l_debug         { return T_L_DEBUG; }
221 – l_error         { return T_L_ERROR; }
222 – l_info          { return T_L_INFO; }
223 – l_notice        { return T_L_NOTICE; }
224 – l_trace         { return T_L_TRACE; }
225 – l_warn          { return T_L_WARN; }
207   leaf_mask       { return LEAF_MASK; }
208   listen          { return LISTEN; }
209 < log_level       { return LOG_LEVEL; }
229 < log             { return LOGGING; }
230 < logging         { return LOGGING; }
231 < logpath         { return T_LOGPATH; }
209 > log             { return T_LOG; }
210   masked          { return TMASKED; }
211   max_clients     { return T_MAX_CLIENTS; }
212   max_ident       { return MAX_IDENT; }
# Line 253 | Line 231 | no_tilde       { return NO_TILDE; }
231   number_per_cidr { return NUMBER_PER_CIDR; }
232   number_per_ip   { return NUMBER_PER_IP; }
233   oper            { return OPERATOR; }
256 – oper_log        { return OPER_LOG; }
234   oper_pass_resv  { return OPER_PASS_RESV; }
235   operator        { return OPERATOR; }
236   passwd          { return PASSWORD; }
# Line 296 | Line 273 | shared          { return T_SHARED; }
273   short_motd      { return SHORT_MOTD; }
274   sid             { return IRCD_SID; }
275   silent          { return SILENT; }
276 + size            { return T_SIZE; }
277   spoof           { return SPOOF; }
278   spoof_notice    { return SPOOF_NOTICE; }
279 + timestamp       { return T_TIMESTAMP; }
280   tkline_expire_notices { return TKLINE_EXPIRE_NOTICES; }
281   type            { return TYPE; }
282   true_no_oper_flood { return TRUE_NO_OPER_FLOOD; }
# Line 469 | Line 448 | cinclude(void)
448  
449    /* do stacking and co. */
450    if (include_stack_ptr >= MAX_INCLUDE_DEPTH)
451 <    ilog(L_ERROR, "Includes nested too deep in %s", p);
451 >    ilog(LOG_TYPE_IRCD, "Includes nested too deep in %s", p);
452    else
453    {
454      FBFILE *tmp_fbfile_in = NULL;
# Line 484 | Line 463 | cinclude(void)
463      
464      if (tmp_fbfile_in == NULL)
465      {
466 <      ilog(L_ERROR, "Unable to read configuration file '%s': %s",
466 >      ilog(LOG_TYPE_IRCD, "Unable to read configuration file '%s': %s",
467             filenamebuf, strerror(errno));
468        return;
469      }

Diff Legend

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