Changeset 969:6808de455810 in freeDiameter
- Timestamp:
- Mar 13, 2013, 1:43:30 AM (11 years ago)
- Branch:
- default
- Children:
- 970:ec348f604399, 972:ce3cacbbccc9
- Parents:
- 966:8862d9dece66 (diff), 968:652713ce3596 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent. - Phase:
- public
- Location:
- libfdcore
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
libfdcore/fdd.l
r965 r969 52 52 yylloc->first_column = yylloc->last_column + 1; \ 53 53 yylloc->last_column = yylloc->first_column + yyleng - 1; \ 54 TRACE_ERROR(\54 fd_log_debug( \ 55 55 "(%d:%d-%d:%d) matched rule %d, length=%d, txt='%s'\n", \ 56 56 yylloc->first_line, yylloc->first_column, \ -
libfdcore/fdd.l
r968 r969 84 84 int globerrfct(const char *epath, int eerrno) 85 85 { 86 TRACE_ DEBUG_ERROR("Failed to scan %s: %s\n", epath, strerror(eerrno));86 TRACE_ERROR("Failed to scan %s: %s\n", epath, strerror(eerrno)); 87 87 return 1; 88 88 } … … 119 119 if (buf[yyleng-2] != '"') 120 120 { 121 TRACE_ DEBUG_ERROR("Unterminated string: %s\n", yytext);121 TRACE_ERROR("Unterminated string: %s\n", yytext); 122 122 return LEX_ERROR; 123 123 } … … 126 126 if (current_nested_level >= MAX_NESTED_CONF_FILES) 127 127 { 128 TRACE_ DEBUG_ERROR("Too many recursion levels in configuration files includes\n");128 TRACE_ERROR("Too many recursion levels in configuration files includes\n"); 129 129 return LEX_ERROR; 130 130 } … … 135 135 if (globerror == GLOB_NOSPACE) 136 136 { 137 TRACE_ DEBUG_ERROR("Not enough memory to parse include directive.\n");137 TRACE_ERROR("Not enough memory to parse include directive.\n"); 138 138 return LEX_ERROR; 139 139 } 140 140 if (globerror == GLOB_ABORTED) 141 141 { 142 TRACE_ DEBUG_ERROR("An error was encountered in include directive.\n");142 TRACE_ERROR("An error was encountered in include directive.\n"); 143 143 return LEX_ERROR; 144 144 } … … 150 150 if (globerror) 151 151 { 152 TRACE_ DEBUG_ERROR("Unexpected error in glob (%d).\n", globerror);152 TRACE_ERROR("Unexpected error in glob (%d).\n", globerror); 153 153 return LEX_ERROR; 154 154 } … … 166 166 if ( ! yyin ) 167 167 { 168 TRACE_ DEBUG_ERROR("Error in %s: %s", nested_conffiles[current_nested_level].filelist.gl_pathv[0], strerror(errno));168 TRACE_ERROR("Error in %s: %s", nested_conffiles[current_nested_level].filelist.gl_pathv[0], strerror(errno)); 169 169 return LEX_ERROR; 170 170 } … … 206 206 if ( ! yyin ) 207 207 { 208 TRACE_ DEBUG_ERROR("Error in %s: %s", nested_conffiles[current_nested_level].filelist.gl_pathv[nested_conffiles[current_nested_level].current_file], strerror(errno));208 TRACE_ERROR("Error in %s: %s", nested_conffiles[current_nested_level].filelist.gl_pathv[nested_conffiles[current_nested_level].current_file], strerror(errno)); 209 209 return LEX_ERROR; 210 210 } … … 234 234 if (ret != 1) { 235 235 /* No matching: an error occurred */ 236 TRACE_ DEBUG_ERROR("Unable to convert the value '%s' to a valid number: %s\n", yytext, strerror(errno));236 TRACE_ERROR("Unable to convert the value '%s' to a valid number: %s\n", yytext, strerror(errno)); 237 237 return LEX_ERROR; /* trig an error in yacc parser */ 238 238 /* Maybe we could REJECT instead of failing here? */ … … 277 277 /* Unrecognized character */ 278 278 <*>. { 279 TRACE_ DEBUG_ERROR("Unrecognized text on line %d col %d: '%s'.\n", yylloc->first_line, yylloc->first_column, yytext);279 TRACE_ERROR("Unrecognized text on line %d col %d: '%s'.\n", yylloc->first_line, yylloc->first_column, yytext); 280 280 return LEX_ERROR; 281 281 } -
libfdcore/fdd.y
r965 r969 323 323 { yyerror (&yylloc, conf, "Not enough memory"); YYERROR; } ); 324 324 sprintf(fname, DEFAULT_EXTENSIONS_PATH "/%s", bkp); 325 free(bkp);326 325 fd = fopen(fname, "r"); 327 } 328 if (fd == NULL) { 329 int ret = errno; 330 TRACE_ERROR("WARNING: Unable to open extension file %s for reading: %s\nLD_LIBRARY_PATH will be used.\n", fname, strerror(ret)); 331 } else { 326 if (fd == NULL) { 327 free(fname); 328 fname = bkp; 329 } else { 330 free(bkp); 331 } 332 } 333 if (fd != NULL) { 332 334 fclose(fd); 333 } 335 } /* otherwise, LD_LIBRARY_PATH will be tested by dl_open. 336 This should not give any security issue, otherwise we can add an "else fail" here. */ 334 337 335 338 /* Try and open the configuration file (optional) */ -
libfdcore/fdd.y
r967 r969 63 63 { 64 64 if (ploc->first_line != ploc->last_line) { 65 TRACE_ DEBUG_ERROR("%s:%d.%d-%d.%d : %s\n", conf->cnf_file, ploc->first_line, ploc->first_column, ploc->last_line, ploc->last_column, s);65 TRACE_ERROR("%s:%d.%d-%d.%d : %s\n", conf->cnf_file, ploc->first_line, ploc->first_column, ploc->last_line, ploc->last_column, s); 66 66 } else if (ploc->first_column != ploc->last_column) { 67 TRACE_ DEBUG_ERROR("%s:%d.%d-%d : %s\n", conf->cnf_file, ploc->first_line, ploc->first_column, ploc->last_column, s);67 TRACE_ERROR("%s:%d.%d-%d : %s\n", conf->cnf_file, ploc->first_line, ploc->first_column, ploc->last_column, s); 68 68 } else { 69 TRACE_ DEBUG_ERROR("%s:%d.%d : %s\n", conf->cnf_file, ploc->first_line, ploc->first_column, s);69 TRACE_ERROR("%s:%d.%d : %s\n", conf->cnf_file, ploc->first_line, ploc->first_column, s); 70 70 } 71 71 } … … 504 504 if (fd == NULL) { 505 505 int ret = errno; 506 TRACE_ DEBUG_ERROR("Unable to open certificate file %s for reading: %s\n", $3, strerror(ret));506 TRACE_ERROR("Unable to open certificate file %s for reading: %s\n", $3, strerror(ret)); 507 507 yyerror (&yylloc, conf, "Error on file name"); 508 508 YYERROR; … … 512 512 if (fd == NULL) { 513 513 int ret = errno; 514 TRACE_ DEBUG_ERROR("Unable to open private key file %s for reading: %s\n", $5, strerror(ret));514 TRACE_ERROR("Unable to open private key file %s for reading: %s\n", $5, strerror(ret)); 515 515 yyerror (&yylloc, conf, "Error on file name"); 516 516 YYERROR; … … 535 535 if (fd == NULL) { 536 536 int ret = errno; 537 TRACE_ DEBUG_ERROR("Unable to open CA file %s for reading: %s\n", $3, strerror(ret));537 TRACE_ERROR("Unable to open CA file %s for reading: %s\n", $3, strerror(ret)); 538 538 yyerror (&yylloc, conf, "Error on file name"); 539 539 YYERROR; … … 575 575 if (fd == NULL) { 576 576 int ret = errno; 577 TRACE_ DEBUG_ERROR("Unable to open CRL file %s for reading: %s\n", $3, strerror(ret));577 TRACE_ERROR("Unable to open CRL file %s for reading: %s\n", $3, strerror(ret)); 578 578 yyerror (&yylloc, conf, "Error on file name"); 579 579 YYERROR; … … 618 618 &err_pos), 619 619 { yyerror (&yylloc, conf, "Error setting Priority parameter."); 620 TRACE_ DEBUG_ERROR("Error at position : %s\n", err_pos);620 TRACE_ERROR("Error at position : %s\n", err_pos); 621 621 YYERROR; } ); 622 622 } … … 635 635 if (fd == NULL) { 636 636 int ret = errno; 637 TRACE_ DEBUG_ERROR("Unable to open DH file %s for reading: %s\n", $3, strerror(ret));637 TRACE_ERROR("Unable to open DH file %s for reading: %s\n", $3, strerror(ret)); 638 638 yyerror (&yylloc, conf, "Error on file name"); 639 639 YYERROR;
Note: See TracChangeset
for help on using the changeset viewer.