Changeset 969:6808de455810 in freeDiameter for libfdcore/fdd.y

Timestamp:

Mar 13, 2013, 1:43:30 AM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

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

Message:

Remerged

Files:

• libfdcore/fdd.y (modified) (1 diff)
• libfdcore/fdd.y (modified) (7 diffs)

libfdcore/fdd.y

@@ -323 +323 @@
                                                 { yyerror (&yylloc, conf, "Not enough memory"); YYERROR; } );
                                         sprintf(fname, DEFAULT_EXTENSIONS_PATH "/%s", bkp);
-                                        free(bkp);
                                         fd = fopen(fname, "r");
-                                }
-                                if (fd == NULL) {
-                                        int ret = errno;
-                                        TRACE_ERROR("WARNING: Unable to open extension file %s for reading: %s\nLD_LIBRARY_PATH will be used.\n", fname, strerror(ret));
-                                } else {
+                                        if (fd == NULL) {
+                                                free(fname);
+                                                fname = bkp;
+                                        } else {
+                                                free(bkp);
+                                        }
+                                }
+                                if (fd != NULL) {
                                         fclose(fd);
-                                }
+                                } /* otherwise, LD_LIBRARY_PATH will be tested by dl_open. 
+                                This should not give any security issue, otherwise we can add an "else fail" here. */
                                 
                                 /* Try and open the configuration file (optional) */

libfdcore/fdd.y

@@ -63 +63 @@
 {
         if (ploc->first_line != ploc->last_line) {
-                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);
+                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);
         } else if (ploc->first_column != ploc->last_column) {
-                TRACE_DEBUG_ERROR("%s:%d.%d-%d : %s\n", conf->cnf_file, ploc->first_line, ploc->first_column, ploc->last_column, s);
+                TRACE_ERROR("%s:%d.%d-%d : %s\n", conf->cnf_file, ploc->first_line, ploc->first_column, ploc->last_column, s);
         } else {
-                TRACE_DEBUG_ERROR("%s:%d.%d : %s\n", conf->cnf_file, ploc->first_line, ploc->first_column, s);
+                TRACE_ERROR("%s:%d.%d : %s\n", conf->cnf_file, ploc->first_line, ploc->first_column, s);
         }
 }
@@ -504 +504 @@
                                 if (fd == NULL) {
                                         int ret = errno;
-                                        TRACE_DEBUG_ERROR("Unable to open certificate file %s for reading: %s\n", $3, strerror(ret));
+                                        TRACE_ERROR("Unable to open certificate file %s for reading: %s\n", $3, strerror(ret));
                                         yyerror (&yylloc, conf, "Error on file name"); 
                                         YYERROR;
@@ -512 +512 @@
                                 if (fd == NULL) {
                                         int ret = errno;
-                                        TRACE_DEBUG_ERROR("Unable to open private key file %s for reading: %s\n", $5, strerror(ret));
+                                        TRACE_ERROR("Unable to open private key file %s for reading: %s\n", $5, strerror(ret));
                                         yyerror (&yylloc, conf, "Error on file name"); 
                                         YYERROR;
@@ -535 +535 @@
                                 if (fd == NULL) {
                                         int ret = errno;
-                                        TRACE_DEBUG_ERROR("Unable to open CA file %s for reading: %s\n", $3, strerror(ret));
+                                        TRACE_ERROR("Unable to open CA file %s for reading: %s\n", $3, strerror(ret));
                                         yyerror (&yylloc, conf, "Error on file name"); 
                                         YYERROR;
@@ -575 +575 @@
                                 if (fd == NULL) {
                                         int ret = errno;
-                                        TRACE_DEBUG_ERROR("Unable to open CRL file %s for reading: %s\n", $3, strerror(ret));
+                                        TRACE_ERROR("Unable to open CRL file %s for reading: %s\n", $3, strerror(ret));
                                         yyerror (&yylloc, conf, "Error on file name"); 
                                         YYERROR;
@@ -618 +618 @@
                                                         &err_pos),
                                                 { yyerror (&yylloc, conf, "Error setting Priority parameter.");
-                                                  TRACE_DEBUG_ERROR("Error at position : %s\n", err_pos);
+                                                  TRACE_ERROR("Error at position : %s\n", err_pos);
                                                   YYERROR; } );
                         }
@@ -635 +635 @@
                                 if (fd == NULL) {
                                         int ret = errno;
-                                        TRACE_DEBUG_ERROR("Unable to open DH file %s for reading: %s\n", $3, strerror(ret));
+                                        TRACE_ERROR("Unable to open DH file %s for reading: %s\n", $3, strerror(ret));
                                         yyerror (&yylloc, conf, "Error on file name"); 
                                         YYERROR;